From 933569f8c65e183058f8da0bb24e38abf00b377d Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Wed, 13 Mar 2019 12:59:06 -0400
Subject: [PATCH] Inherit check fields even if they define the preset

---
 data/presets/presets.json                              | 2 +-
 data/presets/presets/waterway/stream_intermittent.json | 3 +--
 modules/presets/preset.js                              | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/data/presets/presets.json b/data/presets/presets.json
index 4a8320d39..1891dcbce 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1077,7 +1077,7 @@
     "waterway/milestone": {"icon": "temaki-milestone", "fields": ["distance", "direction_vertex"], "moreFields": ["seamark/type"], "geometry": ["point", "vertex"], "tags": {"waterway": "milestone"}, "terms": ["milestone", "marker"], "name": "Waterway Milestone"},
     "waterway/river": {"icon": "iD-waterway-river", "fields": ["name", "structure_waterway", "width", "intermittent", "tidal"], "moreFields": ["covered", "salt"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "tags": {"waterway": "river"}, "name": "River"},
     "waterway/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["name", "operator", "access_simple", "fee", "water_point"], "moreFields": ["opening_hours", "payment_multi", "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}", "intermittent"], "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_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", "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/water_point": {"icon": "maki-drinking-water", "geometry": ["area", "vertex", "point"], "tags": {"waterway": "water_point"}, "name": "Marine Drinking Water"},
     "waterway/waterfall": {"icon": "maki-waterfall", "fields": ["name", "height", "width", "intermittent"], "geometry": ["vertex"], "terms": ["fall"], "tags": {"waterway": "waterfall"}, "name": "Waterfall"},
diff --git a/data/presets/presets/waterway/stream_intermittent.json b/data/presets/presets/waterway/stream_intermittent.json
index 9d325062c..831817c0b 100644
--- a/data/presets/presets/waterway/stream_intermittent.json
+++ b/data/presets/presets/waterway/stream_intermittent.json
@@ -1,8 +1,7 @@
 {
     "icon": "iD-waterway-stream",
     "fields": [
-        "{waterway/stream}",
-        "intermittent"
+        "{waterway/stream}"
     ],
     "moreFields": [
         "{waterway/stream}"
diff --git a/modules/presets/preset.js b/modules/presets/preset.js
index ed1cb5c82..79c7950fa 100644
--- a/modules/presets/preset.js
+++ b/modules/presets/preset.js
@@ -29,8 +29,8 @@ export function presetPreset(id, preset, fields, visible, rawPresets) {
             var f = fields[fieldID];
             if (f.key) {
                 if (preset.tags[f.key] !== undefined &&
-                    // inherit anyway if multiple values are allowed
-                    f.type !== 'multiCombo' && f.type !== 'semiCombo') {
+                    // inherit anyway if multiple values are allowed or just a checkbox
+                    f.type !== 'multiCombo' && f.type !== 'semiCombo' && f.type !== 'check') {
                     return false;
                 }
             }