Merge branch 'openstreetmap:main' into temp

data/fields/ramp.json

@@ -1,6 +1,14 @@
 {
     "key": "ramp",
-    "type": "check",
+    "type": "combo",
+    "strings": {
+        "options": {
+            "yes": "Yes",
+            "no": "No",
+            "separate": "Separately Mapped"
+        }
+    },
+    "customValues": false,
     "label": "Embedded Ramp",
     "terms": [
         "bicycle stairway",

data/fields/telecom.json

@@ -1,5 +1,14 @@
 {
     "key": "telecom",
     "type": "combo",
-    "label": "Type"
+    "label": "Type",
+    "strings": {
+        "options": {
+            "connection_point": "Connection Point",
+            "data_center": "Data Center",
+            "distribution_point": "Distribution Point",
+            "exchange": "Exchange",
+            "service_device": "Service Device"
+        }
+    }
 }

data/presets/amenity/recycling_container.json

@@ -38,5 +38,8 @@
         "key": "amenity",
         "value": "recycling"
     },
-    "name": "Recycling Container"
+    "aliases": [
+        "Recycling Container"
+    ],
+    "name": "Recycling Bin"
 }

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

@@ -0,0 +1,29 @@
+{
+    "icon": "fas-building-flag",
+    "locationSet": {
+        "include": [
+            "ph"
+        ]
+    },
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "barrior hall"
+    ],
+    "tags": {
+        "amenity": "townhall",
+        "townhall:type": "barangay"
+    },
+    "addTags": {
+        "amenity": "townhall",
+        "townhall:type": "barangay",
+        "admin_level": "10"
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "townhall"
+    },
+    "name": "Barangay Hall"
+}

data/presets/amenity/waste_basket.json

@@ -26,5 +26,8 @@
         "litter",
         "trash"
     ],
-    "name": "Waste Basket"
+    "aliases": [
+        "Waste Basket"
+    ],
+    "name": "Trash Can"
 }

interim/source_strings.yaml

@@ -3941,6 +3941,13 @@ en:
       ramp:
         # ramp=*
         label: Embedded Ramp
+        options:
+          # ramp=no
+          'no': 'No'
+          # ramp=separate
+          separate: Separately Mapped
+          # ramp=yes
+          'yes': 'Yes'
         # 'terms: bicycle stairway,push ramp,runnel,wheeling ramp'
         terms: '[translate with synonyms or related terms for ''Embedded Ramp'', separated by commas]'
       rating:
@@ -5034,6 +5041,17 @@ en:
       telecom:
         # telecom=*
         label: Type
+        options:
+          # telecom=connection_point
+          connection_point: Connection Point
+          # telecom=data_center
+          data_center: Data Center
+          # telecom=distribution_point
+          distribution_point: Distribution Point
+          # telecom=exchange
+          exchange: Exchange
+          # telecom=service_device
+          service_device: Service Device
       telecom/medium:
         # telecom:medium=*
         label: Medium
@@ -6719,10 +6737,10 @@ en:
         # 'terms: bottle,can,dump,glass,garbage,rubbish,scrap,trash'
         terms: <translate with synonyms or related terms for 'Recycling Center', separated by commas>
       amenity/recycling_container:
-        # amenity=recycling + recycling_type=container | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Recycling Container
+        # amenity=recycling + recycling_type=container | Recycling Container | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Recycling Bin
         # 'terms: bin,can,bottle,glass,garbage,rubbish,scrap,trash'
-        terms: <translate with synonyms or related terms for 'Recycling Container', separated by commas>
+        terms: <translate with synonyms or related terms for 'Recycling Bin', separated by commas>
       amenity/refugee_site:
         # amenity=refugee_site | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Refugee Camp
@@ -7021,6 +7039,11 @@ en:
         name: Town Hall
         # 'terms: village,city,government,courthouse,municipal'
         terms: <translate with synonyms or related terms for 'Town Hall', separated by commas>
+      amenity/townhall/barangay-PH:
+        # amenity=townhall + townhall:type=barangay | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). | Local preset for countries "PH"
+        name: Barangay Hall
+        # 'terms: barrior hall'
+        terms: <translate with synonyms or related terms for 'Barangay Hall', separated by commas>
       amenity/townhall/city:
         # amenity=townhall + townhall:type=city | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: City Hall
@@ -7176,10 +7199,10 @@ en:
         # 'terms: bin,garbage,rubbish,litter,trash,poo,dog'
         terms: <translate with synonyms or related terms for 'Dog Excrement Bin', separated by commas>
       amenity/waste_basket:
-        # amenity=waste_basket | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Waste Basket
+        # amenity=waste_basket | Waste Basket | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Trash Can
         # 'terms: bin,garbage,rubbish,litter,trash'
-        terms: <translate with synonyms or related terms for 'Waste Basket', separated by commas>
+        terms: <translate with synonyms or related terms for 'Trash Can', separated by commas>
       amenity/waste_disposal:
         # amenity=waste_disposal | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Garbage Dumpster