diff --git a/data/presets.yaml b/data/presets.yaml index 8273dfada..dccf117f5 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -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: diff --git a/data/presets/fields.json b/data/presets/fields.json index 386280ff1..a18ed9bc3 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -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", diff --git a/data/presets/fields/access.json b/data/presets/fields/access.json index 9bf5e0348..8615abfa7 100644 --- a/data/presets/fields/access.json +++ b/data/presets/fields/access.json @@ -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", diff --git a/data/presets/fields/access_simple.json b/data/presets/fields/access_simple.json index e2bc42e9e..66a25d4a9 100644 --- a/data/presets/fields/access_simple.json +++ b/data/presets/fields/access_simple.json @@ -1,7 +1,7 @@ { "key": "access", "type": "combo", - "label": "Access", + "label": "Allowed Access", "placeholder": "yes", "options": ["permissive", "private", "customers", "no"] } diff --git a/dist/locales/en.json b/dist/locales/en.json index 2c59ab543..7fdbb96b0 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -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": { diff --git a/js/id/ui/preset/access.js b/js/id/ui/preset/access.js index 13dde11d0..f3d162ac5 100644 --- a/js/id/ui/preset/access.js +++ b/js/id/ui/preset/access.js @@ -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); }); }); }; diff --git a/test/spec/ui/preset/access.js b/test/spec/ui/preset/access.js index 3533ce017..34a2fb737 100644 --- a/test/spec/ui/preset/access.js +++ b/test/spec/ui/preset/access.js @@ -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'); }); });