Ticket #17249: religion_denomination_14731.patch

trunk/data/defaultpresets.xml

@@ -282 +282 @@
     </chunk>
     <chunk id="religious">
         <text key="name" text="Name" />
-        <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" />
-        <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" />
+        <combo key="religion" text="Religion" values="bahai,buddhist,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" />
+        <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" />
     </chunk>
     <chunk id="voltage">
         <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" />
@@ -3344 +3344 @@
             <space />
             <key key="amenity" value="place_of_worship" />
             <text key="name" text="Name" />
-            <combo key="religion" text="Religion" values="bahai,jain,sikh,spiritualist,taoist,unitarian,zoroastrian" match="keyvalue!" values_searchable="true" />
+            <combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
             <reference ref="service_times" />
             <reference ref="oh_wheelchair" />
             <reference ref="link_contact_address" />
@@ -5347 +5347 @@
             <space />
             <key key="historic" value="wayside_cross" />
             <text key="name" text="Name" />
-            <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" default="christian" />
+            <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian_universalist,zoroastrian" default="christian" />
             <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" />
             <text key="start_date" text="Start date" />
             <text key="inscription" text="Inscription" />
@@ -5357 +5357 @@
             <space />
             <key key="historic" value="wayside_shrine" />
             <text key="name" text="Name" />
-            <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" default="christian" />
+            <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian_universalist,zoroastrian" default="christian" />
             <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" />
             <check key="amenity" text="Place of worship" value_on="place_of_worship" disable_off="true" />
             <combo key="building" text="Building" values="wayside_shrine,yes" values_context="building" />
@@ -5974 +5974 @@
             <key key="shop" value="gift" />
             <reference ref="name_operator_oh_wheelchair" />
             <optional>
-                <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
+                <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian_universalist,zoroastrian" />
                 <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
             </optional>
             <reference ref="link_contact_address_payment" />

trunk/styles/standard/elemstyles.mapcss

@@ -2667 +2667 @@
     icon-image: "presets/religion/church.svg";
     set icon_z17;
 }
+node[amenity=place_of_worship][religion=confucian] {
+    icon-image: "presets/religion/confucian.svg";
+    set icon_z17;
+}
 node[amenity=place_of_worship][religion=hindu] {
     icon-image: "presets/religion/hinduism.svg";
     set icon_z17;
@@ -2699 +2703 @@
     icon-image: "presets/religion/taoism.svg";
     set icon_z17;
 }
+node[amenity=place_of_worship][religion=tenrikyo] {
+    icon-image: "presets/religion/tenrikyo.svg";
+    set icon_z17;
+}
 node[amenity=place_of_worship][religion=unitarian][!is_prop_set(icon-image)] {
     icon-image: "presets/misc/no_icon.svg";
     set icon_z17;