Followup to #8031, #8039, #8040

openstreetmap · Oct 2, 2020 · 1c39281 · 1c39281
1 parent c42c8f0
commit 1c39281
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 44 deletions.
diff --git a/data/presets.yaml b/data/presets.yaml
@@ -3215,6 +3215,7 @@ en:
       amenity/boat_storage:
         # amenity=boat_storage
         name: Boat Storage
+        # 'terms: boathouse,dry dock,marina'
         terms: '<translate with synonyms or related terms for ''Boat Storage'', separated by commas>'
       amenity/bureau_de_change:
         # amenity=bureau_de_change
@@ -3542,6 +3543,11 @@ en:
         name: Loading Dock
         # 'terms: door,loading bay,shipping,unloading,warehouse'
         terms: '<translate with synonyms or related terms for ''Loading Dock'', separated by commas>'
+      amenity/lounger:
+        # amenity=lounger
+        name: Lounger
+        # 'terms: seat,chair,bench'
+        terms: '<translate with synonyms or related terms for ''Lounger'', separated by commas>'
       amenity/love_hotel:
         # amenity=love_hotel
         name: Love Hotel
@@ -5691,10 +5697,6 @@ en:
         name: Shipwreck
         # 'terms: hull,mast,maritime,remains,ship,boat'
         terms: '<translate with synonyms or related terms for ''Shipwreck'', separated by commas>'
-      hot_spring:
-        # natural=hot_spring
-        name: Hot Spring
-        terms: '<translate with synonyms or related terms for ''Hot Spring'', separated by commas>'
       indoor:
         # indoor=*
         name: Indoor Feature
@@ -6365,11 +6367,6 @@ en:
         name: Line
         # 'terms: polyline'
         terms: '<translate with synonyms or related terms for ''Line'', separated by commas>'
-      lounger:
-        # amenity=lounger
-        name: Lounger
-        # 'terms: seat,chair,bench'
-        terms: '<translate with synonyms or related terms for ''Lounger'', separated by commas>'
       man_made:
         # man_made=*
         name: Man Made Feature
@@ -6806,6 +6803,11 @@ en:
         # natural=heath
         name: Heath
         terms: '<translate with synonyms or related terms for ''Heath'', separated by commas>'
+      natural/hot_spring:
+        # natural=hot_spring
+        name: Hot Spring
+        # 'terms: geothermal spring,thermal pool'
+        terms: '<translate with synonyms or related terms for ''Hot Spring'', separated by commas>'
       natural/mud:
         # natural=mud
         name: Mud

diff --git a/data/presets/presets.json b/data/presets/presets.json
@@ -81,7 +81,7 @@
   "amenity/biergarten": {"icon": "fas-beer", "fields": ["name", "address", "opening_hours", "opening_hours/covid19", "outdoor_seating", "brewery"], "moreFields": ["{amenity/bar}", "building_area", "cuisine"], "geometry": ["point", "area"], "tags": {"amenity": "biergarten"}, "terms": ["beer", "bier", "booze"], "name": "Biergarten"},
   "amenity/binoculars": {"icon": "temaki-binoculars", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "direction", "height", "ele_node"], "moreFields": ["colour", "covered", "indoor", "lit", "manufacturer", "ref"], "geometry": ["point"], "terms": ["observation viewer", "optical ranger", "spotting scope", "sight", "spyglass", "telescope", "tower viewer", "viewfinder", "viewing stand"], "tags": {"amenity": "binoculars"}, "name": "Mounted Binoculars"},
   "amenity/boat_rental": {"icon": "temaki-boat_rental", "fields": ["name", "operator", "operator/type", "opening_hours", "opening_hours/covid19", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["access_simple", "address", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "boat_rental"}, "name": "Boat Rental"},
-  "amenity/boat_storage": {"icon": "temaki-boat_rental", "fields": ["name", "building_area", "start_date"], "geometry": ["point", "area"], "tags": {"amenity": "boat_storage"}, "name": "Boat Storage"},
+  "amenity/boat_storage": {"icon": "temaki-boat_rental", "fields": ["name", "operator", "access_simple", "capacity"], "geometry": ["point", "area"], "tags": {"amenity": "boat_storage"}, "terms": ["boathouse", "dry dock", "marina"], "name": "Boat Storage"},
   "amenity/bureau_de_change": {"icon": "temaki-money_hand", "fields": ["name", "operator", "payment_multi", "currency_multi", "address", "building_area"], "moreFields": ["email", "fax", "level", "opening_hours", "opening_hours/covid19", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bureau de change", "money changer"], "tags": {"amenity": "bureau_de_change"}, "name": "Currency Exchange"},
   "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "opening_hours/covid19", "outdoor_seating", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website"], "moreFields": ["air_conditioning", "bar", "brand", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "level", "min_age", "not/name", "payment_multi", "ref/vatin", "reservation", "smoking", "takeaway", "wheelchair"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
   "amenity/cafe/bubble_tea": {"icon": "temaki-bubble_tea", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "cuisine": "bubble_tea"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "terms": ["boba", "bubble milk tea", "pearl milk tea", "taiwanese tea drink", "tapioca", "pearl tea", "boba drink"], "name": "Bubble Tea Cafe"},
@@ -147,6 +147,7 @@
   "amenity/letter_box": {"icon": "temaki-letter_box", "fields": ["post", "access_simple", "height"], "moreFields": ["covered", "indoor", "level", "lit", "lockable", "manufacturer", "material", "operator", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "letter_box"}, "terms": ["curbside delivery box", "home delivery box", "direct-to-door delivery box", "letter hole", "letter plate", "letter slot", "letterbox", "letterhole", "letterplate", "letterslot", "mail box", "mail hole", "mail slot", "mailbox", "mailhole", "mailslot", "through-door delivery box"], "name": "Letter Box"},
   "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "operator/type", "building_area", "address", "ref/isil", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["access_simple", "air_conditioning", "baby_feeding", "email", "fax", "gnis/feature_id", "level", "not/name", "opening_hours", "opening_hours/covid19", "payment_multi", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"},
   "amenity/loading_dock": {"icon": "fas-truck-loading", "fields": ["ref", "operator", "access_simple", "door", "width", "height"], "moreFields": ["address", "colour", "level", "lit", "wheelchair"], "geometry": ["vertex"], "terms": ["door", "loading bay", "shipping", "unloading", "warehouse"], "tags": {"amenity": "loading_dock"}, "name": "Loading Dock"},
+  "amenity/lounger": {"icon": "temaki-bench", "fields": ["material", "colour", "access_simple", "lit"], "moreFields": ["height", "inscription", "level", "manufacturer", "operator"], "geometry": ["point"], "tags": {"amenity": "lounger"}, "terms": ["seat", "chair", "bench"], "name": "Lounger"},
   "amenity/love_hotel": {"icon": "maki-heart", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["email", "fax", "gnis/feature_id", "min_age", "payment_multi", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "love_hotel"}, "name": "Love Hotel"},
   "amenity/marketplace": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building", "opening_hours", "opening_hours/covid19"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "marketplace"}, "name": "Marketplace"},
   "amenity/monastery": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "monastery", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "monastery"}, "name": "Monastery Grounds"},
