Changeset 4796 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

15.01.2012 21:28:46 (4 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])

File:

• trunk/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java (modified) (2 diffs)

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);
+        }
+    }
 }