Changeset 6549 in josm for trunk

Timestamp:

2013-12-27T21:16:58+01:00 (11 years ago)

Author:

simon04

Message:

fix #9379 - Add validator warning: "foot used with highway=motorway|trunk|primary|secondary|tertiary, use sidewalk or separate footway instead"

Location:

trunk

Files:

• data/validator/highway.mapcss (modified) (2 diffs)
• src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (modified) (2 diffs)

trunk/data/validator/highway.mapcss

@@ -58 +58 @@
 }
 
+way[foot][highway =~ /motorway|trunk|primary|secondary|tertiary/] {
+  throwWarning: tr("{0} used with {1}", "{0.key}", "{1.tag}");
+  suggestAlternative: "sidewalk";
+  suggestAlternative: "separate footway";
+  assertMatch: "way highway=primary foot=yes";
+  assertNoMatch: "way highway=primary";
+}
+
 way[highway=road] {
   throwWarning: tr("temporary highway type");
@@ -107 +115 @@
   assertNoMatch: "way name=Foobarstraße";
 }
-
-/*
-TODO: * : W : / *name * /i == * && name != * # misspelled key name
-*/

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -62 +62 @@
         protected final List<PrimitiveToTag> change = new ArrayList<PrimitiveToTag>();
         protected final Map<String, String> keyChange = new LinkedHashMap<String, String>();
-        protected final List<Tag> alternatives = new ArrayList<Tag>();
+        protected final List<String> alternatives = new ArrayList<String>();
         protected final Map<String, Severity> errors = new HashMap<String, Severity>();
         protected final Map<String, Boolean> assertions = new HashMap<String, Boolean>();
@@ -128 +128 @@
                         check.keyChange.put(x[0].trim(), x[1].trim());
                     } else if ("suggestAlternative".equals(ai.key) && val != null) {
-                        check.alternatives.add(val.contains("=") ? Tag.ofString(val) : new Tag(val));
+                        check.alternatives.add(val);
                     } else if ("assertMatch".equals(ai.key) && val != null) {
                         check.assertions.put(val, true);