diff --git a/data/presets.yaml b/data/presets.yaml index d57b9edd6..e7ca88ef9 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -8640,6 +8640,11 @@ en: name: Intermittent Stream # 'terms: arroyo,beck,branch,brook,burn,course,creek,drift,flood,flow,gully,run,runnel,rush,spate,spritz,tributary,wadi,wash,watercourse' terms: '' + waterway/tidal_channel: + # waterway=tidal_channel + name: Tidal Channel + # 'terms: coastal,pill,intertidal,mangroves,marine,salt marsh,tidal creek,tidal flat,tidal inlet,waterway' + terms: '' waterway/water_point: # waterway=water_point name: Marine Drinking Water diff --git a/data/presets/presets.json b/data/presets/presets.json index 2fdcd5260..253ff09b1 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1291,6 +1291,7 @@ "waterway/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "water_point"], "moreFields": ["opening_hours", "seamark/type"], "geometry": ["point", "vertex", "area"], "terms": ["Boat", "Watercraft", "Sanitary", "Dump Station", "Pumpout", "Pump out", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"waterway": "sanitary_dump_station"}, "name": "Marine Toilet Disposal"}, "waterway/stream_intermittent": {"icon": "iD-waterway-stream", "fields": ["{waterway/stream}"], "moreFields": ["{waterway/stream}"], "geometry": ["line"], "terms": ["arroyo", "beck", "branch", "brook", "burn", "course", "creek", "drift", "flood", "flow", "gully", "run", "runnel", "rush", "spate", "spritz", "tributary", "wadi", "wash", "watercourse"], "tags": {"waterway": "stream", "intermittent": "yes"}, "reference": {"key": "waterway", "value": "stream"}, "name": "Intermittent Stream"}, "waterway/stream": {"icon": "iD-waterway-stream", "fields": ["name", "structure_waterway", "width", "intermittent"], "moreFields": ["covered", "fishing", "gnis/feature_id", "salt", "tidal"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "burn", "course", "creek", "current", "drift", "flood", "flow", "freshet", "race", "rill", "rindle", "rivulet", "run", "runnel", "rush", "spate", "spritz", "surge", "tide", "torrent", "tributary", "watercourse"], "tags": {"waterway": "stream"}, "name": "Stream"}, + "waterway/tidal_channel": {"icon": "iD-waterway-stream", "fields": ["name", "structure_waterway", "width", "salt", "tidal", "intermittent"], "moreFields": ["covered", "fishing", "gnis/feature_id"], "geometry": ["line"], "terms": ["coastal", "pill", "intertidal", "mangroves", "marine", "salt marsh", "tidal creek", "tidal flat", "tidal inlet", "waterway"], "tags": {"waterway": "tidal_channel"}, "addTags": {"waterway": "tidal_channel", "tidal": "yes"}, "name": "Tidal Channel"}, "waterway/water_point": {"icon": "maki-drinking-water", "fields": ["{amenity/water_point}"], "moreFields": ["{amenity/water_point}"], "geometry": ["point", "vertex", "area"], "tags": {"waterway": "water_point"}, "terms": ["water faucet", "water point", "water tap", "water source", "water spigot"], "name": "Marine Drinking Water"}, "waterway/waterfall": {"icon": "maki-waterfall", "fields": ["name", "height", "width", "intermittent"], "moreFields": ["gnis/feature_id"], "geometry": ["vertex"], "terms": ["fall"], "tags": {"waterway": "waterfall"}, "name": "Waterfall"}, "waterway/weir": {"icon": "maki-dam", "fields": ["name", "operator", "height", "material"], "moreFields": ["gnis/feature_id", "seamark/type"], "geometry": ["vertex", "line"], "terms": ["low-head dam", "low-rise dam", "wier"], "tags": {"waterway": "weir"}, "name": "Weir"}, diff --git a/data/presets/presets/waterway/tidal_channel.json b/data/presets/presets/waterway/tidal_channel.json new file mode 100644 index 000000000..7582d93e9 --- /dev/null +++ b/data/presets/presets/waterway/tidal_channel.json @@ -0,0 +1,39 @@ +{ + "icon": "iD-waterway-stream", + "fields": [ + "name", + "structure_waterway", + "width", + "salt", + "tidal", + "intermittent" + ], + "moreFields": [ + "covered", + "fishing", + "gnis/feature_id" + ], + "geometry": [ + "line" + ], + "terms": [ + "coastal", + "pill", + "intertidal", + "mangroves", + "marine", + "salt marsh", + "tidal creek", + "tidal flat", + "tidal inlet", + "waterway" + ], + "tags": { + "waterway": "tidal_channel" + }, + "addTags": { + "waterway": "tidal_channel", + "tidal": "yes" + }, + "name": "Tidal Channel" +} diff --git a/data/taginfo.json b/data/taginfo.json index 8abfb9d0b..6bc8e4320 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1227,6 +1227,7 @@ {"key": "waterway", "value": "sanitary_dump_station", "description": "🄿 Marine Toilet Disposal", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/storage_tank.svg"}, {"key": "intermittent", "value": "yes", "description": "🄿 Intermittent Stream", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-stream.svg"}, {"key": "waterway", "value": "stream", "description": "🄿 Stream", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-stream.svg"}, + {"key": "waterway", "value": "tidal_channel", "description": "🄿 Tidal Channel", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-stream.svg"}, {"key": "waterway", "value": "water_point", "description": "🄿 Marine Drinking Water", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/drinking-water-15.svg"}, {"key": "waterway", "value": "waterfall", "description": "🄿 Waterfall", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/waterfall-15.svg"}, {"key": "waterway", "value": "weir", "description": "🄿 Weir", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/dam-15.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 638f5ada6..11cb605ea 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -9946,6 +9946,10 @@ "name": "Stream", "terms": "beck,branch,brook,burn,course,creek,current,drift,flood,flow,freshet,race,rill,rindle,rivulet,run,runnel,rush,spate,spritz,surge,tide,torrent,tributary,watercourse" }, + "waterway/tidal_channel": { + "name": "Tidal Channel", + "terms": "coastal,pill,intertidal,mangroves,marine,salt marsh,tidal creek,tidal flat,tidal inlet,waterway" + }, "waterway/water_point": { "name": "Marine Drinking Water", "terms": "water faucet,water point,water tap,water source,water spigot" diff --git a/modules/osm/tags.js b/modules/osm/tags.js index 64d78298a..a1381c721 100644 --- a/modules/osm/tags.js +++ b/modules/osm/tags.js @@ -76,7 +76,8 @@ export var osmOneWayTags = { 'drain': true, 'fish_pass': true, 'river': true, - 'stream': true + 'stream': true, + 'tidal_channel': true } }; @@ -135,5 +136,5 @@ export var osmRailwayTrackTagValues = { // "waterway" tag values for line features representing water flow export var osmFlowingWaterwayTagValues = { - canal: true, ditch: true, drain: true, fish_pass: true, river: true, stream: true + canal: true, ditch: true, drain: true, fish_pass: true, river: true, stream: true, tidal_channel: true };