Changeset 4796 in josm

Timestamp:

Jan 15, 2012 9:28:46 PM (17 months ago)

Author:

simon04

Message:

fix #6425 - remotecontrol: make download objects available (e.g., /load_object?objects=n1,w2,r3[&new_layer=false&relation_members=true])

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DownloadPrimitiveAction.java (modified) (2 diffs)
• data/osm/SimplePrimitiveId.java (modified) (2 diffs)
• gui/widgets/OsmIdTextField.java (modified) (1 diff)
• io/remotecontrol/RequestProcessor.java (modified) (2 diffs)
• io/remotecontrol/handler/LoadObject.java (added)

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

@@ -200 +200 @@
     }
 
-    void processItems(boolean newLayer, final List<PrimitiveId> ids, boolean downloadReferrers, boolean full) {
+    /**
+     * @param newLayer if the data should be downloaded into a new layer
+     * @param ids
+     * @param downloadReferrers if the referrers of the object should be downloaded as well, i.e., parent relations, and for nodes, additionally, parent ways
+     * @param full if the members of a relation should be downloaded as well
+     */
+    public static void processItems(boolean newLayer, final List<PrimitiveId> ids, boolean downloadReferrers, boolean full) {
         OsmDataLayer layer = getEditLayer();
         if ((layer == null) || newLayer) {
@@ -274 +280 @@
     }
 
-    private ExtendedDialog reportProblemDialog(Set<PrimitiveId> errs,
+    private static ExtendedDialog reportProblemDialog(Set<PrimitiveId> errs,
             String TITLE, String TEXT, String LIST_LABEL, int msgType) {
         JPanel p = new JPanel(new GridBagLayout());

trunk/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java

@@ -3 +3 @@
 
 import java.io.Serializable;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class SimplePrimitiveId implements PrimitiveId, Serializable {
@@ -57 +59 @@
         return type + " " + id;
     }
+
+    /**
+     * Parses a {@code OsmPrimitiveType} from the string {@code s}.
+     * @param s the string to be parsed, e.g., {@code n1}, {@code node1},
+     * {@code w1}, {@code way1}, {@code r1}, {@code rel1}, {@code relation1}.
+     * @return the parsed {@code OsmPrimitiveType}
+     * @throws IllegalArgumentException if the string does not match the pattern
+     */
+    public static SimplePrimitiveId fromString(String s) {
+        final Pattern p = Pattern.compile("((n(ode)?|w(ay)?|r(el(ation)?)?)/?)(\\d+)");
+        final Matcher m = p.matcher(s);
+        if (m.matches()) {
+            return new SimplePrimitiveId(Long.parseLong(m.group(m.groupCount())),
+                    s.charAt(0) == 'n' ? OsmPrimitiveType.NODE
+                    : s.charAt(0) == 'w' ? OsmPrimitiveType.WAY
+                    : OsmPrimitiveType.RELATION);
+        } else {
+            throw new IllegalArgumentException("The string " + s + " does not match the pattern " + p);
+        }
+    }
 }

trunk/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java

@@ -92 +92 @@
         
         public boolean readOsmIds() {
-            String value  = getComponent().getText();
+            String value = getComponent().getText();
             char c;
-            if (value == null || value.trim().length() == 0) return false;
-            try {
-                ids.clear();
-                StringTokenizer st = new StringTokenizer(value,",.+/ \t\n");
-                String s;
-                while (st.hasMoreTokens()) {
-                    s = st.nextToken();
-                    // convert tokens to int skipping v-words (version v2 etc)
-                    c = s.charAt(0);
-                    if (c=='v') {
-                        continue;
-                    }
-                    else if (c=='n') {
-                        ids.add(new SimplePrimitiveId(Long.parseLong(s.substring(1)), OsmPrimitiveType.NODE));
-                    } else if (c=='w') {
-                        ids.add(new SimplePrimitiveId(Long.parseLong(s.substring(1)), OsmPrimitiveType.WAY));
-                    } else if (c=='r') { 
-                        ids.add(new SimplePrimitiveId(Long.parseLong(s.substring(1)), OsmPrimitiveType.RELATION));
-                    } else if (type==OsmPrimitiveType.NODE) {
-                        ids.add(new SimplePrimitiveId(Long.parseLong(s), OsmPrimitiveType.NODE));
-                    } else if (type==OsmPrimitiveType.WAY) {
-                        ids.add(new SimplePrimitiveId(Long.parseLong(s), OsmPrimitiveType.WAY));
-                    } else if (type==OsmPrimitiveType.RELATION) {
-                        ids.add(new SimplePrimitiveId(Long.parseLong(s), OsmPrimitiveType.RELATION));
+            if (value == null || value.trim().length() == 0) {
+                return false;
+            }
+            ids.clear();
+            StringTokenizer st = new StringTokenizer(value, ",.+/ \t\n");
+            String s;
+            while (st.hasMoreTokens()) {
+                s = st.nextToken();
+                // convert tokens to int skipping v-words (version v2 etc)
+                c = s.charAt(0);
+                if (c == 'v') {
+                    continue;
+                } else {
+                    try {
+                        ids.add(SimplePrimitiveId.fromString(s));
+                    } catch (IllegalArgumentException ex) {
+                        if (type == OsmPrimitiveType.NODE) {
+                            ids.add(new SimplePrimitiveId(Long.parseLong(s), OsmPrimitiveType.NODE));
+                        } else if (type == OsmPrimitiveType.WAY) {
+                            ids.add(new SimplePrimitiveId(Long.parseLong(s), OsmPrimitiveType.WAY));
+                        } else if (type == OsmPrimitiveType.RELATION) {
+                            ids.add(new SimplePrimitiveId(Long.parseLong(s), OsmPrimitiveType.RELATION));
+                        } else {
+                            return false;
+                        }
                     }
                 }
-                return true;
-            } catch(NumberFormatException e) {
-                return false;
             }
+            return true;
         }
     }

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

@@ -19 +19 @@
 import org.openstreetmap.josm.io.remotecontrol.handler.ImportHandler;
 import org.openstreetmap.josm.io.remotecontrol.handler.LoadAndZoomHandler;
+import org.openstreetmap.josm.io.remotecontrol.handler.LoadObject;
 import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler;
 import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
@@ -117 +118 @@
         addRequestHandlerClass(ImportHandler.command, ImportHandler.class, true);
         addRequestHandlerClass(VersionHandler.command, VersionHandler.class, true);
+        addRequestHandlerClass(LoadObject.command, LoadObject.class, true);
     }