From 9837af3ba990afbcebc05562d94ed6ebe7590d3c Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Mon, 29 Apr 2019 15:13:25 -0700 Subject: [PATCH] Add Building Height and Building Levels field to some POI presets if they are buildings (close #6238) --- data/presets.yaml | 8 +++++++ data/presets/fields.json | 2 ++ .../fields/building/levels_building.json | 11 ++++++++++ data/presets/fields/height_building.json | 10 +++++++++ data/presets/presets.json | 22 +++++++++---------- data/presets/presets/club.json | 2 ++ data/presets/presets/craft.json | 2 ++ data/presets/presets/healthcare.json | 2 ++ data/presets/presets/office.json | 2 ++ data/presets/presets/shop.json | 2 ++ data/presets/presets/tourism/apartment.json | 2 ++ data/presets/presets/tourism/chalet.json | 2 ++ data/presets/presets/tourism/guest_house.json | 2 ++ .../presets/tourism/information/office.json | 2 ++ data/presets/presets/tourism/motel.json | 2 ++ data/presets/presets/tourism/museum.json | 2 ++ data/taginfo.json | 4 ++-- dist/locales/en.json | 7 ++++++ 18 files changed, 73 insertions(+), 13 deletions(-) create mode 100644 data/presets/fields/building/levels_building.json create mode 100644 data/presets/fields/height_building.json diff --git a/data/presets.yaml b/data/presets.yaml index 48a89c6a8..0ad3e05b7 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -289,6 +289,11 @@ en: building: # building=* label: Building + building/levels_building: + # 'building:levels=*' + label: Building Levels + # building/levels_building field placeholder + placeholder: '2, 4, 6...' building/material: # 'building:material=*' label: Material @@ -792,6 +797,9 @@ en: height: # height=* label: Height (Meters) + height_building: + # height=* + label: Building Height (Meters) highspeed: # highspeed=* label: High-Speed diff --git a/data/presets/fields.json b/data/presets/fields.json index b043f1282..32329795b 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -47,6 +47,7 @@ "bridge/support": {"key": "bridge:support", "type": "combo", "label": "Type"}, "building_area": {"key": "building", "type": "combo", "default": "yes", "geometry": "area", "label": "Building"}, "building": {"key": "building", "type": "combo", "label": "Building"}, + "building/levels_building": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Building Levels", "placeholder": "2, 4, 6...", "prerequisiteTag": {"key": "building", "valueNot": "no"}}, "building/material": {"key": "building:material", "type": "combo", "label": "Material"}, "bunker_type": {"key": "bunker_type", "type": "combo", "label": "Type"}, "cables": {"key": "cables", "type": "number", "minValue": 1, "label": "Cables", "placeholder": "1, 2, 3..."}, @@ -153,6 +154,7 @@ "hashtags": {"key": "hashtags", "type": "semiCombo", "label": "Suggested Hashtags", "placeholder": "#example"}, "healthcare": {"key": "healthcare", "type": "typeCombo", "label": "Type"}, "healthcare/speciality": {"key": "healthcare:speciality", "type": "semiCombo", "reference": {"key": "healthcare"}, "label": "Specialties"}, + "height_building": {"key": "height", "minValue": 0, "type": "number", "label": "Building Height (Meters)", "prerequisiteTag": {"key": "building", "valueNot": "no"}}, "height": {"key": "height", "minValue": 0, "type": "number", "label": "Height (Meters)"}, "highspeed": {"key": "highspeed", "type": "check", "label": "High-Speed"}, "highway": {"key": "highway", "type": "typeCombo", "label": "Type"}, diff --git a/data/presets/fields/building/levels_building.json b/data/presets/fields/building/levels_building.json new file mode 100644 index 000000000..03850c689 --- /dev/null +++ b/data/presets/fields/building/levels_building.json @@ -0,0 +1,11 @@ +{ + "key": "building:levels", + "type": "number", + "minValue": 0, + "label": "Building Levels", + "placeholder": "2, 4, 6...", + "prerequisiteTag": { + "key": "building", + "valueNot": "no" + } +} diff --git a/data/presets/fields/height_building.json b/data/presets/fields/height_building.json new file mode 100644 index 000000000..3ad8324b5 --- /dev/null +++ b/data/presets/fields/height_building.json @@ -0,0 +1,10 @@ +{ + "key": "height", + "minValue": 0, + "type": "number", + "label": "Building Height (Meters)", + "prerequisiteTag": { + "key": "building", + "valueNot": "no" + } +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 7c4aca939..f653acf30 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -334,9 +334,9 @@ "building/university": {"icon": "maki-building", "geometry": ["area"], "terms": ["college"], "tags": {"building": "university"}, "matchScore": 0.5, "name": "University Building"}, "building/warehouse": {"icon": "maki-warehouse", "geometry": ["area"], "tags": {"building": "warehouse"}, "matchScore": 0.5, "name": "Warehouse"}, "camp_site/camp_pitch": {"icon": "maki-campsite", "fields": ["name", "ref"], "geometry": ["point", "area"], "terms": ["tent", "rv"], "tags": {"camp_site": "camp_pitch"}, "name": "Camp Pitch"}, - "club": {"icon": "fas-handshake", "fields": ["name", "club", "operator", "address", "building_area", "opening_hours"], "moreFields": ["access_simple", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"club": "*"}, "terms": ["social"], "name": "Club"}, + "club": {"icon": "fas-handshake", "fields": ["name", "club", "operator", "address", "building_area", "opening_hours"], "moreFields": ["access_simple", "building/levels_building", "height_building", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"club": "*"}, "terms": ["social"], "name": "Club"}, "club/sport": {"icon": "maki-pitch", "fields": ["name", "sport", "{club}"], "geometry": ["point", "area"], "tags": {"club": "sport"}, "terms": ["athletics club", "sporting club", "sports association", "sports society"], "name": "Sports Club"}, - "craft": {"icon": "temaki-tools", "fields": ["name", "craft", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "product", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"craft": "*"}, "terms": [], "name": "Craft"}, + "craft": {"icon": "temaki-tools", "fields": ["name", "craft", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "height_building", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "product", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"craft": "*"}, "terms": [], "name": "Craft"}, "craft/jeweler": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "jeweler"}, "reference": {"key": "shop", "value": "jewelry"}, "name": "Jeweler", "searchable": false, "replacement": "shop/jewelry"}, "craft/locksmith": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "locksmith"}, "reference": {"key": "shop", "value": "locksmith"}, "name": "Locksmith", "searchable": false}, "craft/optician": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "optician"}, "reference": {"key": "shop", "value": "optician"}, "name": "Optician", "searchable": false, "replacement": "shop/optician"}, @@ -415,7 +415,7 @@ "golf/rough": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "rough", "landuse": "grass"}, "reference": {"key": "golf", "value": "rough"}, "name": "Rough"}, "golf/tee": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "tee", "landuse": "grass"}, "terms": ["teeing ground"], "reference": {"key": "golf", "value": "tee"}, "name": "Tee Box"}, "golf/water_hazard": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "water_hazard", "natural": "water"}, "reference": {"key": "golf", "value": "water_hazard"}, "name": "Water Hazard"}, - "healthcare": {"icon": "maki-hospital", "fields": ["name", "healthcare", "operator", "healthcare/speciality", "address", "building_area"], "moreFields": ["opening_hours", "payment_multi", "brand", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"healthcare": "*"}, "terms": ["clinic", "doctor", "disease", "health", "institution", "sick", "surgery", "wellness"], "name": "Healthcare Facility"}, + "healthcare": {"icon": "maki-hospital", "fields": ["name", "healthcare", "operator", "healthcare/speciality", "address", "building_area"], "moreFields": ["building/levels_building", "height_building", "opening_hours", "payment_multi", "brand", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"healthcare": "*"}, "terms": ["clinic", "doctor", "disease", "health", "institution", "sick", "surgery", "wellness"], "name": "Healthcare Facility"}, "healthcare/alternative": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["acupuncture", "anthroposophical", "applied kinesiology", "aromatherapy", "ayurveda", "herbalism", "homeopathy", "hydrotherapy", "hypnosis", "naturopathy", "osteopathy", "reflexology", "reiki", "shiatsu", "traditional", "tuina", "unani"], "tags": {"healthcare": "alternative"}, "name": "Alternative Medicine"}, "healthcare/alternative/chiropractic": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["back", "pain", "spine"], "tags": {"healthcare": "alternative", "healthcare:speciality": "chiropractic"}, "name": "Chiropractor"}, "healthcare/audiologist": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["ear", "hearing", "sound"], "tags": {"healthcare": "audiologist"}, "name": "Audiologist"}, @@ -736,7 +736,7 @@ "natural/wetland": {"icon": "maki-wetland", "fields": ["wetland", "salt", "tidal"], "geometry": ["point", "area"], "tags": {"natural": "wetland"}, "terms": ["bog", "fen", "marsh", "mire", "moor", "muskeg", "peatland", "quagmire", "reedbed", "saltmarsh", "swamp", "tidalflat", "wet meadow"], "name": "Wetland"}, "natural/wood": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle"], "geometry": ["point", "area"], "tags": {"natural": "wood"}, "terms": ["tree"], "name": "Wood"}, "noexit/yes": {"icon": "maki-barrier", "geometry": ["vertex"], "terms": ["no exit", "road end", "dead end"], "tags": {"noexit": "yes"}, "reference": {"key": "noexit", "value": "*"}, "name": "No Exit"}, - "office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "operator", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"}, + "office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "height_building", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "operator", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"}, "office/administrative": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "administrative"}, "terms": [], "searchable": false, "name": "Administrative Office", "replacement": "office/government"}, "office/physician": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "physician"}, "searchable": false, "name": "Physician"}, "office/travel_agent": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "travel_agent"}, "reference": {"key": "shop", "value": "travel_agency"}, "terms": [], "name": "Travel Agency", "searchable": false}, @@ -910,7 +910,7 @@ "seamark/buoy_lateral/green": {"geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "green"}, "name": "Green Buoy"}, "seamark/buoy_lateral/red": {"geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "red"}, "name": "Red Buoy"}, "seamark/mooring": {"fields": ["ref", "operator", "seamark/mooring/category", "seamark/type"], "geometry": ["point"], "terms": ["dolphin", "pile", "bollard", "buoy", "post"], "tags": {"seamark:type": "mooring"}, "name": "Mooring"}, - "shop": {"icon": "maki-shop", "fields": ["name", "shop", "operator", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["air_conditioning", "brand", "currency_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "second_hand", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"shop": "*"}, "terms": [], "name": "Shop"}, + "shop": {"icon": "maki-shop", "fields": ["name", "shop", "operator", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["air_conditioning", "brand", "building/levels_building", "height_building", "currency_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "second_hand", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"shop": "*"}, "terms": [], "name": "Shop"}, "shop/boutique": {"icon": "maki-shop", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "boutique"}, "searchable": false, "name": "Boutique"}, "shop/fashion": {"icon": "maki-shop", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "fashion"}, "searchable": false, "name": "Fashion Store"}, "shop/fishmonger": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "fishmonger"}, "reference": {"key": "shop", "value": "seafood"}, "name": "Fishmonger", "searchable": false}, @@ -1060,7 +1060,7 @@ "tactile_paving": {"icon": "temaki-blind", "fields": ["colour", "description"], "geometry": ["vertex", "point", "line", "area"], "tags": {"tactile_paving": "*"}, "matchScore": 0.25, "terms": ["blind path", "detectable warning surfaces", "tactile ground surface indicators", "tactile walking surface indicators", "truncated domes", "visually impaired path"], "name": "Tactile Paving"}, "telecom/data_center": {"icon": "fas-server", "fields": ["name", "ref", "operator", "building_area"], "moreFields": ["address", "phone", "website"], "geometry": ["point", "area"], "tags": {"telecom": "data_center"}, "terms": ["computer systems storage", "information technology", "server farm", "the cloud", "telecommunications"], "name": "Data Center"}, "tourism/alpine_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee", "fee", "payment_multi_fee"], "moreFields": ["email", "fax", "internet_access/ssid", "phone", "reservation", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["climbing hut"], "tags": {"tourism": "alpine_hut"}, "name": "Alpine Hut"}, - "tourism/apartment": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["email", "fax", "internet_access/ssid", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "apartment"}, "name": "Guest Apartment / Condo"}, + "tourism/apartment": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["building/levels_building", "height_building", "email", "fax", "internet_access/ssid", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "apartment"}, "name": "Guest Apartment / Condo"}, "tourism/aquarium": {"icon": "maki-aquarium", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi_fee", "smoking", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["fish", "sea", "water"], "tags": {"tourism": "aquarium"}, "name": "Aquarium"}, "tourism/artwork": {"icon": "maki-art-gallery", "fields": ["name", "artwork_type", "artist"], "moreFields": ["material", "website"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork"}, "terms": ["mural", "sculpture", "statue"], "name": "Artwork"}, "tourism/artwork/mural": {"icon": "maki-art-gallery", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "mural"}, "reference": {"key": "artwork_type", "value": "mural"}, "terms": ["fresco", "wall painting"], "name": "Mural"}, @@ -1069,20 +1069,20 @@ "tourism/attraction": {"icon": "maki-star", "fields": ["name", "operator", "address"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "attraction"}, "matchScore": 0.75, "name": "Tourist Attraction"}, "tourism/camp_site": {"icon": "maki-campsite", "fields": ["name", "operator", "address", "access_simple", "capacity", "fee", "payment_multi_fee", "internet_access", "internet_access/fee"], "moreFields": ["email", "fax", "internet_access/ssid", "phone", "power_supply", "reservation", "sanitary_dump_station", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_site"}, "name": "Campground"}, "tourism/caravan_site": {"icon": "temaki-rv_park", "fields": ["name", "address", "capacity", "sanitary_dump_station", "power_supply", "internet_access", "internet_access/fee"], "moreFields": ["operator", "fee", "payment_multi_fee", "internet_access/ssid", "smoking", "website", "phone", "email", "fax", "wheelchair", "reservation"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper"], "tags": {"tourism": "caravan_site"}, "name": "RV Park"}, - "tourism/chalet": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "smoking", "payment_multi", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "reservation"], "geometry": ["point", "area"], "terms": ["holiday", "holiday cottage", "holiday home", "vacation", "vacation home"], "tags": {"tourism": "chalet"}, "name": "Holiday Cottage"}, + "tourism/chalet": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "height_building", "smoking", "payment_multi", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "reservation"], "geometry": ["point", "area"], "terms": ["holiday", "holiday cottage", "holiday home", "vacation", "vacation home"], "tags": {"tourism": "chalet"}, "name": "Holiday Cottage"}, "tourism/gallery": {"icon": "maki-art-gallery", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "gallery"}, "name": "Art Gallery"}, - "tourism/guest_house": {"icon": "maki-lodging", "fields": ["name", "operator", "guest_house", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "smoking", "payment_multi", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "reservation"], "geometry": ["point", "area"], "tags": {"tourism": "guest_house"}, "terms": ["B&B", "Bed and Breakfast"], "name": "Guest House"}, + "tourism/guest_house": {"icon": "maki-lodging", "fields": ["name", "operator", "guest_house", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "height_building", "smoking", "payment_multi", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "reservation"], "geometry": ["point", "area"], "tags": {"tourism": "guest_house"}, "terms": ["B&B", "Bed and Breakfast"], "name": "Guest House"}, "tourism/hostel": {"icon": "maki-lodging", "fields": ["{tourism/guest_house}"], "moreFields": ["{tourism/guest_house}"], "geometry": ["point", "area"], "tags": {"tourism": "hostel"}, "name": "Hostel"}, "tourism/hotel": {"icon": "fas-concierge-bell", "fields": ["{tourism/motel}"], "moreFields": ["{tourism/motel}", "stars", "bar"], "geometry": ["point", "area"], "tags": {"tourism": "hotel"}, "name": "Hotel"}, "tourism/information": {"icon": "maki-information", "fields": ["information", "operator", "address", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information"}, "name": "Information"}, "tourism/information/board": {"icon": "maki-information", "fields": ["name", "operator", "board_type", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "board"}, "reference": {"key": "information", "value": "board"}, "name": "Information Board"}, "tourism/information/guidepost": {"icon": "fas-map-signs", "fields": ["name", "elevation", "operator", "ref"], "moreFields": ["material"], "geometry": ["point", "vertex"], "terms": ["signpost"], "tags": {"tourism": "information", "information": "guidepost"}, "reference": {"key": "information", "value": "guidepost"}, "name": "Guidepost"}, "tourism/information/map": {"icon": "fas-map", "fields": ["operator", "map_type", "map_size", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "map"}, "reference": {"key": "information", "value": "map"}, "name": "Map"}, - "tourism/information/office": {"icon": "maki-information", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["email", "fax", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information", "information": "office"}, "reference": {"key": "information", "value": "office"}, "name": "Tourist Information Office"}, + "tourism/information/office": {"icon": "maki-information", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["building/levels_building", "height_building", "email", "fax", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information", "information": "office"}, "reference": {"key": "information", "value": "office"}, "name": "Tourist Information Office"}, "tourism/information/route_marker": {"icon": "maki-information", "fields": ["ref", "operator", "colour", "material", "elevation"], "geometry": ["point", "vertex"], "terms": ["cairn", "painted blaze", "route flag", "route marker", "stone pile", "trail blaze", "trail post", "way marker"], "tags": {"tourism": "information", "information": "route_marker"}, "reference": {"key": "information", "value": "route_marker"}, "name": "Trail Marker"}, "tourism/information/terminal": {"icon": "maki-information", "fields": ["operator"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "terminal"}, "reference": {"key": "information", "value": "terminal"}, "name": "Information Terminal"}, - "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "email", "fax", "internet_access/ssid", "operator", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "name": "Motel"}, - "tourism/museum": {"icon": "temaki-museum", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "fee", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum"}, "name": "Museum"}, + "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "height_building", "email", "fax", "internet_access/ssid", "operator", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "name": "Motel"}, + "tourism/museum": {"icon": "temaki-museum", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "height_building", "fee", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum"}, "name": "Museum"}, "tourism/picnic_site": {"icon": "maki-picnic-site", "fields": ["name", "operator", "address", "access_simple", "capacity"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "fee", "payment_multi_fee", "phone", "reservation", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["camp"], "tags": {"tourism": "picnic_site"}, "name": "Picnic Site"}, "tourism/theme_park": {"icon": "maki-amusement-park", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "theme_park"}, "name": "Theme Park"}, "tourism/trail_riding_station": {"icon": "maki-horse-riding", "fields": ["name", "horse_stables", "horse_riding", "horse_dressage"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "address", "opening_hours", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"tourism": "trail_riding_station"}, "name": "Trail Riding Station", "matchScore": 2}, diff --git a/data/presets/presets/club.json b/data/presets/presets/club.json index f69dce944..ab8fdaa12 100644 --- a/data/presets/presets/club.json +++ b/data/presets/presets/club.json @@ -10,6 +10,8 @@ ], "moreFields": [ "access_simple", + "building/levels_building", + "height_building", "email", "fax", "internet_access", diff --git a/data/presets/presets/craft.json b/data/presets/presets/craft.json index efc40de1b..96b36f24c 100644 --- a/data/presets/presets/craft.json +++ b/data/presets/presets/craft.json @@ -10,6 +10,8 @@ ], "moreFields": [ "air_conditioning", + "building/levels_building", + "height_building", "email", "fax", "internet_access", diff --git a/data/presets/presets/healthcare.json b/data/presets/presets/healthcare.json index 2f1d7d2eb..f6dc5a845 100644 --- a/data/presets/presets/healthcare.json +++ b/data/presets/presets/healthcare.json @@ -9,6 +9,8 @@ "building_area" ], "moreFields": [ + "building/levels_building", + "height_building", "opening_hours", "payment_multi", "brand", diff --git a/data/presets/presets/office.json b/data/presets/presets/office.json index 2dc6b5cb3..66b56a0b6 100644 --- a/data/presets/presets/office.json +++ b/data/presets/presets/office.json @@ -9,6 +9,8 @@ ], "moreFields": [ "air_conditioning", + "building/levels_building", + "height_building", "email", "fax", "internet_access", diff --git a/data/presets/presets/shop.json b/data/presets/presets/shop.json index 045a79892..f26b32d2d 100644 --- a/data/presets/presets/shop.json +++ b/data/presets/presets/shop.json @@ -12,6 +12,8 @@ "moreFields": [ "air_conditioning", "brand", + "building/levels_building", + "height_building", "currency_multi", "email", "fax", diff --git a/data/presets/presets/tourism/apartment.json b/data/presets/presets/tourism/apartment.json index 4e3be7429..cc9103e34 100644 --- a/data/presets/presets/tourism/apartment.json +++ b/data/presets/presets/tourism/apartment.json @@ -10,6 +10,8 @@ "internet_access/fee" ], "moreFields" : [ + "building/levels_building", + "height_building", "email", "fax", "internet_access/ssid", diff --git a/data/presets/presets/tourism/chalet.json b/data/presets/presets/tourism/chalet.json index d7e873293..aa08dbcba 100644 --- a/data/presets/presets/tourism/chalet.json +++ b/data/presets/presets/tourism/chalet.json @@ -10,6 +10,8 @@ ], "moreFields" : [ "air_conditioning", + "building/levels_building", + "height_building", "smoking", "payment_multi", "internet_access/ssid", diff --git a/data/presets/presets/tourism/guest_house.json b/data/presets/presets/tourism/guest_house.json index 39c19cf0a..c5d5d861c 100644 --- a/data/presets/presets/tourism/guest_house.json +++ b/data/presets/presets/tourism/guest_house.json @@ -12,6 +12,8 @@ ], "moreFields" : [ "air_conditioning", + "building/levels_building", + "height_building", "smoking", "payment_multi", "internet_access/ssid", diff --git a/data/presets/presets/tourism/information/office.json b/data/presets/presets/tourism/information/office.json index 6c08caa01..675475115 100644 --- a/data/presets/presets/tourism/information/office.json +++ b/data/presets/presets/tourism/information/office.json @@ -9,6 +9,8 @@ "internet_access/fee" ], "moreFields": [ + "building/levels_building", + "height_building", "email", "fax", "internet_access/ssid", diff --git a/data/presets/presets/tourism/motel.json b/data/presets/presets/tourism/motel.json index 75f92783e..3cca03a2a 100644 --- a/data/presets/presets/tourism/motel.json +++ b/data/presets/presets/tourism/motel.json @@ -11,6 +11,8 @@ ], "moreFields" : [ "air_conditioning", + "building/levels_building", + "height_building", "email", "fax", "internet_access/ssid", diff --git a/data/presets/presets/tourism/museum.json b/data/presets/presets/tourism/museum.json index 8229cb8e6..d6604c7f8 100644 --- a/data/presets/presets/tourism/museum.json +++ b/data/presets/presets/tourism/museum.json @@ -9,6 +9,8 @@ ], "moreFields": [ "air_conditioning", + "building/levels_building", + "height_building", "fee", "internet_access", "internet_access/fee", diff --git a/data/taginfo.json b/data/taginfo.json index 6bdaa2d06..cf0d850e5 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1192,6 +1192,7 @@ {"key": "brand", "description": "🄵 Brand"}, {"key": "brewery", "description": "🄵 Draft Beers"}, {"key": "bridge", "description": "🄵 Type, 🄵 Structure"}, + {"key": "building:levels", "description": "🄵 Building Levels, 🄵 Levels"}, {"key": "building:material", "description": "🄵 Material"}, {"key": "bunker_type", "description": "🄵 Type"}, {"key": "cables", "description": "🄵 Cables"}, @@ -1347,7 +1348,7 @@ {"key": "handrail", "description": "🄵 Handrail"}, {"key": "hashtags", "description": "🄵 Suggested Hashtags"}, {"key": "healthcare:speciality", "description": "🄵 Specialties"}, - {"key": "height", "description": "🄵 Height (Meters)"}, + {"key": "height", "description": "🄵 Building Height (Meters), 🄵 Height (Meters)"}, {"key": "highspeed", "description": "🄵 High-Speed"}, {"key": "historic:civilization", "description": "🄵 Historic Civilization"}, {"key": "wreck:date_sunk", "description": "🄵 Date Sunk"}, @@ -1396,7 +1397,6 @@ {"key": "leaf_type", "value": "mixed", "description": "🄵 Leaf Type"}, {"key": "length", "description": "🄵 Length (Meters)"}, {"key": "level", "description": "🄵 Level"}, - {"key": "building:levels", "description": "🄵 Levels"}, {"key": "liaison", "description": "🄵 Type"}, {"key": "lit", "description": "🄵 Lit"}, {"key": "location", "value": "outdoor", "description": "🄵 Location"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 5d27ea078..eaede94df 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2559,6 +2559,10 @@ "building": { "label": "Building" }, + "building/levels_building": { + "label": "Building Levels", + "placeholder": "2, 4, 6..." + }, "building/material": { "label": "Material" }, @@ -3001,6 +3005,9 @@ "healthcare/speciality": { "label": "Specialties" }, + "height_building": { + "label": "Building Height (Meters)" + }, "height": { "label": "Height (Meters)" },