Changeset 6550 in josm for trunk

Timestamp:

2013-12-27T21:41:52+01:00 (10 years ago)

Author:

simon04

Message:

see #9414 - MapCSS-based tagchecker: unify some checks

Location:

trunk

Files:

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

trunk/data/validator/combinations.mapcss

@@ -111 +111 @@
 }
 
-/* {0} on a node */
-node[source:geometry],
-node[source:outline] {
-  throwWarning: tr("{0} on a node", "{0.key}");
-}
-
 /* {0} on suspicious object */
 *[tunnel  ][!highway][!railway][!waterway][public_transport != platform][man_made != pipeline],
@@ -133 +127 @@
 }
 
+way[highway][barrier],
 *[highway][waterway][waterway!=dam],
 *[highway][natural],

trunk/data/validator/highway.mapcss

@@ -5 +5 @@
   assertMatch: "way highway=unclassified name=\"Bou Blvd.\"";
   assertMatch: "way highway=unclassified name=\"Bou blvd.\"";
-}
-
-node[oneway] {
-  throwWarning: tr("oneway tag on a node");
-  assertMatch: "node oneway=-1";
-  assertNoMatch: "way oneway=-1";
-}
-
-node[bridge?] {
-  throwWarning: tr("bridge tag on a node");
-  assertMatch: "node bridge=yes";
-  assertNoMatch: "node bridge=13";
 }
 
@@ -72 +60 @@
 }
 
-way[highway=cycleway][bicycle?!] {
-  throwWarning: tr("cycleway with tag bicycle");
+way[highway=footway][maxspeed],
+way[highway=steps][maxspeed],
+way[highway=cycleway][bicycle?!],
+way[highway=footway][foot?!],
+way[highway=cycleway][cycleway=lane] {
+  throwWarning: tr("{0} used with {1}", "{0.value}", "{1.tag}");
   assertMatch: "way highway=cycleway bicycle=false";
   assertMatch: "way highway=cycleway bicycle=0";
   assertNoMatch: "way highway=cycleway bicycle=yes";
   assertNoMatch: "way highway=cycleway";
-}
-
-way[highway=footway][foot?!] {
-  throwWarning: tr("footway with tag foot");
   assertMatch: "way highway=footway foot=false";
   assertMatch: "way highway=footway foot=0";
   assertNoMatch: "way highway=footway foot=yes";
   assertNoMatch: "way highway=footway";
-}
-
-way[highway=cycleway][cycleway=lane] {
-  throwWarning: tr("separate cycleway as lane on a cycleway");
   assertMatch: "way highway=cycleway cycleway=lane";
   assertNoMatch: "way highway=cycleway";
   assertNoMatch: "way highway=residential cycleway=lane";
-}
-
-way[highway][barrier] {
-  throwWarning: tr("barrier used on a way");
-  assertMatch: "way highway=residential barrier=hedge";
-  assertNoMatch: "way highway=residential";
-  assertNoMatch: "way barrier=hedge";
-}
-
-way[highway=footway][maxspeed], way[highway=steps][maxspeed] {
-  throwWarning: tr("maxspeed used for footway");
   assertMatch: "way highway=footway maxspeed=20";
   assertNoMatch: "way highway=residential maxspeed=20";

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

@@ -369 +369 @@
      */
     private void addMapCSS(String internalConfigFile) throws ParseException, UnsupportedEncodingException {
-        addMapCSS(new InputStreamReader(getClass().getResourceAsStream("/data/validator/"+internalConfigFile), "UTF-8"));
+        addMapCSS(new InputStreamReader(getClass().getResourceAsStream("/data/validator/" + internalConfigFile + ".mapcss"), "UTF-8"));
     }
 
     @Override
     public void initialize() throws Exception {
-        addMapCSS("deprecated.mapcss");
-        addMapCSS("highway.mapcss");
-        addMapCSS("numeric.mapcss");
-        addMapCSS("religion.mapcss");
-        addMapCSS("relation.mapcss");
-        addMapCSS("combinations.mapcss");
-        addMapCSS("unnecessary.mapcss");
-        addMapCSS("wikipedia.mapcss");
-        addMapCSS("power.mapcss");
+        addMapCSS("deprecated");
+        addMapCSS("highway");
+        addMapCSS("numeric");
+        addMapCSS("religion");
+        addMapCSS("relation");
+        addMapCSS("combinations");
+        addMapCSS("unnecessary");
+        addMapCSS("wikipedia");
+        addMapCSS("power");
+        addMapCSS("geometry");
     }
 }