Allow checkbox fields to support custom strings

.gitignore

@@ -1,3 +1,5 @@
+.DS_Store
+node_modules
 dist/iD.js
 dist/iD.min.js
 dist/iD.css

data/presets.yaml

@@ -240,8 +240,16 @@ en:
         label: Type
       oneway: 
         label: One Way
+        options: 
+          undefined: Assumed to be No
+          yes: Yes
+          no: No
       oneway_yes: 
         label: One Way
+        options: 
+          undefined: Assumed to be Yes
+          yes: Yes
+          no: No
       opening_hours: 
         label: Hours
       operator: 

data/presets/fields.json

@@ -570,13 +570,27 @@
     "oneway": {
         "key": "oneway",
         "type": "check",
-        "label": "One Way"
+        "label": "One Way",
+        "strings": {
+            "options": {
+                "undefined": "Assumed to be No",
+                "yes": "Yes",
+                "no": "No"
+            }
+        }
     },
     "oneway_yes": {
         "key": "oneway",
         "type": "check",
         "default": "yes",
-        "label": "One Way"
+        "label": "One Way",
+        "strings": {
+            "options": {
+                "undefined": "Assumed to be Yes",
+                "yes": "Yes",
+                "no": "No"
+            }
+        }
     },
     "opening_hours": {
         "key": "opening_hours",

data/presets/fields/oneway.json

@@ -1,5 +1,12 @@
 {
     "key": "oneway",
     "type": "check",
-    "label": "One Way"
+    "label": "One Way",
+    "strings": {
+        "options": {
+            "undefined": "Assumed to be No",
+            "yes": "Yes",
+            "no": "No"
+        }
+    }
 }

data/presets/fields/oneway_yes.json

@@ -2,5 +2,12 @@
     "key": "oneway",
     "type": "check",
     "default": "yes",
-    "label": "One Way"
+    "label": "One Way",
+    "strings": {
+        "options": {
+            "undefined": "Assumed to be Yes",
+            "yes": "Yes",
+            "no": "No"
+        }
+    }
 }

data/presets/presets.json

@@ -3822,7 +3822,7 @@
     "highway/motorway": {
         "icon": "highway-motorway",
         "fields": [
-            "oneway",
+            "oneway_yes",
             "maxspeed",
             "structure",
             "access",

data/presets/presets/highway/motorway.json

@@ -1,7 +1,7 @@
 {
     "icon": "highway-motorway",
     "fields": [
-        "oneway",
+        "oneway_yes",
         "maxspeed",
         "structure",
         "access",
@@ -17,4 +17,4 @@
     },
     "terms": [],
     "name": "Motorway"
-}
+}

dist/locales/en.json

@@ -743,10 +743,20 @@
                 "label": "Type"
             },
             "oneway": {
-                "label": "One Way"
+                "label": "One Way",
+                "options": {
+                    "undefined": "Assumed to be No",
+                    "yes": "Yes",
+                    "no": "No"
+                }
             },
             "oneway_yes": {
-                "label": "One Way"
+                "label": "One Way",
+                "options": {
+                    "undefined": "Assumed to be Yes",
+                    "yes": "Yes",
+                    "no": "No"
+                }
             },
             "opening_hours": {
                 "label": "Hours"

js/id/ui/preset/check.js

@@ -1,13 +1,34 @@
 iD.ui.preset.check =
-iD.ui.preset.defaultcheck = function(field) {
+iD.ui.preset.defaultcheck = function(field, context) {
     var event = d3.dispatch('change'),
-        values = field.type === 'check' ?
-            [undefined, 'yes', 'no'] :
-            [undefined, 'yes'],
-        value,
-        box,
-        text,
-        label;
+        options = field.strings && field.strings.options,
+        values = [],
+        texts = [],
+        value, box, text, label;
+
+    if (options) {
+        for (var k in options) {
+            values.push(k === 'undefined' ? undefined : k);
+            texts.push(field.t('check.' + k, { 'default': options[k] }));
+        }
+    } else {
+        values = [undefined, 'yes'];
+        texts = [t('inspector.unknown'), t('inspector.check.yes')];
+        if (field.type === 'check') {
+            values.push('no');
+            texts.push(t('inspector.check.no'));
+        }
+    }
+
+    // hack: pretend oneway field is a oneway_yes field if `junction=roundabout` is set.
+    if (field.id === 'oneway') {
+        var ids = context.selectedIDs(),
+            way = ids.length && context.entity(ids[0]);
+        if (way && way.tags.junction === 'roundabout') {
+            texts.shift();
+            texts.unshift(t('presets.fields.oneway_yes.check.undefined', { 'default': 'Assumed to be Yes' }));
+        }
+    }
 
     var check = function(selection) {
         selection.classed('checkselect', 'true');
@@ -24,7 +45,7 @@ iD.ui.preset.defaultcheck = function(field) {
             .attr('id', 'preset-input-' + field.id);
 
         enter.append('span')
-            .text(t('inspector.unknown'))
+            .text(texts[0])
             .attr('class', 'value');
 
         box = label.select('input')
@@ -42,8 +63,7 @@ iD.ui.preset.defaultcheck = function(field) {
         value = tags[field.key];
         box.property('indeterminate', field.type === 'check' && !value);
         box.property('checked', value === 'yes');
-        text.text(value ? t('inspector.check.' + value, {default: value}) :
-            field.type === 'check' ? t('inspector.unknown') : t('inspector.check.no'));
+        text.text(texts[values.indexOf(value)]);
         label.classed('set', !!value);
     };