From 04e803098270429bb3195cc195868e312ac5ba44 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Fri, 13 Sep 2019 13:18:02 -0400 Subject: [PATCH] Add alternative `semiCombo` field for the `level` tag for elevators, escalators, and steps that cross multiple building levels (re: #6227) --- data/presets.yaml | 8 ++++++++ data/presets/fields.json | 1 + data/presets/fields/level_semi.json | 12 ++++++++++++ data/presets/presets.json | 6 +++--- data/presets/presets/highway/elevator.json | 11 ++++++----- data/presets/presets/highway/steps.json | 6 +++++- data/presets/presets/highway/steps/conveying.json | 12 ++++++++---- data/taginfo.json | 2 +- dist/locales/en.json | 4 ++++ 9 files changed, 48 insertions(+), 14 deletions(-) create mode 100644 data/presets/fields/level_semi.json diff --git a/data/presets.yaml b/data/presets.yaml index 587d735f0..4aaa904d0 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -879,6 +879,7 @@ en: handrail: # handrail=* label: Handrail + terms: '[translate with synonyms or related terms for ''Handrail'', separated by commas]' hashtags: # hashtags=* label: Suggested Hashtags @@ -1144,6 +1145,11 @@ en: label: Level # 'terms: building floor,deck,storey,story' terms: '[translate with synonyms or related terms for ''Level'', separated by commas]' + level_semi: + # level=* + label: Levels + # 'terms: building floors,decks,stories,storeys,storys' + terms: '[translate with synonyms or related terms for ''Levels'', separated by commas]' levels: # 'building:levels=*' label: Levels @@ -2111,6 +2117,7 @@ en: step_count: # step_count=* label: Number of Steps + terms: '[translate with synonyms or related terms for ''Number of Steps'', separated by commas]' stop: # stop=* label: Stop Type @@ -2171,6 +2178,7 @@ en: surface: # surface=* label: Surface + terms: '[translate with synonyms or related terms for ''Surface'', separated by commas]' surveillance: # surveillance=* label: Surveillance Kind diff --git a/data/presets/fields.json b/data/presets/fields.json index 78c3005c3..8e150833a 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -206,6 +206,7 @@ "leaf_type": {"key": "leaf_type", "type": "combo", "label": "Leaf Type", "strings": {"options": {"broadleaved": "Broadleaved", "needleleaved": "Needleleaved", "mixed": "Mixed", "leafless": "Leafless"}}}, "leisure": {"key": "leisure", "type": "typeCombo", "label": "Type"}, "length": {"key": "length", "type": "number", "minValue": 0, "label": "Length (Meters)"}, + "level_semi": {"key": "level", "type": "semiCombo", "label": "Levels", "terms": ["building floors", "decks", "stories", "storeys", "storys"]}, "level": {"key": "level", "type": "combo", "label": "Level", "universal": true, "terms": ["building floor", "deck", "storey", "story"]}, "levels": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Levels", "placeholder": "2, 4, 6..."}, "liaison": {"key": "liaison", "type": "combo", "label": "Type"}, diff --git a/data/presets/fields/level_semi.json b/data/presets/fields/level_semi.json new file mode 100644 index 000000000..673681d16 --- /dev/null +++ b/data/presets/fields/level_semi.json @@ -0,0 +1,12 @@ +{ + "key": "level", + "type": "semiCombo", + "label": "Levels", + "terms": [ + "building floors", + "decks", + "stories", + "storeys", + "storys" + ] +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 8e97cd289..f885e7256 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -482,7 +482,7 @@ "highway/cycleway/bicycle_foot": {"countryCodes": ["ca", "gb", "mx", "us"], "icon": "fas-biking", "geometry": ["line"], "tags": {"highway": "cycleway", "foot": "designated"}, "addTags": {"highway": "cycleway", "foot": "designated", "bicycle": "designated"}, "terms": ["bicycle and foot path", "bike and pedestrian path", "green way", "greenway", "mixed-use trail", "multi-use trail", "segregated trail", "rail trail"], "matchScore": 0.95, "name": "Cycle & Foot Path"}, "highway/cycleway/crossing/marked": {"icon": "fas-biking", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"cycleway": "crossing", "crossing": "marked"}, "addTags": {"highway": "cycleway", "cycleway": "crossing", "crossing": "marked"}, "reference": {"key": "cycleway", "value": "crossing"}, "terms": ["cycle crosswalk", "cycle path crossing", "cycleway crossing", "bicycle crossing", "bike crossing"], "name": "Marked Cycle Crossing"}, "highway/cycleway/crossing/unmarked": {"icon": "fas-biking", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"cycleway": "crossing", "crossing": "unmarked"}, "addTags": {"highway": "cycleway", "cycleway": "crossing", "crossing": "unmarked"}, "reference": {"key": "cycleway", "value": "crossing"}, "terms": ["cycle path crossing", "cycleway crossing", "bicycle crossing", "bike crossing"], "name": "Unmarked Cycle Crossing"}, - "highway/elevator": {"icon": "temaki-elevator", "fields": ["access_simple", "opening_hours", "maxweight", "ref", "wheelchair"], "moreFields": ["maxheight"], "geometry": ["vertex"], "tags": {"highway": "elevator"}, "terms": ["lift"], "name": "Elevator"}, + "highway/elevator": {"icon": "temaki-elevator", "fields": ["ref", "level_semi", "access_simple", "wheelchair", "maxweight"], "moreFields": ["maxheight", "opening_hours"], "geometry": ["vertex"], "tags": {"highway": "elevator"}, "terms": ["lift"], "name": "Elevator"}, "highway/emergency_bay": {"icon": "maki-car", "geometry": ["vertex"], "tags": {"highway": "emergency_bay"}, "terms": ["Highway Emergency Bay"], "name": "Emergency Stopping Place"}, "highway/footway": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["covered", "dog", "lit", "maxweight_bridge", "not/name", "smoothness", "stroller", "tactile_paving", "wheelchair"], "geometry": ["line"], "terms": ["hike", "hiking", "promenade", "trackway", "trail", "walk"], "tags": {"highway": "footway"}, "matchScore": 0.9, "name": "Foot Path"}, "highway/footway/crossing": {"fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"footway": "crossing"}, "addTags": {"highway": "footway", "footway": "crossing"}, "reference": {"key": "footway", "value": "crossing"}, "matchScore": 0.95, "searchable": false, "name": "Pedestrian Crossing"}, @@ -523,8 +523,8 @@ "highway/service/parking_aisle": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"highway": "service", "service": "parking_aisle"}, "reference": {"key": "service", "value": "parking_aisle"}, "name": "Parking Aisle"}, "highway/services": {"icon": "maki-car", "fields": ["{highway/rest_area}"], "moreFields": ["{highway/rest_area}"], "geometry": ["point", "vertex", "area"], "tags": {"highway": "services"}, "terms": ["services", "travel plaza", "service station"], "name": "Service Area"}, "highway/speed_camera": {"icon": "temaki-security_camera", "geometry": ["point", "vertex"], "fields": ["direction", "ref", "maxspeed"], "tags": {"highway": "speed_camera"}, "terms": [], "name": "Speed Camera"}, - "highway/steps": {"icon": "iD-highway-steps", "fields": ["incline_steps", "handrail", "step_count", "surface", "lit", "width"], "moreFields": ["covered", "dog", "indoor", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "steps"}, "terms": ["stairs", "staircase", "stairway"], "name": "Steps"}, - "highway/steps/conveying": {"icon": "maki-entrance", "fields": ["name", "incline_steps", "conveying", "access_simple", "lit", "width", "handrail", "step_count"], "geometry": ["line"], "terms": ["moving staircase", "moving stairway", "people mover"], "tags": {"highway": "steps", "conveying": "*"}, "name": "Escalator"}, + "highway/steps": {"icon": "iD-highway-steps", "fields": ["incline_steps", "access_simple", "handrail", "step_count", "surface", "width"], "moreFields": ["covered", "dog", "indoor", "level_semi", "lit", "name", "ref", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "steps"}, "terms": ["stairs", "staircase", "stairway"], "name": "Steps"}, + "highway/steps/conveying": {"icon": "maki-entrance", "fields": ["incline_steps", "conveying", "access_simple", "indoor", "level_semi", "width"], "moreFields": ["{highway/steps}", "handrail", "step_count", "surface"], "geometry": ["line"], "terms": ["moving staircase", "moving stairway", "people mover"], "tags": {"highway": "steps", "conveying": "*"}, "name": "Escalator"}, "highway/stop": {"icon": "temaki-stop", "fields": ["stop", "direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "stop"}, "terms": ["stop", "halt", "sign"], "name": "Stop Sign"}, "highway/street_lamp": {"icon": "temaki-bulb", "geometry": ["point", "vertex"], "tags": {"highway": "street_lamp"}, "fields": ["lamp_type", "direction", "ref"], "terms": ["streetlight", "street light", "lamp", "light", "gaslight"], "name": "Street Lamp"}, "highway/tertiary_link": {"icon": "iD-highway-tertiary-link", "fields": ["{highway/primary_link}"], "moreFields": ["{highway/primary_link}"], "geometry": ["line"], "tags": {"highway": "tertiary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Tertiary Link"}, diff --git a/data/presets/presets/highway/elevator.json b/data/presets/presets/highway/elevator.json index cfc1c6c7d..194e85bb1 100644 --- a/data/presets/presets/highway/elevator.json +++ b/data/presets/presets/highway/elevator.json @@ -1,14 +1,15 @@ { "icon": "temaki-elevator", "fields": [ - "access_simple", - "opening_hours", - "maxweight", "ref", - "wheelchair" + "level_semi", + "access_simple", + "wheelchair", + "maxweight" ], "moreFields": [ - "maxheight" + "maxheight", + "opening_hours" ], "geometry": [ "vertex" diff --git a/data/presets/presets/highway/steps.json b/data/presets/presets/highway/steps.json index 307d25ace..33f09e587 100644 --- a/data/presets/presets/highway/steps.json +++ b/data/presets/presets/highway/steps.json @@ -2,16 +2,20 @@ "icon": "iD-highway-steps", "fields": [ "incline_steps", + "access_simple", "handrail", "step_count", "surface", - "lit", "width" ], "moreFields": [ "covered", "dog", "indoor", + "level_semi", + "lit", + "name", + "ref", "stroller", "wheelchair" ], diff --git a/data/presets/presets/highway/steps/conveying.json b/data/presets/presets/highway/steps/conveying.json index e138240f0..81b1a2b6b 100644 --- a/data/presets/presets/highway/steps/conveying.json +++ b/data/presets/presets/highway/steps/conveying.json @@ -1,14 +1,18 @@ { "icon": "maki-entrance", "fields": [ - "name", "incline_steps", "conveying", "access_simple", - "lit", - "width", + "indoor", + "level_semi", + "width" + ], + "moreFields": [ + "{highway/steps}", "handrail", - "step_count" + "step_count", + "surface" ], "geometry": [ "line" diff --git a/data/taginfo.json b/data/taginfo.json index 65326c0b9..2cb1f32a5 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1491,7 +1491,7 @@ {"key": "leaf_type", "value": "leafless", "description": "🄵 Leaf Type"}, {"key": "leaf_type", "value": "mixed", "description": "🄵 Leaf Type"}, {"key": "length", "description": "🄵 Length (Meters)"}, - {"key": "level", "description": "🄵 Level"}, + {"key": "level", "description": "🄵 Levels, 🄵 Level"}, {"key": "liaison", "description": "🄵 Type"}, {"key": "line_attachment", "description": "🄵 Line Attachment"}, {"key": "lit", "description": "🄵 Lit"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 35bb9b214..7b2689b9d 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3551,6 +3551,10 @@ "label": "Length (Meters)", "terms": "" }, + "level_semi": { + "label": "Levels", + "terms": "building floors,decks,stories,storeys,storys" + }, "level": { "label": "Level", "terms": "building floor,deck,storey,story"