diff --git a/data/fields/address.json b/data/fields/address.json index a56ccacf..22210949 100644 --- a/data/fields/address.json +++ b/data/fields/address.json @@ -7,7 +7,6 @@ "keys": [ "addr:block_number", "addr:city", - "addr:block_number", "addr:conscriptionnumber", "addr:country", "addr:county", diff --git a/data/fields/caravans.json b/data/fields/caravans.json index 40cc30e5..5d677d19 100644 --- a/data/fields/caravans.json +++ b/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" ] } diff --git a/data/fields/check_date.json b/data/fields/check_date.json index c0d49cea..643bdf59 100644 --- a/data/fields/check_date.json +++ b/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" ] } diff --git a/data/fields/circumference.json b/data/fields/circumference.json index 5fa71e4b..2b4fe8f3 100644 --- a/data/fields/circumference.json +++ b/data/fields/circumference.json @@ -5,7 +5,7 @@ "snake_case": false, "placeholder": "1 m, 20 cm, 30\"…", "terms": [ - "DBH", + "dbh", "diameter at breast height" ] } diff --git a/data/fields/crossing_raised.json b/data/fields/crossing_raised.json index 3717dafd..f9df22c5 100644 --- a/data/fields/crossing_raised.json +++ b/data/fields/crossing_raised.json @@ -5,8 +5,8 @@ "terms": [ "flat top", "hump", - "speed", - "slow" + "slow", + "speed" ], "strings": { "options": { diff --git a/data/fields/descent.json b/data/fields/descent.json index 11d438e1..98fe565e 100644 --- a/data/fields/descent.json +++ b/data/fields/descent.json @@ -4,7 +4,7 @@ "type": "number", "label": "Total Descent", "terms": [ - "descent", - "cumulative elevation" + "cumulative elevation", + "descent" ] } diff --git a/data/fields/diet_multi.json b/data/fields/diet_multi.json index 3e52a59e..2b64db54 100644 --- a/data/fields/diet_multi.json +++ b/data/fields/diet_multi.json @@ -3,8 +3,8 @@ "type": "multiCombo", "label": "Diet Types", "terms": [ - "gluten free", "fruitarian", + "gluten free", "halal", "kosher", "lactose free", diff --git a/data/fields/fhrs/id-GB.json b/data/fields/fhrs/id-GB.json index 8fe9749e..2b78046e 100644 --- a/data/fields/fhrs/id-GB.json +++ b/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" ] } diff --git a/data/fields/fuel/fuel_multi.json b/data/fields/fuel/fuel_multi.json index 6f5fc983..7e1fc83f 100644 --- a/data/fields/fuel/fuel_multi.json +++ b/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": [ diff --git a/data/fields/gnis/feature_id-US.json b/data/fields/gnis/feature_id-US.json index 2325da0b..7a6d648c 100644 --- a/data/fields/gnis/feature_id-US.json +++ b/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" ] } diff --git a/data/fields/irrigation_pivot.json b/data/fields/irrigation_pivot.json index 70b8bc70..7c38a220 100644 --- a/data/fields/irrigation_pivot.json +++ b/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": { diff --git a/data/fields/level_semi.json b/data/fields/level_semi.json index 673681d1..b49fe137 100644 --- a/data/fields/level_semi.json +++ b/data/fields/level_semi.json @@ -5,8 +5,8 @@ "terms": [ "building floors", "decks", - "stories", "storeys", + "stories", "storys" ] } diff --git a/data/fields/picnic_table.json b/data/fields/picnic_table.json index 375c886a..baf6fa46 100644 --- a/data/fields/picnic_table.json +++ b/data/fields/picnic_table.json @@ -3,7 +3,7 @@ "type": "check", "label": "Picnic Table", "terms": [ - "outdoor table", - "bench" + "bench", + "outdoor table" ] } diff --git a/data/fields/post.json b/data/fields/post.json index fb22ab38..7b726971 100644 --- a/data/fields/post.json +++ b/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", diff --git a/data/fields/real_fire-GB-IE.json b/data/fields/real_fire-GB-IE.json index 13e3cdf0..d72c411f 100644 --- a/data/fields/real_fire-GB-IE.json +++ b/data/fields/real_fire-GB-IE.json @@ -9,7 +9,7 @@ "type": "check", "label": "Real Fire", "terms": [ - "fire place", - "fire" + "fire", + "fire place" ] } diff --git a/data/fields/ref/FR/siret-FR.json b/data/fields/ref/FR/siret-FR.json index 923f1ec4..2a7510c7 100644 --- a/data/fields/ref/FR/siret-FR.json +++ b/data/fields/ref/FR/siret-FR.json @@ -10,7 +10,7 @@ ] }, "terms": [ - "French company identification number", - "SIRET" + "french company identification number", + "siret" ] } diff --git a/data/fields/ref/edubase-GB.json b/data/fields/ref/edubase-GB.json index e9cc386b..676ea5a4 100644 --- a/data/fields/ref/edubase-GB.json +++ b/data/fields/ref/edubase-GB.json @@ -10,7 +10,7 @@ ] }, "terms": [ - "Edubase Reference", - "DfE URN" + "dfe urn", + "edubase reference" ] } diff --git a/data/fields/ref/linz/place_id-NZ.json b/data/fields/ref/linz/place_id-NZ.json index e70d3444..d9c26f41 100644 --- a/data/fields/ref/linz/place_id-NZ.json +++ b/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" ] } diff --git a/data/fields/salt.json b/data/fields/salt.json index 93709130..6b4b7311 100644 --- a/data/fields/salt.json +++ b/data/fields/salt.json @@ -3,7 +3,7 @@ "type": "check", "label": "Salt", "terms": [ - "saline", - "salinated" + "salinated", + "saline" ] } diff --git a/data/fields/static_caravans.json b/data/fields/static_caravans.json index bc2d42e4..db39bc2a 100644 --- a/data/fields/static_caravans.json +++ b/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" ] } diff --git a/data/fields/traffic_calming.json b/data/fields/traffic_calming.json index 4ab5d93f..7e4a200b 100644 --- a/data/fields/traffic_calming.json +++ b/data/fields/traffic_calming.json @@ -5,8 +5,8 @@ "terms": [ "flat top", "hump", - "speed", - "slow" + "slow", + "speed" ], "strings": { "options": { diff --git a/data/fields/website/menu.json b/data/fields/website/menu.json index 0eb63238..1b65b8ca 100644 --- a/data/fields/website/menu.json +++ b/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" ] } diff --git a/data/presets/@templates/contact.json b/data/presets/@templates/contact.json index 342a6658..032b88da 100644 --- a/data/presets/@templates/contact.json +++ b/data/presets/@templates/contact.json @@ -1,5 +1,4 @@ { - "fields": [], "moreFields": [ "email", "fax", diff --git a/data/presets/@templates/poi.json b/data/presets/@templates/poi.json index 68b61b0c..a2aba926 100644 --- a/data/presets/@templates/poi.json +++ b/data/presets/@templates/poi.json @@ -1,5 +1,4 @@ { - "fields": [], "moreFields": [ "{@templates/contact}", "address", diff --git a/data/presets/address.json b/data/presets/address.json index 5b1c09e0..de18917e 100644 --- a/data/presets/address.json +++ b/data/presets/address.json @@ -10,8 +10,6 @@ "tags": { "addr:*": "*" }, - "addTags": {}, - "removeTags": {}, "reference": { "key": "addr" }, diff --git a/data/presets/amenity/clock/sundial.json b/data/presets/amenity/clock/sundial.json index 5f60b5a5..89f8a203 100644 --- a/data/presets/amenity/clock/sundial.json +++ b/data/presets/amenity/clock/sundial.json @@ -6,7 +6,6 @@ "visibility", "inscription" ], - "moreFields": [], "geometry": [ "point", "vertex" diff --git a/data/presets/amenity/watering_place.json b/data/presets/amenity/watering_place.json index b639379c..b285cb52 100644 --- a/data/presets/amenity/watering_place.json +++ b/data/presets/amenity/watering_place.json @@ -7,7 +7,6 @@ "charge_fee", "opening_hours" ], - "moreFields": [], "geometry": [ "point", "vertex", diff --git a/data/presets/building/_entrance.json b/data/presets/building/_entrance.json index 5843c42e..31fa242d 100644 --- a/data/presets/building/_entrance.json +++ b/data/presets/building/_entrance.json @@ -1,7 +1,5 @@ { "icon": "maki-entrance-alt1", - "fields": [], - "moreFields": [], "geometry": [ "vertex" ], diff --git a/data/presets/emergency/lifeguard.json b/data/presets/emergency/lifeguard.json index c8faa4d2..17e0d693 100644 --- a/data/presets/emergency/lifeguard.json +++ b/data/presets/emergency/lifeguard.json @@ -7,7 +7,6 @@ "building_area_yes", "opening_hours" ], - "moreFields": [], "geometry": [ "point", "area" diff --git a/data/presets/golf/lateral_water_hazard.json b/data/presets/golf/lateral_water_hazard.json index 61501644..365eb639 100644 --- a/data/presets/golf/lateral_water_hazard.json +++ b/data/presets/golf/lateral_water_hazard.json @@ -1,6 +1,5 @@ { "icon": "maki-golf", - "fields": [], "geometry": [ "area" ], diff --git a/data/presets/golf/water_hazard.json b/data/presets/golf/water_hazard.json index c607a695..2051a344 100644 --- a/data/presets/golf/water_hazard.json +++ b/data/presets/golf/water_hazard.json @@ -1,6 +1,5 @@ { "icon": "maki-golf", - "fields": [], "geometry": [ "area" ], diff --git a/data/presets/highway/_traffic_sign.json b/data/presets/highway/_traffic_sign.json index cdc7016d..38cc5c77 100644 --- a/data/presets/highway/_traffic_sign.json +++ b/data/presets/highway/_traffic_sign.json @@ -10,7 +10,6 @@ "tags": { "highway": "traffic_sign" }, - "terms": [], "searchable": false, "name": "{traffic_sign}" } diff --git a/data/presets/highway/milestone.json b/data/presets/highway/milestone.json index a09075ee..7f7f44b2 100644 --- a/data/presets/highway/milestone.json +++ b/data/presets/highway/milestone.json @@ -9,7 +9,6 @@ "ref", "direction_vertex" ], - "moreFields": [], "tags": { "highway": "milestone" }, diff --git a/data/presets/highway/toll_gantry.json b/data/presets/highway/toll_gantry.json index 627a5a58..066c8434 100644 --- a/data/presets/highway/toll_gantry.json +++ b/data/presets/highway/toll_gantry.json @@ -13,7 +13,6 @@ "opening_hours", "payment_multi" ], - "moreFields": [], "geometry": [ "vertex" ], diff --git a/data/presets/landuse/education.json b/data/presets/landuse/education.json index 0de11516..d9f37985 100644 --- a/data/presets/landuse/education.json +++ b/data/presets/landuse/education.json @@ -4,7 +4,6 @@ "name", "operator" ], - "moreFields": [], "geometry": [ "area" ], diff --git a/data/presets/leisure/bird_hide.json b/data/presets/leisure/bird_hide.json index fe18d827..468d9635 100644 --- a/data/presets/leisure/bird_hide.json +++ b/data/presets/leisure/bird_hide.json @@ -6,7 +6,6 @@ "address", "opening_hours" ], - "moreFields": [], "geometry": [ "point", "area" diff --git a/data/presets/man_made/_courtyard.json b/data/presets/man_made/_courtyard.json index 6e7331ed..b8560f63 100644 --- a/data/presets/man_made/_courtyard.json +++ b/data/presets/man_made/_courtyard.json @@ -3,7 +3,6 @@ "fields": [ "name" ], - "moreFields": [], "geometry": [ "area" ], diff --git a/data/presets/man_made/manhole/power.json b/data/presets/man_made/manhole/power.json index 656fcd27..ed410f42 100644 --- a/data/presets/man_made/manhole/power.json +++ b/data/presets/man_made/manhole/power.json @@ -19,7 +19,6 @@ "cover", "electric", "hole", - "hole", "power", "utility" ], diff --git a/data/presets/man_made/tower/observation.json b/data/presets/man_made/tower/observation.json index 79639c82..9df6b43a 100644 --- a/data/presets/man_made/tower/observation.json +++ b/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", diff --git a/data/presets/natural/water/river.json b/data/presets/natural/water/river.json index 55b4b6cc..1e96ea4e 100644 --- a/data/presets/natural/water/river.json +++ b/data/presets/natural/water/river.json @@ -5,7 +5,6 @@ "intermittent", "tidal" ], - "moreFields": [], "geometry": [ "area" ], diff --git a/data/presets/natural/water/stream.json b/data/presets/natural/water/stream.json index 246dda2a..442db4ce 100644 --- a/data/presets/natural/water/stream.json +++ b/data/presets/natural/water/stream.json @@ -4,7 +4,6 @@ "water", "intermittent" ], - "moreFields": [], "geometry": [ "area" ], diff --git a/data/presets/natural/wetland/bog.json b/data/presets/natural/wetland/bog.json index 88498756..843c2415 100644 --- a/data/presets/natural/wetland/bog.json +++ b/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" } diff --git a/data/presets/natural/wetland/fen.json b/data/presets/natural/wetland/fen.json index 9991641b..9febd882 100644 --- a/data/presets/natural/wetland/fen.json +++ b/data/presets/natural/wetland/fen.json @@ -1,6 +1,5 @@ { "icon": "maki-wetland", - "fields": [], "geometry": [ "area" ], diff --git a/data/presets/natural/wetland/mangrove.json b/data/presets/natural/wetland/mangrove.json index cf1dfc25..f64aa625 100644 --- a/data/presets/natural/wetland/mangrove.json +++ b/data/presets/natural/wetland/mangrove.json @@ -15,6 +15,5 @@ "key": "wetland", "value": "mangrove" }, - "terms": [], "name": "Mangrove" } diff --git a/data/presets/natural/wetland/marsh.json b/data/presets/natural/wetland/marsh.json index a84a7744..77eea2b1 100644 --- a/data/presets/natural/wetland/marsh.json +++ b/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" } diff --git a/data/presets/natural/wetland/reedbed.json b/data/presets/natural/wetland/reedbed.json index 2bdd9c79..d669b789 100644 --- a/data/presets/natural/wetland/reedbed.json +++ b/data/presets/natural/wetland/reedbed.json @@ -1,6 +1,5 @@ { "icon": "maki-wetland", - "fields": [], "geometry": [ "area" ], diff --git a/data/presets/natural/wetland/string_bog.json b/data/presets/natural/wetland/string_bog.json index e129ae55..eef6ec7b 100644 --- a/data/presets/natural/wetland/string_bog.json +++ b/data/presets/natural/wetland/string_bog.json @@ -1,6 +1,5 @@ { "icon": "maki-wetland", - "fields": [], "geometry": [ "area" ], diff --git a/data/presets/natural/wetland/swamp.json b/data/presets/natural/wetland/swamp.json index c00fd3dd..342a4f7c 100644 --- a/data/presets/natural/wetland/swamp.json +++ b/data/presets/natural/wetland/swamp.json @@ -1,6 +1,5 @@ { "icon": "temaki-swamp", - "fields": [], "moreFields": [ "tidal" ], diff --git a/data/presets/natural/wetland/wet_meadow.json b/data/presets/natural/wetland/wet_meadow.json index 08729748..490c5cb9 100644 --- a/data/presets/natural/wetland/wet_meadow.json +++ b/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" } diff --git a/data/presets/public_transport/stop_position.json b/data/presets/public_transport/stop_position.json index 69cde81d..4a0a1e12 100644 --- a/data/presets/public_transport/stop_position.json +++ b/data/presets/public_transport/stop_position.json @@ -7,7 +7,6 @@ "operator", "vehicles" ], - "moreFields": [], "geometry": [ "vertex" ], diff --git a/data/presets/tourism/wilderness_hut.json b/data/presets/tourism/wilderness_hut.json index f2721468..558fe327 100644 --- a/data/presets/tourism/wilderness_hut.json +++ b/data/presets/tourism/wilderness_hut.json @@ -32,7 +32,6 @@ "biwakschachtel", "bothy", "cabin", - "cabin", "lodge", "lodging", "overnight accommodations", diff --git a/data/presets/type/_associatedStreet.json b/data/presets/type/_associatedStreet.json new file mode 100644 index 00000000..ee2f7cf2 --- /dev/null +++ b/data/presets/type/_associatedStreet.json @@ -0,0 +1,14 @@ +{ + "icon": "iD-relation", + "fields": [ + "name" + ], + "geometry": [ + "relation" + ], + "tags": { + "type": "associatedStreet" + }, + "searchable": false, + "name": "Associated Street" +} diff --git a/data/presets/type/multipolygon.json b/data/presets/type/multipolygon.json index 99d6fcb4..5a3897b7 100644 --- a/data/presets/type/multipolygon.json +++ b/data/presets/type/multipolygon.json @@ -6,7 +6,6 @@ "tags": { "type": "multipolygon" }, - "removeTags": {}, "name": "Multipolygon", "matchScore": 0.1 }