Changeset 15473 in josm

Timestamp:

2019-10-24T21:14:32+02:00 (4 years ago)

Author:

Klumbumbus

Message:

• fix #18251 - warn about ​wikipedia:lang tags with URL encoded values, no autofix as the syntax is not yet supported; reword an other validator warning
• ignore traffic_calming=dynamic_bump, approved proposal but very few uses so far

Location:

trunk/data/validator

Files:

• ignoretags.cfg (modified) (1 diff)
• wikipedia.mapcss (modified) (3 diffs)

trunk/data/validator/ignoretags.cfg

@@ -154 +154 @@
 ; Misc Tags
 ;
+K:traffic_calming=dynamic_bump
 K:type=is_in
 K:type=benchmark

trunk/data/validator/wikipedia.mapcss

@@ -1 @@
-/* validation for the wikipedia=* tag - see tickets #8383, #14425 */
+/* validation for the wikipedia=* tag - see tickets #8383, #14425, #18251 */
 
 /* If there is no language at all, this is broken. Also catches 'wikipedia' used as 'email', 'website', 'ele' [sic!] ... */
@@ -52 +52 @@
   assertMatch: "node wikipedia=en:Foo%27s";
   assertNoMatch: "node wikipedia=en:Foo";
+}
+
+*[/^wikipedia:[-a-z]{2,12}$/][/^wikipedia:[-a-z]{2,12}$/ =~ /(?i).*%[0-9A-F][0-9A-F]/] {
+  throwError: tr("{0} tag should not have URL-encoded values like ''%27''", "{0.key}");
+  /* fixAdd: concat("{0.key}", "=", get(regexp_match("(?i)^([-a-z]+:)(.*)$", tag("{0.key}")),1), trim(replace(URL_decode(get(regexp_match("(?i)^([-a-z]+:)(.+)$", tag("{0.key}")),2)), "_", " "))); */
+    /* tag("{0.key}") is not yet supported */
+  assertMatch: "node wikipedia:de=Foo%27s";
+  assertNoMatch: "node wikipedia:de=Foo";
 }
 
@@ -138 +146 @@
 }
 
-/* Wikipedia without wikidata */
+/* Wikipedia:lang without wikipedia */
 *[!wikipedia][/^wikipedia:/] {
-  throwWarning: tr("wikipedia tag is not set, but a ''{0}'' tag is. Make sure to use wikipedia=language:value together with wikidata tag.", "{1.key}");
+  throwWarning: tr("''{0}'' tag is set, but no ''{1}'' tag. Make sure to set ''wikipedia=language:value'' for the main article and optional ''wikipedia:language=value'' only for additional articles that are not just other language variants of the main article.", "{1.key}", "{0.key}");
   assertMatch: "node wikipedia:en=a";
   assertNoMatch: "node wikipedia=a wikipedia:en=b";