Changeset 15449 in josm

Timestamp:

2019-10-10T17:06:20+02:00 (5 years ago)

Author:

GerdP

Message:

see #13538: deprecate LatLon.isOutSideWorld()

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• coor/LatLon.java (modified) (2 diffs)
• osm/Node.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -18 +18 @@
 
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.tools.Logging;
@@ -193 +194 @@
      * Determines if this lat/lon is outside of the world
      * @return <code>true</code>, if the coordinate is outside the world, compared by using lat/lon.
-     */
+     * @deprecated use {@link Node#isOutSideWorld} instead, see also #13538.
+     */
+    @Deprecated
     public boolean isOutSideWorld() {
         Bounds b = ProjectionRegistry.getProjection().getWorldBoundsLatLon();

trunk/src/org/openstreetmap/josm/data/osm/Node.java

@@ -11 +11 @@
 import java.util.stream.Collectors;
 
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -411 +412 @@
         LatLon ll = getCoor();
         if (ll != null) {
-            if (ll.isOutSideWorld())
+            Bounds b = ProjectionRegistry.getProjection().getWorldBoundsLatLon();
+            if (lat() < b.getMinLat() || lat() > b.getMaxLat() || lon() < b.getMinLon() || lon() > b.getMaxLon()) {
                 return true;
+            }
             if (!ProjectionRegistry.getProjection().latlon2eastNorth(ll).equalsEpsilon(getEastNorth(), 1.0)) {
                 // we get here if a node was moved or created left from -180 or right from +180