Make the waterway destination field separate from the road sign destination field (re: 7c5ec9be70)

Make the destination field for the destination_sign preset a semiCombo (re: #6970)

data/presets.yaml

@@ -666,7 +666,7 @@ en:
         label: Design
       destination:
         # destination=*
-        label: Destination
+        label: Destinations
       destination/ref:
         # 'destination:ref=*'
         label: Destination Road Numbers
@@ -683,6 +683,9 @@ en:
       destination_oneway:
         # destination=*
         label: Destinations
+      destination_waterway:
+        # destination=*
+        label: Destination
       devices:
         # devices=*
         label: Devices

data/presets/fields.json

@@ -116,7 +116,8 @@
   "description": {"key": "description", "type": "textarea", "label": "Description", "universal": true, "terms": ["summary"]},
   "design": {"key": "design", "type": "combo", "label": "Design"},
   "destination_oneway": {"key": "destination", "type": "semiCombo", "label": "Destinations", "prerequisiteTag": {"key": "oneway", "value": "yes"}, "snake_case": false},
-  "destination": {"key": "destination", "type": "text", "label": "Destination"},
+  "destination_waterway": {"key": "destination", "type": "text", "label": "Destination"},
+  "destination": {"key": "destination", "type": "semiCombo", "label": "Destinations"},
   "destination/ref_oneway": {"key": "destination:ref", "type": "semiCombo", "label": "Destination Road Numbers", "prerequisiteTag": {"key": "oneway", "value": "yes"}, "snake_case": false},
   "destination/ref": {"key": "destination:ref", "type": "semiCombo", "label": "Destination Road Numbers", "snake_case": false},
   "destination/symbol_oneway": {"key": "destination:symbol", "type": "semiCombo", "label": "Destination Symbols", "prerequisiteTag": {"key": "oneway", "value": "yes"}},

data/presets/fields/destination.json

@@ -1,5 +1,5 @@
 {
     "key": "destination",
-    "type": "text",
-    "label": "Destination"
+    "type": "semiCombo",
+    "label": "Destinations"
 }

data/presets/fields/destination_waterway.json

@@ -0,0 +1,5 @@
+{
+    "key": "destination",
+    "type": "text",
+    "label": "Destination"
+}

data/presets/presets.json

@@ -1312,7 +1312,7 @@
   "type/route/tram": {"icon": "temaki-tram", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "tram"}, "name": "Tram Route"},
   "type/route/trolleybus": {"icon": "temaki-trolleybus", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "trolleybus"}, "name": "Trolleybus Route"},
   "type/site": {"icon": "iD-relation", "fields": ["name", "site"], "geometry": ["relation"], "tags": {"type": "site"}, "name": "Site"},
-  "type/waterway": {"icon": "iD-waterway-stream", "fields": ["name", "waterway", "destination", "ref"], "geometry": ["relation"], "tags": {"type": "waterway"}, "name": "Waterway"},
+  "type/waterway": {"icon": "iD-waterway-stream", "fields": ["name", "waterway", "destination_waterway", "ref"], "geometry": ["relation"], "tags": {"type": "waterway"}, "name": "Waterway"},
   "waterway/riverbank": {"icon": "maki-water", "geometry": ["area"], "tags": {"waterway": "riverbank"}, "name": "Riverbank", "searchable": false},
   "waterway/boatyard": {"icon": "temaki-boat", "fields": ["name", "operator"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "boatyard"}, "name": "Boatyard"},
   "waterway/canal": {"icon": "iD-waterway-canal", "fields": ["name", "structure_waterway", "width", "intermittent", "lock"], "moreFields": ["fishing", "gnis/feature_id", "salt", "tidal"], "geometry": ["line"], "tags": {"waterway": "canal"}, "name": "Canal"},

data/presets/presets/type/waterway.json

@@ -3,7 +3,7 @@
     "fields": [
         "name",
         "waterway",
-        "destination",
+        "destination_waterway",
         "ref"
     ],
     "geometry": [

dist/locales/en.json

@@ -3290,9 +3290,12 @@
                 "destination_oneway": {
                     "label": "Destinations"
                 },
-                "destination": {
+                "destination_waterway": {
                     "label": "Destination"
                 },
+                "destination": {
+                    "label": "Destinations"
+                },
                 "destination/ref_oneway": {
                     "label": "Destination Road Numbers"
                 },

modules/ui/fields/combo.js

@@ -351,7 +351,7 @@ export function uiFieldCombo(field, context) {
 
             // Use a separate line for each value in the Destinations field
             // to mimic highway exit signs
-            if (field.id === 'destination_oneway') {
+            if (field.key === 'destination') {
                 listClass += ' full-line-chips';
             }
 
@@ -584,7 +584,7 @@ export function uiFieldCombo(field, context) {
                 var targetIndexOffsetTop = null;
                 var draggedTagWidth = d3_select(this).node().offsetWidth;
 
-                if (field.id === 'destination_oneway') { // meaning tags are full width
+                if (field.key === 'destination') { // meaning tags are full width
                     container.selectAll('.chip')
                         .style('transform', function(d2, index2) {
                             var node = d3_select(this).node();