Merge branch 'openstreetmap:main' into temp

data/fields/house.json

@@ -0,0 +1,5 @@
+{
+    "key": "house",
+    "type": "combo",
+    "label": "House Type"
+}

data/fields/tomb.json

@@ -1,5 +1,21 @@
 {
     "key": "tomb",
     "type": "typeCombo",
-    "label": "Type"
+    "label": "Type",
+    "strings": {
+        "options": {
+            "columbarium": "Columbarium",
+            "crypt": "Crypt",
+            "dolmen": "Dolmen",
+            "hypogeum": "Hypogeum",
+            "mausoleum": "Mausoleum",
+            "pyramid": "Pyramid",
+            "rock-cut": "Rock-cut Tomb",
+            "sarcophagus": "Sarcophagus",
+            "table": "Table",
+            "tumulus": "Tumulus",
+            "vault": "Vault",
+            "war_grave": "Single War Grave"
+        }
+    }
 }

data/fields/vending.json

@@ -1,5 +1,32 @@
 {
     "key": "vending",
     "type": "semiCombo",
-    "label": "Types of Goods"
+    "label": "Types of Goods",
+    "strings": {
+        "options": {
+            "bicycle_tube": "Bicycle Tubes",
+            "bread": "Bread",
+            "cigarettes": "Cigarettes",
+            "coffee": "Coffee",
+            "condoms": "Condoms",
+            "drinks": "Drinks",
+            "eggs": "Eggs",
+            "electronics": "Electronics",
+            "elongated_coin": "Souvenir Coins",
+            "excrement_bags": "Excrement Bags",
+            "feminine_hygiene": "Feminine Hygiene Products",
+            "food": "Food",
+            "fuel": "Fuel",
+            "ice_cream": "Ice Cream",
+            "ice_cubes": "Ice Cubes",
+            "milk": "Milk",
+            "newspapers": "Newspapers",
+            "parking_tickets": "Parking Tickets",
+            "pizza": "Pizza",
+            "public_transport_tickets": "Public Transport Tickets",
+            "stamps": "Postage Stamps",
+            "sweets": "Sweets",
+            "water": "Drinking Water"
+        }
+    }
 }

data/presets/amenity/drinking_water.json

@@ -16,7 +16,8 @@
         "lit"
     ],
     "geometry": [
-        "point"
+        "point",
+        "vertex"
     ],
     "tags": {
         "amenity": "drinking_water"

data/presets/building/house.json

@@ -3,6 +3,10 @@
     "geometry": [
         "area"
     ],
+    "fields": [
+        "{building}",
+        "house"
+    ],
     "tags": {
         "building": "house"
     },

data/presets/building/house/_detached.json

@@ -0,0 +1,17 @@
+{
+    "icon": "maki-home",
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "house",
+        "house": "detached"
+    },
+    "reference": {
+        "key": "house",
+        "value": "detached"
+    },
+    "matchScore": 0.5,
+    "name": "{building/detached}",
+    "searchable": false
+}

data/presets/building/house/_semi-detached.json

@@ -0,0 +1,17 @@
+{
+    "icon": "maki-home",
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "house",
+        "house": "semi-detached"
+    },
+    "reference": {
+        "key": "house",
+        "value": "semi-detached"
+    },
+    "matchScore": 0.5,
+    "name": "{building/semidetached_house}",
+    "searchable": false
+}

data/presets/building/house/_terrace.json

@@ -0,0 +1,17 @@
+{
+    "icon": "temaki-row_houses",
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "house",
+        "house": "terrace"
+    },
+    "reference": {
+        "key": "house",
+        "value": "terrace"
+    },
+    "matchScore": 0.5,
+    "name": "{building/terrace}",
+    "searchable": false
+}

data/presets/building/house/terraced.json

@@ -0,0 +1,29 @@
+{
+    "icon": "temaki-row_houses",
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "house",
+        "house": "terraced"
+    },
+    "reference": {
+        "key": "house",
+        "value": "terraced"
+    },
+    "terms": [
+        "brownstone",
+        "dwelling",
+        "family",
+        "home",
+        "residence",
+        "row home",
+        "terrace",
+        "townhome"
+    ],
+    "matchScore": 0.5,
+    "name": "Townhouse",
+    "aliases": [
+        "Row House"
+    ]
+}

data/presets/building/terrace.json

@@ -7,13 +7,16 @@
         "building": "terrace"
     },
     "terms": [
-        "home",
-        "terrace",
         "brownstone",
+        "dwelling",
         "family",
+        "home",
         "residence",
-        "dwelling"
+        "row home",
+        "row house",
+        "terrace",
+        "townhome"
     ],
     "matchScore": 0.5,
-    "name": "Row Houses"
+    "name": "Row of Townhouses"
 }

data/presets/man_made/milk_churn_stand.json

@@ -0,0 +1,19 @@
+{
+    "icon": "temaki-milk_jug",
+    "fields": [
+        "material"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "creamery stand",
+        "milk can stand",
+        "milk stand"
+    ],
+    "tags": {
+        "man_made": "milk_churn_stand"
+    },
+    "name": "Milk Churn Stand"
+}