Merge branch 'openstreetmap:main' into temp

data/deprecated.json

@@ -446,6 +446,14 @@
     "old": {"crossing": "no", "highway": "crossing"},
     "replace": {"crossing": "no"}
   },
+  {
+    "old": {"cuisine": "barbeque"},
+    "replace": {"cuisine": "barbecue"}
+  },
+  {
+    "old": {"cuisine": "bbq"},
+    "replace": {"cuisine": "barbecue"}
+  },
   {
     "old": {"cuisine": "gluten-free"},
     "replace": {"diet:gluten_free": "*"}

data/fields/healthcare.json

@@ -1,5 +1,35 @@
 {
     "key": "healthcare",
     "type": "typeCombo",
-    "label": "Type"
+    "label": "Type",
+    "strings": {
+        "options": {
+            "alternative": "Alternative Medicine",
+            "audiologist": "Audiologist",
+            "birthing_centre": "Birthing Center",
+            "blood_bank": "Blood Bank",
+            "blood_donation": "Blood Donation Center",
+            "clinic": "Clinic",
+            "community_health_worker": "Community Health Worker",
+            "counselling": "Counselling Center",
+            "dentist": "Dentist",
+            "dialysis": "Dialysis Center",
+            "doctor": "Doctor",
+            "hospice": "Hospice",
+            "hospital": "Hospital",
+            "laboratory": "Medical Laboratory",
+            "midwife": "Midwife",
+            "nurse": "Nurse",
+            "occupational_therapist": "Occupational Therapist",
+            "optometrist": "Optometrist",
+            "pharmacy": "Pharmacy",
+            "physiotherapist": "Physiotherapist",
+            "podiatrist": "Podiatrist",
+            "psychotherapist": "Psychotherapist",
+            "rehabilitation": "Rehabilitation Facility",
+            "sample_collection": "Sample Collection Facility",
+            "speech_therapist": "Speech Therapist",
+            "vaccination_centre": "Vaccination Center"
+        }
+    }
 }

data/presets/amenity/parcel_locker.json

@@ -6,11 +6,15 @@
         "parcel_dropoff",
         "opening_hours",
         "payment_multi",
-        "ref"
+        "ref",
+        "wheelchair"
     ],
     "moreFields": [
         "brand",
-        "colour"
+        "collection_times",
+        "colour",
+        "indoor",
+        "surveillance"
     ],
     "geometry": [
         "point",

data/presets/amenity/restaurant/barbecue.json

@@ -19,11 +19,14 @@
     ],
     "tags": {
         "amenity": "restaurant",
-        "cuisine": "barbeque"
+        "cuisine": "barbecue"
     },
     "reference": {
         "key": "cuisine",
-        "value": "barbeque"
+        "value": "barbecue"
     },
-    "name": "Barbeque Restaurant"
+    "name": "Barbecue Restaurant",
+    "aliases": [
+        "Barbeque Restaurant"
+    ]
 }

data/presets/amenity/townhall/barangay-PH.json

@@ -10,7 +10,7 @@
         "area"
     ],
     "terms": [
-        "barrior hall"
+        "barrio hall"
     ],
     "tags": {
         "amenity": "townhall",

data/presets/highway/emergency_bay.json

@@ -1,11 +1,15 @@
 {
     "icon": "maki-car",
     "geometry": [
-        "vertex"
+        "vertex",
+        "line"
     ],
     "tags": {
         "highway": "emergency_bay"
     },
+    "fields": [
+        "direction_vertex_dual"
+    ],
     "terms": [
         "Highway Emergency Bay"
     ],