From 67b3b92cdf01a76bf10c8e9568815ae155547a4a Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Mon, 28 Jan 2019 12:38:27 -0500 Subject: [PATCH] Add name and intermittent fields to natural/water preset Update natural/water/... presets to use field inheritance --- data/presets/presets.json | 14 +++++++------- data/presets/presets/natural/water.json | 4 +++- data/presets/presets/natural/water/canal.json | 4 ---- data/presets/presets/natural/water/lake.json | 4 ---- data/presets/presets/natural/water/pond.json | 4 ---- data/presets/presets/natural/water/reservoir.json | 4 ---- data/presets/presets/natural/water/river.json | 4 ---- data/presets/presets/natural/water/stream.json | 4 ---- 8 files changed, 10 insertions(+), 32 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index e6a865580..171bf87ac 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -660,14 +660,14 @@ "natural/tree_row": {"icon": "maki-park", "fields": ["leaf_type", "leaf_cycle", "denotation"], "geometry": ["line"], "tags": {"natural": "tree_row"}, "terms": [], "name": "Tree Row"}, "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": {"icon": "maki-water", "fields": ["name", "water", "intermittent"], "geometry": ["area"], "tags": {"natural": "water"}, "name": "Water"}, "natural/water/basin": {"icon": "maki-water", "fields": ["name", "basin", "intermittent_yes"], "geometry": ["area"], "tags": {"natural": "water", "water": "basin"}, "reference": {"key": "water", "value": "basin"}, "terms": ["detention", "drain", "overflow", "rain", "retention"], "name": "Basin"}, - "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", "riverbank", "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/water/canal": {"icon": "maki-water", "geometry": ["area"], "tags": {"natural": "water", "water": "canal"}, "reference": {"key": "water", "value": "canal"}, "name": "Canal"}, + "natural/water/lake": {"icon": "maki-water", "geometry": ["area"], "tags": {"natural": "water", "water": "lake"}, "reference": {"key": "water", "value": "lake"}, "terms": ["lakelet", "loch", "mere"], "name": "Lake"}, + "natural/water/pond": {"icon": "maki-water", "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", "geometry": ["area"], "tags": {"natural": "water", "water": "reservoir"}, "reference": {"key": "water", "value": "reservoir"}, "name": "Reservoir"}, + "natural/water/river": {"icon": "maki-water", "geometry": ["area"], "tags": {"natural": "water", "water": "river"}, "reference": {"key": "water", "value": "river"}, "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "riverbank", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "name": "River"}, + "natural/water/stream": {"icon": "maki-water", "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"}, diff --git a/data/presets/presets/natural/water.json b/data/presets/presets/natural/water.json index e6eae66e5..a2e08e505 100644 --- a/data/presets/presets/natural/water.json +++ b/data/presets/presets/natural/water.json @@ -1,7 +1,9 @@ { "icon": "maki-water", "fields": [ - "water" + "name", + "water", + "intermittent" ], "geometry": [ "area" diff --git a/data/presets/presets/natural/water/canal.json b/data/presets/presets/natural/water/canal.json index bafe9965f..cd464b101 100644 --- a/data/presets/presets/natural/water/canal.json +++ b/data/presets/presets/natural/water/canal.json @@ -1,9 +1,5 @@ { "icon": "maki-water", - "fields": [ - "name", - "intermittent" - ], "geometry": [ "area" ], diff --git a/data/presets/presets/natural/water/lake.json b/data/presets/presets/natural/water/lake.json index 7e90c3807..b2133a7c2 100644 --- a/data/presets/presets/natural/water/lake.json +++ b/data/presets/presets/natural/water/lake.json @@ -1,9 +1,5 @@ { "icon": "maki-water", - "fields": [ - "name", - "intermittent" - ], "geometry": [ "area" ], diff --git a/data/presets/presets/natural/water/pond.json b/data/presets/presets/natural/water/pond.json index df7593e12..10739e9f8 100644 --- a/data/presets/presets/natural/water/pond.json +++ b/data/presets/presets/natural/water/pond.json @@ -1,9 +1,5 @@ { "icon": "maki-water", - "fields": [ - "name", - "intermittent" - ], "geometry": [ "area" ], diff --git a/data/presets/presets/natural/water/reservoir.json b/data/presets/presets/natural/water/reservoir.json index 539faaac4..72eca9262 100644 --- a/data/presets/presets/natural/water/reservoir.json +++ b/data/presets/presets/natural/water/reservoir.json @@ -1,9 +1,5 @@ { "icon": "maki-water", - "fields": [ - "name", - "intermittent" - ], "geometry": [ "area" ], diff --git a/data/presets/presets/natural/water/river.json b/data/presets/presets/natural/water/river.json index 6ee23d23b..c08ee137d 100644 --- a/data/presets/presets/natural/water/river.json +++ b/data/presets/presets/natural/water/river.json @@ -1,9 +1,5 @@ { "icon": "maki-water", - "fields": [ - "name", - "intermittent" - ], "geometry": [ "area" ], diff --git a/data/presets/presets/natural/water/stream.json b/data/presets/presets/natural/water/stream.json index 3d5d9db46..65a2ac14e 100644 --- a/data/presets/presets/natural/water/stream.json +++ b/data/presets/presets/natural/water/stream.json @@ -1,9 +1,5 @@ { "icon": "maki-water", - "fields": [ - "name", - "intermittent" - ], "geometry": [ "area" ],