From 93ff34dc398feaf0da29978cf6e2badb21751da9 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 17 Dec 2019 13:22:05 -0500 Subject: [PATCH] Add preset for waterway=fish_pass --- data/presets.yaml | 5 +++ data/presets/presets.json | 1 + data/presets/presets/waterway/fish_pass.json | 35 ++++++++++++++++++++ data/taginfo.json | 1 + dist/locales/en.json | 4 +++ modules/osm/tags.js | 3 +- 6 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 data/presets/presets/waterway/fish_pass.json diff --git a/data/presets.yaml b/data/presets.yaml index 1e9ddf9c3..62b4100cb 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -8450,6 +8450,11 @@ en: # waterway=drain name: Drain terms: '' + waterway/fish_pass: + # waterway=fish_pass + name: Fish Pass + # 'terms: eel ladder,eel pass,fish ladder,fish migration,fish passage,fish siphon,fish steps,fish way,fishladder,fishpass,fishsteps,fishway' + terms: '' waterway/fuel: # waterway=fuel name: Marine Fuel Station diff --git a/data/presets/presets.json b/data/presets/presets.json index fc4b3a5ce..6a9f9353a 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1267,6 +1267,7 @@ "waterway/ditch": {"icon": "iD-waterway-ditch", "fields": ["{waterway/drain}"], "moreFields": ["{waterway/drain}"], "geometry": ["line"], "tags": {"waterway": "ditch"}, "name": "Ditch"}, "waterway/dock": {"icon": "maki-harbor", "fields": ["name", "dock", "operator"], "geometry": ["area", "vertex", "point"], "terms": ["boat", "ship", "vessel", "marine"], "tags": {"waterway": "dock"}, "name": "Wet Dock / Dry Dock"}, "waterway/drain": {"icon": "iD-waterway-ditch", "fields": ["structure_waterway", "intermittent"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"waterway": "drain"}, "name": "Drain"}, + "waterway/fish_pass": {"icon": "temaki-fish_ladder", "fields": ["name", "structure_waterway", "width", "seasonal"], "moreFields": ["covered", "gnis/feature_id", "salt"], "geometry": ["line"], "terms": ["eel ladder", "eel pass", "fish ladder", "fish migration", "fish passage", "fish siphon", "fish steps", "fish way", "fishladder", "fishpass", "fishsteps", "fishway"], "tags": {"waterway": "fish_pass"}, "name": "Fish Pass"}, "waterway/fuel": {"icon": "maki-fuel", "fields": ["name", "operator", "address", "opening_hours", "fuel_multi"], "moreFields": ["brand", "building", "email", "fax", "payment_multi", "phone", "seamark/type", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["petrol", "gas", "diesel", "boat"], "tags": {"waterway": "fuel"}, "name": "Marine Fuel Station"}, "waterway/lock_gate": {"icon": "maki-dam", "geometry": ["vertex", "line"], "fields": ["name", "ref", "height", "material"], "tags": {"waterway": "lock_gate"}, "addTags": {"waterway": "lock_gate", "seamark:type": "gate"}, "terms": ["canal"], "name": "Lock Gate"}, "waterway/milestone": {"icon": "temaki-milestone", "fields": ["distance", "direction_vertex"], "moreFields": ["seamark/type"], "geometry": ["point", "vertex"], "tags": {"waterway": "milestone"}, "terms": ["milestone", "marker"], "name": "Waterway Milestone"}, diff --git a/data/presets/presets/waterway/fish_pass.json b/data/presets/presets/waterway/fish_pass.json new file mode 100644 index 000000000..c834c6ac1 --- /dev/null +++ b/data/presets/presets/waterway/fish_pass.json @@ -0,0 +1,35 @@ +{ + "icon": "temaki-fish_ladder", + "fields": [ + "name", + "structure_waterway", + "width", + "seasonal" + ], + "moreFields": [ + "covered", + "gnis/feature_id", + "salt" + ], + "geometry": [ + "line" + ], + "terms": [ + "eel ladder", + "eel pass", + "fish ladder", + "fish migration", + "fish passage", + "fish siphon", + "fish steps", + "fish way", + "fishladder", + "fishpass", + "fishsteps", + "fishway" + ], + "tags": { + "waterway": "fish_pass" + }, + "name": "Fish Pass" +} diff --git a/data/taginfo.json b/data/taginfo.json index db65123ce..e0e2fbc1b 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1204,6 +1204,7 @@ {"key": "waterway", "value": "ditch", "description": "🄿 Ditch", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-ditch.svg"}, {"key": "waterway", "value": "dock", "description": "🄿 Wet Dock / Dry Dock", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/harbor-15.svg"}, {"key": "waterway", "value": "drain", "description": "🄿 Drain", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-ditch.svg"}, + {"key": "waterway", "value": "fish_pass", "description": "🄿 Fish Pass", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/fish_ladder.svg"}, {"key": "waterway", "value": "fuel", "description": "🄿 Marine Fuel Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/fuel-15.svg"}, {"key": "waterway", "value": "lock_gate", "description": "🄿 Lock Gate", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/dam-15.svg"}, {"key": "waterway", "value": "milestone", "description": "🄿 Waterway Milestone", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/milestone.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index b768d6e81..c377546c5 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -9792,6 +9792,10 @@ "name": "Drain", "terms": "" }, + "waterway/fish_pass": { + "name": "Fish Pass", + "terms": "eel ladder,eel pass,fish ladder,fish migration,fish passage,fish siphon,fish steps,fish way,fishladder,fishpass,fishsteps,fishway" + }, "waterway/fuel": { "name": "Marine Fuel Station", "terms": "petrol,gas,diesel,boat" diff --git a/modules/osm/tags.js b/modules/osm/tags.js index 28adb57c0..64d78298a 100644 --- a/modules/osm/tags.js +++ b/modules/osm/tags.js @@ -74,6 +74,7 @@ export var osmOneWayTags = { 'canal': true, 'ditch': true, 'drain': true, + 'fish_pass': true, 'river': true, 'stream': true } @@ -134,5 +135,5 @@ export var osmRailwayTrackTagValues = { // "waterway" tag values for line features representing water flow export var osmFlowingWaterwayTagValues = { - canal: true, ditch: true, drain: true, river: true, stream: true + canal: true, ditch: true, drain: true, fish_pass: true, river: true, stream: true };