Standardize field terms (#1760)

data/fields/address.json

@@ -7,7 +7,6 @@
     "keys": [
         "addr:block_number",
         "addr:city",
-        "addr:block_number",
         "addr:conscriptionnumber",
         "addr:country",
         "addr:county",

data/fields/caravans.json

@@ -3,9 +3,9 @@
     "type": "check",
     "label": "Campervan / Camping Trailer",
     "terms": [
-        "Camper",
-        "Camper Trailer",
-        "Caravan",
-        "Tourer"
+        "camper",
+        "camper trailer",
+        "caravan",
+        "tourer"
     ]
 }

data/fields/check_date.json

@@ -5,7 +5,7 @@
     "placeholder": "YYYY-MM-DD",
     "universal": true,
     "terms": [
-        "survey date",
-        "last survey date"
+        "last survey date",
+        "survey date"
     ]
 }

data/fields/circumference.json

@@ -5,7 +5,7 @@
     "snake_case": false,
     "placeholder": "1 m, 20 cm, 30\"…",
     "terms": [
-        "DBH",
+        "dbh",
         "diameter at breast height"
     ]
 }

data/fields/crossing_raised.json

@@ -5,8 +5,8 @@
     "terms": [
         "flat top",
         "hump",
-        "speed",
-        "slow"
+        "slow",
+        "speed"
     ],
     "strings": {
         "options": {

data/fields/descent.json

@@ -4,7 +4,7 @@
     "type": "number",
     "label": "Total Descent",
     "terms": [
-        "descent",
-        "cumulative elevation"
+        "cumulative elevation",
+        "descent"
     ]
 }

data/fields/diet_multi.json

@@ -3,8 +3,8 @@
     "type": "multiCombo",
     "label": "Diet Types",
     "terms": [
-        "gluten free",
         "fruitarian",
+        "gluten free",
         "halal",
         "kosher",
         "lactose free",

data/fields/fhrs/id-GB.json

@@ -10,8 +10,8 @@
         ]
     },
     "terms": [
-        "Food Hygiene Rating Scheme",
-        "Food Hygiene Rating System",
-        "Food Standards Agency"
+        "food hygiene rating scheme",
+        "food hygiene rating system",
+        "food standards agency"
     ]
 }

data/fields/fuel/fuel_multi.json

@@ -37,20 +37,20 @@
     "autoSuggestions": true,
     "caseSensitive": true,
     "terms": [
-        "diesel",
-        "gas",
-        "gasoline",
-        "petrol",
-        "ethanol",
         "biodiesel",
         "bioethanol",
+        "cng",
+        "diesel",
+        "ethanol",
         "fuel",
         "fuel mix",
-        "mixture",
-        "propane",
+        "gas",
+        "gasoline",
+        "lng",
         "lpg",
-        "cng",
-        "lng"
+        "mixture",
+        "petrol",
+        "propane"
     ],
     "locationSet": {
         "exclude": [

data/fields/gnis/feature_id-US.json

@@ -10,8 +10,8 @@
         ]
     },
     "terms": [
-        "Federal Geographic Names Information Service",
-        "United States Board on Geographic Names",
-        "USA"
+        "federal geographic names information service",
+        "united states board on geographic names",
+        "usa"
     ]
 }

data/fields/irrigation_pivot.json

@@ -4,8 +4,8 @@
     "label": "Center-Pivot Irrigation",
     "terms": [
         "central pivot irrigation",
-        "water wheel",
-        "circle irrigation"
+        "circle irrigation",
+        "water wheel"
     ],
     "strings": {
         "options": {

data/fields/level_semi.json

@@ -5,8 +5,8 @@
     "terms": [
         "building floors",
         "decks",
-        "stories",
         "storeys",
+        "stories",
         "storys"
     ]
 }

data/fields/picnic_table.json

@@ -3,7 +3,7 @@
     "type": "check",
     "label": "Picnic Table",
     "terms": [
-        "outdoor table",
-        "bench"
+        "bench",
+        "outdoor table"
     ]
 }

data/fields/post.json

@@ -4,11 +4,9 @@
     "keys": [
         "post:block_number",
         "post:city",
-        "post:block_number",
         "post:conscriptionnumber",
         "post:county",
         "post:country",
-        "post:county",
         "post:district",
         "post:floor",
         "post:hamlet",

data/fields/real_fire-GB-IE.json

@@ -9,7 +9,7 @@
     "type": "check",
     "label": "Real Fire",
     "terms": [
-        "fire place",
-        "fire"
+        "fire",
+        "fire place"
     ]
 }

