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

Timestamp:

2014-01-12T10:41:20+01:00 (10 years ago)

Author:

simon04

Message:

Make strings like foo relation/123 and way/345 but also node/789 paste-able in "Download object", some refactoring of related code

File:

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

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

@@ -22 +22 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -52 +53 @@
 
     // Optional argument 'select'
-    private final Set<Long> ways = new HashSet<Long>();
-    private final Set<Long> nodes = new HashSet<Long>();
-    private final Set<Long> relations = new HashSet<Long>();
+    private final HashSet<SimplePrimitiveId> toSelect = new HashSet<SimplePrimitiveId>();
 
     @Override
@@ -60 +59 @@
         String msg = tr("Remote Control has been asked to load data from the API.") +
                 "<br>" + tr("Bounding box: ") + new BBox(minlon, minlat, maxlon, maxlat).toStringCSV(", ");
-        if (args.containsKey("select") && ways.size()+nodes.size()+relations.size() > 0) {
-            msg += "<br>" + tr("Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}", relations.size(), ways.size(), nodes.size());
+        if (args.containsKey("select") && toSelect.size() > 0) {
+            msg += "<br>" + tr("Selection: {0}", toSelect.size());
         }
         return msg;
@@ -168 +167 @@
                     if(ds == null) // e.g. download failed
                         return;
-                    for (Way w : ds.getWays()) {
-                        if (ways.contains(w.getId())) {
-                            newSel.add(w);
-                        }
-                    }
-                    ways.clear();
-                    for (Node n : ds.getNodes()) {
-                        if (nodes.contains(n.getId())) {
-                            newSel.add(n);
-                        }
-                    }
-                    nodes.clear();
-                    for (Relation r : ds.getRelations()) {
-                        if (relations.contains(r.getId())) {
-                            newSel.add(r);
-                        }
-                    }
-                    relations.clear();
+                    for (SimplePrimitiveId id : toSelect) {
+                        final OsmPrimitive p = ds.getPrimitiveById(id);
+                        if (p != null) {
+                            newSel.add(p);
+                        }
+                    }
+                    toSelect.clear();
                     ds.setSelected(newSel);
                     if (PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) {
@@ -277 +265 @@
         // Process optional argument 'select'
         if (args.containsKey("select")) {
-            ways.clear();
-            nodes.clear();
-            relations.clear();
+            toSelect.clear();
             for (String item : args.get("select").split(",")) {
                 try {
-                    if (item.startsWith("way")) {
-                        ways.add(Long.parseLong(item.substring(3)));
-                    } else if (item.startsWith("node")) {
-                        nodes.add(Long.parseLong(item.substring(4)));
-                    } else if (item.startsWith("relation")) {
-                        relations.add(Long.parseLong(item.substring(8)));
-                    } else if (item.startsWith("rel")) {
-                        relations.add(Long.parseLong(item.substring(3)));
-                    } else {
-                        Main.warn("RemoteControl: invalid selection '"+item+"' ignored");
-                    }
-                } catch (NumberFormatException e) {
-                    Main.warn("RemoteControl: invalid selection '"+item+"' ignored");
+                    toSelect.add(SimplePrimitiveId.fromString(item));
+                } catch (IllegalArgumentException ex) {
+                    Main.warn("RemoteControl: invalid selection '" + item + "' ignored");
                 }
             }