Merge pull request #5582 from quincylvania/more-fields

Define additional preset-specific fields for the "Add field" dropdown
openstreetmap · Dec 9, 2018 · f9552e6 · f9552e6
2 parents cbcafae + 4285f2f
commit f9552e6
Show file tree

Hide file tree

Showing 19 changed files with 185 additions and 121 deletions.
diff --git a/build_data.js b/build_data.js
@@ -2,6 +2,7 @@
 const requireESM = require('esm')(module);
 const _cloneDeep = requireESM('lodash-es/cloneDeep').default;
 const _forEach = requireESM('lodash-es/forEach').default;
+const _intersection = requireESM('lodash-es/intersection').default;
 const _isEmpty = requireESM('lodash-es/isEmpty').default;
 const _merge = requireESM('lodash-es/merge').default;
 const _toPairs = requireESM('lodash-es/toPairs').default;
@@ -214,6 +215,7 @@ function suggestionsToPresets(presets) {
             name: name,
             icon: preset.icon,
             fields: preset.fields,
+            moreFields: preset.moreFields,
             geometry: preset.geometry,
             tags: _merge({}, preset.tags, wikidataTag),
             addTags: suggestion.tags,
@@ -461,11 +463,24 @@ function validatePresetFields(presets, fields) {
         if (preset.fields) {
             preset.fields.forEach(function(field) {
                 if (fields[field] === undefined) {
-                    console.error('Unknown preset field: ' + field + ' in preset ' + preset.name);
+                    console.error('Unknown preset field "' + field + '" in "fields" array of preset ' + preset.name);
                     process.exit(1);
                 }
             });
         }
+        if (preset.moreFields) {
+            preset.moreFields.forEach(function(field) {
+                if (fields[field] === undefined) {
+                    console.error('Unknown preset field "' + field + '" in "moreFields" array of preset ' + preset.name);
+                    process.exit(1);
+                }
+            });
+        }
+        var fieldsIntersection = _intersection(preset.fields, preset.moreFields);
+        if (fieldsIntersection.length > 0) {
+            console.error('Preset field "' + fieldsIntersection[0] + '" in both "fields" and "moreFields" arrays of preset ' + preset.name);
+            process.exit(1);
+        }
     });
 }
 

diff --git a/data/presets/README.md b/data/presets/README.md
@@ -17,10 +17,17 @@ A basic preset is of the form:
 {
     // The icon in iD which represents this feature.
     "icon": "maki-park",
-    // An array of field names. See the fields documentation for details of what's valid here.
+    // The names of fields that will appear by default in the editor sidebar.
+    // See the fields documentation for details of what's valid here.
     "fields": [
         "address"
     ],
+    // The names of fields that the user can add manually. These will also
+    // appear if the corresponding tags are present.
+    "moreFields": [
+        "phone",
+        "website"
+    ],
     // The geometry types for which this preset is valid.
     // options are point, area, line, and vertex.
     // vertexes are points that are parts of lines, like the nodes in a road

diff --git a/data/presets/presets.json b/data/presets/presets.json
diff --git a/data/presets/presets/amenity/cafe.json b/data/presets/presets/amenity/cafe.json
@@ -8,11 +8,13 @@
         "opening_hours",
         "internet_access",
         "internet_access/fee",
-        "internet_access/ssid",
         "smoking",
         "outdoor_seating",
         "takeaway"
     ],
+    "moreFields" : [
+        "internet_access/ssid"
+    ],
     "geometry": [
         "point",
         "area"

diff --git a/data/presets/presets/amenity/library.json b/data/presets/presets/amenity/library.json
@@ -8,9 +8,11 @@
         "opening_hours",
         "internet_access",
         "internet_access/fee",
-        "internet_access/ssid",
         "ref/isil"
     ],