data/fields/ref/FR/siret-FR.json

@@ -10,7 +10,7 @@
         ]
     },
     "terms": [
-        "French company identification number",
-        "SIRET"
+        "french company identification number",
+        "siret"
     ]
 }

data/fields/ref/edubase-GB.json

@@ -10,7 +10,7 @@
         ]
     },
     "terms": [
-        "Edubase Reference",
-        "DfE URN"
+        "dfe urn",
+        "edubase reference"
     ]
 }

data/fields/ref/linz/place_id-NZ.json

@@ -12,12 +12,12 @@
         ]
     },
     "terms": [
-        "NZ",
-        "LINZ",
-        "Land Information New Zealand",
-        "Toitū Te Whenua",
-        "NZGB",
-        "New Zealand Geographic Board",
-        "Ngā Pou Taunaha o Aotearoa"
+        "land information new zealand",
+        "linz",
+        "new zealand geographic board",
+        "ngā pou taunaha o aotearoa",
+        "nz",
+        "nzgb",
+        "toitū te whenua"
     ]
 }

data/fields/salt.json

@@ -3,7 +3,7 @@
     "type": "check",
     "label": "Salt",
     "terms": [
-        "saline",
-        "salinated"
+        "salinated",
+        "saline"
     ]
 }

data/fields/static_caravans.json

@@ -3,9 +3,9 @@
     "type": "check",
     "label": "Mobile Homes",
     "terms": [
-        "House Trailers",
-        "Park Home",
-        "Static Caravans",
-        "Trailer home"
+        "house trailers",
+        "park home",
+        "static caravans",
+        "trailer home"
     ]
 }

data/fields/traffic_calming.json

@@ -5,8 +5,8 @@
     "terms": [
         "flat top",
         "hump",
-        "speed",
-        "slow"
+        "slow",
+        "speed"
     ],
     "strings": {
         "options": {

data/fields/website/menu.json

@@ -4,10 +4,10 @@
     "placeholder": "https://example.com",
     "label": "Menu Link",
     "terms": [
-        "online menu",
+        "menu",
         "menu uri",
         "menu url",
-        "website menu",
-        "menu"
+        "online menu",
+        "website menu"
     ]
 }

data/presets/@templates/contact.json

@@ -1,5 +1,4 @@
 {
-    "fields": [],
     "moreFields": [
         "email",
         "fax",

data/presets/@templates/poi.json

@@ -1,5 +1,4 @@
 {
-    "fields": [],
     "moreFields": [
         "{@templates/contact}",
         "address",

data/presets/address.json

@@ -10,8 +10,6 @@
     "tags": {
         "addr:*": "*"
     },
-    "addTags": {},
-    "removeTags": {},
     "reference": {
         "key": "addr"
     },

data/presets/amenity/clock/sundial.json

@@ -6,7 +6,6 @@
         "visibility",
         "inscription"
     ],
-    "moreFields": [],
     "geometry": [
         "point",
         "vertex"

data/presets/amenity/watering_place.json

@@ -7,7 +7,6 @@
         "charge_fee",
         "opening_hours"
     ],
-    "moreFields": [],
     "geometry": [
         "point",
         "vertex",

data/presets/building/_entrance.json

@@ -1,7 +1,5 @@
 {
     "icon": "maki-entrance-alt1",
-    "fields": [],
-    "moreFields": [],
     "geometry": [
         "vertex"
     ],

data/presets/emergency/lifeguard.json

@@ -7,7 +7,6 @@
         "building_area_yes",
         "opening_hours"
     ],
-    "moreFields": [],
     "geometry": [
         "point",
         "area"

data/presets/golf/lateral_water_hazard.json

@@ -1,6 +1,5 @@
 {
     "icon": "maki-golf",
-    "fields": [],
     "geometry": [
         "area"
     ],

data/presets/golf/water_hazard.json

@@ -1,6 +1,5 @@
 {
     "icon": "maki-golf",
-    "fields": [],
     "geometry": [
         "area"
     ],

data/presets/highway/_traffic_sign.json

@@ -10,7 +10,6 @@
     "tags": {
         "highway": "traffic_sign"
     },
-    "terms": [],
     "searchable": false,
     "name": "{traffic_sign}"
 }

data/presets/highway/milestone.json

@@ -9,7 +9,6 @@
         "ref",
         "direction_vertex"
     ],
-    "moreFields": [],
     "tags": {
         "highway": "milestone"
     },

data/presets/highway/toll_gantry.json

@@ -13,7 +13,6 @@
         "opening_hours",
         "payment_multi"
     ],
-    "moreFields": [],
     "geometry": [
         "vertex"
     ],

data/presets/landuse/education.json

@@ -4,7 +4,6 @@
         "name",
         "operator"
     ],
-    "moreFields": [],
     "geometry": [
         "area"
     ],

data/presets/leisure/bird_hide.json

@@ -6,7 +6,6 @@
         "address",
         "opening_hours"
     ],
-    "moreFields": [],
     "geometry": [
         "point",
         "area"

data/presets/man_made/_courtyard.json

@@ -3,7 +3,6 @@
     "fields": [
         "name"
     ],
-    "moreFields": [],
     "geometry": [
         "area"
     ],

data/presets/man_made/manhole/power.json

@@ -19,7 +19,6 @@
         "cover",
         "electric",
         "hole",
-        "hole",
         "power",
         "utility"
     ],

data/presets/man_made/tower/observation.json

@@ -1,5 +1,10 @@
 {
     "icon": "maki-observation-tower",
+    "fields": [
+        "{man_made/tower}",
+        "access_simple",
+        "fee"
+    ],
     "moreFields": [
         "{man_made/tower}",
         "opening_hours",

data/presets/natural/water/river.json

@@ -5,7 +5,6 @@
         "intermittent",
         "tidal"
     ],
-    "moreFields": [],
     "geometry": [
         "area"
     ],

data/presets/natural/water/stream.json

@@ -4,7 +4,6 @@
         "water",
         "intermittent"
     ],
-    "moreFields": [],
     "geometry": [
         "area"
     ],

data/presets/natural/wetland/bog.json

@@ -1,6 +1,5 @@
 {
     "icon": "maki-wetland",
-    "fields": [],
     "geometry": [
         "area"
     ],
@@ -12,6 +11,5 @@
         "key": "wetland",
         "value": "bog"
     },
-    "terms": [],
     "name": "Bog"
 }

data/presets/natural/wetland/fen.json

@@ -1,6 +1,5 @@
 {
     "icon": "maki-wetland",
-    "fields": [],
     "geometry": [
         "area"
     ],

data/presets/natural/wetland/mangrove.json

@@ -15,6 +15,5 @@
         "key": "wetland",
         "value": "mangrove"
     },
-    "terms": [],
     "name": "Mangrove"
 }

data/presets/natural/wetland/marsh.json

@@ -1,6 +1,5 @@
 {
     "icon": "maki-wetland",
-    "fields": [],
     "geometry": [
         "area"
     ],
@@ -12,6 +11,5 @@
         "key": "wetland",
         "value": "marsh"
     },
-    "terms": [],
     "name": "Marsh"
 }

