From fec27a04d3c59ba69720751e2689b950fb6892e4 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 11 Sep 2017 14:04:09 -0400 Subject: [PATCH] Add intermittent checkbox field, and Intermittent Stream preset --- data/presets.yaml | 8 ++ data/presets/fields.json | 5 ++ data/presets/fields/intermittent.json | 5 ++ data/presets/presets.json | 86 +++++++++++++++---- data/presets/presets/natural/spring.json | 4 + data/presets/presets/natural/water/lake.json | 7 +- data/presets/presets/natural/water/pond.json | 7 +- .../presets/natural/water/reservoir.json | 7 +- data/presets/presets/waterway/boatyard.json | 2 +- data/presets/presets/waterway/canal.json | 3 +- data/presets/presets/waterway/ditch.json | 3 +- data/presets/presets/waterway/drain.json | 3 +- data/presets/presets/waterway/river.json | 3 +- data/presets/presets/waterway/stream.json | 3 +- .../presets/waterway/stream_intermittent.json | 43 ++++++++++ data/presets/presets/waterway/waterfall.json | 3 +- data/taginfo.json | 4 + dist/locales/en.json | 7 ++ 18 files changed, 172 insertions(+), 31 deletions(-) create mode 100644 data/presets/fields/intermittent.json create mode 100644 data/presets/presets/waterway/stream_intermittent.json diff --git a/data/presets.yaml b/data/presets.yaml index 04310176e..0b87e42c4 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -630,6 +630,9 @@ en: inscription: # inscription=* label: Inscription + intermittent: + # intermittent=* + label: Intermittent internet_access: # internet_access=* label: Internet Access @@ -4876,6 +4879,11 @@ en: 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: '' + waterway/stream_intermittent: + # 'waterway=stream, intermittent=yes' + 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/water_point: # waterway=water_point name: Marine Drinking Water diff --git a/data/presets/fields.json b/data/presets/fields.json index cee4ba054..cf7684111 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -875,6 +875,11 @@ "type": "textarea", "label": "Inscription" }, + "intermittent": { + "key": "intermittent", + "type": "check", + "label": "Intermittent" + }, "internet_access": { "key": "internet_access", "type": "combo", diff --git a/data/presets/fields/intermittent.json b/data/presets/fields/intermittent.json new file mode 100644 index 000000000..ffbe6aaa1 --- /dev/null +++ b/data/presets/fields/intermittent.json @@ -0,0 +1,5 @@ +{ + "key": "intermittent", + "type": "check", + "label": "Intermittent" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 992217700..b3bdcc236 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -10035,6 +10035,10 @@ }, "natural/spring": { "icon": "water", + "fields": [ + "name", + "intermittent" + ], "geometry": [ "point", "vertex" @@ -10112,12 +10116,13 @@ }, "natural/water/lake": { "icon": "water", + "fields": [ + "name", + "intermittent" + ], "geometry": [ "area" ], - "fields": [ - "name" - ], "tags": { "natural": "water", "water": "lake" @@ -10135,12 +10140,13 @@ }, "natural/water/pond": { "icon": "water", + "fields": [ + "name", + "intermittent" + ], "geometry": [ "area" ], - "fields": [ - "name" - ], "tags": { "natural": "water", "water": "pond" @@ -10160,12 +10166,13 @@ }, "natural/water/reservoir": { "icon": "water", + "fields": [ + "name", + "intermittent" + ], "geometry": [ "area" ], - "fields": [ - "name" - ], "tags": { "natural": "water", "water": "reservoir" @@ -15268,7 +15275,8 @@ "icon": "waterway-canal", "fields": [ "name", - "width" + "width", + "intermittent" ], "geometry": [ "line" @@ -15297,7 +15305,8 @@ "waterway/ditch": { "icon": "waterway-ditch", "fields": [ - "tunnel_waterway" + "tunnel_waterway", + "intermittent" ], "geometry": [ "line" @@ -15333,7 +15342,8 @@ "waterway/drain": { "icon": "waterway-stream", "fields": [ - "tunnel_waterway" + "tunnel_waterway", + "intermittent" ], "geometry": [ "line" @@ -15372,7 +15382,8 @@ "fields": [ "name", "tunnel_waterway", - "width" + "width", + "intermittent" ], "geometry": [ "line" @@ -15438,12 +15449,56 @@ }, "name": "Marine Toilet Disposal" }, + "waterway/stream_intermittent": { + "icon": "waterway-stream", + "fields": [ + "name", + "tunnel_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": "waterway-stream", "fields": [ "name", "tunnel_waterway", - "width" + "width", + "intermittent" ], "geometry": [ "line" @@ -15497,7 +15552,8 @@ "fields": [ "name", "height", - "width" + "width", + "intermittent" ], "geometry": [ "vertex" diff --git a/data/presets/presets/natural/spring.json b/data/presets/presets/natural/spring.json index 447110579..2292d40a0 100644 --- a/data/presets/presets/natural/spring.json +++ b/data/presets/presets/natural/spring.json @@ -1,5 +1,9 @@ { "icon": "water", + "fields": [ + "name", + "intermittent" + ], "geometry": [ "point", "vertex" diff --git a/data/presets/presets/natural/water/lake.json b/data/presets/presets/natural/water/lake.json index a35c5c50e..ea3bf28c0 100644 --- a/data/presets/presets/natural/water/lake.json +++ b/data/presets/presets/natural/water/lake.json @@ -1,11 +1,12 @@ { "icon": "water", + "fields": [ + "name", + "intermittent" + ], "geometry": [ "area" ], - "fields": [ - "name" - ], "tags": { "natural": "water", "water": "lake" diff --git a/data/presets/presets/natural/water/pond.json b/data/presets/presets/natural/water/pond.json index ef6aeaf08..21d246f5d 100644 --- a/data/presets/presets/natural/water/pond.json +++ b/data/presets/presets/natural/water/pond.json @@ -1,11 +1,12 @@ { "icon": "water", + "fields": [ + "name", + "intermittent" + ], "geometry": [ "area" ], - "fields": [ - "name" - ], "tags": { "natural": "water", "water": "pond" diff --git a/data/presets/presets/natural/water/reservoir.json b/data/presets/presets/natural/water/reservoir.json index 6fba02ecb..274c721e2 100644 --- a/data/presets/presets/natural/water/reservoir.json +++ b/data/presets/presets/natural/water/reservoir.json @@ -1,11 +1,12 @@ { "icon": "water", + "fields": [ + "name", + "intermittent" + ], "geometry": [ "area" ], - "fields": [ - "name" - ], "tags": { "natural": "water", "water": "reservoir" diff --git a/data/presets/presets/waterway/boatyard.json b/data/presets/presets/waterway/boatyard.json index 919354792..a445dd6d7 100644 --- a/data/presets/presets/waterway/boatyard.json +++ b/data/presets/presets/waterway/boatyard.json @@ -1,7 +1,7 @@ { "icon": "harbor", "fields":[ - "name", + "name", "operator" ], "geometry": [ diff --git a/data/presets/presets/waterway/canal.json b/data/presets/presets/waterway/canal.json index 6cab011d8..2b22b0f57 100644 --- a/data/presets/presets/waterway/canal.json +++ b/data/presets/presets/waterway/canal.json @@ -2,7 +2,8 @@ "icon": "waterway-canal", "fields": [ "name", - "width" + "width", + "intermittent" ], "geometry": [ "line" diff --git a/data/presets/presets/waterway/ditch.json b/data/presets/presets/waterway/ditch.json index 9373764b1..e5ff49863 100644 --- a/data/presets/presets/waterway/ditch.json +++ b/data/presets/presets/waterway/ditch.json @@ -1,7 +1,8 @@ { "icon": "waterway-ditch", "fields": [ - "tunnel_waterway" + "tunnel_waterway", + "intermittent" ], "geometry": [ "line" diff --git a/data/presets/presets/waterway/drain.json b/data/presets/presets/waterway/drain.json index 71f63d634..614284713 100644 --- a/data/presets/presets/waterway/drain.json +++ b/data/presets/presets/waterway/drain.json @@ -1,7 +1,8 @@ { "icon": "waterway-stream", "fields": [ - "tunnel_waterway" + "tunnel_waterway", + "intermittent" ], "geometry": [ "line" diff --git a/data/presets/presets/waterway/river.json b/data/presets/presets/waterway/river.json index 3125600e2..a4448bf67 100644 --- a/data/presets/presets/waterway/river.json +++ b/data/presets/presets/waterway/river.json @@ -3,7 +3,8 @@ "fields": [ "name", "tunnel_waterway", - "width" + "width", + "intermittent" ], "geometry": [ "line" diff --git a/data/presets/presets/waterway/stream.json b/data/presets/presets/waterway/stream.json index 802924646..3b26a9436 100644 --- a/data/presets/presets/waterway/stream.json +++ b/data/presets/presets/waterway/stream.json @@ -3,7 +3,8 @@ "fields": [ "name", "tunnel_waterway", - "width" + "width", + "intermittent" ], "geometry": [ "line" diff --git a/data/presets/presets/waterway/stream_intermittent.json b/data/presets/presets/waterway/stream_intermittent.json new file mode 100644 index 000000000..e6ff48837 --- /dev/null +++ b/data/presets/presets/waterway/stream_intermittent.json @@ -0,0 +1,43 @@ +{ + "icon": "waterway-stream", + "fields": [ + "name", + "tunnel_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" +} diff --git a/data/presets/presets/waterway/waterfall.json b/data/presets/presets/waterway/waterfall.json index 2081e6a37..d87e625dc 100644 --- a/data/presets/presets/waterway/waterfall.json +++ b/data/presets/presets/waterway/waterfall.json @@ -3,7 +3,8 @@ "fields": [ "name", "height", - "width" + "width", + "intermittent" ], "geometry": [ "vertex" diff --git a/data/taginfo.json b/data/taginfo.json index 01c8c176c..757d03e6b 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -3062,6 +3062,10 @@ "key": "waterway", "value": "sanitary_dump_station" }, + { + "key": "intermittent", + "value": "yes" + }, { "key": "waterway", "value": "stream" diff --git a/dist/locales/en.json b/dist/locales/en.json index 6dd81dd60..8237da0df 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1619,6 +1619,9 @@ "inscription": { "label": "Inscription" }, + "intermittent": { + "label": "Intermittent" + }, "internet_access": { "label": "Internet Access", "options": { @@ -5385,6 +5388,10 @@ "name": "Marine Toilet Disposal", "terms": "Boat,Watercraft,Sanitary,Dump Station,Pumpout,Pump out,Elsan,CDP,CTDP,Chemical Toilet" }, + "waterway/stream_intermittent": { + "name": "Intermittent Stream", + "terms": "arroyo,beck,branch,brook,burn,course,creek,drift,flood,flow,gully,run,runnel,rush,spate,spritz,tributary,wadi,wash,watercourse" + }, "waterway/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"