Changeset 6674 in josm for trunk/src/org/openstreetmap/josm/data/osm

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/data/osm/SimplePrimitiveId.java (modified) (3 diffs)

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

@@ -3 +3 @@
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -9 +11 @@
     private final long id;
     private final OsmPrimitiveType type;
+
+    public static final Pattern ID_PATTERN = Pattern.compile("((n(ode)?|w(ay)?|r(el(ation)?)?)/?)(\\d+)");
 
     public SimplePrimitiveId(long id, OsmPrimitiveType type) {
@@ -64 +68 @@
 
     /**
-     * Parses a {@code OsmPrimitiveType} from the string {@code s}.
+     * Parses a {@code SimplePrimitiveId} 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}
+     * @return the parsed {@code SimplePrimitiveId}
      * @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);
+        final Matcher m = ID_PATTERN.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);
+                    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);
+            throw new IllegalArgumentException("The string " + s + " does not match the pattern " + ID_PATTERN);
         }
     }
+
+    /**
+     * Attempts to parse extract any primitive id from the string {@code s}.
+     * @param s the string to be parsed, e.g., {@code n1, w1}, {@code node1 and rel2}.
+     * @return the parsed list of {@code OsmPrimitiveType}s.
+     */
+    public static List<SimplePrimitiveId> fuzzyParse(String s) {
+        final ArrayList<SimplePrimitiveId> ids = new ArrayList<SimplePrimitiveId>();
+        final Matcher m = ID_PATTERN.matcher(s);
+        while (m.find()) {
+            final char firstChar = s.charAt(m.start());
+            ids.add(new SimplePrimitiveId(Long.parseLong(m.group(m.groupCount())),
+                    firstChar == 'n'
+                            ? OsmPrimitiveType.NODE
+                            : firstChar == 'w'
+                            ? OsmPrimitiveType.WAY
+                            : OsmPrimitiveType.RELATION));
+        }
+        return ids;
+    }
 }