data/presets/natural/wetland/reedbed.json

@@ -1,6 +1,5 @@
 {
     "icon": "maki-wetland",
-    "fields": [],
     "geometry": [
         "area"
     ],

data/presets/natural/wetland/string_bog.json

@@ -1,6 +1,5 @@
 {
     "icon": "maki-wetland",
-    "fields": [],
     "geometry": [
         "area"
     ],

data/presets/natural/wetland/swamp.json

@@ -1,6 +1,5 @@
 {
     "icon": "temaki-swamp",
-    "fields": [],
     "moreFields": [
         "tidal"
     ],

data/presets/natural/wetland/wet_meadow.json

@@ -1,6 +1,5 @@
 {
     "icon": "maki-wetland",
-    "fields": [],
     "geometry": [
         "area"
     ],
@@ -12,6 +11,5 @@
         "key": "wetland",
         "value": "wet_meadow"
     },
-    "terms": [],
     "name": "Wet Meadow"
 }

data/presets/public_transport/stop_position.json

@@ -7,7 +7,6 @@
         "operator",
         "vehicles"
     ],
-    "moreFields": [],
     "geometry": [
         "vertex"
     ],

data/presets/tourism/wilderness_hut.json

@@ -32,7 +32,6 @@
         "biwakschachtel",
         "bothy",
         "cabin",
-        "cabin",
         "lodge",
         "lodging",
         "overnight accommodations",

data/presets/type/_associatedStreet.json

@@ -0,0 +1,14 @@
+{
+    "icon": "iD-relation",
+    "fields": [
+        "name"
+    ],
+    "geometry": [
+        "relation"
+    ],
+    "tags": {
+        "type": "associatedStreet"
+    },
+    "searchable": false,
+    "name": "Associated Street"
+}

data/presets/type/multipolygon.json

@@ -6,7 +6,6 @@
     "tags": {
         "type": "multipolygon"
     },
-    "removeTags": {},
     "name": "Multipolygon",
     "matchScore": 0.1
 }