Changeset 14960 in josm for trunk/test

Timestamp:

2019-04-04T11:34:48+02:00 (5 years ago)

Author:

GerdP

Message:

see #13538:

• Add new method isOutSideWorld() to class Node and use the method where LatLon.isOutSideWorld() was used before
• Add a check in MoveNodeAction to make sure that rounding errors near 180 longitude don't move the node from east to west or vice versa

(I've removed the changes to reactions implemented in 13538-v2.patch, they would be too confusing.)

TODO: Plugins should use the new method in Node

File:

• trunk/test/unit/org/openstreetmap/josm/data/osm/NodeTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/data/osm/NodeTest.java

@@ -12 +12 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.DataSource;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -27 +28 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
+    public JOSMTestRules test = new JOSMTestRules().projection();
 
     /**
@@ -104 +105 @@
         new Node().load(new WayData());
     }
+
+    /**
+     * Test that {@link Node#isOutSideWorld} works as expected.
+     */
+    @Test
+    public void testOutsideWorld() {
+        Node n = new Node(1, 1);
+        n.setCoor(LatLon.ZERO);
+        assertFalse(n.isOutSideWorld());
+        n.setCoor(null);
+        assertFalse(n.isOutSideWorld());
+        n.setCoor(LatLon.NORTH_POLE);
+        assertTrue(n.isOutSideWorld());
+        n.setCoor(new LatLon(0, 180.0));
+        assertFalse(n.isOutSideWorld());
+        // simulate a small move east
+        n.setEastNorth(new EastNorth(n.getEastNorth().getX() + 0.1, n.getEastNorth().getY()));
+        assertTrue(n.isOutSideWorld());
+        n.setCoor(new LatLon(0, -180.0));
+        assertFalse(n.isOutSideWorld());
+        // simulate a small move west
+        n.setEastNorth(new EastNorth(n.getEastNorth().getX() - 0.1, n.getEastNorth().getY()));
+        assertTrue(n.isOutSideWorld());
+    }
+
 }