CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-20 15:34:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2686 from ebrelsford/cycleway-preset

Browse Source 
Add cycleway preset field for highways with bike lanes
This commit is contained in:
Bryan Housel
2015-06-15 21:35:03 -04:00
parent be1e3738f1 95b1eb6cce
commit fda8146972
21 changed files with 329 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/app.css
+15
View File
@@ -1234,6 +1234,21 @@ a:hover .icon.out-link { background-position: -500px -14px;}
border-bottom-right-radius: 4px;
}
/* preset form cycleway */
.form-field-cycleway .preset-input-wrap li {
border-bottom: 1px solid #CCC;
}
.form-field-cycleway .preset-input-wrap li:last-child {
border-bottom: 0;
}
.preset-input-cycleway-wrap input {
border-radius: 0;
border-width: 0;
border-left-width: 1px;
}
/* preset form numbers */
input[type=number] {
data/presets.yaml
+37
View File
@@ -251,6 +251,43 @@ en:
cuisine:
# 'cuisine=*'
label: Cuisine
cycleway:
# 'cycleway:left=*, cycleway:right=*'
label: Bike Lanes
options:
# lane=yes
lane:
description: A bike lane separated from auto traffic by a painted line
title: Standard bike lane
# none=yes
none:
description: No bike lane
title: None
# opposite=yes
opposite:
description: A bike lane that travels in both directions on a one-way street
title: Contraflow bike lane
# opposite_lane=yes
opposite_lane:
description: A bike lane that travels in the opposite direction of traffic
title: Opposite bike lane
# share_busway=yes
share_busway:
description: A bike lane shared with a bus lane
title: Bike lane shared with bus
# shared_lane=yes
shared_lane:
description: A bike lane with no separation from auto traffic
title: Shared bike lane
# track=yes
track:
description: A bike lane separated from traffic by a physical barrier
title: Bike track
# cycleway field placeholder
placeholder: none
types:
'cycleway:left': Left side
'cycleway:right': Right side
delivery:
# 'delivery=*'
label: Delivery
data/presets/fields.json
+48
View File
@@ -321,6 +321,54 @@
"type": "combo",
"label": "Cuisine"
},
"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"
}
}
}
},
"delivery": {
"key": "delivery",
"type": "check",
data/presets/fields/cycleway.json
+43
View File
@@ -0,0 +1,43 @@
{
"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"
}
}
}
}
data/presets/presets.json
+20 -10
View File
@@ -3938,7 +3938,8 @@
"maxspeed",
"structure",
"access",
"surface"
"surface",
"cycleway"
],
"geometry": [
"line"
@@ -4081,7 +4082,8 @@
"access",
"lanes",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
@@ -4100,7 +4102,8 @@
"structure",
"access",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
@@ -4147,7 +4150,8 @@
"maxspeed",
"structure",
"access",
"surface"
"surface",
"cycleway"
],
"geometry": [
"line"
@@ -4199,7 +4203,8 @@
"access",
"lanes",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
@@ -4218,7 +4223,8 @@
"structure",
"access",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
@@ -4241,7 +4247,8 @@
"maxspeed",
"structure",
"access",
"surface"
"surface",
"cycleway"
],
"geometry": [
"line"
@@ -4411,7 +4418,8 @@
"access",
"lanes",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
@@ -4430,7 +4438,8 @@
"structure",
"access",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
@@ -4548,7 +4557,8 @@
"maxspeed",
"structure",
"access",
"surface"
"surface",
"cycleway"
],
"geometry": [
"line"
data/presets/presets/highway/living_street.json
+2 -1
View File
@@ -5,7 +5,8 @@
"maxspeed",
"structure",
"access",
"surface"
"surface",
"cycleway"
],
"geometry": [
"line"
data/presets/presets/highway/primary.json
+3 -2
View File
@@ -7,7 +7,8 @@
"access",
"lanes",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
@@ -17,4 +18,4 @@
},
"terms": [],
"name": "Primary Road"
}
}
data/presets/presets/highway/primary_link.json
+2 -1
View File
@@ -6,7 +6,8 @@
"structure",
"access",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
data/presets/presets/highway/residential.json
+3 -2
View File
@@ -5,7 +5,8 @@
"maxspeed",
"structure",
"access",
"surface"
"surface",
"cycleway"
],
"geometry": [
"line"
@@ -15,4 +16,4 @@
},
"terms": [],
"name": "Residential Road"
}
}
data/presets/presets/highway/secondary.json
+3 -2
View File
@@ -7,7 +7,8 @@
"access",
"lanes",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
@@ -17,4 +18,4 @@
},
"terms": [],
"name": "Secondary Road"
}
}
data/presets/presets/highway/secondary_link.json
+2 -1
View File
@@ -6,7 +6,8 @@
"structure",
"access",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
data/presets/presets/highway/service.json
+3 -2
View File
@@ -6,7 +6,8 @@
"maxspeed",
"structure",
"access",
"surface"
"surface",
"cycleway"
],
"geometry": [
"line"
@@ -16,4 +17,4 @@
},
"terms": [],
"name": "Service Road"
}
}
data/presets/presets/highway/tertiary.json
+3 -2
View File
@@ -7,7 +7,8 @@
"access",
"lanes",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
@@ -17,4 +18,4 @@
},
"terms": [],
"name": "Tertiary Road"
}
}
data/presets/presets/highway/tertiary_link.json
+2 -1
View File
@@ -6,7 +6,8 @@
"structure",
"access",
"surface",
"ref"
"ref",
"cycleway"
],
"geometry": [
"line"
data/presets/presets/highway/unclassified.json
+3 -2
View File
@@ -5,7 +5,8 @@
"maxspeed",
"structure",
"access",
"surface"
"surface",
"cycleway"
],
"geometry": [
"line"
@@ -15,4 +16,4 @@
},
"terms": [],
"name": "Unclassified Road"
}
}
data/presets/schema/field.json
+1
View File
@@ -52,6 +52,7 @@
"address",
"check",
"combo",
"cycleway",
"defaultcheck",
"text",
"maxspeed",
dist/img/line-presets.png
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

