Ticket #17249: religion_denomination_14731.patch

File religion_denomination_14731.patch, 5.7 KB (added by Claudius, 9 months ago)
  • trunk/data/defaultpresets.xml

     
    282282    </chunk>
    283283    <chunk id="religious">
    284284        <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" />
     285        <combo key="religion" text="Religion" values="bahai,buddhist,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" />
     286        <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,greek_catholic,greek_orthodox,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reformed,roman_catholic,russian_orthodox,seventh_day_adventist,shia,sunni" />
    287287    </chunk>
    288288    <chunk id="voltage">
    289289        <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" />
     
    33443344            <space />
    33453345            <key key="amenity" value="place_of_worship" />
    33463346            <text key="name" text="Name" />
    3347             <combo key="religion" text="Religion" values="bahai,jain,sikh,spiritualist,taoist,unitarian,zoroastrian" match="keyvalue!" values_searchable="true" />
     3347            <combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
    33483348            <reference ref="service_times" />
    33493349            <reference ref="oh_wheelchair" />
    33503350            <reference ref="link_contact_address" />
     
    53475347            <space />
    53485348            <key key="historic" value="wayside_cross" />
    53495349            <text key="name" text="Name" />
    5350             <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" default="christian" />
     5350            <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian_universalist,zoroastrian" default="christian" />
    53515351            <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" />
    53525352            <text key="start_date" text="Start date" />
    53535353            <text key="inscription" text="Inscription" />
     
    53575357            <space />
    53585358            <key key="historic" value="wayside_shrine" />
    53595359            <text key="name" text="Name" />
    5360             <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" default="christian" />
     5360            <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian_universalist,zoroastrian" default="christian" />
    53615361            <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" />
    53625362            <check key="amenity" text="Place of worship" value_on="place_of_worship" disable_off="true" />
    53635363            <combo key="building" text="Building" values="wayside_shrine,yes" values_context="building" />
     
    59745974            <key key="shop" value="gift" />
    59755975            <reference ref="name_operator_oh_wheelchair" />
    59765976            <optional>
    5977                 <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
     5977                <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian_universalist,zoroastrian" />
    59785978                <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
    59795979            </optional>
    59805980            <reference ref="link_contact_address_payment" />
  • trunk/styles/standard/elemstyles.mapcss

     
    26672667    icon-image: "presets/religion/church.svg";
    26682668    set icon_z17;
    26692669}
     2670node[amenity=place_of_worship][religion=confucian] {
     2671    icon-image: "presets/religion/confucian.svg";
     2672    set icon_z17;
     2673}
    26702674node[amenity=place_of_worship][religion=hindu] {
    26712675    icon-image: "presets/religion/hinduism.svg";
    26722676    set icon_z17;
     
    26992703    icon-image: "presets/religion/taoism.svg";
    27002704    set icon_z17;
    27012705}
     2706node[amenity=place_of_worship][religion=tenrikyo] {
     2707    icon-image: "presets/religion/tenrikyo.svg";
     2708    set icon_z17;
     2709}
    27022710node[amenity=place_of_worship][religion=unitarian][!is_prop_set(icon-image)] {
    27032711    icon-image: "presets/misc/no_icon.svg";
    27042712    set icon_z17;