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

Timestamp:

2014-08-01T19:17:40+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10206 - Check MapCSS validator assertions for local rules if new advanced option validator.check_assert_local_rules is enabled in preferences

File:

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

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

@@ -6 +6 @@
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
+
+import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.TextTagParser;
 
 public final class OsmUtils {
@@ -48 +52 @@
         return FALSE_VALUES.contains(value);
     }
+
+    /**
+     * Creates a new OSM primitive according to the given assertion. Originally written for unit tests,
+     * this can also be used in another places like validation of local MapCSS validator rules.
+     * @param assertion The assertion describing OSM primitive (ex: "way name=Foo railway=rail")
+     * @return a new OSM primitive according to the given assertion
+     * @throws IllegalArgumentException if assertion is null or if the primitive type cannot be deduced from it
+     * @since 7356
+     */
+    public static OsmPrimitive createPrimitive(String assertion) {
+        CheckParameterUtil.ensureParameterNotNull(assertion, "assertion");
+        final String[] x = assertion.split("\\s+", 2);
+        final OsmPrimitive p = "n".equals(x[0]) || "node".equals(x[0])
+                ? new Node()
+                : "w".equals(x[0]) || "way".equals(x[0])
+                ? new Way()
+                : "r".equals(x[0]) || "relation".equals(x[0])
+                ? new Relation()
+                : null;
+        if (p == null) {
+            throw new IllegalArgumentException("Expecting n/node/w/way/r/relation, but got " + x[0]);
+        }
+        for (final Map.Entry<String, String> i : TextTagParser.readTagsFromText(x[1]).entrySet()) {
+            p.put(i.getKey(), i.getValue());
+        }
+        return p;
+    }
 }