Add expected_rcn_route_relations and expected_rwn_route_relations fields (close #7176)

data/deprecated.json

@@ -940,6 +940,10 @@
       "old": {"route": "ncn"},
       "replace": {"route": "bicycle", "network": "ncn"}
     },
+    {
+      "old": {"rwn_expected_route_relations": "*"},
+      "replace": {"expected_rwn_route_relations": "$1"}
+    },
     {
       "old": {"shop": "adult"},
       "replace": {"shop": "erotic"}

data/presets.yaml

@@ -820,6 +820,12 @@ en:
       except:
         # except=*
         label: Exceptions
+      expected_rcn_route_relations:
+        # expected_rcn_route_relations=*
+        label: Adjacent Cycling Nodes
+      expected_rwn_route_relations:
+        # expected_rwn_route_relations=*
+        label: Adjacent Walking Nodes
       faces:
         # faces=*
         label: Faces

data/presets/fields.json

@@ -141,6 +141,8 @@
     "enforcement": {"key": "enforcement", "type": "combo", "label": "Type"},
     "entrance": {"key": "entrance", "type": "typeCombo", "label": "Type"},
     "except": {"key": "except", "type": "combo", "label": "Exceptions"},
+    "expected_rcn_route_relations": {"key": "expected_rcn_route_relations", "type": "number", "label": "Adjacent Cycling Nodes"},
+    "expected_rwn_route_relations": {"key": "expected_rwn_route_relations", "type": "number", "label": "Adjacent Walking Nodes"},
     "faces": {"key": "faces", "type": "number", "minValue": 0, "label": "Faces"},
     "fax": {"key": "fax", "type": "tel", "label": "Fax", "placeholder": "+31 42 123 4567"},
     "fee": {"key": "fee", "type": "check", "label": "Fee"},

data/presets/fields/expected_rcn_route_relations.json

@@ -0,0 +1,5 @@
+{
+    "key": "expected_rcn_route_relations",
+    "type": "number",
+    "label": "Adjacent Cycling Nodes"
+}

data/presets/fields/expected_rwn_route_relations.json

@@ -0,0 +1,5 @@
+{
+    "key": "expected_rwn_route_relations",
+    "type": "number",
+    "label": "Adjacent Walking Nodes"
+}

data/presets/presets.json

@@ -834,7 +834,7 @@
     "natural/water/wastewater": {"icon": "temaki-waste", "geometry": ["area"], "tags": {"natural": "water", "water": "wastewater"}, "reference": {"key": "water", "value": "wastewater"}, "terms": ["excrement", "shit", "sewage", "wastewater", "Settling Basin", "Clarifier Basin"], "name": "Wastewater Basin"},
     "natural/wetland": {"icon": "maki-wetland", "fields": ["wetland", "salt", "tidal"], "geometry": ["point", "area"], "tags": {"natural": "wetland"}, "terms": ["bog", "fen", "marsh", "mire", "moor", "muskeg", "peatland", "quagmire", "reedbed", "saltmarsh", "swamp", "tidalflat", "wet meadow"], "name": "Wetland"},
     "natural/wood": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle"], "geometry": ["area", "point"], "tags": {"natural": "wood"}, "terms": ["boreal", "forest", "forrest", "taiga", "tree", "trees", "woodlands", "woods"], "name": "Natural Wood"},
-    "network/type/node_network": {"fields": ["name", "rwn_ref", "rcn_ref"], "geometry": ["vertex"], "tags": {"network:type": "node_network"}, "terms": ["node network", "rcn", "rwn"], "countryCodes": ["be", "de", "lu", "nl"], "matchScore": 0.2, "name": "Recreational Network Node"},
+    "network/type/node_network": {"fields": ["name", "rwn_ref", "expected_rwn_route_relations", "rcn_ref", "expected_rcn_route_relations"], "geometry": ["vertex"], "tags": {"network:type": "node_network"}, "terms": ["node network", "rcn", "rwn"], "countryCodes": ["be", "de", "lu", "nl"], "matchScore": 0.2, "name": "Recreational Network Node"},
     "noexit/yes": {"icon": "maki-barrier", "geometry": ["vertex"], "terms": ["no exit", "road end", "dead end"], "tags": {"noexit": "yes"}, "reference": {"key": "noexit", "value": "*"}, "name": "No Exit"},
     "office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "baby_feeding", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "operator", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"},
     "office/administrative": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "administrative"}, "searchable": false, "name": "Administrative Office"},

data/presets/presets/network/type/node_network.json

@@ -2,7 +2,9 @@
     "fields": [
         "name",
         "rwn_ref",
-        "rcn_ref"
+        "expected_rwn_route_relations",
+        "rcn_ref",
+        "expected_rcn_route_relations"
     ],
     "geometry": [
         "vertex"

data/taginfo.json

@@ -1472,6 +1472,8 @@
     {"key": "embassy", "description": "🄵 Type"},
     {"key": "enforcement", "description": "🄵 Type"},
     {"key": "except", "description": "🄵 Exceptions"},
+    {"key": "expected_rcn_route_relations", "description": "🄵 Adjacent Cycling Nodes"},
+    {"key": "expected_rwn_route_relations", "description": "🄵 Adjacent Walking Nodes"},
     {"key": "faces", "description": "🄵 Faces"},
     {"key": "fax", "description": "🄵 Fax"},
     {"key": "fee", "description": "🄵 Fee"},
@@ -2132,6 +2134,7 @@
     {"key": "roof:color", "description": "🄳 ➜ roof:colour=*"},
     {"key": "roof:shape", "value": "half_hipped", "description": "🄳 ➜ roof:shape=half-hipped"},
     {"key": "route", "value": "ncn", "description": "🄳 ➜ route=bicycle + network=ncn"},
+    {"key": "rwn_expected_route_relations", "description": "🄳 ➜ expected_rwn_route_relations=*"},
     {"key": "shop", "value": "adult", "description": "🄳 ➜ shop=erotic"},
     {"key": "shop", "value": "antique", "description": "🄳 ➜ shop=antiques"},
     {"key": "shop", "value": "army_surplus", "description": "🄳 ➜ shop=military_surplus"},

dist/locales/en.json

@@ -3270,6 +3270,12 @@
                 "except": {
                     "label": "Exceptions"
                 },
+                "expected_rcn_route_relations": {
+                    "label": "Adjacent Cycling Nodes"
+                },
+                "expected_rwn_route_relations": {
+                    "label": "Adjacent Walking Nodes"
+                },
                 "faces": {
                     "label": "Faces"
                 },