Changeset 8730 in josm for trunk

Timestamp:

2015-09-04T21:32:36+02:00 (9 years ago)

Author:

Klumbumbus

Message:

fix #11491 - add/enhance validator rules for postcode/postal_code/addr:postcode

Location:

trunk/data/validator

Files:

• combinations.mapcss (modified) (1 diff)
• deprecated.mapcss (modified) (1 diff)

trunk/data/validator/combinations.mapcss

@@ -206 +206 @@
 }
 
-/* see #9811 */
+/* see #9811, #11491 */
 *[place][place!=farm][/^addr:/],
 *[boundary][/^addr:/],
-*[highway][/^addr:/][highway!=services][highway!=rest_area] {
+*[highway][/^addr:/][highway!=services][highway!=rest_area][!"addr:postcode"] {
   throwWarning: tr("{0} together with addr:*", "{0.key}");
+}
+*[!highway][postal_code]["addr:postcode"][postal_code=*"addr:postcode"] {
+  throwWarning: tr("{0} together with {1}", "{1.key}", "{2.key}");
+}
+*[!highway][postal_code]["addr:postcode"][postal_code!=*"addr:postcode"] {
+  throwWarning: tr("{0} together with {1} and conflicting values", "{1.key}", "{2.key}");
+}
+way[highway][postal_code]["addr:postcode"][postal_code=*"addr:postcode"] {
+  throwWarning: tr("{0} together with {1}", "{1.key}", "{2.key}");
+  fixRemove: "addr:postcode";
+}
+way[highway][postal_code]["addr:postcode"][postal_code!=*"addr:postcode"] {
+  throwWarning: tr("{0} together with {1} and conflicting values", "{1.key}", "{2.key}");
+}
+way[highway][!postal_code]["addr:postcode"] {
+  throwWarning: tr("{0} together with {1}", "{0.key}", "{2.key}");
+  suggestAlternative: "postal_code";
+  fixChangeKey: "addr:postcode=>postal_code";
 }
 

trunk/data/validator/deprecated.mapcss

@@ -529 +529 @@
   fixChangeKey: "pk => distance";
 }
+
+*[postcode] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "addr:postcode";
+  suggestAlternative: "postal_code";
+}