@@ -607,7 +608,6 @@
   "historic/wayside_cross": {"icon": "maki-religious-christian", "fields": ["name", "inscription", "material"], "moreFields": ["{historic}", "start_date", "religion", "denomination"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "wayside_cross"}, "name": "Wayside Cross"},
   "historic/wayside_shrine": {"icon": "maki-landmark", "fields": ["name", "religion", "denomination", "inscription", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "wayside_shrine"}, "name": "Wayside Shrine"},
   "historic/wreck": {"icon": "temaki-ruins", "fields": ["name", "access_simple", "seamark/wreck/category", "historic/wreck/date_sunk", "historic/wreck/visible_at_low_tide", "historic/wreck/visible_at_high_tide"], "moreFields": ["{historic}", "seamark/type"], "geometry": ["point", "area"], "tags": {"historic": "wreck"}, "addTags": {"historic": "wreck", "seamark:type": "wreck"}, "terms": ["hull", "mast", "maritime", "remains", "ship", "boat"], "name": "Shipwreck"},
-  "hot_spring": {"icon": "maki-water", "fields": ["name", "water", "hot_water", "intermittent"], "moreFields": ["fishing", "gnis/feature_id", "salt", "tidal"], "geometry": ["area"], "tags": {"natural": "hot_spring"}, "name": "Hot Spring"},
   "indoor/corridor_line": {"fields": ["level", "name"], "geometry": ["line"], "tags": {"indoor": "corridor"}, "searchable": false, "matchScore": 1.1, "name": "Indoor Corridor", "replacement": "highway/corridor"},
   "indoor/area": {"fields": ["level", "name", "ref_room_number", "height"], "geometry": ["area"], "tags": {"indoor": "area"}, "terms": ["indoor space"], "matchScore": 0.8, "name": "Indoor Area"},
   "indoor/corridor": {"icon": "temaki-pedestrian", "fields": ["level", "name", "ref", "height"], "geometry": ["area"], "tags": {"indoor": "corridor"}, "terms": ["concourse", "foyer", "hallway", "passageway"], "matchScore": 0.8, "name": "Indoor Corridor"},
