Changeset 15648 in josm for trunk/data/validator

Timestamp:

2020-01-06T22:13:13+01:00 (6 years ago)

Author:

Klumbumbus

Message:

• fix #18374 - warn if collection_times is used instead of opening_hours on amenity=recycling, rewording in preset
• see #18411, see #10576 - add railway=construction preset, icon derived from internal rail and way_construction icons, PD and CC0 licensed
• see #18411 - warn about railway=construction or highway=construction together with construction=yes
• see #18517 - restore office=administrative icon in nodist folder, add autofix for office=administrative -> government
• move building=ger to residential building preset
• remove TLD from IANA
• see #18507
  • add kerb=* to crossing and traffic signals preset
  • warn about barrier=kerb together with kerb=no
  • warn about kerb=unknown
  • warn if barrier=kerb and kerb=* are used on isolated nodes
  • warn if barrier=kerb is used on highway=crossing as part of a major road and suggest kerb=* instead
  • deprecate sloped_curb=* in favor of kerb=*
• see #12575 - new craft icons, all PD and CC0 licensed:
  • gardener: derived from internal florist icon and ​https://publicdomainvectors.org/en/free-clipart/Planting-a-new-tree/83454.html
  • shoemaker: resized from ​https://publicdomainvectors.org/en/free-clipart/Brown-shoe/43147.html
  • upholsterer: resized from ​https://publicdomainvectors.org/en/free-clipart/Old-chair-vector-image/71929.html

Location:

trunk/data/validator

Files:

• combinations.mapcss (modified) (2 diffs)
• deprecated.mapcss (modified) (3 diffs)
• highway.mapcss (modified) (1 diff)

trunk/data/validator/combinations.mapcss

@@ -270 +270 @@
 }
 
-/* {0.tag} together with {1.tag}, see #17950, #17330, #17623, #17592, #17594, #17542, #16861, #16147, #10186 */
+/* {0.tag} together with {1.tag}, see #18411, #17950, #17330, #17623, #17592, #17594, #17542, #16861, #16147, #10186 */
+*[barrier=kerb][kerb=no],
+way[highway=construction][construction=yes],
+way[railway=construction][construction=yes],
 *[man_made=bridge][bridge=yes],
 *[man_made=tunnel][tunnel=yes],
@@ -649 +652 @@
   group: tr("suspicious tag combination");
 }
+
+/* #18374 */
+*[amenity=recycling][collection_times="24/7"][!opening_hours],
+*[amenity=recycling][collection_times       ][!opening_hours][collection_times=~/[a-z]-[A-Z].*[0-9]-[0-9]/] {
+  throwWarning: tr("{0} together with {1}. Probably {2} is meant.", "{1.key}", "{0.tag}", "{2.key}");
+  group: tr("suspicious tag combination");
+  fixChangeKey: "collection_times => opening_hours";
+  /* spaces in asserts are not yet supported
+  assertMatch: "node amenity=recycling collection_times=Mo-Fr 06:00-20:00";
+  assertNoMatch: "node amenity=recycling collection_times=Mo-Fr 15:00";
+  assertNoMatch: "node amenity=recycling collection_times=Mo 08:00-11:00";
+  assertNoMatch: "node amenity=recycling collection_times=Sa[2,4] 8:00-11:00";
+  */
+}
+*[amenity=recycling][collection_times="24/7"][opening_hours],
+*[amenity=recycling][collection_times       ][opening_hours][collection_times=~/[a-z]-[A-Z].*[0-9]-[0-9]/] {
+  throwWarning: tr("{0} together with {1}. Probably {2} is meant.", "{1.key}", "{0.tag}", "{2.key}");
+  group: tr("suspicious tag combination");
+}

trunk/data/validator/deprecated.mapcss

@@ -543 +543 @@
 
 /* see #11070 */
+*[kerb=unknown],
 *[lock=unknown],
 *[hide=unknown],
@@ -1069 +1070 @@
 }
 
+/* #18517 */
 *[office=administrative] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
-  group: tr("deprecated tagging");
   suggestAlternative: "office=government";
+  group: tr("deprecated tagging");
+  fixAdd: "office=government";
 }
 
@@ -1854 +1857 @@
   group: tr("deprecated tagging");
 }
+
+*[sloped_curb=yes][!kerb],
+*[sloped_curb=both][!kerb] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "kerb=lowered";
+  group: tr("deprecated tagging");
+  fixRemove: "sloped_curb";
+  fixAdd: "kerb=lowered";
+}
+*[sloped_curb=no][!kerb] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "kerb=yes";
+  group: tr("deprecated tagging");
+  fixRemove: "sloped_curb";
+  fixAdd: "kerb=yes";
+}
+*[sloped_curb][sloped_curb !~ /^(yes|both|no)$/][!kerb],
+*[sloped_curb][kerb] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "kerb=*";
+  group: tr("deprecated tagging");
+}

trunk/data/validator/highway.mapcss

@@ -158 +158 @@
   fixAdd: "railway=level_crossing";
 }
+
+node[highway=crossing][barrier=kerb].is_in_major_road {
+  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+  suggestAlternative: "kerb=*";
+  group: tr("suspicious tag combination");
+}