Changeset 14867 in josm for trunk/data/validator

Timestamp:

2019-03-09T21:59:55+01:00 (7 years ago)

Author:

Klumbumbus

Message:

fix #17249 - clean up religion and denomination, replace religion=unitarian by religion=unitarian_universalist, warn about religion=catholic, add religion=tenrikyo and religion=confucian, add icons (​https://commons.wikimedia.org/wiki/File:Tenrikyo_emblem.svg and ​https://commons.wikimedia.org/wiki/File:%E6%9C%A8%E9%90%B8_---_Confucian_wooden-clapper_bell.svg, modified, PD and CC0 licensed)

Location:

trunk/data/validator

Files:

• deprecated.mapcss (modified) (1 diff)
• religion.mapcss (modified) (2 diffs)

trunk/data/validator/deprecated.mapcss

@@ -1389 +1389 @@
   group: tr("deprecated tagging");
 }
+
+/* #17249 */
+*[religion=unitarian] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "religion=unitarian_universalist";
+  fixAdd: "religion=unitarian_universalist";
+  group: tr("deprecated tagging");
+}

trunk/data/validator/religion.mapcss

@@ -9 +9 @@
 }
 
-*[religion=christian][denomination][denomination !~ /^(anglican|apostolic|baptist|catholic|christian_community|christian_scientist|coptic_orthodox|czechoslovak_hussite|dutch_reformed|evangelical|foursquare|greek_catholic|greek_orthodox|jehovahs_witness|kabbalah|karaite|living_waters_church|lutheran|maronite|mennonite|methodist|mormon|new_apostolic|nondenominational|old_catholic|orthodox|pentecostal|presbyterian|protestant|quaker|roman_catholic|russian_orthodox|salvation_army|serbian_orthodox|seventh_day_adventist|spiritist|united|united_reformed|uniting)$/] {
+*[religion=christian][denomination][denomination !~ /^(anglican|apostolic|baptist|catholic|church_of_scotland|christian_community|christian_scientist|coptic_orthodox|czechoslovak_hussite|dutch_reformed|evangelical|foursquare|greek_catholic|greek_orthodox|iglesia_ni_cristo|jehovahs_witness|kabbalah|karaite|living_waters_church|lutheran|maronite|mennonite|methodist|mormon|new_apostolic|nondenominational|old_catholic|orthodox|pentecostal|presbyterian|protestant|quaker|reformed|roman_catholic|romanian_orthodox|russian_orthodox|salvation_army|serbian_orthodox|seventh_day_adventist|spiritist|united|united_reformed|united|united_methodist|united_reformed|uniting)$/] {
   throwOther: tr("unknown christian denomination");
   assertMatch: "node religion=christian denomination=foobar";
@@ -29 +29 @@
   assertNoMatch: "node religion=jewish";
 }
+
+*[religion=catholic] {
+  throwWarning: tr("{0}", "{0.tag}");
+  suggestAlternative: "religion=christian + denomination=catholic";
+  fixChangeKey: "religion => denomination";
+  fixAdd: "religion=christian";
+}