CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 01:02:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix cycleway field to appear if "cycleway" tag present but not "cycleway:left" nor "cycleway:right" (close #5756)

Browse Source
This commit is contained in:
Quincy Morgan
2019-01-25 08:39:15 -05:00
parent 5eda112bfa
commit decba8f215
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/presets.yaml
View File

@@ -412,7 +412,7 @@ en:
# cycle_network=*
label: Network
cycleway:
# 'cycleway:left=*, cycleway:right=*'
# 'cycleway=*, cycleway:left=*, cycleway:right=*'
label: Bike Lanes
options:
# lane=yes

2
data/presets/fields.json
View File

@@ -75,7 +75,7 @@
"currency_multi": {"key": "currency:", "type": "multiCombo", "label": "Currency Types"},
"cutting": {"key": "cutting", "type": "typeCombo", "label": "Type", "placeholder": "Default"},
"cycle_network": {"key": "cycle_network", "type": "networkCombo", "label": "Network"},
"cycleway": {"keys": ["cycleway:left", "cycleway:right"], "reference": {"key": "cycleway"}, "type": "cycleway", "label": "Bike Lanes", "placeholder": "none", "strings": {"types": {"cycleway:left": "Left side", "cycleway:right": "Right side"}, "options": {"none": {"title": "None", "description": "No bike lane"}, "lane": {"title": "Standard bike lane", "description": "A bike lane separated from auto traffic by a painted line"}, "shared_lane": {"title": "Shared bike lane", "description": "A bike lane with no separation from auto traffic"}, "track": {"title": "Bike track", "description": "A bike lane separated from traffic by a physical barrier"}, "share_busway": {"title": "Bike lane shared with bus", "description": "A bike lane shared with a bus lane"}, "opposite_lane": {"title": "Opposite bike lane", "description": "A bike lane that travels in the opposite direction of traffic"}, "opposite": {"title": "Contraflow bike lane", "description": "A bike lane that travels in both directions on a one-way street"}}}},
"cycleway": {"keys": ["cycleway", "cycleway:left", "cycleway:right"], "reference": {"key": "cycleway"}, "type": "cycleway", "label": "Bike Lanes", "placeholder": "none", "strings": {"types": {"cycleway:left": "Left side", "cycleway:right": "Right side"}, "options": {"none": {"title": "None", "description": "No bike lane"}, "lane": {"title": "Standard bike lane", "description": "A bike lane separated from auto traffic by a painted line"}, "shared_lane": {"title": "Shared bike lane", "description": "A bike lane with no separation from auto traffic"}, "track": {"title": "Bike track", "description": "A bike lane separated from traffic by a physical barrier"}, "share_busway": {"title": "Bike lane shared with bus", "description": "A bike lane shared with a bus lane"}, "opposite_lane": {"title": "Opposite bike lane", "description": "A bike lane that travels in the opposite direction of traffic"}, "opposite": {"title": "Contraflow bike lane", "description": "A bike lane that travels in both directions on a one-way street"}}}},
"dance/style": {"key": "dance:style", "type": "semiCombo", "label": "Dance Styles"},
"date": {"key": "date", "type": "check", "label": "Date"},
"delivery": {"key": "delivery", "type": "check", "label": "Delivery"},

2
data/presets/fields/cycleway.json
View File

@@ -1,5 +1,5 @@
{
"keys": ["cycleway:left", "cycleway:right"],
"keys": ["cycleway", "cycleway:left", "cycleway:right"],
"reference": {"key": "cycleway"},
"type": "cycleway",
"label": "Bike Lanes",

7
data/taginfo.json
View File

@@ -1153,6 +1153,13 @@
{"key": "currency:", "description": "🄵 Currency Types"},
{"key": "cutting", "description": "🄵 Type, 🄵 Structure"},
{"key": "cycle_network", "description": "🄵 Network"},
{"key": "cycleway", "value": "none", "description": "🄵 Bike Lanes"},
{"key": "cycleway", "value": "lane", "description": "🄵 Bike Lanes"},
{"key": "cycleway", "value": "shared_lane", "description": "🄵 Bike Lanes"},
{"key": "cycleway", "value": "track", "description": "🄵 Bike Lanes"},
{"key": "cycleway", "value": "share_busway", "description": "🄵 Bike Lanes"},
{"key": "cycleway", "value": "opposite_lane", "description": "🄵 Bike Lanes"},
{"key": "cycleway", "value": "opposite", "description": "🄵 Bike Lanes"},
{"key": "cycleway:left", "value": "none", "description": "🄵 Bike Lanes"},
{"key": "cycleway:left", "value": "lane", "description": "🄵 Bike Lanes"},
{"key": "cycleway:left", "value": "shared_lane", "description": "🄵 Bike Lanes"},

3
modules/ui/fields/cycleway.js
View File

@@ -34,9 +34,10 @@ export function uiFieldCycleway(field, context) {
.attr('class', 'labeled-inputs')
.merge(div);
var keys = ['cycleway:left', 'cycleway:right'];
items = div.selectAll('li')
.data(field.keys);
.data(keys);
var enter = items.enter()
.append('li')