From 1142d57321a0fd39a9bc0874eb41f4bd6f20bf8b Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Mon, 18 May 2020 11:22:46 -0400 Subject: [PATCH] Remove Both/All option from yield sign direction field (close #7581) --- data/presets.yaml | 8 ++++++++ data/presets/fields.json | 1 + data/presets/fields/direction_vertex_dual.json | 11 +++++++++++ data/presets/presets.json | 2 +- data/presets/presets/highway/give_way.json | 2 +- dist/locales/en.json | 7 +++++++ 6 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 data/presets/fields/direction_vertex_dual.json diff --git a/data/presets.yaml b/data/presets.yaml index 4acbacd61..ab4c4f1a9 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -745,6 +745,14 @@ en: both: Both / All # direction=forward forward: Forward + direction_vertex_dual: + # direction=* + label: Direction Affected + options: + # direction=backward + backward: Backward + # direction=forward + forward: Forward dispensing: # dispensing=* label: Dispenses Prescriptions diff --git a/data/presets/fields.json b/data/presets/fields.json index 9c27cd0ee..89b03e550 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -123,6 +123,7 @@ "diplomatic/services": {"key": "diplomatic:services:", "type": "multiCombo", "label": "Services"}, "direction_cardinal": {"key": "direction", "type": "combo", "label": "Direction", "strings": {"options": {"N": "North", "E": "East", "S": "South", "W": "West", "NE": "Northeast", "SE": "Southeast", "SW": "Southwest", "NW": "Northwest", "NNE": "North-northeast", "ENE": "East-northeast", "ESE": "East-southeast", "SSE": "South-southeast", "SSW": "South-southwest", "WSW": "West-southwest", "WNW": "West-northwest", "NNW": "North-northwest"}}}, "direction_clock": {"key": "direction", "type": "combo", "label": "Direction", "strings": {"options": {"clockwise": "Clockwise", "anticlockwise": "Counterclockwise"}}}, + "direction_vertex_dual": {"key": "direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward"}}}, "direction_vertex": {"key": "direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}}, "direction": {"key": "direction", "type": "number", "label": "Direction (Degrees Clockwise)", "placeholder": "45, 90, 180, 270"}, "dispensing": {"key": "dispensing", "type": "check", "label": "Dispenses Prescriptions", "default": "yes"}, diff --git a/data/presets/fields/direction_vertex_dual.json b/data/presets/fields/direction_vertex_dual.json new file mode 100644 index 000000000..ee4f70052 --- /dev/null +++ b/data/presets/fields/direction_vertex_dual.json @@ -0,0 +1,11 @@ +{ + "key": "direction", + "type": "combo", + "label": "Direction Affected", + "strings": { + "options": { + "forward": "Forward", + "backward": "Backward" + } + } +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 49c22b4d3..1419040fa 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -527,7 +527,7 @@ "highway/footway/sidewalk": {"icon": "temaki-pedestrian", "geometry": ["line"], "tags": {"footway": "sidewalk"}, "addTags": {"highway": "footway", "footway": "sidewalk"}, "reference": {"key": "footway", "value": "sidewalk"}, "terms": ["pavement", "sidepath"], "name": "Sidewalk"}, "highway/footway/unmarked-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"footway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "addTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Unmarked Crossing (Raised)"}, "highway/footway/unmarked": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"footway": "crossing", "crossing": "unmarked"}, "addTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["unmarked foot path crossing", "unmarked crosswalk", "unmarked pedestrian crossing"], "name": "Unmarked Crossing"}, - "highway/give_way": {"icon": "temaki-yield", "fields": ["direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "give_way"}, "terms": ["give way", "yield", "sign"], "name": "Yield Sign"}, + "highway/give_way": {"icon": "temaki-yield", "fields": ["direction_vertex_dual"], "geometry": ["vertex"], "tags": {"highway": "give_way"}, "terms": ["give way", "yield", "sign"], "name": "Yield Sign"}, "highway/living_street": {"icon": "iD-highway-living-street", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["covered", "cycleway", "flood_prone", "junction_line", "lit", "maxheight", "maxweight_bridge", "oneway/bicycle", "smoothness", "trolley_wire", "width"], "geometry": ["line"], "tags": {"highway": "living_street"}, "name": "Living Street"}, "highway/milestone": {"icon": "temaki-milestone", "geometry": ["point", "vertex"], "fields": ["distance", "direction_vertex"], "tags": {"highway": "milestone"}, "terms": ["mile marker", "mile post", "mile stone", "mileage marker", "milemarker", "milepost"], "name": "Highway Milestone"}, "highway/mini_roundabout": {"icon": "maki-circle-stroked", "geometry": ["vertex"], "terms": ["traffic circle"], "tags": {"highway": "mini_roundabout"}, "fields": ["direction_clock"], "name": "Mini-Roundabout"}, diff --git a/data/presets/presets/highway/give_way.json b/data/presets/presets/highway/give_way.json index 5716e0dee..e6001a406 100644 --- a/data/presets/presets/highway/give_way.json +++ b/data/presets/presets/highway/give_way.json @@ -1,7 +1,7 @@ { "icon": "temaki-yield", "fields": [ - "direction_vertex" + "direction_vertex_dual" ], "geometry": [ "vertex" diff --git a/dist/locales/en.json b/dist/locales/en.json index 5c5bb65dd..c894fa7e1 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3249,6 +3249,13 @@ "anticlockwise": "Counterclockwise" } }, + "direction_vertex_dual": { + "label": "Direction Affected", + "options": { + "forward": "Forward", + "backward": "Backward" + } + }, "direction_vertex": { "label": "Direction Affected", "options": {