Changeset 7521 in josm for trunk/src/org

Timestamp:

2014-09-10T21:53:16+02:00 (10 years ago)

Author:

bastiK

Message:

fixed #10498 - do not rely on current selection when adding tags to primitives,
but pass list of primitives to method as parameter

Location:

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

Files:

• AddTagsDialog.java (modified) (3 diffs)
• handler/AddNodeHandler.java (modified) (4 diffs)
• handler/AddWayHandler.java (modified) (5 diffs)
• handler/LoadAndZoomHandler.java (modified) (4 diffs)
• handler/LoadObjectHandler.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java

@@ -291 +291 @@
      * addtags=wikipedia:de%3DResidenzschloss Dresden|name:en%3DDresden Castle
      */
-    public static void addTags(final Map<String, String> args, final String sender) {
+    public static void addTags(final Map<String, String> args, final String sender, final Collection<? extends OsmPrimitive> primitives) {
         if (args.containsKey("addtags")) {
             GuiHelper.executeByMainWorkerInEDT(new Runnable() {
@@ -319 +319 @@
                             i++;
                         }
-                        addTags(keyValue, sender);
+                        addTags(keyValue, sender, primitives);
                     }
                 }
@@ -333 +333 @@
      * @param sender is a string for skipping confirmations. Use epmty string for always confirmed adding.
      */
-    public static void addTags(String[][] keyValue, String sender) {
+    public static void addTags(String[][] keyValue, String sender, Collection<? extends OsmPrimitive> primitives) {
         if (trustedSenders.contains(sender)) {
             if (Main.main.getCurrentDataSet() != null) {
-                Collection<OsmPrimitive> s = Main.main.getCurrentDataSet().getSelected();
                 for (String[] row : keyValue) {
-                    Main.main.undoRedo.add(new ChangePropertyCommand(s, row[0], row[1]));
+                    Main.main.undoRedo.add(new ChangePropertyCommand(primitives, row[0], row[1]));
                 }
             }

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

@@ -5 +5 @@
 
 import java.awt.Point;
+import java.util.Collections;
 import java.util.Map;
 
@@ -29 +30 @@
     private double lat;
     private double lon;
+    
+    private Node node;
 
     @Override
@@ -87 +90 @@
         LatLon ll = new LatLon(lat, lon);
 
-        Node nd = null;
+        node = null;
 
         if (Main.isDisplayingMapView()) {
             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
+            node = Main.map.mapView.getNearestNode(p, OsmPrimitive.isUsablePredicate);
+            if (node!=null && node.getCoor().greatCircleDistance(ll) > Main.pref.getDouble("remotecontrol.tolerance", 0.1)) {
+                node = null; // node is too far
             }
         }
 
-        if (nd==null) {
-            nd = new Node(ll);
+        if (node==null) {
+            node = new Node(ll);
             // Now execute the commands to add this node.
-            Main.main.undoRedo.add(new AddCommand(nd));
+            Main.main.undoRedo.add(new AddCommand(node));
         }
 
-        Main.main.getCurrentDataSet().setSelected(nd);
+        Main.main.getCurrentDataSet().setSelected(node);
         if (PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) {
             AutoScaleAction.autoScale("selection");
@@ -110 +113 @@
         }
         // parse parameter addtags=tag1=value1|tag2=vlaue2
-        AddTagsDialog.addTags(args, sender);
+        AddTagsDialog.addTags(args, sender, Collections.singleton(node));
     }
 

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

@@ -7 +7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -36 +37 @@
 
     private final List<LatLon> allCoordinates = new ArrayList<>();
+    
+    private Way way;
 
     /**
@@ -69 +72 @@
         GuiHelper.runInEDTAndWait(new Runnable() {
             @Override public void run() {
-                addWay();
+                way = addWay();
             }
         });
         // parse parameter addtags=tag1=value1|tag2=value2
-        AddTagsDialog.addTags(args, sender);
+        AddTagsDialog.addTags(args, sender, Collections.singleton(way));
     }
 
@@ -150 +153 @@
      * This function creates the way with given coordinates of nodes
      */
-    private void addWay() {
+    private Way addWay() {
         addedNodes = new HashMap<>();
         Way way = new Way();
@@ -167 +170 @@
             Main.map.mapView.repaint();
         }
+        return way;
     }
 }

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

@@ -160 +160 @@
         }
 
+        final Collection<OsmPrimitive> forTagAdd = new HashSet<>();
         final Bounds bbox = new Bounds(minlat, minlon, maxlat, maxlon);
         if (args.containsKey("select") && PermissionPrefWithDefault.CHANGE_SELECTION.isAllowed()) {
@@ -174 +175 @@
                         if (p != null) {
                             newSel.add(p);
+                            forTagAdd.add(p);
                         }
                     }
@@ -188 +190 @@
         } else if (args.containsKey("search") && PermissionPrefWithDefault.CHANGE_SELECTION.isAllowed()) {
             try {
-                final DataSet ds = Main.main.getCurrentDataSet();
                 final SearchCompiler.Match search = SearchCompiler.compile(args.get("search"), false, false);
-                final Collection<OsmPrimitive> filteredPrimitives = Utils.filter(ds.allPrimitives(), search);
-                ds.setSelected(filteredPrimitives);
-                zoom(filteredPrimitives, bbox);
+                Main.worker.submit(new Runnable() {
+                    @Override
+                    public void run() {
+                        final DataSet ds = Main.main.getCurrentDataSet();
+                        final Collection<OsmPrimitive> filteredPrimitives = Utils.filter(ds.allPrimitives(), search);
+                        ds.setSelected(filteredPrimitives);
+                        forTagAdd.addAll(filteredPrimitives);
+                        zoom(filteredPrimitives, bbox);
+                    }
+                });
             } catch (SearchCompiler.ParseError ex) {
                 Main.error(ex);
@@ -219 +227 @@
         }
 
-        AddTagsDialog.addTags(args, sender);
+        AddTagsDialog.addTags(args, sender, forTagAdd);
     }
 

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

@@ -2 +2 @@
 package org.openstreetmap.josm.io.remotecontrol.handler;
 
+import java.util.Collection;
+import java.util.HashSet;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -8 +10 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
@@ -68 +72 @@
                 public void run() {
                     final List<PrimitiveId> downloaded = task.getDownloadedId();
+                    final DataSet ds = Main.main.getCurrentDataSet();
                     if(downloaded != null) {
                         GuiHelper.runInEDT(new Runnable() {
                             @Override
                             public void run() {
-                                Main.main.getCurrentDataSet().setSelected(downloaded);
+                                ds.setSelected(downloaded);
                             }
                         });
                     }
-                    AddTagsDialog.addTags(args, sender);
+                    Collection<OsmPrimitive> downlPrim = new HashSet<>();
+                    for (PrimitiveId id : downloaded) {
+                        downlPrim.add(ds.getPrimitiveById(id));
+                    }
+                    AddTagsDialog.addTags(args, sender, downlPrim);
                     ps.clear();
                 }