dist/img/relation-presets.png
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 25 KiB

dist/locales/en.json
Vendored
+38
View File
@@ -786,6 +786,44 @@
"cuisine": {
"label": "Cuisine"
},
"cycleway": {
"label": "Bike Lanes",
"placeholder": "none",
"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"
}
}
},
"delivery": {
"label": "Delivery"
},
index.html
+1
View File
@@ -127,6 +127,7 @@
<script src='js/id/ui/preset/address.js'></script>
<script src='js/id/ui/preset/check.js'></script>
<script src='js/id/ui/preset/combo.js'></script>
<script src='js/id/ui/preset/cycleway.js'></script>
<script src='js/id/ui/preset/input.js'></script>
<script src='js/id/ui/preset/localized.js'></script>
<script src='js/id/ui/preset/maxspeed.js'></script>
js/id/ui/preset/cycleway.js
+100
View File
@@ -0,0 +1,100 @@
iD.ui.preset.cycleway = function(field) {
var event = d3.dispatch('change'),
items;
function cycleway(selection) {
var wrap = selection.selectAll('.preset-input-wrap')
.data([0]);
wrap.enter().append('div')
.attr('class', 'cf preset-input-wrap')
.append('ul');
items = wrap.select('ul').selectAll('li')
.data(field.keys);
// Enter
var enter = items.enter().append('li')
.attr('class', function(d) { return 'cf preset-cycleway-' + d; });
enter.append('span')
.attr('class', 'col6 label preset-label-cycleway')
.attr('for', function(d) { return 'preset-input-cycleway-' + d; })
.text(function(d) { return field.t('types.' + d); });
enter.append('div')
.attr('class', 'col6 preset-input-cycleway-wrap')
.append('input')
.attr('type', 'text')
.attr('class', 'preset-input-cycleway')
.attr('id', function(d) { return 'preset-input-cycleway-' + d; })
.each(function(d) {
d3.select(this)
.call(d3.combobox()
.data(cycleway.options(d)));
});
// Update
wrap.selectAll('.preset-input-cycleway')
.on('change', change)
.on('blur', change);
}
function change() {
var inputs = d3.selectAll('.preset-input-cycleway')[0],
left = d3.select(inputs[0]).value(),
right = d3.select(inputs[1]).value(),
tag = {};
if (left === 'none' || left === '') { left = undefined; }
if (right === 'none' || right === '') { right = undefined; }
// Always set both left and right as changing one can affect the other
tag = {
cycleway: undefined,
'cycleway:left': left,
'cycleway:right': right
};
// If the left and right tags match, use the cycleway tag to tag both
// sides the same way
if (left === right) {
tag = {
cycleway: left,
'cycleway:left': undefined,
'cycleway:right': undefined
};
}
event.change(tag);
}
cycleway.options = function() {
return d3.keys(field.strings.options).map(function(option) {
return {
title: field.t('options.' + option + '.description'),
value: option
};
});
};
cycleway.tags = function(tags) {
items.selectAll('.preset-input-cycleway')
.value(function(d) {
// If cycleway is set, always return that
if (tags.cycleway) {
return tags.cycleway;
}
return tags[d] || '';
})
.attr('placeholder', field.placeholder());
};
cycleway.focus = function() {
items.selectAll('.preset-input-cycleway')
.node().focus();
};
return d3.rebind(cycleway, event, 'on');
};