Use field inheritance for place of worship presets

data/presets/presets.json

@@ -146,14 +146,14 @@
     "amenity/pharmacy": {"icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "drive_through", "dispensing"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy"}, "addTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "terms": ["apothecary", "drug store", "drugstore", "med*", "prescription"], "name": "Pharmacy Counter"},
     "amenity/photo_booth": {"icon": "fas-person-booth", "fields": ["name", "operator", "payment_multi", "wheelchair"], "geometry": ["point", "area"], "terms": ["photobooth", "photo", "booth", "kiosk", "camera"], "tags": {"amenity": "photo_booth"}, "name": "Photo Booth"},
     "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "moreFields": ["air_conditioning", "opening_hours", "internet_access", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship"}, "name": "Place of Worship"},
-    "amenity/place_of_worship/buddhist": {"icon": "maki-religious-buddhist", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["stupa", "vihara", "monastery", "temple", "pagoda", "zendo", "dojo"], "tags": {"amenity": "place_of_worship", "religion": "buddhist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Buddhist Temple"},
-    "amenity/place_of_worship/christian": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "oratory", "parish", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Christian Church"},
-    "amenity/place_of_worship/hindu": {"icon": "temaki-hinduism", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["kovil", "devasthana", "mandir", "kshetram", "alayam", "shrine", "temple"], "tags": {"amenity": "place_of_worship", "religion": "hindu"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Hindu Temple"},
-    "amenity/place_of_worship/jewish": {"icon": "maki-religious-jewish", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["jewish"], "tags": {"amenity": "place_of_worship", "religion": "jewish"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Jewish Synagogue"},
-    "amenity/place_of_worship/muslim": {"icon": "maki-religious-muslim", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["muslim"], "tags": {"amenity": "place_of_worship", "religion": "muslim"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Muslim Mosque"},
-    "amenity/place_of_worship/shinto": {"icon": "temaki-shinto", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["kami", "torii"], "tags": {"amenity": "place_of_worship", "religion": "shinto"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Shinto Shrine"},
-    "amenity/place_of_worship/sikh": {"icon": "temaki-sikhism", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["gurudwara", "temple"], "tags": {"amenity": "place_of_worship", "religion": "sikh"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Sikh Temple"},
-    "amenity/place_of_worship/taoist": {"icon": "temaki-taoism", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["daoist", "monastery", "temple"], "tags": {"amenity": "place_of_worship", "religion": "taoist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Taoist Temple"},
+    "amenity/place_of_worship/buddhist": {"icon": "maki-religious-buddhist", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["stupa", "vihara", "monastery", "temple", "pagoda", "zendo", "dojo"], "tags": {"amenity": "place_of_worship", "religion": "buddhist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Buddhist Temple"},
+    "amenity/place_of_worship/christian": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "oratory", "parish", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Christian Church"},
+    "amenity/place_of_worship/hindu": {"icon": "temaki-hinduism", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["kovil", "devasthana", "mandir", "kshetram", "alayam", "shrine", "temple"], "tags": {"amenity": "place_of_worship", "religion": "hindu"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Hindu Temple"},
+    "amenity/place_of_worship/jewish": {"icon": "maki-religious-jewish", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["jewish"], "tags": {"amenity": "place_of_worship", "religion": "jewish"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Jewish Synagogue"},
+    "amenity/place_of_worship/muslim": {"icon": "maki-religious-muslim", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["muslim"], "tags": {"amenity": "place_of_worship", "religion": "muslim"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Muslim Mosque"},
+    "amenity/place_of_worship/shinto": {"icon": "temaki-shinto", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["kami", "torii"], "tags": {"amenity": "place_of_worship", "religion": "shinto"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Shinto Shrine"},
+    "amenity/place_of_worship/sikh": {"icon": "temaki-sikhism", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["gurudwara", "temple"], "tags": {"amenity": "place_of_worship", "religion": "sikh"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Sikh Temple"},
+    "amenity/place_of_worship/taoist": {"icon": "temaki-taoism", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["daoist", "monastery", "temple"], "tags": {"amenity": "place_of_worship", "religion": "taoist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Taoist Temple"},
     "amenity/planetarium": {"icon": "maki-globe", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "fee", "payment_multi_fee", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["museum", "astronomy", "observatory"], "tags": {"amenity": "planetarium"}, "name": "Planetarium"},
     "amenity/police": {"icon": "maki-police", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["badge", "constable", "constabulary", "cop", "detective", "fed", "law", "enforcement", "officer", "patrol"], "tags": {"amenity": "police"}, "name": "Police"},
     "amenity/post_box": {"icon": "temaki-post_box", "fields": ["operator", "collection_times", "drive_through", "ref"], "moreFields": ["wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "post_box"}, "terms": ["letter", "post"], "name": "Mailbox"},

data/presets/presets/amenity/place_of_worship/buddhist.json

@@ -4,9 +4,7 @@
         "name",
         "religion",
         "denomination",
-        "building_area",
-        "address",
-        "service_times"
+        "{amenity/place_of_worship}"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/place_of_worship/christian.json

@@ -4,9 +4,7 @@
         "name",
         "religion",
         "denomination",
-        "building_area",
-        "address",
-        "service_times"
+        "{amenity/place_of_worship}"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/place_of_worship/hindu.json

@@ -4,9 +4,7 @@
         "name",
         "religion",
         "denomination",
-        "building_area",
-        "address",
-        "service_times"
+        "{amenity/place_of_worship}"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/place_of_worship/jewish.json

@@ -4,9 +4,7 @@
         "name",
         "religion",
         "denomination",
-        "building_area",
-        "address",
-        "service_times"
+        "{amenity/place_of_worship}"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/place_of_worship/muslim.json

@@ -4,9 +4,7 @@
         "name",
         "religion",
         "denomination",
-        "building_area",
-        "address",
-        "service_times"
+        "{amenity/place_of_worship}"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/place_of_worship/shinto.json

@@ -4,9 +4,7 @@
         "name",
         "religion",
         "denomination",
-        "building_area",
-        "address",
-        "service_times"
+        "{amenity/place_of_worship}"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/place_of_worship/sikh.json

@@ -4,9 +4,7 @@
         "name",
         "religion",
         "denomination",
-        "building_area",
-        "address",
-        "service_times"
+        "{amenity/place_of_worship}"
     ],
     "geometry": [
         "point",

data/presets/presets/amenity/place_of_worship/taoist.json

@@ -4,9 +4,7 @@
         "name",
         "religion",
         "denomination",
-        "building_area",
-        "address",
-        "service_times"
+        "{amenity/place_of_worship}"
     ],
     "geometry": [
         "point",