Changeset 13640 in josm for trunk/src


Ignore:
Timestamp:
2018-04-15T23:58:36+02:00 (18 months ago)
Author:
Don-vip
Message:

javadoc/codestyle

Location:
trunk/src/org/openstreetmap/josm
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/projection/AbstractProjection.java

    r12820 r13640  
    120120        LatLon ll = datum.fromWGS84(new LatLon(toConvert));
    121121        double[] en = proj.project(Utils.toRadians(ll.lat()), Utils.toRadians(LatLon.normalizeLon(ll.lon() - lon0 - pm)));
    122         return new EastNorth((ellps.a * k0 * en[0] + x0) / toMeter, (ellps.a * k0 * en[1] + y0) / toMeter);
     122        return new EastNorth(
     123                (ellps.a * k0 * en[0] + x0) / toMeter,
     124                (ellps.a * k0 * en[1] + y0) / toMeter);
    123125    }
    124126
     
    134136        Bounds bounds = getWorldBoundsLatLon();
    135137        return new LatLon(Utils.clamp(ll.lat(), bounds.getMinLat(), bounds.getMaxLat()),
    136                 Utils.clamp(ll.lon(), bounds.getMinLon(), bounds.getMaxLon()));
     138                          Utils.clamp(ll.lon(), bounds.getMinLon(), bounds.getMaxLon()));
    137139    }
    138140
    139141    private LatLon eastNorth2latlon(EastNorth en, DoubleUnaryOperator normalizeLon) {
    140         double[] latlonRad = proj.invproject((en.east() * toMeter - x0) / ellps.a / k0, (en.north() * toMeter - y0) / ellps.a / k0);
     142        double[] latlonRad = proj.invproject(
     143                 (en.east() * toMeter - x0) / ellps.a / k0,
     144                (en.north() * toMeter - y0) / ellps.a / k0);
    141145        double lon = Utils.toDegrees(latlonRad[1]) + lon0 + pm;
    142146        LatLon ll = new LatLon(Utils.toDegrees(latlonRad[0]), normalizeLon.applyAsDouble(lon));
     
    160164                for (int chunk = minChunk; chunk <= maxChunk; chunk++) {
    161165                    ret.put(new ProjectionBounds(Math.max(area.minEast, minEast + chunk * dEast), area.minNorth,
    162                             Math.min(area.maxEast, maxEast + chunk * dEast), area.maxNorth),
     166                                                 Math.min(area.maxEast, maxEast + chunk * dEast), area.maxNorth),
    163167                            new ShiftedProjecting(this, new EastNorth(-chunk * dEast, 0)));
    164168                }
  • trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java

    r13639 r13640  
    2323 * <p>
    2424 * This implementation provides transforms for two cases of the lambert conic conformal projection:
    25  * <p>
     25 * </p>
    2626 * <ul>
    2727 *   <li>{@code Lambert_Conformal_Conic_1SP} (EPSG code 9801)</li>
     
    3333 * The {@code "standard_parallel_2"} parameter is optional and will be given the same value
    3434 * as {@code "standard_parallel_1"} if not set (creating a 1 standard parallel projection).
    35  * <p>
     35 * </p>
    3636 * <b>References:</b>
    3737 * <ul>
  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

    r13105 r13640  
    2525
    2626import org.openstreetmap.josm.data.coor.LatLon;
     27import org.openstreetmap.josm.data.osm.IPrimitive;
    2728import org.openstreetmap.josm.data.osm.Node;
    2829import org.openstreetmap.josm.data.osm.OsmPrimitive;
     
    555556         * @param env the environment
    556557         * @return the area of a closed way or multipolygon in square meters or {@code null}
    557          * @see Geometry#computeArea(OsmPrimitive)
     558         * @see Geometry#computeArea(IPrimitive)
    558559         */
    559560        public static Float areasize(final Environment env) { // NO_UCD (unused code)
Note: See TracChangeset for help on using the changeset viewer.