allow individual preset field options to reference other translations

modules/presets/field.js

@@ -1,13 +1,17 @@
 import { localizer, t } from '../core/localizer';
-import { utilSafeClassName } from '../util/util';
+import { utilResolveReference, utilSafeClassName } from '../util/util';
 
 
 //
 // `presetField` decorates a given `field` Object
 // with some extra methods for searching and matching geometry
 //
-export function presetField(fieldID, field, allFields) {
+export function presetField(fieldID, field, allFields, allPresets) {
   allFields = allFields || {};
+  allPresets = allPresets || {};
+
+  const references = { fields: allFields, presets: allPresets };
+
   let _this = Object.assign({}, field);   // shallow copy
 
   _this.id = fieldID;
@@ -53,5 +57,24 @@ export function presetField(fieldID, field, allFields) {
 
   _this.increment = _this.type === 'number' ? (_this.increment || 1) : undefined;
 
+  /** @param {boolean} [allOptions] - see https://github.com/openstreetmap/id/commit/a35653 */
+  _this.options = (allOptions) => {
+    const referencedField = _this.resolveReference('stringsCrossReference');
+    let options = field.options || [];
+    if (referencedField !== _this) {
+      if (allOptions) {
+        options.push(...referencedField.options());
+      } else {
+        options = referencedField.options();
+      }
+    }
+
+    return options.map(option => {
+      const reference = utilResolveReference(option, references);
+      if (reference) return reference.label;
+      return option;
+    });
+  };
+
   return _this;
 }

modules/presets/index.js

@@ -98,7 +98,7 @@ export function presetIndex() {
         let f = d.fields[fieldID];
 
         if (f) {   // add or replace
-          f = presetField(fieldID, f, _fields);
+          f = presetField(fieldID, f, _fields, _presets);
           if (f.locationSet) newLocationSets.push(f);
           _fields[fieldID] = f;
 

modules/ui/fields/check.js

@@ -17,7 +17,7 @@ export { uiFieldCheck as uiFieldOnewayCheck };
 
 export function uiFieldCheck(field, context) {
     var dispatch = d3_dispatch('change');
-    var options = field.options;
+    var options = field.options();
     var values = [];
     var texts = [];
 
@@ -34,9 +34,6 @@ export function uiFieldCheck(field, context) {
 
 
     var stringsField = field.resolveReference('stringsCrossReference');
-    if (!options && stringsField.options) {
-        options = stringsField.options;
-    }
 
     if (options) {
         for (var i in options) {

modules/ui/fields/combo.js

@@ -174,14 +174,8 @@ export function uiFieldCombo(field, context) {
 
     function getOptions(allOptions) {
         var stringsField = field.resolveReference('stringsCrossReference');
-        if (!(field.options || stringsField.options)) return [];
+        const options = field.options(allOptions);
 
-        let options;
-        if (allOptions !== true) {
-            options = field.options || stringsField.options;
-        } else {
-            options = [].concat(field.options, stringsField.options).filter(Boolean);
-        }
         const result = options.map(function(v) {
             const labelId = getLabelId(stringsField, v);
             return {
@@ -272,7 +266,7 @@ export function uiFieldCombo(field, context) {
                     d.value.toLowerCase().indexOf(_countryCode + ':') === 0);
             }
 
-            const additionalOptions = (field.options || stringsField.options || [])
+            const additionalOptions = (field.options() || stringsField.options() || [])
                 .filter(v => !data.some(dv => dv.value === (_isMulti ? field.key + v : v)))
                 .map(v => ({ value: v }));
 

modules/ui/fields/radio.js

@@ -17,7 +17,7 @@ export function uiFieldRadio(field, context) {
     var labels = d3_select(null);
     var radios = d3_select(null);
     var strings = field.resolveReference('stringsCrossReference');
-    var radioData = (field.options || strings.options || field.keys).slice();  // shallow copy
+    var radioData = (field.options() || strings.options() || field.keys).slice();  // shallow copy
     var typeField;
     var layerField;
     var _oldType = {};
@@ -279,7 +279,7 @@ export function uiFieldRadio(field, context) {
 
         radios.property('checked', function(d) {
             return isOptionChecked(d) &&
-                (field.key || field.options.filter(isOptionChecked).length === 1);
+                (field.key || field.options().filter(isOptionChecked).length === 1);
         });
 
         labels

modules/util/index.js

@@ -40,6 +40,7 @@ export { utilPrefixCSSProperty } from './util';
 export { utilPrefixDOMProperty } from './util';
 export { utilQsString } from './util';
 export { utilRebind } from './rebind';
+export { utilResolveReference } from './util';
 export { utilSafeClassName } from './util';
 export { utilSetTransform } from './util';
 export { utilSessionMutex } from './session_mutex';

modules/util/util.js

@@ -692,3 +692,26 @@ export function utilCleanOsmString(val, maxChars) {
     // trim to the number of allowed characters
     return utilUnicodeCharsTruncated(val, maxChars);
   }
+
+/**
+ * For cross-referenced strings from id-tagging-schema:
+ * If the `string` contains an expression like `{group/x/y/z}`, it will
+ * return `allItems['group']['x/y/z']`
+ * @template T
+ * @param {string} path
+ * @param {{ [group: string]: { [key: string]: T } } | undefined} allItems
+ * @returns {T | undefined}
+ */
+export function utilResolveReference(path, allItems) {
+    const match = path.match(/^\{(.*)\}$/);
+    if (match) {
+        const [group, ...remainder] = match[1].split('/');
+        const value = allItems?.[group]?.[remainder.join('/')];
+
+        if (value) {
+            return value;
+        }
+        console.error(`Unable to resolve referenced field: ${match[1]}`);  // eslint-disable-line no-console
+    }
+    return undefined;
+}

test/spec/util/util.js

@@ -374,4 +374,22 @@ describe('iD.util', function() {
             expect(iD.utilOldestID(['z', 'a', 'A', 'Z'])).to.eql('z');
         });
     });
+
+    describe('utilResolveReference', () => {
+        const allItems = {
+            group1: { 'a/b': 1 },
+            group2: { 'x': 2 },
+        };
+        it.each`
+            path                   | result
+            ${'{group1/a/b}'}      | ${1}
+            ${'{group2/x}'}        | ${2}
+            ${'{group2/invalid}'}  | ${undefined}
+            ${'{invalid/invalid}'} | ${undefined}
+            ${'{}'}                | ${undefined}
+            ${''}                  | ${undefined}
+        `('resolves $path to $result', ({ path, result }) => {
+            expect(iD.utilResolveReference(path, allItems)).toBe(result);
+        });
+    });
 });