From 7847d54295770e4d83c846de2eace8909472e1ac Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Mon, 6 Jan 2020 16:14:15 -0500 Subject: [PATCH] Add `expected_rcn_route_relations` and `expected_rwn_route_relations` fields (close #7176) --- data/deprecated.json | 4 ++++ data/presets.yaml | 6 ++++++ data/presets/fields.json | 2 ++ data/presets/fields/expected_rcn_route_relations.json | 5 +++++ data/presets/fields/expected_rwn_route_relations.json | 5 +++++ data/presets/presets.json | 2 +- data/presets/presets/network/type/node_network.json | 4 +++- data/taginfo.json | 3 +++ dist/locales/en.json | 6 ++++++ 9 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 data/presets/fields/expected_rcn_route_relations.json create mode 100644 data/presets/fields/expected_rwn_route_relations.json diff --git a/data/deprecated.json b/data/deprecated.json index 6b81d5ae8..878a708de 100644 --- a/data/deprecated.json +++ b/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"} diff --git a/data/presets.yaml b/data/presets.yaml index 52d1a2ac6..d57b9edd6 100644 --- a/data/presets.yaml +++ b/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 diff --git a/data/presets/fields.json b/data/presets/fields.json index 39aa3a09b..d06133565 100644 --- a/data/presets/fields.json +++ b/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"}, diff --git a/data/presets/fields/expected_rcn_route_relations.json b/data/presets/fields/expected_rcn_route_relations.json new file mode 100644 index 000000000..50d825902 --- /dev/null +++ b/data/presets/fields/expected_rcn_route_relations.json @@ -0,0 +1,5 @@ +{ + "key": "expected_rcn_route_relations", + "type": "number", + "label": "Adjacent Cycling Nodes" +} diff --git a/data/presets/fields/expected_rwn_route_relations.json b/data/presets/fields/expected_rwn_route_relations.json new file mode 100644 index 000000000..f0247fb4f --- /dev/null +++ b/data/presets/fields/expected_rwn_route_relations.json @@ -0,0 +1,5 @@ +{ + "key": "expected_rwn_route_relations", + "type": "number", + "label": "Adjacent Walking Nodes" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index d600c36bc..2c2cd4f38 100644 --- a/data/presets/presets.json +++ b/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"}, diff --git a/data/presets/presets/network/type/node_network.json b/data/presets/presets/network/type/node_network.json index 0eb974bc4..5006d063e 100644 --- a/data/presets/presets/network/type/node_network.json +++ b/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" diff --git a/data/taginfo.json b/data/taginfo.json index 260d08888..6846a5a66 100644 --- a/data/taginfo.json +++ b/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"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 270eccc5f..638f5ada6 100644 --- a/dist/locales/en.json +++ b/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" },