From 4b84ce231afcbc3cb27f22c3cf0753b795fb06ef Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 12 Nov 2019 12:12:55 +0100 Subject: [PATCH] Add preset and fields for recreational network nodes (close #6992) --- data/presets.yaml | 11 ++++++++++ data/presets/fields.json | 2 ++ data/presets/fields/rcn_ref.json | 5 +++++ data/presets/fields/rwn_ref.json | 5 +++++ data/presets/presets.json | 1 + .../presets/network/type/node_network.json | 22 +++++++++++++++++++ data/taginfo.json | 3 +++ dist/locales/en.json | 10 +++++++++ 8 files changed, 59 insertions(+) create mode 100644 data/presets/fields/rcn_ref.json create mode 100644 data/presets/fields/rwn_ref.json create mode 100644 data/presets/presets/network/type/node_network.json diff --git a/data/presets.yaml b/data/presets.yaml index 3e2cadbbc..cc671ca13 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1739,6 +1739,9 @@ en: rating: # rating=* label: Power Rating + rcn_ref: + # rcn_ref=* + label: Cycling Code recycling_accepts: # 'recycling:=*' label: Accepts @@ -1847,6 +1850,9 @@ en: route_master: # route_master=* label: Type + rwn_ref: + # rwn_ref=* + label: Walking Code sac_scale: # sac_scale=* label: Hiking Difficulty @@ -6329,6 +6335,11 @@ en: name: Wood # 'terms: tree' terms: '' + network/type/node_network: + # 'network:type=node_network' + name: Recreational Network Node + # 'terms: node network,rcn,rwn' + terms: '' noexit/yes: # noexit=yes name: No Exit diff --git a/data/presets/fields.json b/data/presets/fields.json index 9614afe36..aec99e085 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -295,6 +295,7 @@ "railway/position": {"key": "railway:position", "type": "text", "placeholder": "Distance to one decimal (123.4)", "label": "Milestone Position"}, "railway/signal/direction": {"key": "railway:signal:direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}}, "rating": {"key": "rating", "type": "combo", "label": "Power Rating", "snake_case": false}, + "rcn_ref": {"key": "rcn_ref", "type": "text", "label": "Cycling Code"}, "recycling_accepts": {"key": "recycling:", "type": "multiCombo", "label": "Accepts"}, "recycling_type": {"key": "recycling_type", "type": "combo", "label": "Type", "placeholder": "Container, Center", "strings": {"options": {"container": "Container", "centre": "Center"}}}, "ref_aeroway_gate": {"key": "ref", "type": "text", "label": "Gate Number"}, @@ -322,6 +323,7 @@ "rooms": {"key": "rooms", "type": "number", "minValue": 0, "label": "Rooms"}, "route_master": {"key": "route_master", "type": "combo", "label": "Type"}, "route": {"key": "route", "type": "combo", "label": "Type"}, + "rwn_ref": {"key": "rwn_ref", "type": "text", "label": "Walking Code"}, "sac_scale": {"key": "sac_scale", "type": "combo", "label": "Hiking Difficulty", "placeholder": "Mountain Hiking, Alpine Hiking...", "strings": {"options": {"hiking": "T1: Hiking", "mountain_hiking": "T2: Mountain Hiking", "demanding_mountain_hiking": "T3: Demanding Mountain Hiking", "alpine_hiking": "T4: Alpine Hiking", "demanding_alpine_hiking": "T5: Demanding Alpine Hiking", "difficult_alpine_hiking": "T6: Difficult Alpine Hiking"}}}, "salt": {"key": "salt", "type": "check", "label": "Salt", "terms": ["saline", "salinated"]}, "sanitary_dump_station": {"key": "sanitary_dump_station", "type": "check", "label": "Toilet Disposal"}, diff --git a/data/presets/fields/rcn_ref.json b/data/presets/fields/rcn_ref.json new file mode 100644 index 000000000..d9beb46a7 --- /dev/null +++ b/data/presets/fields/rcn_ref.json @@ -0,0 +1,5 @@ +{ + "key": "rcn_ref", + "type": "text", + "label": "Cycling Code" +} diff --git a/data/presets/fields/rwn_ref.json b/data/presets/fields/rwn_ref.json new file mode 100644 index 000000000..3ffd9546c --- /dev/null +++ b/data/presets/fields/rwn_ref.json @@ -0,0 +1,5 @@ +{ + "key": "rwn_ref", + "type": "text", + "label": "Walking Code" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 914e28652..3e81fe6f6 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -820,6 +820,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": ["point", "area"], "tags": {"natural": "wood"}, "terms": ["tree"], "name": "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"], "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", "building/levels_building", "email", "fax", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "operator", "phone", "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 new file mode 100644 index 000000000..6b7ddc153 --- /dev/null +++ b/data/presets/presets/network/type/node_network.json @@ -0,0 +1,22 @@ +{ + "fields": [ + "name", + "rwn_ref", + "rcn_ref" + ], + "geometry": [ + "vertex" + ], + "tags": { + "network:type": "node_network" + }, + "terms": [ + "node network", + "rcn", + "rwn" + ], + "countryCodes": [ + "be", "de", "lu", "nl" + ], + "name": "Recreational Network Node" +} diff --git a/data/taginfo.json b/data/taginfo.json index 7ca3a6ebc..d6c846a09 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -796,6 +796,7 @@ {"key": "water", "value": "wastewater", "description": "🄿 Wastewater Basin", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/waste.svg"}, {"key": "natural", "value": "wetland", "description": "🄿 Wetland", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/wetland-15.svg"}, {"key": "natural", "value": "wood", "description": "🄿 Wood", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/park-alt1-15.svg"}, + {"key": "network:type", "value": "node_network", "description": "🄿 Recreational Network Node", "object_types": ["node"]}, {"key": "noexit", "value": "yes", "description": "🄿 No Exit", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/barrier-15.svg"}, {"key": "office", "description": "🄿 Office, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, {"key": "office", "value": "administrative", "description": "🄿 Administrative Office (unsearchable), 🄳 ➜ office=government", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"}, @@ -1653,6 +1654,7 @@ {"key": "railway:signal:direction", "value": "backward", "description": "🄵 Direction Affected"}, {"key": "railway:signal:direction", "value": "both", "description": "🄵 Direction Affected"}, {"key": "rating", "description": "🄵 Power Rating"}, + {"key": "rcn_ref", "description": "🄵 Cycling Code"}, {"key": "recycling:", "description": "🄵 Accepts"}, {"key": "ref", "description": "🄵 Gate Number, 🄵 Hole Number, 🄵 Junction Number, 🄵 Platform Number, 🄵 Road Number, 🄵 Room Number, 🄵 Route Number, 🄵 Runway Number, 🄵 Stop Number, 🄵 Taxiway Name, 🄵 Reference Code"}, {"key": "ref:isil", "description": "🄵 ISIL Code"}, @@ -1671,6 +1673,7 @@ {"key": "rooms", "description": "🄵 Rooms"}, {"key": "route_master", "description": "🄵 Type"}, {"key": "route", "description": "🄵 Type"}, + {"key": "rwn_ref", "description": "🄵 Walking Code"}, {"key": "sac_scale", "value": "hiking", "description": "🄵 Hiking Difficulty"}, {"key": "sac_scale", "value": "mountain_hiking", "description": "🄵 Hiking Difficulty"}, {"key": "sac_scale", "value": "demanding_mountain_hiking", "description": "🄵 Hiking Difficulty"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 438f96800..488587f75 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3935,6 +3935,9 @@ "rating": { "label": "Power Rating" }, + "rcn_ref": { + "label": "Cycling Code" + }, "recycling_accepts": { "label": "Accepts" }, @@ -4036,6 +4039,9 @@ "route": { "label": "Type" }, + "rwn_ref": { + "label": "Walking Code" + }, "sac_scale": { "label": "Hiking Difficulty", "terms": "", @@ -7880,6 +7886,10 @@ "name": "Wood", "terms": "tree" }, + "network/type/node_network": { + "name": "Recreational Network Node", + "terms": "node network,rcn,rwn" + }, "noexit/yes": { "name": "No Exit", "terms": "no exit,road end,dead end"