Changeset 14960 in josm for trunk

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

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/CreateCircleAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/MoveAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/MoveNodeAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/osm/Node.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/NodeTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java

@@ -214 +214 @@
                 double y = center.north() + r*Math.sin(alpha);
                 LatLon ll = ProjectionRegistry.getProjection().eastNorth2latlon(new EastNorth(x, y));
-                if (ll.isOutSideWorld()) {
+                if (new Node(new EastNorth(x, y)).isOutSideWorld()) {
                     notifyNodesNotOnCircle();
                     return;

trunk/src/org/openstreetmap/josm/actions/MoveAction.java

@@ -152 +152 @@
 
         for (Node n : affectedNodes) {
-            if (n.isLatLonKnown() && n.getCoor().isOutSideWorld()) {
+            if (n.isLatLonKnown() && n.isOutSideWorld()) {
                 // Revert move
                 ((MoveCommand) c).moveAgain(-distx, -disty);

trunk/src/org/openstreetmap/josm/actions/MoveNodeAction.java

@@ -52 +52 @@
         // move the node
         UndoRedoHandler.getInstance().add(new MoveCommand(n, coordinates));
+        if (n.getCoor().distance(coordinates) > 1) {
+            // see #13538: Avoid rounding error near 180 longitude which moves nodes too far
+            if (coordinates.lon() >= 180.0) {
+                coordinates = new LatLon(coordinates.lat(), Math.nextDown(180.0));
+            } else if (coordinates.lon() <= -180.0) {
+                coordinates = new LatLon(coordinates.lat(), Math.nextUp(-180.0));
+            }
+            UndoRedoHandler.getInstance().undo(1);
+            UndoRedoHandler.getInstance().add(new MoveCommand(n, coordinates));
+        }
         MainApplication.getMap().mapView.repaint();
     }

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -530 +530 @@
 
         if (newNode) {
-            if (n.getCoor().isOutSideWorld()) {
+            if (n.isOutSideWorld()) {
                 JOptionPane.showMessageDialog(
                         MainApplication.getMainFrame(),

trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java

@@ -416 +416 @@
         } else if (state == State.IMPROVING) {
             // Checking if the new coordinate is outside of the world
-            if (mv.getLatLon(mousePos.x, mousePos.y).isOutSideWorld()) {
+            if (new Node(mv.getEastNorth(mousePos.x, mousePos.y)).isOutSideWorld()) {
                 JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                         tr("Cannot add a node outside of the world."),

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -32 +32 @@
 import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -723 +722 @@
                 }
                 for (Node n : affectedNodes) {
-                    LatLon ll = n.getCoor();
-                    if (ll != null && ll.isOutSideWorld()) {
+                    if (n.isOutSideWorld()) {
                         // Revert move
                         if (c instanceof MoveCommand) {

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

@@ -403 +403 @@
         return referrers(Way.class).collect(Collectors.toList());
     }
+
+    /**
+     * Determines if this node is outside of the world. See also #13538.
+     * @return <code>true</code>, if the coordinate is outside the world, compared by using lat/lon and east/north
+     * @since 14960
+     */
+    public boolean isOutSideWorld() {
+        LatLon ll = getCoor();
+        if (ll != null) {
+            if (ll.isOutSideWorld())
+                return true;
+            if (!new Node(ll).getEastNorth().equalsEpsilon(getEastNorth(), 1.0)) {
+                // we get here if a node was moved or created left from -180 or right from +180
+                return true;
+            }
+        }
+        return false;
+    }
 }

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());
+    }
+
 }