Changeset 12820 in josm

Timestamp:

2017-09-10T15:49:59+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - wrap around +180 degrees, for consistency

File:

• trunk/src/org/openstreetmap/josm/data/projection/AbstractProjection.java (modified) (3 diffs)

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

@@ -148 +148 @@
         if (proj.lonIsLinearToEast()) {
             //FIXME: Respect datum?
-            // wrap the wrold around
+            // wrap the world around
             Bounds bounds = getWorldBoundsLatLon();
             double minEast = latlon2eastNorth(bounds.getMin()).east();
@@ -225 +225 @@
 
     private void visitOutline(Bounds b, int nPoints, Consumer<EastNorth> visitor) {
-        double minlon = b.getMinLon();
+        double maxlon = b.getMaxLon();
         if (b.crosses180thMeridian()) {
-            minlon -= 360.0;
-        }
-        double spanLon = b.getMaxLon() - minlon;
+            maxlon += 360.0;
+        }
+        double spanLon = maxlon - b.getMinLon();
         double spanLat = b.getMaxLat() - b.getMinLat();
 
@@ -235 +235 @@
         for (int step = 0; step < nPoints; step++) {
             visitor.accept(latlon2eastNorth(
-                    new LatLon(b.getMinLat(), minlon + spanLon * step / nPoints)));
-        }
-        for (int step = 0; step < nPoints; step++) {
-            visitor.accept(latlon2eastNorth(
-                    new LatLon(b.getMinLat() + spanLat * step / nPoints, b.getMaxLon())));
-        }
-        for (int step = 0; step < nPoints; step++) {
-            visitor.accept(latlon2eastNorth(
-                    new LatLon(b.getMaxLat(), b.getMaxLon() - spanLon * step / nPoints)));
-        }
-        for (int step = 0; step < nPoints; step++) {
-            visitor.accept(latlon2eastNorth(
-                    new LatLon(b.getMaxLat() - spanLat * step / nPoints, minlon)));
+                    new LatLon(b.getMinLat(), b.getMinLon() + spanLon * step / nPoints)));
+        }
+        for (int step = 0; step < nPoints; step++) {
+            visitor.accept(latlon2eastNorth(
+                    new LatLon(b.getMinLat() + spanLat * step / nPoints, maxlon)));
+        }
+        for (int step = 0; step < nPoints; step++) {
+            visitor.accept(latlon2eastNorth(
+                    new LatLon(b.getMaxLat(), maxlon - spanLon * step / nPoints)));
+        }
+        for (int step = 0; step < nPoints; step++) {
+            visitor.accept(latlon2eastNorth(
+                    new LatLon(b.getMaxLat() - spanLat * step / nPoints, b.getMinLon())));
         }
     }