Add fields and terms to the ferry route line preset

Unify the fields for the two different ferry route presets

data/presets.yaml

@@ -6666,6 +6666,7 @@ en:
       route/ferry:
         # route=ferry
         name: Ferry Route
+        # 'terms: boat,merchant vessel,ship,water bus,water shuttle,water taxi'
         terms: '<translate with synonyms or related terms for ''Ferry Route'', separated by commas>'
       seamark:
         # 'seamark:type=*'

data/presets/presets.json

@@ -959,7 +959,7 @@
     "railway/train_wash": {"icon": "maki-rail", "geometry": ["point", "vertex", "area"], "fields": ["operator", "building_area"], "tags": {"railway": "wash"}, "terms": ["wash", "clean"], "name": "Train Wash"},
     "railway/tram": {"icon": "temaki-tram", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["light rail", "streetcar", "tram", "trolley"], "name": "Tram"},
     "relation": {"icon": "iD-relation", "fields": ["name", "relation"], "geometry": ["relation"], "tags": {}, "name": "Relation"},
-    "route/ferry": {"icon": "maki-ferry", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "to", "from"], "moreFields": ["maxheight", "maxweight", "opening_hours", "wheelchair"], "tags": {"route": "ferry"}, "name": "Ferry Route"},
+    "route/ferry": {"icon": "maki-ferry", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "toll", "to", "from"], "moreFields": ["dog", "interval", "maxheight", "maxweight", "network", "opening_hours", "ref_route", "wheelchair"], "tags": {"route": "ferry"}, "terms": ["boat", "merchant vessel", "ship", "water bus", "water shuttle", "water taxi"], "name": "Ferry Route"},
     "seamark/beacon_isolated_danger": {"fields": ["ref", "operator", "seamark/beacon_isolated_danger/shape", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["beacon isolated danger", "isolated danger beacon", "iala"], "tags": {"seamark:type": "beacon_isolated_danger"}, "name": "Danger Beacon"},
     "seamark/beacon_lateral": {"fields": ["ref", "operator", "seamark/beacon_lateral/colour", "seamark/beacon_lateral/category", "seamark/beacon_lateral/shape", "seamark/beacon_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral beacon", "beacon lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "beacon_lateral"}, "name": "Channel Beacon"},
     "seamark/buoy_lateral": {"fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral"}, "name": "Channel Buoy"},
@@ -1193,7 +1193,7 @@
     "type/route/bicycle": {"icon": "maki-bicycle", "fields": ["name", "ref_route", "network_bicycle", "cycle_network", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "bicycle"}, "name": "Cycle Route"},
     "type/route/bus": {"icon": "maki-bus", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "bus"}, "name": "Bus Route"},
     "type/route/detour": {"icon": "iD-route-detour", "fields": ["name", "ref_route", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "detour"}, "name": "Detour Route"},
-    "type/route/ferry": {"icon": "maki-ferry", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["interval", "maxheight", "maxweight", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "ferry"}, "name": "Ferry Route"},
+    "type/route/ferry": {"icon": "maki-ferry", "fields": ["{route/ferry}"], "moreFields": ["{route/ferry}"], "geometry": ["relation"], "tags": {"type": "route", "route": "ferry"}, "name": "Ferry Route"},
     "type/route/foot": {"icon": "temaki-pedestrian", "fields": ["name", "ref_route", "operator", "network_foot", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "foot"}, "name": "Foot Route"},
     "type/route/hiking": {"icon": "fas-hiking", "fields": ["name", "ref_route", "operator", "network_foot", "description", "distance", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "hiking"}, "name": "Hiking Route"},
     "type/route/horse": {"icon": "maki-horse-riding", "fields": ["name", "ref_route", "operator", "network_horse", "description", "distance", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "horse"}, "name": "Riding Route"},

data/presets/presets/route/ferry.json

@@ -8,17 +8,30 @@
         "operator",
         "duration",
         "access",
+        "toll",
         "to",
         "from"
     ],
     "moreFields": [
+        "dog",
+        "interval",
         "maxheight",
         "maxweight",
+        "network",
         "opening_hours",
+        "ref_route",
         "wheelchair"
     ],
     "tags": {
         "route": "ferry"
     },
+    "terms": [
+        "boat",
+        "merchant vessel",
+        "ship",
+        "water bus",
+        "water shuttle",
+        "water taxi"
+    ],
     "name": "Ferry Route"
 }

data/presets/presets/type/route/ferry.json

@@ -1,20 +1,10 @@
 {
     "icon": "maki-ferry",
     "fields": [
-        "name",
-        "ref_route",
-        "operator",
-        "network",
-        "to",
-        "from"
+        "{route/ferry}"
     ],
     "moreFields" : [
-        "interval",
-        "maxheight",
-        "maxweight",
-        "opening_hours",
-        "duration",
-        "wheelchair"
+        "{route/ferry}"
     ],
     "geometry": [
         "relation"

dist/locales/en.json

@@ -8197,7 +8197,7 @@
                 },
                 "route/ferry": {
                     "name": "Ferry Route",
-                    "terms": ""
+                    "terms": "boat,merchant vessel,ship,water bus,water shuttle,water taxi"
                 },
                 "seamark/beacon_isolated_danger": {
                     "name": "Danger Beacon",