Changeset 13212 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-12-17T20:27:00+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15676 - Remote Control: add new keyword currentselection for parameter select in LoadAndZoomHandler (patch by skorbut, modified)

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java (modified) (5 diffs)

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

@@ -10 +10 @@
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Set;
 import java.util.concurrent.Future;
@@ -60 +61 @@
     // Optional argument 'select'
     private final Set<SimplePrimitiveId> toSelect = new HashSet<>();
+
+    private Boolean isKeepingCurrentSelection = false;
 
     @Override
@@ -160 +163 @@
          * deselect objects if parameter addtags given
          */
-        if (args.containsKey("addtags")) {
+        if (args.containsKey("addtags") && !isKeepingCurrentSelection) {
             GuiHelper.executeByMainWorkerInEDT(() -> {
                 DataSet ds = MainApplication.getLayerManager().getEditDataSet();
@@ -185 +188 @@
                     }
                 }
+                if (isKeepingCurrentSelection) {
+                    Collection<OsmPrimitive> sel = ds.getSelected();
+                    newSel.addAll(sel);
+                    forTagAdd.addAll(sel);
+                }
                 toSelect.clear();
+                isKeepingCurrentSelection = false;
                 ds.setSelected(newSel);
                 zoom(newSel, bbox);
@@ -287 +296 @@
             for (String item : args.get("select").split(",")) {
                 if (!item.isEmpty()) {
+                    if ("currentselection".equals(item.toLowerCase(Locale.ENGLISH))) {
+                        isKeepingCurrentSelection = true;
+                        continue;
+                    }
                     try {
                         toSelect.add(SimplePrimitiveId.fromString(item));