From c664281c2dc4fc414893bd13cb11ceb1d7b77a20 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 26 Dec 2016 15:09:34 -0500 Subject: [PATCH] Add presets for natural Bare Rock, Ridge, Sand (closes #3646) Also cleanup terms --- data/presets.yaml | 18 ++++ data/presets/presets.json | 88 ++++++++++++++----- data/presets/presets/natural/bare_rock.json | 12 +++ data/presets/presets/natural/bay.json | 4 +- data/presets/presets/natural/beach.json | 6 +- .../presets/natural/cave_entrance.json | 10 ++- data/presets/presets/natural/cliff.json | 6 +- data/presets/presets/natural/coastline.json | 8 +- data/presets/presets/natural/fell.json | 2 +- data/presets/presets/natural/glacier.json | 4 +- data/presets/presets/natural/grassland.json | 8 +- data/presets/presets/natural/heath.json | 4 +- data/presets/presets/natural/ridge.json | 12 +++ data/presets/presets/natural/sand.json | 12 +++ data/presets/presets/natural/scree.json | 4 +- data/presets/presets/natural/scrub.json | 7 +- data/presets/presets/natural/spring.json | 4 +- data/presets/presets/natural/tree.json | 4 +- data/presets/presets/natural/tree_row.json | 4 +- data/presets/presets/natural/water.json | 4 +- data/presets/presets/natural/water/lake.json | 4 +- data/presets/presets/natural/water/pond.json | 4 +- .../presets/natural/water/reservoir.json | 4 +- data/taginfo.json | 12 +++ dist/locales/en.json | 18 +++- 25 files changed, 200 insertions(+), 63 deletions(-) create mode 100644 data/presets/presets/natural/bare_rock.json create mode 100644 data/presets/presets/natural/ridge.json create mode 100644 data/presets/presets/natural/sand.json diff --git a/data/presets.yaml b/data/presets.yaml index 84214ec5b..163477b6c 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3069,6 +3069,11 @@ en: # natural=* name: Natural terms: '' + natural/bare_rock: + # natural=bare_rock + name: Bare Rock + # 'terms: rock' + terms: '' natural/bay: # natural=bay name: Bay @@ -3076,6 +3081,7 @@ en: natural/beach: # natural=beach name: Beach + # 'terms: shore' terms: '' natural/cave_entrance: # natural=cave_entrance @@ -3085,6 +3091,7 @@ en: natural/cliff: # natural=cliff name: Cliff + # 'terms: escarpment' terms: '' natural/coastline: # natural=coastline @@ -3102,6 +3109,7 @@ en: natural/grassland: # natural=grassland name: Grassland + # 'terms: prairie,savanna' terms: '' natural/heath: # natural=heath @@ -3112,11 +3120,21 @@ en: name: Peak # 'terms: acme,aiguille,alp,climax,crest,crown,hill,mount,mountain,pinnacle,summit,tip,top' terms: '' + natural/ridge: + # natural=ridge + name: Ridge + # 'terms: crest' + terms: '' natural/saddle: # natural=saddle name: Saddle # 'terms: pass,mountain pass,top' terms: '' + natural/sand: + # natural=sand + name: Sand + # 'terms: desert' + terms: '' natural/scree: # natural=scree name: Scree diff --git a/data/presets/presets.json b/data/presets/presets.json index 9f83f18e8..c2e294012 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -7402,15 +7402,27 @@ }, "name": "Natural" }, + "natural/bare_rock": { + "geometry": [ + "area" + ], + "tags": { + "natural": "bare_rock" + }, + "terms": [ + "rock" + ], + "name": "Bare Rock" + }, "natural/bay": { "geometry": [ "point", "area" ], - "terms": [], "tags": { "natural": "bay" }, + "terms": [], "name": "Bay" }, "natural/beach": { @@ -7421,10 +7433,12 @@ "point", "area" ], - "terms": [], "tags": { "natural": "beach" }, + "terms": [ + "shore" + ], "name": "Beach" }, "natural/cave_entrance": { @@ -7436,6 +7450,9 @@ "fee", "access_simple" ], + "tags": { + "natural": "cave_entrance" + }, "terms": [ "cavern", "hollow", @@ -7443,9 +7460,6 @@ "shelter", "cavity" ], - "tags": { - "natural": "cave_entrance" - }, "name": "Cave Entrance" }, "natural/cliff": { @@ -7455,63 +7469,67 @@ "line", "area" ], - "terms": [], "tags": { "natural": "cliff" }, + "terms": [ + "escarpment" + ], "name": "Cliff" }, "natural/coastline": { "geometry": [ "line" ], - "terms": [ - "shore" - ], "tags": { "natural": "coastline" }, + "terms": [ + "shore" + ], "name": "Coastline" }, "natural/fell": { "geometry": [ "area" ], - "terms": [], "tags": { "natural": "fell" }, + "terms": [], "name": "Fell" }, "natural/glacier": { "geometry": [ "area" ], - "terms": [], "tags": { "natural": "glacier" }, + "terms": [], "name": "Glacier" }, "natural/grassland": { "geometry": [ - "point", "area" ], - "terms": [], "tags": { "natural": "grassland" }, + "terms": [ + "prairie", + "savanna" + ], "name": "Grassland" }, "natural/heath": { "geometry": [ "area" ], - "terms": [], "tags": { "natural": "heath" }, + "terms": [], "name": "Heath" }, "natural/peak": { @@ -7543,6 +7561,18 @@ ], "name": "Peak" }, + "natural/ridge": { + "geometry": [ + "line" + ], + "tags": { + "natural": "ridge" + }, + "terms": [ + "crest" + ], + "name": "Ridge" + }, "natural/saddle": { "icon": "triangle-stroked", "fields": [ @@ -7562,6 +7592,18 @@ ], "name": "Saddle" }, + "natural/sand": { + "geometry": [ + "area" + ], + "tags": { + "natural": "sand" + }, + "terms": [ + "desert" + ], + "name": "Sand" + }, "natural/scree": { "geometry": [ "area" @@ -7592,43 +7634,43 @@ "point", "vertex" ], - "terms": [], "tags": { "natural": "spring" }, + "terms": [], "name": "Spring" }, "natural/tree_row": { + "icon": "park", "fields": [ "leaf_type", "leaf_cycle", "denotation" ], - "icon": "park", "geometry": [ "line" ], - "terms": [], "tags": { "natural": "tree_row" }, + "terms": [], "name": "Tree row" }, "natural/tree": { + "icon": "park", "fields": [ "leaf_type_singular", "leaf_cycle_singular", "denotation" ], - "icon": "park", "geometry": [ "point", "vertex" ], - "terms": [], "tags": { "natural": "tree" }, + "terms": [], "name": "Tree" }, "natural/volcano": { @@ -7650,6 +7692,7 @@ "name": "Volcano" }, "natural/water": { + "icon": "water", "fields": [ "water" ], @@ -7659,10 +7702,10 @@ "tags": { "natural": "water" }, - "icon": "water", "name": "Water" }, "natural/water/lake": { + "icon": "water", "geometry": [ "area" ], @@ -7675,10 +7718,10 @@ "loch", "mere" ], - "icon": "water", "name": "Lake" }, "natural/water/pond": { + "icon": "water", "geometry": [ "area" ], @@ -7693,10 +7736,10 @@ "pool", "mere" ], - "icon": "water", "name": "Pond" }, "natural/water/reservoir": { + "icon": "water", "geometry": [ "area" ], @@ -7704,7 +7747,6 @@ "natural": "water", "water": "reservoir" }, - "icon": "water", "name": "Reservoir" }, "natural/wetland": { diff --git a/data/presets/presets/natural/bare_rock.json b/data/presets/presets/natural/bare_rock.json new file mode 100644 index 000000000..df275e667 --- /dev/null +++ b/data/presets/presets/natural/bare_rock.json @@ -0,0 +1,12 @@ +{ + "geometry": [ + "area" + ], + "tags": { + "natural": "bare_rock" + }, + "terms": [ + "rock" + ], + "name": "Bare Rock" +} diff --git a/data/presets/presets/natural/bay.json b/data/presets/presets/natural/bay.json index 48fbc04e9..e16f45dc0 100644 --- a/data/presets/presets/natural/bay.json +++ b/data/presets/presets/natural/bay.json @@ -3,9 +3,9 @@ "point", "area" ], - "terms": [], "tags": { "natural": "bay" }, + "terms": [], "name": "Bay" -} \ No newline at end of file +} diff --git a/data/presets/presets/natural/beach.json b/data/presets/presets/natural/beach.json index 8e32bc4a0..284e3157e 100644 --- a/data/presets/presets/natural/beach.json +++ b/data/presets/presets/natural/beach.json @@ -6,9 +6,11 @@ "point", "area" ], - "terms": [], "tags": { "natural": "beach" }, + "terms": [ + "shore" + ], "name": "Beach" -} \ No newline at end of file +} diff --git a/data/presets/presets/natural/cave_entrance.json b/data/presets/presets/natural/cave_entrance.json index cec044455..ec5b68c40 100644 --- a/data/presets/presets/natural/cave_entrance.json +++ b/data/presets/presets/natural/cave_entrance.json @@ -7,9 +7,15 @@ "fee", "access_simple" ], - "terms": ["cavern","hollow","grotto","shelter","cavity"], "tags": { "natural": "cave_entrance" }, + "terms": [ + "cavern", + "hollow", + "grotto", + "shelter", + "cavity" + ], "name": "Cave Entrance" -} \ No newline at end of file +} diff --git a/data/presets/presets/natural/cliff.json b/data/presets/presets/natural/cliff.json index a29e609d4..ea857bebb 100644 --- a/data/presets/presets/natural/cliff.json +++ b/data/presets/presets/natural/cliff.json @@ -5,9 +5,11 @@ "line", "area" ], - "terms": [], "tags": { "natural": "cliff" }, + "terms": [ + "escarpment" + ], "name": "Cliff" -} \ No newline at end of file +} diff --git a/data/presets/presets/natural/coastline.json b/data/presets/presets/natural/coastline.json index fd601a56f..87b1a7142 100644 --- a/data/presets/presets/natural/coastline.json +++ b/data/presets/presets/natural/coastline.json @@ -2,11 +2,11 @@ "geometry": [ "line" ], - "terms": [ - "shore" - ], "tags": { "natural": "coastline" }, + "terms": [ + "shore" + ], "name": "Coastline" -} \ No newline at end of file +} diff --git a/data/presets/presets/natural/fell.json b/data/presets/presets/natural/fell.json index 56e3779a2..2e2cab96f 100644 --- a/data/presets/presets/natural/fell.json +++ b/data/presets/presets/natural/fell.json @@ -2,9 +2,9 @@ "geometry": [ "area" ], - "terms": [], "tags": { "natural": "fell" }, + "terms": [], "name": "Fell" } diff --git a/data/presets/presets/natural/glacier.json b/data/presets/presets/natural/glacier.json index dd40909bd..19f5a7e27 100644 --- a/data/presets/presets/natural/glacier.json +++ b/data/presets/presets/natural/glacier.json @@ -2,9 +2,9 @@ "geometry": [ "area" ], - "terms": [], "tags": { "natural": "glacier" }, + "terms": [], "name": "Glacier" -} \ No newline at end of file +} diff --git a/data/presets/presets/natural/grassland.json b/data/presets/presets/natural/grassland.json index 84e7cbf58..4c6d7f7c9 100644 --- a/data/presets/presets/natural/grassland.json +++ b/data/presets/presets/natural/grassland.json @@ -1,11 +1,13 @@ { "geometry": [ - "point", "area" ], - "terms": [], "tags": { "natural": "grassland" }, + "terms": [ + "prairie", + "savanna" + ], "name": "Grassland" -} \ No newline at end of file +} diff --git a/data/presets/presets/natural/heath.json b/data/presets/presets/natural/heath.json index bf2fdc0f9..f44114e21 100644 --- a/data/presets/presets/natural/heath.json +++ b/data/presets/presets/natural/heath.json @@ -2,9 +2,9 @@ "geometry": [ "area" ], - "terms": [], "tags": { "natural": "heath" }, + "terms": [], "name": "Heath" -} \ No newline at end of file +} diff --git a/data/presets/presets/natural/ridge.json b/data/presets/presets/natural/ridge.json new file mode 100644 index 000000000..d85057ede --- /dev/null +++ b/data/presets/presets/natural/ridge.json @@ -0,0 +1,12 @@ +{ + "geometry": [ + "line" + ], + "tags": { + "natural": "ridge" + }, + "terms": [ + "crest" + ], + "name": "Ridge" +} diff --git a/data/presets/presets/natural/sand.json b/data/presets/presets/natural/sand.json new file mode 100644 index 000000000..eecaf9c63 --- /dev/null +++ b/data/presets/presets/natural/sand.json @@ -0,0 +1,12 @@ +{ + "geometry": [ + "area" + ], + "tags": { + "natural": "sand" + }, + "terms": [ + "desert" + ], + "name": "Sand" +} diff --git a/data/presets/presets/natural/scree.json b/data/presets/presets/natural/scree.json index 52c87251b..0cf178962 100644 --- a/data/presets/presets/natural/scree.json +++ b/data/presets/presets/natural/scree.json @@ -5,6 +5,8 @@ "tags": { "natural": "scree" }, - "terms": ["loose rocks"], + "terms": [ + "loose rocks" + ], "name": "Scree" } diff --git a/data/presets/presets/natural/scrub.json b/data/presets/presets/natural/scrub.json index 82e942e82..eb8d37c48 100644 --- a/data/presets/presets/natural/scrub.json +++ b/data/presets/presets/natural/scrub.json @@ -5,6 +5,9 @@ "tags": { "natural": "scrub" }, - "terms": ["bush","shrubs"], + "terms": [ + "bush", + "shrubs" + ], "name": "Scrub" -} \ No newline at end of file +} diff --git a/data/presets/presets/natural/spring.json b/data/presets/presets/natural/spring.json index 0d6b2a93f..3e7c70085 100644 --- a/data/presets/presets/natural/spring.json +++ b/data/presets/presets/natural/spring.json @@ -3,9 +3,9 @@ "point", "vertex" ], - "terms": [], "tags": { "natural": "spring" }, + "terms": [], "name": "Spring" -} \ No newline at end of file +} diff --git a/data/presets/presets/natural/tree.json b/data/presets/presets/natural/tree.json index d3f6d8c90..a5066822a 100644 --- a/data/presets/presets/natural/tree.json +++ b/data/presets/presets/natural/tree.json @@ -1,17 +1,17 @@ { + "icon": "park", "fields": [ "leaf_type_singular", "leaf_cycle_singular", "denotation" ], - "icon": "park", "geometry": [ "point", "vertex" ], - "terms": [], "tags": { "natural": "tree" }, + "terms": [], "name": "Tree" } diff --git a/data/presets/presets/natural/tree_row.json b/data/presets/presets/natural/tree_row.json index bbd01fa0b..4586f8684 100644 --- a/data/presets/presets/natural/tree_row.json +++ b/data/presets/presets/natural/tree_row.json @@ -1,16 +1,16 @@ { + "icon": "park", "fields": [ "leaf_type", "leaf_cycle", "denotation" ], - "icon": "park", "geometry": [ "line" ], - "terms": [], "tags": { "natural": "tree_row" }, + "terms": [], "name": "Tree row" } diff --git a/data/presets/presets/natural/water.json b/data/presets/presets/natural/water.json index 7de80e9a7..c0b74aae9 100644 --- a/data/presets/presets/natural/water.json +++ b/data/presets/presets/natural/water.json @@ -1,4 +1,5 @@ { + "icon": "water", "fields": [ "water" ], @@ -8,6 +9,5 @@ "tags": { "natural": "water" }, - "icon": "water", "name": "Water" -} \ No newline at end of file +} diff --git a/data/presets/presets/natural/water/lake.json b/data/presets/presets/natural/water/lake.json index f6bfcff15..e795f8d4a 100644 --- a/data/presets/presets/natural/water/lake.json +++ b/data/presets/presets/natural/water/lake.json @@ -1,4 +1,5 @@ { + "icon": "water", "geometry": [ "area" ], @@ -11,6 +12,5 @@ "loch", "mere" ], - "icon": "water", "name": "Lake" -} \ No newline at end of file +} diff --git a/data/presets/presets/natural/water/pond.json b/data/presets/presets/natural/water/pond.json index b4d92500d..40de8d966 100644 --- a/data/presets/presets/natural/water/pond.json +++ b/data/presets/presets/natural/water/pond.json @@ -1,4 +1,5 @@ { + "icon": "water", "geometry": [ "area" ], @@ -13,6 +14,5 @@ "pool", "mere" ], - "icon": "water", "name": "Pond" -} \ No newline at end of file +} diff --git a/data/presets/presets/natural/water/reservoir.json b/data/presets/presets/natural/water/reservoir.json index bdd709011..3905cbd21 100644 --- a/data/presets/presets/natural/water/reservoir.json +++ b/data/presets/presets/natural/water/reservoir.json @@ -1,4 +1,5 @@ { + "icon": "water", "geometry": [ "area" ], @@ -6,6 +7,5 @@ "natural": "water", "water": "reservoir" }, - "icon": "water", "name": "Reservoir" -} \ No newline at end of file +} diff --git a/data/taginfo.json b/data/taginfo.json index 676b368c6..801c1c79c 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1661,6 +1661,10 @@ { "key": "natural" }, + { + "key": "natural", + "value": "bare_rock" + }, { "key": "natural", "value": "bay" @@ -1701,10 +1705,18 @@ "key": "natural", "value": "peak" }, + { + "key": "natural", + "value": "ridge" + }, { "key": "natural", "value": "saddle" }, + { + "key": "natural", + "value": "sand" + }, { "key": "natural", "value": "scree" diff --git a/dist/locales/en.json b/dist/locales/en.json index cf1183103..381849664 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3445,13 +3445,17 @@ "name": "Natural", "terms": "" }, + "natural/bare_rock": { + "name": "Bare Rock", + "terms": "rock" + }, "natural/bay": { "name": "Bay", "terms": "" }, "natural/beach": { "name": "Beach", - "terms": "" + "terms": "shore" }, "natural/cave_entrance": { "name": "Cave Entrance", @@ -3459,7 +3463,7 @@ }, "natural/cliff": { "name": "Cliff", - "terms": "" + "terms": "escarpment" }, "natural/coastline": { "name": "Coastline", @@ -3475,7 +3479,7 @@ }, "natural/grassland": { "name": "Grassland", - "terms": "" + "terms": "prairie,savanna" }, "natural/heath": { "name": "Heath", @@ -3485,10 +3489,18 @@ "name": "Peak", "terms": "acme,aiguille,alp,climax,crest,crown,hill,mount,mountain,pinnacle,summit,tip,top" }, + "natural/ridge": { + "name": "Ridge", + "terms": "crest" + }, "natural/saddle": { "name": "Saddle", "terms": "pass,mountain pass,top" }, + "natural/sand": { + "name": "Sand", + "terms": "desert" + }, "natural/scree": { "name": "Scree", "terms": "loose rocks"