From ecdea0d6e7f9f7909c6fca54e0ef86af595b9210 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 7 Mar 2013 15:25:39 -0800 Subject: [PATCH] Expand natural presets --- data/presets/forms.json | 4 - data/presets/presets.json | 161 +++++++++++++++++++- data/presets/presets/natural/bay.json | 15 ++ data/presets/presets/natural/beach.json | 18 +++ data/presets/presets/natural/cliff.json | 17 +++ data/presets/presets/natural/glacier.json | 14 ++ data/presets/presets/natural/grassland.json | 15 ++ data/presets/presets/natural/heath.json | 14 ++ data/presets/presets/natural/peak.json | 28 ++++ data/presets/presets/natural/scrub.json | 13 ++ data/presets/presets/natural/spring.json | 15 ++ data/presets/presets/natural/water.json | 5 +- data/presets/presets/natural/wetland.json | 6 + data/presets/presets/natural/wood.json | 6 + data/presets/presets/order.json | 9 ++ 15 files changed, 333 insertions(+), 7 deletions(-) create mode 100644 data/presets/presets/natural/bay.json create mode 100644 data/presets/presets/natural/beach.json create mode 100644 data/presets/presets/natural/cliff.json create mode 100644 data/presets/presets/natural/glacier.json create mode 100644 data/presets/presets/natural/grassland.json create mode 100644 data/presets/presets/natural/heath.json create mode 100644 data/presets/presets/natural/peak.json create mode 100644 data/presets/presets/natural/scrub.json create mode 100644 data/presets/presets/natural/spring.json diff --git a/data/presets/forms.json b/data/presets/forms.json index 9a1d96c67..2f0b77256 100644 --- a/data/presets/forms.json +++ b/data/presets/forms.json @@ -84,9 +84,5 @@ "layer": { "key": "layer", "type": "combo" - }, - "water": { - "key": "water", - "type": "combo" } } diff --git a/data/presets/presets.json b/data/presets/presets.json index 09709c139..974f0225f 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -58,6 +58,53 @@ }, "icon": "park" }, + { + "name": "bay", + "match": { + "type": [ + "point", + "area" + ], + "terms": [], + "tags": { + "natural": "bay" + } + }, + "icon": "" + }, + { + "name": "beach", + "match": { + "type": [ + "point", + "area" + ], + "terms": [], + "tags": { + "natural": "beach" + } + }, + "form": [ + "surface" + ], + "icon": "" + }, + { + "name": "cliff", + "match": { + "type": [ + "point", + "vertex", + "line", + "area" + ], + "terms": [], + "tags": { + "natural": "cliff" + } + }, + "icon": "" + }, { "name": "coastline", "match": { @@ -74,7 +121,102 @@ "icon": "" }, { - "name": "truee", + "name": "glacier", + "match": { + "type": [ + "area" + ], + "terms": [], + "tags": { + "natural": "glacier" + } + }, + "icon": "" + }, + { + "name": "grassland", + "match": { + "type": [ + "point", + "area" + ], + "terms": [], + "tags": { + "natural": "grassland" + } + }, + "icon": "" + }, + { + "name": "heath", + "match": { + "type": [ + "area" + ], + "terms": [], + "tags": { + "natural": "heath" + } + }, + "icon": "" + }, + { + "name": "peak", + "match": { + "type": [ + "point", + "vertex" + ], + "tags": { + "natural": "peak" + }, + "terms": [ + "acme", + "aiguille", + "alp", + "climax", + "crest", + "crown", + "hill", + "mount", + "mountain", + "pinnacle", + "summit", + "tip", + "top" + ] + }, + "icon": "" + }, + { + "name": "scrub", + "match": { + "type": [ + "area" + ], + "tags": { + "natural": "scrub" + }, + "terms": [] + }, + "icon": "" + }, + { + "name": "spring", + "match": { + "type": [ + "point", + "vertex" + ], + "terms": [], + "tags": { + "natural": "spring" + } + }, + "icon": "" + }, + { + "name": "tree", "match": { "type": [ "point", @@ -105,7 +247,10 @@ "terms": [] }, "form": [ - "water" + { + "key": "water", + "type": "combo" + } ], "icon": "" }, @@ -173,6 +318,12 @@ }, "terms": [] }, + "form": [ + { + "key": "wetland", + "type": "combo" + } + ], "icon": "" }, { @@ -187,6 +338,12 @@ }, "terms": [] }, + "form": [ + { + "key": "wood", + "type": "combo" + } + ], "icon": "park2" }, { diff --git a/data/presets/presets/natural/bay.json b/data/presets/presets/natural/bay.json new file mode 100644 index 000000000..dd3f1a088 --- /dev/null +++ b/data/presets/presets/natural/bay.json @@ -0,0 +1,15 @@ +{ + "name": "bay", + "match": { + "type": [ + "point", + "area" + ], + "terms": [ + ], + "tags": { + "natural": "bay" + } + }, + "icon": "" +} \ No newline at end of file diff --git a/data/presets/presets/natural/beach.json b/data/presets/presets/natural/beach.json new file mode 100644 index 000000000..2854cc425 --- /dev/null +++ b/data/presets/presets/natural/beach.json @@ -0,0 +1,18 @@ +{ + "name": "beach", + "match": { + "type": [ + "point", + "area" + ], + "terms": [ + ], + "tags": { + "natural": "beach" + } + }, + "form": [ + "surface" + ], + "icon": "" +} \ No newline at end of file diff --git a/data/presets/presets/natural/cliff.json b/data/presets/presets/natural/cliff.json new file mode 100644 index 000000000..d1dc7b578 --- /dev/null +++ b/data/presets/presets/natural/cliff.json @@ -0,0 +1,17 @@ +{ + "name": "cliff", + "match": { + "type": [ + "point", + "vertex", + "line", + "area" + ], + "terms": [ + ], + "tags": { + "natural": "cliff" + } + }, + "icon": "" +} \ No newline at end of file diff --git a/data/presets/presets/natural/glacier.json b/data/presets/presets/natural/glacier.json new file mode 100644 index 000000000..c45423457 --- /dev/null +++ b/data/presets/presets/natural/glacier.json @@ -0,0 +1,14 @@ +{ + "name": "glacier", + "match": { + "type": [ + "area" + ], + "terms": [ + ], + "tags": { + "natural": "glacier" + } + }, + "icon": "" +} \ No newline at end of file diff --git a/data/presets/presets/natural/grassland.json b/data/presets/presets/natural/grassland.json new file mode 100644 index 000000000..087313623 --- /dev/null +++ b/data/presets/presets/natural/grassland.json @@ -0,0 +1,15 @@ +{ + "name": "grassland", + "match": { + "type": [ + "point", + "area" + ], + "terms": [ + ], + "tags": { + "natural": "grassland" + } + }, + "icon": "" +} \ No newline at end of file diff --git a/data/presets/presets/natural/heath.json b/data/presets/presets/natural/heath.json new file mode 100644 index 000000000..0f1f3b51b --- /dev/null +++ b/data/presets/presets/natural/heath.json @@ -0,0 +1,14 @@ +{ + "name": "heath", + "match": { + "type": [ + "area" + ], + "terms": [ + ], + "tags": { + "natural": "heath" + } + }, + "icon": "" +} \ No newline at end of file diff --git a/data/presets/presets/natural/peak.json b/data/presets/presets/natural/peak.json new file mode 100644 index 000000000..212300054 --- /dev/null +++ b/data/presets/presets/natural/peak.json @@ -0,0 +1,28 @@ +{ + "name": "peak", + "match": { + "type": [ + "point", + "vertex" + ], + "tags": { + "natural": "peak" + }, + "terms": [ + "acme", + "aiguille", + "alp", + "climax", + "crest", + "crown", + "hill", + "mount", + "mountain", + "pinnacle", + "summit", + "tip", + "top" + ] + }, + "icon": "" +} \ No newline at end of file diff --git a/data/presets/presets/natural/scrub.json b/data/presets/presets/natural/scrub.json new file mode 100644 index 000000000..a47fdd9ec --- /dev/null +++ b/data/presets/presets/natural/scrub.json @@ -0,0 +1,13 @@ +{ + "name": "scrub", + "match": { + "type": [ + "area" + ], + "tags": { + "natural": "scrub" + }, + "terms": [] + }, + "icon": "" +} \ No newline at end of file diff --git a/data/presets/presets/natural/spring.json b/data/presets/presets/natural/spring.json new file mode 100644 index 000000000..8ed91a2ed --- /dev/null +++ b/data/presets/presets/natural/spring.json @@ -0,0 +1,15 @@ +{ + "name": "spring", + "match": { + "type": [ + "point", + "vertex" + ], + "terms": [ + ], + "tags": { + "natural": "spring" + } + }, + "icon": "" +} \ No newline at end of file diff --git a/data/presets/presets/natural/water.json b/data/presets/presets/natural/water.json index 13104086f..5b24bbec5 100644 --- a/data/presets/presets/natural/water.json +++ b/data/presets/presets/natural/water.json @@ -10,7 +10,10 @@ "terms": [] }, "form": [ - "water" + { + "key": "water", + "type": "combo" + } ], "icon": "" } \ No newline at end of file diff --git a/data/presets/presets/natural/wetland.json b/data/presets/presets/natural/wetland.json index 795a27001..5a517e807 100644 --- a/data/presets/presets/natural/wetland.json +++ b/data/presets/presets/natural/wetland.json @@ -10,5 +10,11 @@ }, "terms": [] }, + "form": [ + { + "key": "wetland", + "type": "combo" + } + ], "icon": "" } \ No newline at end of file diff --git a/data/presets/presets/natural/wood.json b/data/presets/presets/natural/wood.json index 816adb3c9..96a45e726 100644 --- a/data/presets/presets/natural/wood.json +++ b/data/presets/presets/natural/wood.json @@ -10,5 +10,11 @@ }, "terms": [] }, + "form": [ + { + "key": "wood", + "type": "combo" + } + ], "icon": "park2" } \ No newline at end of file diff --git a/data/presets/presets/order.json b/data/presets/presets/order.json index 0e2180883..2af08f9a1 100644 --- a/data/presets/presets/order.json +++ b/data/presets/presets/order.json @@ -1,7 +1,16 @@ [ "amenity/cafe", "leisure/park", + "natural/bay", + "natural/beach", + "natural/cliff", "natural/coastline", + "natural/glacier", + "natural/grassland", + "natural/heath", + "natural/peak", + "natural/scrub", + "natural/spring", "natural/tree", "natural/water", "natural/water/lake",