consolidate optional fields of "POI" presets into template "presets"

openstreetmap · Apr 13, 2023 · bdae3f0 · bdae3f0
1 parent d9b12bc
commit bdae3f0
Show file tree

Hide file tree

Showing 172 changed files with 451 additions and 1,166 deletions.
diff --git a/data/presets/@templates/contact.json b/data/presets/@templates/contact.json
@@ -0,0 +1,25 @@
+{
+    "fields": [],
+    "moreFields": [
+        "email",
+        "fax",
+        "phone",
+        "website"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "tags": {
+        "@template": "contact"
+    },
+    "searchable": false,
+    "locationSet": {
+        "include": [
+            "999"
+        ],
+        "exclude": [
+            "999"
+        ]
+    },
+    "name": "{point}"
+}
diff --git a/data/presets/@templates/internet_access.json b/data/presets/@templates/internet_access.json
@@ -0,0 +1,27 @@
+{
+    "fields": [
+        "internet_access",
+        "internet_access/fee"
+    ],
+    "moreFields": [
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "tags": {
+        "@template": "internet_access"
+    },
+    "searchable": false,
+    "locationSet": {
+        "include": [
+            "999"
+        ],
+        "exclude": [
+            "999"
+        ]
+    },
+    "name": "{point}"
+}
diff --git a/data/presets/@templates/poi.json b/data/presets/@templates/poi.json
@@ -0,0 +1,33 @@
+{
+    "fields": [],
+    "moreFields": [
+        "{@templates/contact}",
+        "address",
+        "contact/facebook",
+        "gnis/feature_id-US",
+        "level",
+        "not/name",
+        "opening_hours",
+        "opening_hours/covid19",
+        "payment_multi",
+        "ref/vatin",
+        "ref/FR/siret-FR",
+        "wheelchair"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "tags": {
+        "@template": "poi"
+    },
+    "searchable": false,
+    "locationSet": {
+        "include": [
+            "999"
+        ],
+        "exclude": [
+            "999"
+        ]
+    },
+    "name": "{point}"
+}
diff --git a/data/presets/_attraction.json b/data/presets/_attraction.json
@@ -9,12 +9,10 @@
         "charge_fee"
     ],
     "moreFields": [
+        "{@templates/contact}",
         "address",
-        "email",
-        "fax",
         "opening_hours/covid19",
-        "payment_multi",
-        "phone"
+        "payment_multi"
     ],
     "geometry": [
         "point",

diff --git a/data/presets/aeroway/aerodrome.json b/data/presets/aeroway/aerodrome.json
@@ -7,15 +7,12 @@
         "address",
         "operator",
         "operator/type",
-        "internet_access",
-        "internet_access/fee",
-        "internet_access/ssid"
+        "{@templates/internet_access}"
     ],
     "moreFields": [
-        "email",
-        "fax",
-        "gnis/feature_id-US",
-        "phone"
+        "{@templates/contact}",
+        "{@templates/internet_access}",
+        "gnis/feature_id-US"
     ],
     "geometry": [
         "area",

diff --git a/data/presets/aeroway/spaceport.json b/data/presets/aeroway/spaceport.json
@@ -8,12 +8,8 @@
         "wikidata"
     ],
     "moreFields": [
-        "email",
-        "fax",
-        "internet_access",
-        "internet_access/fee",
-        "internet_access/ssid",
-        "phone"
+        "{@templates/contact}",
+        "{@templates/internet_access}"
     ],
     "geometry": [
         "area",

diff --git a/data/presets/amenity/_bus_station.json b/data/presets/amenity/_bus_station.json
@@ -4,9 +4,11 @@
         "name",
         "building_area",
         "operator",
-        "internet_access",
-        "internet_access/fee",
-        "internet_access/ssid"
+        "{@templates/internet_access}"
+    ],
+    "moreFields": [
+        "{@templates/internet_access}",
+        "{amenity}"
     ],
     "geometry": [
         "point",

diff --git a/data/presets/amenity/_coworking_space.json b/data/presets/amenity/_coworking_space.json
@@ -5,11 +5,10 @@
         "address",
         "building_area_yes",
         "opening_hours",
-        "internet_access",
-        "internet_access/fee",
-        "internet_access/ssid"
+        "{@templates/internet_access}"
     ],
     "moreFields": [
+        "{@templates/internet_access}",
         "opening_hours/covid19",
         "ref/FR/siret-FR"
     ],

diff --git a/data/presets/amenity/_embassy.json b/data/presets/amenity/_embassy.json
@@ -7,9 +7,7 @@
         "building_area_yes"
     ],
     "moreFields": [
-        "email",
-        "fax",
-        "phone",
+        "{@templates/contact}",
         "wheelchair"
     ],
     "geometry": [

diff --git a/data/presets/amenity/animal_boarding.json b/data/presets/amenity/animal_boarding.json
@@ -9,15 +9,7 @@
         "animal_boarding"
     ],
     "moreFields": [
-        "contact/facebook",
-        "email",
-        "fax",
-        "gnis/feature_id-US",
-        "level",
-        "opening_hours/covid19",
-        "payment_multi",
-        "phone",
-        "wheelchair"
+        "{@templates/poi}"
     ],
     "geometry": [
         "point",

diff --git a/data/presets/amenity/animal_breeding.json b/data/presets/amenity/animal_breeding.json
@@ -9,15 +9,7 @@
         "animal_breeding"
     ],
     "moreFields": [
-        "contact/facebook",
-        "email",
-        "fax",
-        "gnis/feature_id-US",
-        "level",
-        "opening_hours/covid19",
-        "ref/FR/siret-FR",
-        "phone",
-        "wheelchair"
+        "{@templates/poi}"
     ],
     "geometry": [
         "point",

diff --git a/data/presets/amenity/animal_shelter.json b/data/presets/amenity/animal_shelter.json
@@ -9,14 +9,7 @@
         "animal_shelter"
     ],
     "moreFields": [
-        "contact/facebook",
-        "email",
-        "fax",
-        "gnis/feature_id-US",
-        "level",
-        "opening_hours/covid19",
-        "phone",
-        "wheelchair"
+        "{@templates/poi}"
     ],
     "geometry": [
         "point",

diff --git a/data/presets/amenity/arts_centre.json b/data/presets/amenity/arts_centre.json
@@ -8,20 +8,10 @@
         "website"
     ],
     "moreFields": [
+        "{@templates/internet_access}",
+        "{@templates/poi}",
         "charge_fee",
-        "contact/facebook",
-        "email",
-        "fax",
-        "fee",
-        "gnis/feature_id-US",
-        "internet_access",
-        "internet_access/fee",
-        "internet_access/ssid",
-        "level",
-        "opening_hours/covid19",
-        "payment_multi",
-        "phone",
-        "wheelchair"
+        "fee"
     ],
     "geometry": [
         "point",

diff --git a/data/presets/amenity/bank.json b/data/presets/amenity/bank.json
@@ -10,23 +10,12 @@
         "drive_through"
     ],
     "moreFields": [
+        "{@templates/internet_access}",
+        "{@templates/poi}",
         "air_conditioning",
         "branch_brand",
         "brand",
-        "contact/facebook",
-        "currency_multi",
-        "email",
-        "fax",
-        "gnis/feature_id-US",
-        "internet_access",
-        "internet_access/fee",
-        "internet_access/ssid",
-        "level",
-        "opening_hours/covid19",
-        "phone",
-        "ref/vatin",
-        "ref/FR/siret-FR",
-        "wheelchair"
+        "currency_multi"
     ],
     "geometry": [
         "point",

diff --git a/data/presets/amenity/bar.json b/data/presets/amenity/bar.json
@@ -9,26 +9,14 @@
         "brewery"
     ],
     "moreFields": [
+        "{@templates/internet_access}",
+        "{@templates/poi}",
         "air_conditioning",
-        "contact/facebook",
-        "email",
-        "fax",
-        "gnis/feature_id-US",
-        "internet_access",
-        "internet_access/fee",
-        "internet_access/ssid",
-        "level",
         "microbrewery",
-        "opening_hours/covid19",
         "operator",
         "outdoor_seating",
-        "payment_multi",
-        "phone",
-        "ref/vatin",
-        "ref/FR/siret-FR",
         "smoking",
-        "sport_pub",
-        "wheelchair"
+        "sport_pub"
     ],
     "geometry": [
         "point",

diff --git a/data/presets/amenity/bicycle_rental.json b/data/presets/amenity/bicycle_rental.json
@@ -10,15 +10,9 @@
         "payment_multi_fee"
     ],
     "moreFields": [
+        "{@templates/poi}",
         "address",
-        "covered",
-        "email",
-        "fax",
-        "level",
-        "opening_hours",
-        "opening_hours/covid19",
-        "phone",
-        "wheelchair"
+        "covered"
     ],
     "geometry": [
         "point",

diff --git a/data/presets/amenity/boat_rental.json b/data/presets/amenity/boat_rental.json
@@ -10,15 +10,9 @@
         "charge_fee"
     ],
     "moreFields": [
+        "{@templates/poi}",
         "access_simple",
-        "address",
-        "contact/facebook",
-        "email",
-        "fax",
-        "opening_hours/covid19",
-        "ref/FR/siret-FR",
-        "phone",
-        "wheelchair"
+        "address"
     ],
     "geometry": [
         "point",

diff --git a/data/presets/amenity/bureau_de_change.json b/data/presets/amenity/bureau_de_change.json
@@ -9,15 +9,7 @@
         "building_area"
     ],
     "moreFields": [
-        "contact/facebook",
-        "email",
-        "fax",
-        "level",
-        "opening_hours",
-        "opening_hours/covid19",
-        "ref/FR/siret-FR",
-        "phone",
-        "wheelchair"
+        "{@templates/poi}"
     ],
     "geometry": [
         "point",