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

Improvements to access field (closes #2763)

Browse Source
This commit is contained in:
Bryan Housel
2015-09-06 22:46:55 -04:00
parent 473f410d2e
commit 522e593f11
7 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/presets.yaml
View File

@@ -62,16 +62,16 @@ en:
# access=yes
title: Allowed
# access field placeholder
placeholder: Unknown
placeholder: Not Specified
types:
access: General
access: All
bicycle: Bicycles
foot: Foot
horse: Horses
motor_vehicle: Motor Vehicles
access_simple:
# 'access=*'
label: Access
label: Allowed Access
# access_simple field placeholder
placeholder: 'yes'
access_toilets:

6
data/presets/fields.json
View File

@@ -12,10 +12,10 @@
},
"type": "access",
"label": "Allowed Access",
"placeholder": "Unknown",
"placeholder": "Not Specified",
"strings": {
"types": {
"access": "General",
"access": "All",
"foot": "Foot",
"motor_vehicle": "Motor Vehicles",
"bicycle": "Bicycles",
@@ -56,7 +56,7 @@
"access_simple": {
"key": "access",
"type": "combo",
"label": "Access",
"label": "Allowed Access",
"placeholder": "yes",
"options": [
"permissive",

4
data/presets/fields/access.json
View File

@@ -3,10 +3,10 @@
"reference": {"key": "access"},
"type": "access",
"label": "Allowed Access",
"placeholder": "Unknown",
"placeholder": "Not Specified",
"strings": {
"types": {
"access": "General",
"access": "All",
"foot": "Foot",
"motor_vehicle": "Motor Vehicles",
"bicycle": "Bicycles",

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

@@ -1,7 +1,7 @@
{
"key": "access",
"type": "combo",
"label": "Access",
"label": "Allowed Access",
"placeholder": "yes",
"options": ["permissive", "private", "customers", "no"]
}

6
dist/locales/en.json vendored
View File

@@ -593,9 +593,9 @@
"fields": {
"access": {
"label": "Allowed Access",
"placeholder": "Unknown",
"placeholder": "Not Specified",
"types": {
"access": "General",
"access": "All",
"foot": "Foot",
"motor_vehicle": "Motor Vehicles",
"bicycle": "Bicycles",
@@ -633,7 +633,7 @@
}
},
"access_simple": {
"label": "Access",
"label": "Allowed Access",
"placeholder": "yes"
},
"access_toilets": {

18
js/id/ui/preset/access.js
View File

@@ -54,10 +54,10 @@ iD.ui.preset.access = function(field) {
if (type !== 'access') {
options.unshift('yes');
options.push('designated');
}
if (type === 'bicycle') {
options.push('dismount');
if (type === 'bicycle') {
options.push('dismount');
}
}
return options.map(function(option) {
@@ -178,14 +178,12 @@ iD.ui.preset.access = function(field) {
return tags.access ? tags.access : field.placeholder();
});
items.selectAll('#preset-input-access-access')
.attr('placeholder', 'yes');
// items.selectAll('#preset-input-access-access')
// .attr('placeholder', 'yes');
_.forEach(placeholders[tags.highway], function(value, key) {
items.selectAll('#preset-input-access-' + key)
.attr('placeholder', function() {
return (tags.access && (value === 'yes' || value === 'designated')) ? tags.access : value;
});
_.forEach(placeholders[tags.highway], function(v, k) {
items.selectAll('#preset-input-access-' + k)
.attr('placeholder', function() { return (tags.access || v); });
});
};

4
test/spec/ui/preset/access.js
View File

@@ -94,12 +94,12 @@ describe('iD.ui.preset.access', function() {
expect(selection.selectAll('#preset-input-access-bicycle').attr('placeholder')).to.equal('permissive');
});
it('does not override a "no" placeholder with more specific access tag (#2213)', function() {
it('overrides a "no" placeholder with more specific access tag (#2763)', function() {
var access = iD.ui.preset.access(field);
selection.call(access);
access.tags({highway: 'cycleway', access: 'destination'});
expect(selection.selectAll('#preset-input-access-motor_vehicle').attr('placeholder')).to.equal('no');
expect(selection.selectAll('#preset-input-access-motor_vehicle').attr('placeholder')).to.equal('destination');
});
});