From 18ea434d021817505638c42de9802aedcf2937ad Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 14 Jan 2019 13:09:46 -0500 Subject: [PATCH] Update water area presets to use `natural=water + water=*` (closes #5591) --- data/presets.yaml | 22 ++++++- data/presets/presets.json | 17 +++-- .../landuse/{basin.json => _basin.json} | 4 +- data/presets/presets/landuse/_farm.json | 1 - data/presets/presets/landuse/_pond.json | 15 +++++ data/presets/presets/landuse/_reservoir.json | 15 +++++ data/presets/presets/natural/water/canal.json | 19 ++++++ data/presets/presets/natural/water/lake.json | 4 +- data/presets/presets/natural/water/pond.json | 4 +- .../presets/natural/water/reservoir.json | 4 +- data/presets/presets/natural/water/river.json | 34 ++++++++++ .../presets/presets/natural/water/stream.json | 46 ++++++++++++++ .../{riverbank.json => _riverbank.json} | 3 +- data/taginfo.json | 63 ++++++++++++++----- dist/locales/en.json | 36 ++++++++--- 15 files changed, 247 insertions(+), 40 deletions(-) rename data/presets/presets/landuse/{basin.json => _basin.json} (81%) create mode 100644 data/presets/presets/landuse/_pond.json create mode 100644 data/presets/presets/landuse/_reservoir.json create mode 100644 data/presets/presets/natural/water/canal.json create mode 100644 data/presets/presets/natural/water/river.json create mode 100644 data/presets/presets/natural/water/stream.json rename data/presets/presets/waterway/{riverbank.json => _riverbank.json} (71%) diff --git a/data/presets.yaml b/data/presets.yaml index a708daf012..b718e83a14 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -4197,7 +4197,6 @@ en: landuse/basin: # landuse=basin name: Basin - terms: '' landuse/brownfield: # landuse=brownfield name: Brownfield @@ -4350,6 +4349,9 @@ en: name: Plant Nursery # 'terms: flower,garden,grow,vivero' terms: '' + landuse/pond: + # landuse=pond + name: Pond landuse/quarry: # landuse=quarry name: Quarry @@ -4368,6 +4370,9 @@ en: # landuse=religious name: Religious Area terms: '' + landuse/reservoir: + # landuse=reservoir + name: Reservoir landuse/residential: # landuse=residential name: Residential Area @@ -5040,6 +5045,10 @@ en: # natural=water name: Water terms: '' + natural/water/canal: + # 'natural=water, water=canal' + name: Canal + terms: '' natural/water/lake: # 'natural=water, water=lake' name: Lake @@ -5054,6 +5063,16 @@ en: # 'natural=water, water=reservoir' name: Reservoir terms: '' + natural/water/river: + # 'natural=water, water=river' + name: River + # 'terms: beck,branch,brook,course,creek,estuary,rill,rivulet,run,runnel,stream,tributary,watercourse' + terms: '' + natural/water/stream: + # 'natural=water, water=stream' + 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' + terms: '' natural/wetland: # natural=wetland name: Wetland @@ -6854,7 +6873,6 @@ en: waterway/riverbank: # waterway=riverbank name: Riverbank - terms: '' waterway/sanitary_dump_station: # waterway=sanitary_dump_station name: Marine Toilet Disposal diff --git a/data/presets/presets.json b/data/presets/presets.json index 0da8cb97f9..38a221eab8 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -473,10 +473,12 @@ "internet_access/wlan": {"icon": "fas-wifi", "geometry": ["point", "area"], "fields": ["internet_access/fee", "internet_access/ssid"], "terms": ["wi-fi", "wifi", "hotspot"], "tags": {"internet_access": "wlan"}, "matchScore": 0.25, "name": "Wi-Fi Hotspot"}, "junction": {"icon": "temaki-junction", "fields": ["name"], "geometry": ["vertex", "area"], "tags": {"junction": "yes"}, "name": "Junction"}, "landuse": {"fields": ["name", "landuse"], "geometry": ["area"], "tags": {"landuse": "*"}, "matchScore": 0.9, "name": "Land Use"}, - "landuse/farm": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "geometry": ["point", "area"], "tags": {"landuse": "farm"}, "terms": [], "name": "Farmland", "searchable": false}, + "landuse/basin": {"icon": "maki-water", "fields": ["name", "basin", "intermittent_yes"], "geometry": ["area"], "tags": {"landuse": "basin"}, "name": "Basin", "searchable": false}, + "landuse/farm": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "geometry": ["point", "area"], "tags": {"landuse": "farm"}, "name": "Farmland", "searchable": false}, + "landuse/pond": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"landuse": "pond"}, "name": "Pond", "searchable": false}, + "landuse/reservoir": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"landuse": "reservoir"}, "name": "Reservoir", "searchable": false}, "landuse/allotments": {"icon": "maki-garden-centre", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "allotments"}, "terms": ["allotment", "garden"], "name": "Community Garden"}, "landuse/aquaculture": {"icon": "maki-aquarium", "fields": ["name", "operator", "produce"], "geometry": ["area"], "tags": {"landuse": "aquaculture"}, "terms": ["fish farm", "crustacean", "algae", "aquafarming", "shrimp farm", "oyster farm", "mariculture", "algaculture"], "name": "Aquaculture"}, - "landuse/basin": {"icon": "maki-water", "fields": ["name", "basin", "intermittent_yes"], "geometry": ["area"], "tags": {"landuse": "basin"}, "terms": [], "name": "Basin"}, "landuse/brownfield": {"geometry": ["area"], "fields": ["name"], "tags": {"landuse": "brownfield"}, "terms": [], "matchScore": 0.9, "name": "Brownfield"}, "landuse/cemetery": {"icon": "maki-cemetery", "fields": ["name", "religion", "denomination"], "geometry": ["area"], "tags": {"landuse": "cemetery"}, "terms": [], "name": "Cemetery"}, "landuse/churchyard": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination"], "geometry": ["area"], "tags": {"landuse": "churchyard"}, "terms": [], "name": "Churchyard"}, @@ -657,9 +659,12 @@ "natural/tree": {"icon": "maki-park", "fields": ["leaf_type_singular", "leaf_cycle_singular", "denotation"], "geometry": ["point", "vertex"], "tags": {"natural": "tree"}, "terms": [], "name": "Tree"}, "natural/volcano": {"icon": "maki-volcano", "fields": ["name", "elevation", "volcano/status", "volcano/type"], "geometry": ["point", "vertex"], "tags": {"natural": "volcano"}, "terms": ["mountain", "crater"], "name": "Volcano"}, "natural/water": {"icon": "maki-water", "fields": ["water"], "geometry": ["area"], "tags": {"natural": "water"}, "name": "Water"}, - "natural/water/lake": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"natural": "water", "water": "lake"}, "reference": {"key": "natural", "value": "water"}, "terms": ["lakelet", "loch", "mere"], "name": "Lake"}, - "natural/water/pond": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"natural": "water", "water": "pond"}, "reference": {"key": "natural", "value": "water"}, "terms": ["lakelet", "millpond", "tarn", "pool", "mere"], "name": "Pond"}, - "natural/water/reservoir": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"natural": "water", "water": "reservoir"}, "reference": {"key": "natural", "value": "water"}, "name": "Reservoir"}, + "natural/water/canal": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"natural": "water", "water": "canal"}, "reference": {"key": "water", "value": "canal"}, "name": "Canal"}, + "natural/water/lake": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"natural": "water", "water": "lake"}, "reference": {"key": "water", "value": "lake"}, "terms": ["lakelet", "loch", "mere"], "name": "Lake"}, + "natural/water/pond": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"natural": "water", "water": "pond"}, "reference": {"key": "water", "value": "pond"}, "terms": ["lakelet", "millpond", "tarn", "pool", "mere"], "name": "Pond"}, + "natural/water/reservoir": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"natural": "water", "water": "reservoir"}, "reference": {"key": "water", "value": "reservoir"}, "name": "Reservoir"}, + "natural/water/river": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"natural": "water", "water": "river"}, "reference": {"key": "water", "value": "river"}, "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "name": "River"}, + "natural/water/stream": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"natural": "water", "water": "stream"}, "reference": {"key": "water", "value": "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"], "name": "Stream"}, "natural/wetland": {"icon": "maki-wetland", "fields": ["wetland"], "geometry": ["point", "area"], "tags": {"natural": "wetland"}, "terms": ["bog", "marsh", "reedbed", "swamp", "tidalflat"], "name": "Wetland"}, "natural/wood": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle"], "geometry": ["point", "area"], "tags": {"natural": "wood"}, "terms": ["tree"], "name": "Wood"}, "noexit/yes": {"icon": "maki-barrier", "geometry": ["vertex"], "terms": ["no exit", "road end", "dead end"], "tags": {"noexit": "yes"}, "reference": {"key": "noexit", "value": "*"}, "name": "No Exit"}, @@ -1047,6 +1052,7 @@ "type/site": {"icon": "iD-relation", "fields": ["name", "site"], "geometry": ["relation"], "tags": {"type": "site"}, "name": "Site"}, "type/waterway": {"icon": "iD-route-water", "fields": ["name", "waterway", "ref"], "geometry": ["relation"], "tags": {"type": "waterway"}, "name": "Waterway"}, "vertex": {"fields": ["name"], "geometry": ["vertex"], "tags": {}, "name": "Other", "matchScore": 0.1}, + "waterway/riverbank": {"icon": "maki-water", "geometry": ["area"], "tags": {"waterway": "riverbank"}, "name": "Riverbank", "searchable": false}, "waterway/boatyard": {"icon": "maki-harbor", "fields": ["name", "operator"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "boatyard"}, "name": "Boatyard"}, "waterway/canal": {"icon": "iD-waterway-canal", "fields": ["name", "width", "intermittent"], "geometry": ["line"], "tags": {"waterway": "canal"}, "name": "Canal"}, "waterway/dam": {"icon": "maki-dam", "geometry": ["point", "vertex", "line", "area"], "fields": ["name"], "tags": {"waterway": "dam"}, "name": "Dam"}, @@ -1056,7 +1062,6 @@ "waterway/fuel": {"icon": "maki-fuel", "fields": ["name", "operator", "address", "opening_hours", "fuel_multi"], "geometry": ["point", "area"], "terms": ["petrol", "gas", "diesel", "boat"], "tags": {"waterway": "fuel"}, "name": "Marine Fuel Station"}, "waterway/milestone": {"icon": "temaki-milestone", "geometry": ["point", "vertex"], "fields": ["distance", "direction_vertex"], "tags": {"waterway": "milestone"}, "terms": ["milestone", "marker"], "name": "Waterway Milestone"}, "waterway/river": {"icon": "iD-waterway-river", "fields": ["name", "structure_waterway", "width", "intermittent"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "tags": {"waterway": "river"}, "name": "River"}, - "waterway/riverbank": {"icon": "maki-water", "geometry": ["area"], "tags": {"waterway": "riverbank"}, "name": "Riverbank"}, "waterway/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["name", "operator", "access_simple", "fee", "water_point"], "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": ["name", "structure_waterway", "width", "intermittent"], "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"], "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"}, diff --git a/data/presets/presets/landuse/basin.json b/data/presets/presets/landuse/_basin.json similarity index 81% rename from data/presets/presets/landuse/basin.json rename to data/presets/presets/landuse/_basin.json index 5fc9bcd7d4..dc96337866 100644 --- a/data/presets/presets/landuse/basin.json +++ b/data/presets/presets/landuse/_basin.json @@ -11,6 +11,6 @@ "tags": { "landuse": "basin" }, - "terms": [], - "name": "Basin" + "name": "Basin", + "searchable": false } diff --git a/data/presets/presets/landuse/_farm.json b/data/presets/presets/landuse/_farm.json index fbef40aac1..f347b04ec1 100644 --- a/data/presets/presets/landuse/_farm.json +++ b/data/presets/presets/landuse/_farm.json @@ -12,7 +12,6 @@ "tags": { "landuse": "farm" }, - "terms": [], "name": "Farmland", "searchable": false } diff --git a/data/presets/presets/landuse/_pond.json b/data/presets/presets/landuse/_pond.json new file mode 100644 index 0000000000..cf31f37944 --- /dev/null +++ b/data/presets/presets/landuse/_pond.json @@ -0,0 +1,15 @@ +{ + "icon": "maki-water", + "fields": [ + "name", + "intermittent" + ], + "geometry": [ + "area" + ], + "tags": { + "landuse": "pond" + }, + "name": "Pond", + "searchable": false +} diff --git a/data/presets/presets/landuse/_reservoir.json b/data/presets/presets/landuse/_reservoir.json new file mode 100644 index 0000000000..c46c2adf85 --- /dev/null +++ b/data/presets/presets/landuse/_reservoir.json @@ -0,0 +1,15 @@ +{ + "icon": "maki-water", + "fields": [ + "name", + "intermittent" + ], + "geometry": [ + "area" + ], + "tags": { + "landuse": "reservoir" + }, + "name": "Reservoir", + "searchable": false +} diff --git a/data/presets/presets/natural/water/canal.json b/data/presets/presets/natural/water/canal.json new file mode 100644 index 0000000000..bafe9965fd --- /dev/null +++ b/data/presets/presets/natural/water/canal.json @@ -0,0 +1,19 @@ +{ + "icon": "maki-water", + "fields": [ + "name", + "intermittent" + ], + "geometry": [ + "area" + ], + "tags": { + "natural": "water", + "water": "canal" + }, + "reference": { + "key": "water", + "value": "canal" + }, + "name": "Canal" +} diff --git a/data/presets/presets/natural/water/lake.json b/data/presets/presets/natural/water/lake.json index 4e511cb8e2..7e90c38077 100644 --- a/data/presets/presets/natural/water/lake.json +++ b/data/presets/presets/natural/water/lake.json @@ -12,8 +12,8 @@ "water": "lake" }, "reference": { - "key": "natural", - "value": "water" + "key": "water", + "value": "lake" }, "terms": [ "lakelet", diff --git a/data/presets/presets/natural/water/pond.json b/data/presets/presets/natural/water/pond.json index 1934fd2592..df7593e12b 100644 --- a/data/presets/presets/natural/water/pond.json +++ b/data/presets/presets/natural/water/pond.json @@ -12,8 +12,8 @@ "water": "pond" }, "reference": { - "key": "natural", - "value": "water" + "key": "water", + "value": "pond" }, "terms": [ "lakelet", diff --git a/data/presets/presets/natural/water/reservoir.json b/data/presets/presets/natural/water/reservoir.json index 88db07dc76..539faaac4b 100644 --- a/data/presets/presets/natural/water/reservoir.json +++ b/data/presets/presets/natural/water/reservoir.json @@ -12,8 +12,8 @@ "water": "reservoir" }, "reference": { - "key": "natural", - "value": "water" + "key": "water", + "value": "reservoir" }, "name": "Reservoir" } diff --git a/data/presets/presets/natural/water/river.json b/data/presets/presets/natural/water/river.json new file mode 100644 index 0000000000..4b22a554a3 --- /dev/null +++ b/data/presets/presets/natural/water/river.json @@ -0,0 +1,34 @@ +{ + "icon": "maki-water", + "fields": [ + "name", + "intermittent" + ], + "geometry": [ + "area" + ], + "tags": { + "natural": "water", + "water": "river" + }, + "reference": { + "key": "water", + "value": "river" + }, + "terms": [ + "beck", + "branch", + "brook", + "course", + "creek", + "estuary", + "rill", + "rivulet", + "run", + "runnel", + "stream", + "tributary", + "watercourse" + ], + "name": "River" +} diff --git a/data/presets/presets/natural/water/stream.json b/data/presets/presets/natural/water/stream.json new file mode 100644 index 0000000000..3d5d9db46c --- /dev/null +++ b/data/presets/presets/natural/water/stream.json @@ -0,0 +1,46 @@ +{ + "icon": "maki-water", + "fields": [ + "name", + "intermittent" + ], + "geometry": [ + "area" + ], + "tags": { + "natural": "water", + "water": "stream" + }, + "reference": { + "key": "water", + "value": "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" + ], + "name": "Stream" +} diff --git a/data/presets/presets/waterway/riverbank.json b/data/presets/presets/waterway/_riverbank.json similarity index 71% rename from data/presets/presets/waterway/riverbank.json rename to data/presets/presets/waterway/_riverbank.json index cfcf6be40a..2d80220372 100644 --- a/data/presets/presets/waterway/riverbank.json +++ b/data/presets/presets/waterway/_riverbank.json @@ -6,5 +6,6 @@ "tags": { "waterway": "riverbank" }, - "name": "Riverbank" + "name": "Riverbank", + "searchable": false } diff --git a/data/taginfo.json b/data/taginfo.json index c2b4701919..c531598df4 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -3155,6 +3155,13 @@ "description": "🄿 Land Use, 🄵 Type", "object_types": ["area"] }, + { + "key": "landuse", + "value": "basin", + "description": "🄿 Basin (unsearchable)", + "object_types": ["area"], + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true" + }, { "key": "landuse", "value": "farm", @@ -3162,6 +3169,20 @@ "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/farm-15.svg?sanitize=true" }, + { + "key": "landuse", + "value": "pond", + "description": "🄿 Pond (unsearchable)", + "object_types": ["area"], + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true" + }, + { + "key": "landuse", + "value": "reservoir", + "description": "🄿 Reservoir (unsearchable)", + "object_types": ["area"], + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true" + }, { "key": "landuse", "value": "allotments", @@ -3176,13 +3197,6 @@ "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/aquarium-15.svg?sanitize=true" }, - { - "key": "landuse", - "value": "basin", - "description": "🄿 Basin", - "object_types": ["area"], - "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true" - }, { "key": "landuse", "value": "brownfield", @@ -4384,6 +4398,13 @@ "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/volcano-15.svg?sanitize=true" }, + { + "key": "water", + "value": "canal", + "description": "🄿 Canal", + "object_types": ["area"], + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true" + }, { "key": "water", "value": "lake", @@ -4405,6 +4426,20 @@ "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true" }, + { + "key": "water", + "value": "river", + "description": "🄿 River", + "object_types": ["area"], + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true" + }, + { + "key": "water", + "value": "stream", + "description": "🄿 Stream", + "object_types": ["area"], + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true" + }, { "key": "natural", "value": "wetland", @@ -6832,6 +6867,13 @@ "object_types": ["relation"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/route-water.svg?sanitize=true" }, + { + "key": "waterway", + "value": "riverbank", + "description": "🄿 Riverbank (unsearchable)", + "object_types": ["area"], + "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true" + }, { "key": "waterway", "value": "boatyard", @@ -6895,13 +6937,6 @@ "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-river.svg?sanitize=true" }, - { - "key": "waterway", - "value": "riverbank", - "description": "🄿 Riverbank", - "object_types": ["area"], - "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true" - }, { "key": "waterway", "value": "sanitary_dump_station", diff --git a/dist/locales/en.json b/dist/locales/en.json index fe2571857b..7b97632d6a 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5452,10 +5452,22 @@ "name": "Land Use", "terms": "" }, + "landuse/basin": { + "name": "Basin", + "terms": "" + }, "landuse/farm": { "name": "Farmland", "terms": "" }, + "landuse/pond": { + "name": "Pond", + "terms": "" + }, + "landuse/reservoir": { + "name": "Reservoir", + "terms": "" + }, "landuse/allotments": { "name": "Community Garden", "terms": "allotment,garden" @@ -5464,10 +5476,6 @@ "name": "Aquaculture", "terms": "fish farm,crustacean,algae,aquafarming,shrimp farm,oyster farm,mariculture,algaculture" }, - "landuse/basin": { - "name": "Basin", - "terms": "" - }, "landuse/brownfield": { "name": "Brownfield", "terms": "" @@ -6188,6 +6196,10 @@ "name": "Water", "terms": "" }, + "natural/water/canal": { + "name": "Canal", + "terms": "" + }, "natural/water/lake": { "name": "Lake", "terms": "lakelet,loch,mere" @@ -6200,6 +6212,14 @@ "name": "Reservoir", "terms": "" }, + "natural/water/river": { + "name": "River", + "terms": "beck,branch,brook,course,creek,estuary,rill,rivulet,run,runnel,stream,tributary,watercourse" + }, + "natural/water/stream": { + "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" + }, "natural/wetland": { "name": "Wetland", "terms": "bog,marsh,reedbed,swamp,tidalflat" @@ -7748,6 +7768,10 @@ "name": "Other", "terms": "" }, + "waterway/riverbank": { + "name": "Riverbank", + "terms": "" + }, "waterway/boatyard": { "name": "Boatyard", "terms": "" @@ -7784,10 +7808,6 @@ "name": "River", "terms": "beck,branch,brook,course,creek,estuary,rill,rivulet,run,runnel,stream,tributary,watercourse" }, - "waterway/riverbank": { - "name": "Riverbank", - "terms": "" - }, "waterway/sanitary_dump_station": { "name": "Marine Toilet Disposal", "terms": "Boat,Watercraft,Sanitary,Dump Station,Pumpout,Pump out,Elsan,CDP,CTDP,Chemical Toilet"