Changeset 14867 in josm


Ignore:
Timestamp:
2019-03-09T21:59:55+01:00 (6 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
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r14841 r14867  
    281281        </combo>
    282282    </chunk>
    283     <chunk id="religious">
    284         <text key="name" text="Name" />
    285         <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" />
    286         <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,greek_catholic,jehovahs_witness,lutheran,methodist,mormon,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,roman_catholic,shia,sunni" />
    287     </chunk>
     283    <!-- start of religions and denominations -->
     284        <chunk id="religious"> <!-- all religions and denominations -->
     285            <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" values_searchable="true" />
     286            <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,conservative,evangelical,greek_catholic,greek_orthodox,ibadi,iglesia_ni_cristo,jehovahs_witness,lutheran,mahayana,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reform,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,shaivism,shaktism,shia,smartism,spiritist,sunni,tibetan,theravada,united,united_methodist,vaishnavism,vajrayana" values_searchable="true" />
     287        </chunk>
     288        <chunk id="religious_catholic_christian"> <!-- special case for wayside_shrine and wayside_cross: all religions and catholic denominations with default to catholic christian -->
     289            <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" default="christian" values_searchable="true" />
     290            <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" values_searchable="true" />
     291        </chunk>
     292        <chunk id="other_religions"> <!-- religions which don't have an own preset -->
     293            <combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
     294        </chunk>
     295        <chunk id="christian_denominations"> <!-- christian denominations -->
     296            <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,evangelical,greek_catholic,greek_orthodox,iglesia_ni_cristo,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,spiritist,united,united_methodist" values_searchable="true" />
     297        </chunk>
     298        <chunk id="muslim_denominations"> <!-- muslim denominations -->
     299            <combo key="denomination" text="Denomination" values="ibadi,nondenominational,shia,sunni" values_searchable="true" />
     300        </chunk>
     301        <chunk id="jewish_denominations"> <!-- jewish denominations -->
     302            <combo key="denomination" text="Denomination" values="orthodox,conservative,nondenominational,reform" values_context="jewish" values_searchable="true" /> <!-- values_context because of orthodox, #9629 -->
     303        </chunk>
     304        <chunk id="buddhist_denominations"> <!-- buddhist denominations -->
     305            <combo key="denomination" text="Denomination" values="tibetan,theravada,mahayana,vajrayana" values_searchable="true" />
     306        </chunk>
     307        <chunk id="hindu_denominations"> <!-- hindu denominations -->
     308            <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
     309        </chunk>
     310        <!-- shinto and the religions which don't have an own preset don't have denominations (yet) -->
     311    <!-- end of religions and denominations -->
    288312    <chunk id="voltage">
    289313        <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,22000,20000,15000;200000,110000;20000" />
    … …  
    32733297            <text key="name" text="Name" />
    32743298            <combo key="building" text="Building type" values="basilica,cathedral,chapel,church,temple" values_searchable="true" />
    3275             <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,evangelical,greek_catholic,greek_orthodox,iglesia_ni_cristo,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,nondenominational,orthodox,pentecostal,presbyterian,protestant,quaker,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,spiritist,united,united_methodist" values_context="christian" values_searchable="true" />
     3299            <reference ref="christian_denominations" />
    32763300            <reference ref="service_times" />
    32773301            <reference ref="oh_wheelchair" />
    … …  
    32863310            <text key="name" text="Name" />
    32873311            <combo key="building" text="Building type" values="mosque" values_searchable="true" />
    3288             <combo key="denomination" text="Denomination" values="ibadi,nondenominational,shia,sunni" values_searchable="true" />
     3312            <reference ref="muslim_denominations" />
    32893313            <reference ref="service_times" />
    32903314            <reference ref="oh_wheelchair" />
    … …  
    32993323            <text key="name" text="Name" />
    33003324            <combo key="building" text="Building type" values="synagogue" values_searchable="true" />
    3301             <combo key="denomination" text="Denomination" values="orthodox,conservative,nondenominational,reform" values_context="jewish" values_searchable="true" />
     3325            <reference ref="jewish_denominations" />
    33023326            <reference ref="service_times" />
    33033327            <reference ref="oh_wheelchair" />
    … …  
    33113335            <key key="religion" value="buddhist" />
    33123336            <text key="name" text="Name" />
    3313             <combo key="denomination" text="Denomination" values="tibetan,theravada,mahayana,vajrayana" values_searchable="true" />
     3337            <reference ref="buddhist_denominations" />
    33143338            <reference ref="service_times" />
    33153339            <reference ref="oh_wheelchair" />
    … …  
    33233347            <key key="religion" value="hindu" />
    33243348            <text key="name" text="Name" />
    3325             <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
     3349            <reference ref="hindu_denominations" />
    33263350            <reference ref="service_times" />
    33273351            <reference ref="oh_wheelchair" />
    … …  
    33453369            <key key="amenity" value="place_of_worship" />
    33463370            <text key="name" text="Name" />
    3347             <combo key="religion" text="Religion" values="bahai,jain,sikh,spiritualist,taoist,unitarian,zoroastrian" match="keyvalue!" values_searchable="true" />
     3371            <reference ref="other_religions" />
    33483372            <reference ref="service_times" />
    33493373            <reference ref="oh_wheelchair" />
    … …  
    53545378            <key key="historic" value="wayside_cross" />
    53555379            <text key="name" text="Name" />
    5356             <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" default="christian" />
    5357             <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" />
     5380            <reference ref="religious_catholic_christian" />
    53585381            <text key="start_date" text="Start date" />
    53595382            <text key="inscription" text="Inscription" />
    … …  
    53645387            <key key="historic" value="wayside_shrine" />
    53655388            <text key="name" text="Name" />
    5366             <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" default="christian" />
    5367             <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" />
     5389            <reference ref="religious_catholic_christian" />
    53685390            <check key="amenity" text="Place of worship" value_on="place_of_worship" disable_off="true" />
    53695391            <combo key="building" text="Building" values="wayside_shrine,yes" values_context="building" />
    … …  
    59816003            <reference ref="name_operator_oh_wheelchair" />
    59826004            <optional>
    5983                 <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
    5984                 <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
     6005                <reference ref="religious" />
    59856006            </optional>
    59866007            <reference ref="link_contact_address_payment" />
    … …  
    62376258        <space />
    62386259        <key key="office" value="religion" />
     6260        <text key="name" text="Name" />
    62396261        <reference ref="religious" />
    62406262        <reference ref="oh_wheelchair" />
    … …  
    69546976            <space />
    69556977            <key key="amenity" value="grave_yard" />
     6978            <text key="name" text="Name" />
    69566979            <reference ref="religious" />
    69576980        </item> <!-- Graveyard -->
    … …  
    69606983            <space />
    69616984            <key key="landuse" value="cemetery" />
     6985            <text key="name" text="Name" />
    69626986            <reference ref="religious" />
    69636987        </item> <!-- Cemetery -->
    … …  
    69666990            <space />
    69676991            <key key="landuse" value="religious" />
     6992            <text key="name" text="Name" />
    69686993            <reference ref="religious" />
    69696994        </item> <!-- Religious -->

  • trunk/data/validator/deprecated.mapcss

    r14815 r14867  
    13891389  group: tr("deprecated tagging");
    13901390}
     1391
     1392/* #17249 */
     1393*[religion=unitarian] {
     1394  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1395  suggestAlternative: "religion=unitarian_universalist";
     1396  fixAdd: "religion=unitarian_universalist";
     1397  group: tr("deprecated tagging");
     1398}

  • trunk/data/validator/religion.mapcss

    r11363 r14867  
    99}
    1010
    11 *[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)$/] {
     11*[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)$/] {
    1212  throwOther: tr("unknown christian denomination");
    1313  assertMatch: "node religion=christian denomination=foobar";
    … …  
    2929  assertNoMatch: "node religion=jewish";
    3030}
     31
     32*[religion=catholic] {
     33  throwWarning: tr("{0}", "{0.tag}");
     34  suggestAlternative: "religion=christian + denomination=catholic";
     35  fixChangeKey: "religion => denomination";
     36  fixAdd: "religion=christian";
     37}

  • trunk/styles/standard/elemstyles.mapcss

    r14830 r14867  
    26612661    set icon_z17;
    26622662}
     2663node[amenity=place_of_worship][religion=caodaism][!is_prop_set(icon-image)] {
     2664    icon-image: "presets/misc/no_icon.svg";
     2665    set icon_z17;
     2666}
    26632667node[amenity=place_of_worship][religion=christian] {
    26642668    icon-image: "presets/religion/church.svg";
    26652669    set icon_z17;
    26662670}
     2671node[amenity=place_of_worship][religion=confucian] {
     2672    icon-image: "presets/religion/confucian.svg";
     2673    set icon_z17;
     2674}
    26672675node[amenity=place_of_worship][religion=hindu] {
    26682676    icon-image: "presets/religion/hinduism.svg";
    … …  
    26812689    set icon_z17;
    26822690}
     2691node[amenity=place_of_worship][religion=shinto] {
     2692    icon-image: "presets/religion/shinto.svg";
     2693    set icon_z17;
     2694}
    26832695node[amenity=place_of_worship][religion=sikh] {
    26842696    icon-image: "presets/religion/sikhism.svg";
    26852697    set icon_z17;
    26862698}
    2687 node[amenity=place_of_worship][religion=shinto] {
    2688     icon-image: "presets/religion/shinto.svg";
    2689     set icon_z17;
    2690 }
    26912699node[amenity=place_of_worship][religion=spiritualist][!is_prop_set(icon-image)] {
    26922700    icon-image: "presets/misc/no_icon.svg";
    … …  
    26972705    set icon_z17;
    26982706}
    2699 node[amenity=place_of_worship][religion=unitarian][!is_prop_set(icon-image)] {
     2707node[amenity=place_of_worship][religion=tenrikyo] {
     2708    icon-image: "presets/religion/tenrikyo.svg";
     2709    set icon_z17;
     2710}
     2711node[amenity=place_of_worship][religion=unitarian_universalist][!is_prop_set(icon-image)] {
    27002712    icon-image: "presets/misc/no_icon.svg";
    27012713    set icon_z17;
Note: See TracChangeset for help on using the changeset viewer.