Changeset 13640 in josm for trunk

Timestamp:

2018-04-15T23:58:36+02:00 (7 years ago)

Author:

Don-vip

Message:

javadoc/codestyle

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/projection/AbstractProjection.java (modified) (3 diffs)
• data/projection/proj/LambertConformalConic.java (modified) (2 diffs)
• gui/mappaint/mapcss/ExpressionFactory.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/projection/AbstractProjection.java

@@ -120 +120 @@
         LatLon ll = datum.fromWGS84(new LatLon(toConvert));
         double[] en = proj.project(Utils.toRadians(ll.lat()), Utils.toRadians(LatLon.normalizeLon(ll.lon() - lon0 - pm)));
-        return new EastNorth((ellps.a * k0 * en[0] + x0) / toMeter, (ellps.a * k0 * en[1] + y0) / toMeter);
+        return new EastNorth(
+                (ellps.a * k0 * en[0] + x0) / toMeter,
+                (ellps.a * k0 * en[1] + y0) / toMeter);
     }
 
@@ -134 +136 @@
         Bounds bounds = getWorldBoundsLatLon();
         return new LatLon(Utils.clamp(ll.lat(), bounds.getMinLat(), bounds.getMaxLat()),
-                Utils.clamp(ll.lon(), bounds.getMinLon(), bounds.getMaxLon()));
+                          Utils.clamp(ll.lon(), bounds.getMinLon(), bounds.getMaxLon()));
     }
 
     private LatLon eastNorth2latlon(EastNorth en, DoubleUnaryOperator normalizeLon) {
-        double[] latlonRad = proj.invproject((en.east() * toMeter - x0) / ellps.a / k0, (en.north() * toMeter - y0) / ellps.a / k0);
+        double[] latlonRad = proj.invproject(
+                 (en.east() * toMeter - x0) / ellps.a / k0,
+                (en.north() * toMeter - y0) / ellps.a / k0);
         double lon = Utils.toDegrees(latlonRad[1]) + lon0 + pm;
         LatLon ll = new LatLon(Utils.toDegrees(latlonRad[0]), normalizeLon.applyAsDouble(lon));
@@ -160 +164 @@
                 for (int chunk = minChunk; chunk <= maxChunk; chunk++) {
                     ret.put(new ProjectionBounds(Math.max(area.minEast, minEast + chunk * dEast), area.minNorth,
-                            Math.min(area.maxEast, maxEast + chunk * dEast), area.maxNorth),
+                                                 Math.min(area.maxEast, maxEast + chunk * dEast), area.maxNorth),
                             new ShiftedProjecting(this, new EastNorth(-chunk * dEast, 0)));
                 }

trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java

@@ -23 +23 @@
  * <p>
  * This implementation provides transforms for two cases of the lambert conic conformal projection:
- * <p>
+ * </p>
  * <ul>
  *   <li>{@code Lambert_Conformal_Conic_1SP} (EPSG code 9801)</li>
@@ -33 +33 @@
  * The {@code "standard_parallel_2"} parameter is optional and will be given the same value
  * as {@code "standard_parallel_1"} if not set (creating a 1 standard parallel projection).
- * <p>
+ * </p>
  * <b>References:</b>
  * <ul>

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -25 +25 @@
 
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -555 +556 @@
          * @param env the environment
          * @return the area of a closed way or multipolygon in square meters or {@code null}
-         * @see Geometry#computeArea(OsmPrimitive)
+         * @see Geometry#computeArea(IPrimitive)
          */
         public static Float areasize(final Environment env) { // NO_UCD (unused code)