@@ -748,7 +748,6 @@
   "leisure/trampoline_park": {"icon": "fas-chevron-circle-up", "fields": ["name", "address", "building_area", "opening_hours", "opening_hours/covid19", "phone", "website"], "moreFields": ["brand", "charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "operator", "payment_multi"], "geometry": ["point", "area"], "tags": {"leisure": "trampoline_park"}, "terms": ["bounce", "jump", "spring"], "name": "Trampoline Park"},
   "leisure/water_park": {"icon": "fas-swimmer", "fields": ["{tourism/theme_park}", "sport"], "moreFields": ["{tourism/theme_park}"], "geometry": ["area", "point"], "terms": ["swim", "pool", "dive"], "tags": {"leisure": "water_park"}, "name": "Water Park"},
   "line": {"fields": ["name"], "geometry": ["line"], "tags": {}, "terms": ["polyline"], "name": "Line", "matchScore": 0.1},
-  "lounger": {"icon": "temaki-bench", "fields": ["backrest", "material", "seats", "colour"], "moreFields": ["access_simple", "height", "inscription", "level", "lit", "manufacturer", "operator"], "geometry": ["point", "vertex", "line"], "terms": ["seat", "chair", "bench"], "tags": {"amenity": "lounger"}, "name": "Lounger"},
   "man_made/adit": {"icon": "temaki-adit_profile", "geometry": ["point", "area"], "fields": ["name", "operator", "resource", "direction"], "moreFields": ["gnis/feature_id"], "terms": ["cave", "horizontal mine entrance", "tunnel", "underground"], "tags": {"man_made": "adit"}, "name": "Adit"},
   "man_made/antenna": {"icon": "temaki-antenna", "fields": ["communication_multi", "operator", "manufacturer", "height"], "geometry": ["point"], "terms": ["broadcast", "cell phone", "cell", "communication", "mobile phone", "radio", "television", "transmission", "tv"], "tags": {"man_made": "antenna"}, "name": "Antenna"},
   "man_made/beacon": {"icon": "maki-communications-tower", "fields": ["name", "height"], "moreFields": ["seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"man_made": "beacon"}, "name": "Beacon", "matchScore": 0.5},
@@ -839,6 +838,7 @@
   "natural/glacier": {"icon": "temaki-snow", "geometry": ["area"], "tags": {"natural": "glacier"}, "terms": ["ice", "snow"], "name": "Glacier"},
   "natural/grassland": {"icon": "temaki-grass", "geometry": ["area"], "tags": {"natural": "grassland"}, "terms": ["field", "prairie", "savanna"], "name": "Grassland"},
   "natural/heath": {"icon": "temaki-shrub_low", "geometry": ["area"], "tags": {"natural": "heath"}, "terms": [], "name": "Heath"},
+  "natural/hot_spring": {"icon": "maki-water", "fields": ["name", "intermittent"], "moreFields": ["gnis/feature_id"], "geometry": ["point"], "tags": {"natural": "hot_spring"}, "terms": ["geothermal spring", "thermal pool"], "name": "Hot Spring"},
   "natural/mud": {"geometry": ["area"], "tags": {"natural": "mud"}, "terms": ["wetland"], "name": "Mud"},
   "natural/peak": {"icon": "maki-mountain", "fields": ["name", "ele_node"], "geometry": ["point", "vertex"], "tags": {"natural": "peak"}, "terms": ["acme", "aiguille", "alp", "climax", "crest", "crown", "hill", "mount", "mountain", "pinnacle", "summit", "tip", "top"], "name": "Peak"},
   "natural/reef": {"icon": "temaki-beach", "geometry": ["area", "point"], "tags": {"natural": "reef"}, "terms": ["barrier", "coral", "ocean", "sand", "shoal"], "name": "Reef"},

diff --git a/data/presets/presets/amenity/boat_storage.json b/data/presets/presets/amenity/boat_storage.json
@@ -2,8 +2,9 @@
     "icon": "temaki-boat_rental",
     "fields": [
         "name",
-        "building_area",
-        "start_date"
+        "operator",
+        "access_simple",
+        "capacity"
     ],
     "geometry": [
         "point",
@@ -12,5 +13,10 @@
     "tags": {
         "amenity": "boat_storage"
     },
+    "terms": [
+        "boathouse",
+        "dry dock",
+        "marina"
+    ],
     "name": "Boat Storage"
 }
diff --git a/data/presets/presets/lounger.json → data/presets/presets/amenity/lounger.json b/data/presets/presets/lounger.json → data/presets/presets/amenity/lounger.json
@@ -1,32 +1,28 @@
 {
     "icon": "temaki-bench",
     "fields": [
-        "backrest",
         "material",
-        "seats",
-        "colour"
+        "colour",
+        "access_simple",
+        "lit"
     ],
     "moreFields": [
-        "access_simple",
         "height",
         "inscription",
         "level",
-        "lit",
         "manufacturer",
         "operator"
     ],
     "geometry": [
-        "point",
-        "vertex",
-        "line"
+        "point"
     ],
+    "tags": {
+        "amenity": "lounger"
+    },
     "terms": [
         "seat",
         "chair",
         "bench"
     ],
-    "tags": {
-        "amenity": "lounger"
-    },
     "name": "Lounger"
 }
diff --git a/data/presets/presets/hot_spring.json → data/presets/presets/natural/hot_spring.json b/data/presets/presets/hot_spring.json → data/presets/presets/natural/hot_spring.json
@@ -2,22 +2,20 @@
     "icon": "maki-water",
     "fields": [
         "name",
-        "water",
-        "hot_water",
         "intermittent"
     ],
     "moreFields": [
-        "fishing",
-        "gnis/feature_id",
-        "salt",
-        "tidal"
+        "gnis/feature_id"
     ],
     "geometry": [
-        "area"
+        "point"
     ],
     "tags": {
         "natural": "hot_spring"
     },
+    "terms": [
+        "geothermal spring",
+        "thermal pool"
+    ],
     "name": "Hot Spring"
 }
-