Changeset 5845 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/handler

Timestamp:

2013-04-13T14:19:56+02:00 (11 years ago)

Author:

akks

Message:

fix #8599: Remote control command add_way now creates closed ways correctly
Show old values and tooltips in add_tags dialog
All nodes added by add_node and add_way are merged with existing ones

Location:

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler

Files:

• AddNodeHandler.java (modified) (3 diffs)
• AddWayHandler.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Point;
 import java.util.HashMap;
 import org.openstreetmap.josm.Main;
@@ -10 +11 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
@@ -64 +66 @@
         // Create a new node
         LatLon ll = new LatLon(lat, lon);
-        Node nnew = new Node(ll);
 
-        // Now execute the commands to add this node.
-        Main.main.undoRedo.add(new AddCommand(nnew));
-        Main.main.getCurrentDataSet().setSelected(nnew);
+        Node nd = null;
+        
+        if (Main.map != null &&  Main.map.mapView != null) {
+            Point p = Main.map.mapView.getPoint(ll);
+            nd = Main.map.mapView.getNearestNode(p, OsmPrimitive.isUsablePredicate);
+            if (nd!=null && nd.getCoor().greatCircleDistance(ll) > Main.pref.getDouble("remotecontrol.tolerance", 0.1)) {
+                nd = null; // node is too far
+            }
+        }
+
+        if (nd==null) {
+            nd = new Node(ll);
+            // Now execute the commands to add this node.
+            Main.main.undoRedo.add(new AddCommand(nd));
+        }
+        
+        Main.main.getCurrentDataSet().setSelected(nd);
         if (PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) {
             AutoScaleAction.autoScale("selection");

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Point;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -15 +17 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -31 +34 @@
     
     private final List<LatLon> allCoordinates = new ArrayList<LatLon>();
+
+    /**
+     * The place to remeber already added nodes (they are reused if needed @since 5845
+     */
+    HashMap<LatLon, Node> addedNodes;
 
     @Override
@@ -84 +92 @@
         }
     }
+    
+    /**
+     * Find the node with almost the same ccords in dataset or in already added nodes 
+     * @since 5845
+     **/
+    Node findOrCreateNode(LatLon ll,  List<Command> commands) {
+        Node nd = null;     
+         
+        if (Main.map != null && Main.map.mapView != null) {
+            Point p = Main.map.mapView.getPoint(ll);
+            nd = Main.map.mapView.getNearestNode(p, OsmPrimitive.isUsablePredicate);
+            if (nd!=null && nd.getCoor().greatCircleDistance(ll) > Main.pref.getDouble("remote.tolerance", 0.1)) {
+                nd = null; // node is too far
+            }
+        }
+        
+        Node prev = null;
+        for (LatLon lOld: addedNodes.keySet()) {
+            if (lOld.greatCircleDistance(ll) < Main.pref.getDouble("remotecontrol.tolerance", 0.1)) {
+                prev = addedNodes.get(lOld);
+                break;
+            }
+        }
 
+        if (prev!=null) {
+            nd = prev;
+        } else if (nd==null) {
+            nd = new Node(ll);
+            // Now execute the commands to add this node.
+            commands.add(new AddCommand(nd));
+            addedNodes.put(ll, nd);
+        }
+        return nd;
+    }
+    
     /*
      * This function creates the way with given coordinates of nodes
      */
     private void addWay() {
+        addedNodes = new HashMap<LatLon, Node>();
         Way way = new Way();
         List<Command> commands = new LinkedList<Command>();
         for (LatLon ll : allCoordinates) {
-            Node node = new Node(ll);
+            Node node = findOrCreateNode(ll, commands);
             way.addNode(node);
-            commands.add(new AddCommand(node));
         }
         allCoordinates.clear();