+    "moreFields" : [
+        "internet_access/ssid"
+    ],
     "geometry": [
         "point",
         "area"

diff --git a/data/presets/presets/amenity/love_hotel.json b/data/presets/presets/amenity/love_hotel.json
@@ -8,7 +8,9 @@
         "smoking",
         "rooms",
         "internet_access",
-        "internet_access/fee",
+        "internet_access/fee"
+    ],
+    "moreFields" : [
         "internet_access/ssid"
     ],
     "geometry": [

diff --git a/data/presets/presets/leisure/marina.json b/data/presets/presets/leisure/marina.json
@@ -9,7 +9,9 @@
         "sanitary_dump_station",
         "power_supply",
         "internet_access",
-        "internet_access/fee",
+        "internet_access/fee"
+    ],
+    "moreFields" : [
         "internet_access/ssid"
     ],
     "geometry": [

diff --git a/data/presets/presets/tourism/alpine_hut.json b/data/presets/presets/tourism/alpine_hut.json
@@ -6,7 +6,9 @@
         "address",
         "building_area",
         "internet_access",
-        "internet_access/fee",
+        "internet_access/fee"
+    ],
+    "moreFields" : [
         "internet_access/ssid"
     ],
     "geometry": [

diff --git a/data/presets/presets/tourism/apartment.json b/data/presets/presets/tourism/apartment.json
@@ -8,7 +8,9 @@
         "smoking",
         "rooms",
         "internet_access",
-        "internet_access/fee",
+        "internet_access/fee"
+    ],
+    "moreFields" : [
         "internet_access/ssid"
     ],
     "geometry": [

diff --git a/data/presets/presets/tourism/camp_site.json b/data/presets/presets/tourism/camp_site.json
@@ -8,7 +8,9 @@
         "capacity",
         "fee",
         "internet_access",
-        "internet_access/fee",
+        "internet_access/fee"
+    ],
+    "moreFields" : [
         "internet_access/ssid"
     ],
     "geometry": [

diff --git a/data/presets/presets/tourism/caravan_site.json b/data/presets/presets/tourism/caravan_site.json
@@ -9,7 +9,9 @@
         "sanitary_dump_station",
         "power_supply",
         "internet_access",
-        "internet_access/fee",
+        "internet_access/fee"
+    ],
+    "moreFields" : [
         "internet_access/ssid"
     ],
     "geometry": [

diff --git a/data/presets/presets/tourism/chalet.json b/data/presets/presets/tourism/chalet.json
@@ -7,7 +7,9 @@
         "building_area",
         "smoking",
         "internet_access",
-        "internet_access/fee",
+        "internet_access/fee"
+    ],
+    "moreFields" : [
         "internet_access/ssid"
     ],
     "geometry": [

diff --git a/data/presets/presets/tourism/guest_house.json b/data/presets/presets/tourism/guest_house.json
@@ -8,7 +8,9 @@
         "smoking",
         "rooms",
         "internet_access",
-        "internet_access/fee",
+        "internet_access/fee"
+    ],
+    "moreFields" : [
         "internet_access/ssid"
     ],
     "geometry": [

diff --git a/data/presets/presets/tourism/hostel.json b/data/presets/presets/tourism/hostel.json
@@ -8,7 +8,9 @@
         "smoking",
         "rooms",
         "internet_access",
-        "internet_access/fee",
+        "internet_access/fee"
+    ],
+    "moreFields" : [
         "internet_access/ssid"
     ],
     "geometry": [

diff --git a/data/presets/presets/tourism/hotel.json b/data/presets/presets/tourism/hotel.json
@@ -7,10 +7,12 @@
         "address",
         "building_area",
         "smoking",
-        "stars",
         "rooms",
         "internet_access",
-        "internet_access/fee",
+        "internet_access/fee"
+    ],
+    "moreFields": [
+        "stars",
         "internet_access/ssid"
     ],
     "geometry": [

diff --git a/data/presets/presets/tourism/motel.json b/data/presets/presets/tourism/motel.json
@@ -9,7 +9,9 @@
         "smoking",
         "rooms",
         "internet_access",
-        "internet_access/fee",
+        "internet_access/fee"
+    ],
+    "moreFields" : [
         "internet_access/ssid"
     ],
     "geometry": [

diff --git a/data/presets/schema/preset.json b/data/presets/schema/preset.json
@@ -42,7 +42,14 @@
             }
         },
         "fields": {
-            "description": "Form fields that are displayed for the preset",
+            "description": "Default form fields that are displayed for the preset",
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "moreFields": {
+            "description": "Additional form fields that can be attached with the 'Add field' dropdown",
             "type": "array",
             "items": {
                 "type": "string"

diff --git a/modules/presets/preset.js b/modules/presets/preset.js
@@ -10,6 +10,7 @@ export function presetPreset(id, preset, fields) {
 
     preset.id = id;
     preset.fields = (preset.fields || []).map(getFields);
+    preset.moreFields = (preset.moreFields || []).map(getFields);
     preset.geometry = (preset.geometry || []);
 
 

diff --git a/modules/ui/preset_editor.js b/modules/ui/preset_editor.js
@@ -53,14 +53,22 @@ export function uiPresetEditor(context) {
                 );
             }
 
-            presets.universal().forEach(function(field) {
+            _preset.moreFields.forEach(function(field) {
                 if (_preset.fields.indexOf(field) === -1) {
                     _fieldsArr.push(
                         uiField(context, field, entity, { show: false })
                     );
                 }
             });
 
+            presets.universal().forEach(function(field) {
+                if (_preset.fields.indexOf(field) === -1 && _preset.moreFields.indexOf(field) === -1) {
+                    _fieldsArr.push(
+                        uiField(context, field, entity, { show: false })
+                    );
+                }
+            });
+
             _fieldsArr.forEach(function(field) {
                 field
                     .on('change', function(t, onInput) {