Changeset 11337 in josm

Timestamp:

2016-11-28T21:11:03+01:00 (7 years ago)

Author:

Klumbumbus

Message:

• fix #14057 - validate direction values, deprecate direction=up/down in favor of incline=up/down
• deprecate amenity=advertising in favor of advertising=*
• don't warn about "highway without a reference" if destination:ref is present

Location:

trunk/data/validator

Files:

• deprecated.mapcss (modified) (1 diff)
• highway.mapcss (modified) (1 diff)
• ignoretags.cfg (modified) (1 diff)

trunk/data/validator/deprecated.mapcss

@@ -1125 +1125 @@
   fixChangeKey: "lock => lockable";
 }
+
+*[amenity=advertising][!advertising] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "advertising=*";
+  group: tr("deprecated tagging");
+}
+*[amenity=advertising][advertising] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "advertising=*";
+  group: tr("deprecated tagging");
+  fixRemove: "amenity";
+}
+
+way[direction=up][incline=up],
+way[direction=down][incline=down],
+way[direction=up][!incline],
+way[direction=down][!incline] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "incline";
+  group: tr("deprecated tagging");
+  fixChangeKey: "direction => incline";
+}
+way[direction=up][incline][incline!=up],
+way[direction=down][incline][incline!=down] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "incline";
+  group: tr("deprecated tagging");
+}

trunk/data/validator/highway.mapcss

@@ -53 +53 @@
 }
 
-way.major_road[!ref] {
+way.major_road[!ref][!destination:ref] {
   throwOther: tr("highway without a reference");
   group: tr("missing tag");
   assertMatch: "way highway=primary";
   assertNoMatch: "way highway=primary ref=123";
+  assertNoMatch: "way highway=primary destination:ref=123";
 }
 

trunk/data/validator/ignoretags.cfg

@@ -118 +118 @@
 E:cables
 E:circuits
+E:direction
 ;
 ; Ignore valid and semi-valid keys that end with...