Changeset 14057 in josm for trunk

Timestamp:

2018-07-28T01:16:04+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16495 - make wikipedia validation rules case insensitive

File:

• trunk/data/validator/wikipedia.mapcss (modified) (6 diffs)

trunk/data/validator/wikipedia.mapcss

@@ -49 +49 @@
 *[wikipedia =~ /(?i)^[-a-z]{2,12}:.*%[0-9A-F][0-9A-F]/] {
   throwError: tr("{0} tag should not have URL-encoded values like ''%27''", "{0.tag}");
-  fixAdd: concat("wikipedia=", get(regexp_match("^([-a-z]+:)(.*)$", tag("wikipedia")),1), trim(replace(URL_decode(get(regexp_match("^([-a-z]+:)(.+)$", tag("wikipedia")),2)), "_", " ")));
+  fixAdd: concat("wikipedia=", get(regexp_match("(?i)^([-a-z]+:)(.*)$", tag("wikipedia")),1), trim(replace(URL_decode(get(regexp_match("(?i)^([-a-z]+:)(.+)$", tag("wikipedia")),2)), "_", " ")));
   assertMatch: "node wikipedia=en:Foo%27s";
   assertNoMatch: "node wikipedia=en:Foo";
@@ -56 +56 @@
 *[wikipedia =~ /(?i)^[-a-z]{2,12}: /] {
   throwWarning: tr("wikipedia title should not start with a space after language code");
-  fixAdd: concat("wikipedia=", get(regexp_match("^([-a-z]+:)(.*)$", tag("wikipedia")),1), trim(get(regexp_match("^([-a-z]+:)(.*)$", tag("wikipedia")),2)));
+  fixAdd: concat("wikipedia=", get(regexp_match("(?i)^([-a-z]+:)(.*)$", tag("wikipedia")),1), trim(get(regexp_match("(?i)^([-a-z]+:)(.*)$", tag("wikipedia")),2)));
   assertMatch: "node wikipedia=en: foo";
   assertNoMatch: "node wikipedia=en:foo";
@@ -63 +63 @@
 *[wikipedia =~ /(?i)^[-a-z]{2,12}:wiki\//] { 
   throwWarning: tr("wikipedia title should not have ''{0}'' prefix", "wiki/");
-  fixAdd: concat("wikipedia=", get(regexp_match("^([-a-z]+:)wiki/(.*)$", tag("wikipedia")),1), trim(get(regexp_match("^([-a-z]+:)wiki/(.*)$", tag("wikipedia")),2)));
+  fixAdd: concat("wikipedia=", get(regexp_match("(?i)^([-a-z]+:)wiki/(.*)$", tag("wikipedia")),1), trim(get(regexp_match("(?i)^([-a-z]+:)wiki/(.*)$", tag("wikipedia")),2)));
   assertMatch: "node wikipedia=en:wiki/foo";
   assertNoMatch: "node wikipedia=en:foo";
@@ -73 +73 @@
 *[wikipedia =~ /^[-a-zA-Z]{2,12}:\p{Ll}/][wikipedia !~ /^jbo:/][wikipedia !~ /(?i)^[-a-z]{2,12}:https?:/] {
   throwWarning: tr("wikipedia page title should have first letter capitalized");
-  fixAdd: concat("wikipedia=", get(regexp_match("^([-a-z]+:)(.)(.*)$", tag("wikipedia")),1), upper(get(regexp_match("^([-a-z]+:)(.)(.*)$", tag("wikipedia")),2)), get(regexp_match("^([-a-z]+:)(.)(.*)$", tag("wikipedia")),3));
+  fixAdd: concat("wikipedia=", get(regexp_match("(?i)^([-a-z]+:)(.)(.*)$", tag("wikipedia")),1), upper(get(regexp_match("(?i)^([-a-z]+:)(.)(.*)$", tag("wikipedia")),2)), get(regexp_match("(?i)^([-a-z]+:)(.)(.*)$", tag("wikipedia")),3));
   assertMatch: "node wikipedia=en:foo";
   assertNoMatch: "node wikipedia=en:Foo";
@@ -82 +82 @@
 *[wikipedia =~ /(?i)^[-a-z]{2,12}:.*_/][wikipedia !~ /(?i)^[-a-z]{2,12}:https?:/] {
   throwWarning: tr("wikipedia page title should have spaces instead of underscores (''_''→'' '')");
-  fixAdd: concat("wikipedia=", get(regexp_match("^([-a-z]+:)(.+)$", tag("wikipedia")),1), trim(replace(get(regexp_match("^([-a-z]+:)(.+)$", tag("wikipedia")),2), "_", " ")));
+  fixAdd: concat("wikipedia=", get(regexp_match("(?i)^([-a-z]+:)(.+)$", tag("wikipedia")),1), trim(replace(get(regexp_match("(?i)^([-a-z]+:)(.+)$", tag("wikipedia")),2), "_", " ")));
   assertMatch: "node wikipedia=en:foo_bar";
   assertNoMatch: "node wikipedia=en:foo bar";
@@ -111 +111 @@
 *[wikipedia ^= "zh:zh:"] {
   throwWarning: tr("wikipedia language seems to be duplicated, e.g. en:en:Foo");
-  fixAdd: concat("wikipedia=", get(regexp_match("^([-a-z]+:)([-a-z]+:)(.*)$", tag("wikipedia")),2), trim(get(regexp_match("^([-a-z]+:)([-a-z]+:)(.*)$", tag("wikipedia")),3)));
+  fixAdd: concat("wikipedia=", get(regexp_match("(?i)^([-a-z]+:)([-a-z]+:)(.*)$", tag("wikipedia")),2), trim(get(regexp_match("(?i)^([-a-z]+:)([-a-z]+:)(.*)$", tag("wikipedia")),3)));
   assertMatch: "node wikipedia=en:en:Foo";
   assertMatch: "node wikipedia=en:fr:Foo";