Changeset 7818 in josm for trunk

Timestamp:

2014-12-17T14:54:55+01:00 (9 years ago)

Author:

Klumbumbus

Message:

see #10837 - add some more validation rules (based on rules by naoliv)

Location:

trunk/data/validator

Files:

• combinations.mapcss (modified) (3 diffs)
• deprecated.mapcss (modified) (2 diffs)

trunk/data/validator/combinations.mapcss

@@ -134 +134 @@
 }
 
+/* {0.key} together with {1.key}, see #10837 */
+*[noname?][name],
+*[highway]["addr:street"] {
+  throwWarning: tr("{0} together with {1}", "{0.key}", "{1.key}");
+}
+
 /* {0} on suspicious object */
 *[tunnel  ][!highway][!railway][!waterway][public_transport != platform][man_made != pipeline],
@@ -165 +171 @@
 }
 
-/* see ticket #9593 */
+/* see #9593 */
 *[sport][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground)$/][natural !~ /^(beach|bare_rock)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/] {
     throwWarning: tr("sport without physical feature");
@@ -187 +193 @@
     throwWarning: tr("{0} should be on the node where {1} and {2} intersect", "ford", "highway", "waterway");
 }
+
+/* any other *_name tag but not a name, see #10837 */
+*[/_name$/][!name] {
+  throwWarning: tr("alternative name without {0}", "{1.key}");
+}
+
+/* see #10837 */
+way[destination][!oneway?] {
+  throwWarning: tr("incomplete usage of {0} on a way without {1}", "{0.key}", "{1.key}");
+  suggestAlternative: "destination:forward";
+  suggestAlternative: "destination:backward";
+}

trunk/data/validator/deprecated.mapcss

@@ -330 +330 @@
 }
 
-/* see #10661 */
-*[barrier=yes] {
+/* see #10661, #10837 */
+*[barrier=yes],
+*[amenity=yes],
+*[place=yes] {
   throwWarning: tr("{0}={1} is unspecific. Please replace ''{1}'' by a specific value.", "{0.key}", "{0.value}");
 }
 
-/* see #10693 - http://wiki.openstreetmap.org/wiki/Proposed_features/drop_recommendation_for_place_name */
+/* see #10693 - http://wiki.openstreetmap.org/wiki/Proposed_features/drop_recommendation_for_place_name , #10837 */
 *[place_name][!name] {
   throwWarning: tr("{0} should be replaced with {1}", "{0.key}", "{1.key}");
   fixChangeKey: "place_name => name";
+}
+*[place][place_name = *name] {
+  throwWarning: tr("{0} = {1}; remove {0}", "{1.key}", "{1.value}");
+  fixRemove: "{1.key}";
 }
 
@@ -355 +361 @@
   fixAdd: "mooring=yes";
 }
+
+/* see #10837 */
+*[building][levels] {
+  throwWarning: tr("{0} is deprecated", "{1.key}");
+  suggestAlternative: "building:levels";
+  fixChangeKey: "levels => building:levels";
+}