Changeset 12778 in josm for trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java

Timestamp:

2017-09-08T01:04:05+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - deprecate Projections#project and Projections#inverseProject

replacement is a bit more verbose, but the fact that Main.proj is
involved need not be hidden

File:

• trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (modified) (3 diffs)

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

@@ -19 +19 @@
 import java.util.TreeSet;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
@@ -29 +30 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
-import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
@@ -138 +138 @@
                 if (joinWayToNode) {
                     for (Node node : nodesInSegment) {
-                        EastNorth newPosition = Geometry.closestPointToSegment(w.getNode(segmentIndex).getEastNorth(),
-                                                                            w.getNode(segmentIndex+1).getEastNorth(),
-                                                                            node.getEastNorth());
-                        MoveCommand c = new MoveCommand(node, Projections.inverseProject(newPosition));
+                        EastNorth newPosition = Geometry.closestPointToSegment(
+                                w.getNode(segmentIndex).getEastNorth(),
+                                w.getNode(segmentIndex+1).getEastNorth(),
+                                node.getEastNorth());
+                        MoveCommand c = new MoveCommand(
+                                node, Main.getProjection().eastNorth2latlon(newPosition));
                         // Avoid moving a given node several times at the same position in case of overlapping ways
                         if (!cmds.contains(c)) {