diff --git a/data/presets.yaml b/data/presets.yaml index 28892c216..cdc0f7afa 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -460,6 +460,9 @@ en: forward: Forward # conveying=reversible reversible: Reversible + conveying_escalator: + # conveying=* + label: Escalator country: # country=* label: Country @@ -5065,11 +5068,21 @@ en: name: Indoor Door # 'terms: doorframe,doorway,portal,room access,threshold' terms: '' + indoor/elevator: + # 'indoor=room, elevator=yes' + name: Indoor Elevator Shaft + # 'terms: elevator,lift' + terms: '' indoor/room: # indoor=room name: Room # 'terms: antechamber,anteroom,atrium,cell,chamber,concourse,foyer,indoor room,lobby,vestibule' terms: '' + indoor/stairs: + # 'indoor=room, stairs=yes' + name: Indoor Stairwell + # 'terms: stair,stairs,staircase,stairway,stairwell,steps' + terms: '' indoor/wall: # indoor=wall name: Indoor Wall diff --git a/data/presets/fields.json b/data/presets/fields.json index cb149b798..c1c0c2047 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -76,6 +76,7 @@ "consulate": {"key": "consulate", "type": "combo", "label": "Type"}, "contact/webcam": {"key": "contact:webcam", "type": "url", "icon": "website", "label": "Webcam URL", "placeholder": "http://example.com/"}, "content": {"key": "content", "type": "combo", "label": "Content", "options": ["silage", "water", "oil", "fuel", "slurry", "gas", "manure", "sewage"]}, + "conveying_escalator": {"key": "conveying", "type": "check", "label": "Escalator"}, "conveying": {"key": "conveying", "type": "typeCombo", "label": "Movement Direction", "strings": {"options": {"forward": "Forward", "backward": "Backward", "reversible": "Reversible"}}}, "country": {"key": "country", "type": "combo", "label": "Country"}, "couplings": {"key": "couplings", "type": "number", "minValue": 1, "label": "Couplings", "placeholder": "1, 2, 3..."}, diff --git a/data/presets/fields/conveying_escalator.json b/data/presets/fields/conveying_escalator.json new file mode 100644 index 000000000..66dfa64be --- /dev/null +++ b/data/presets/fields/conveying_escalator.json @@ -0,0 +1,5 @@ +{ + "key": "conveying", + "type": "check", + "label": "Escalator" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index f80b35b3e..90f12ddde 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -562,7 +562,9 @@ "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"}, "indoor/door": {"icon": "maki-entrance-alt1", "fields": ["level", "ref", "door_type", "access_simple", "width", "height"], "moreFields": ["wheelchair"], "geometry": ["vertex"], "tags": {"indoor": "door"}, "addTags": {"indoor": "door", "door": "yes"}, "removeTags": {"indoor": "door", "door": "*"}, "terms": ["doorframe", "doorway", "portal", "room access", "threshold"], "name": "Indoor Door"}, + "indoor/elevator": {"icon": "temaki-elevator", "fields": ["ref", "level_semi"], "geometry": ["area"], "tags": {"indoor": "room", "elevator": "yes"}, "terms": ["elevator", "lift"], "matchScore": 0.8, "name": "Indoor Elevator Shaft"}, "indoor/room": {"fields": ["level", "name", "ref_room_number", "room", "height"], "geometry": ["area"], "tags": {"indoor": "room"}, "terms": ["antechamber", "anteroom", "atrium", "cell", "chamber", "concourse", "foyer", "indoor room", "lobby", "vestibule"], "matchScore": 0.8, "name": "Room"}, + "indoor/stairs": {"icon": "iD-highway-steps", "fields": ["ref", "level_semi", "conveying_escalator"], "geometry": ["area"], "tags": {"indoor": "room", "stairs": "yes"}, "terms": ["stair", "stairs", "staircase", "stairway", "stairwell", "steps"], "matchScore": 0.8, "name": "Indoor Stairwell"}, "indoor/wall": {"icon": "temaki-wall", "fields": ["level", "height"], "geometry": ["line"], "tags": {"indoor": "wall"}, "terms": ["indoor barrier", "room divider", "room partition"], "name": "Indoor Wall"}, "internet_access/wlan": {"icon": "fas-wifi", "geometry": ["point", "area"], "fields": ["internet_access/ssid", "internet_access/fee"], "moreFields": ["level"], "terms": ["wi-fi", "wifi", "hotspot"], "tags": {"internet_access": "wlan"}, "matchScore": 0.25, "name": "Wi-Fi Hotspot"}, "junction": {"icon": "temaki-junction", "fields": ["name"], "geometry": ["vertex", "area"], "tags": {"junction": "yes"}, "name": "Junction"}, diff --git a/data/presets/presets/indoor/elevator.json b/data/presets/presets/indoor/elevator.json new file mode 100644 index 000000000..56f7c6723 --- /dev/null +++ b/data/presets/presets/indoor/elevator.json @@ -0,0 +1,20 @@ +{ + "icon":"temaki-elevator", + "fields": [ + "ref", + "level_semi" + ], + "geometry": [ + "area" + ], + "tags": { + "indoor": "room", + "elevator": "yes" + }, + "terms": [ + "elevator", + "lift" + ], + "matchScore": 0.8, + "name": "Indoor Elevator Shaft" +} diff --git a/data/presets/presets/indoor/stairs.json b/data/presets/presets/indoor/stairs.json new file mode 100644 index 000000000..c3e210554 --- /dev/null +++ b/data/presets/presets/indoor/stairs.json @@ -0,0 +1,25 @@ +{ + "icon": "iD-highway-steps", + "fields": [ + "ref", + "level_semi", + "conveying_escalator" + ], + "geometry": [ + "area" + ], + "tags": { + "indoor": "room", + "stairs": "yes" + }, + "terms": [ + "stair", + "stairs", + "staircase", + "stairway", + "stairwell", + "steps" + ], + "matchScore": 0.8, + "name": "Indoor Stairwell" +} diff --git a/data/taginfo.json b/data/taginfo.json index b07ca859a..74fdc6154 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -478,7 +478,7 @@ {"key": "highway", "value": "emergency_bay", "description": "🄿 Emergency Stopping Place", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"}, {"key": "highway", "value": "footway", "description": "🄿 Foot Path", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"}, {"key": "footway", "value": "crossing", "description": "🄿 Pedestrian Crossing (unsearchable)", "object_types": ["way"]}, - {"key": "conveying", "description": "🄿 Moving Walkway, 🄿 Escalator", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"}, + {"key": "conveying", "description": "🄿 Moving Walkway, 🄿 Escalator, 🄵 Escalator", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"}, {"key": "footway", "value": "sidewalk", "description": "🄿 Sidewalk", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"}, {"key": "highway", "value": "give_way", "description": "🄿 Yield Sign", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/yield.svg"}, {"key": "highway", "value": "living_street", "description": "🄿 Living Street", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-living-street.svg"}, @@ -544,7 +544,9 @@ {"key": "indoor", "value": "corridor", "description": "🄿 Indoor Corridor (unsearchable), 🄿 Indoor Corridor", "object_types": ["way"]}, {"key": "indoor", "value": "area", "description": "🄿 Indoor Area", "object_types": ["area"]}, {"key": "indoor", "value": "door", "description": "🄿 Indoor Door", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"}, + {"key": "elevator", "value": "yes", "description": "🄿 Indoor Elevator Shaft", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/elevator.svg"}, {"key": "indoor", "value": "room", "description": "🄿 Room", "object_types": ["area"]}, + {"key": "stairs", "value": "yes", "description": "🄿 Indoor Stairwell", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-steps.svg"}, {"key": "indoor", "value": "wall", "description": "🄿 Indoor Wall", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/wall.svg"}, {"key": "internet_access", "value": "wlan", "description": "🄿 Wi-Fi Hotspot, 🄵 Internet Access", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-wifi.svg"}, {"key": "junction", "value": "yes", "description": "🄿 Junction", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/junction.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 0ea5a681e..d6cf597d3 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2870,6 +2870,10 @@ "label": "Content", "terms": "" }, + "conveying_escalator": { + "label": "Escalator", + "terms": "" + }, "conveying": { "label": "Movement Direction", "terms": "", @@ -7129,10 +7133,18 @@ "name": "Indoor Door", "terms": "doorframe,doorway,portal,room access,threshold" }, + "indoor/elevator": { + "name": "Indoor Elevator Shaft", + "terms": "elevator,lift" + }, "indoor/room": { "name": "Room", "terms": "antechamber,anteroom,atrium,cell,chamber,concourse,foyer,indoor room,lobby,vestibule" }, + "indoor/stairs": { + "name": "Indoor Stairwell", + "terms": "stair,stairs,staircase,stairway,stairwell,steps" + }, "indoor/wall": { "name": "Indoor Wall", "terms": "indoor barrier,room divider,room partition"