CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-15 21:48:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add presets for natural Bare Rock, Ridge, Sand

Browse Source 
(closes #3646)

Also cleanup terms
This commit is contained in:
Bryan Housel
2016-12-26 15:09:34 -05:00
parent 99bf8d4dbd
commit c664281c2d
25 changed files with 200 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+18
View File
@@ -3069,6 +3069,11 @@ en:
# natural=*
name: Natural
terms: '<translate with synonyms or related terms for ''Natural'', separated by commas>'
natural/bare_rock:
# natural=bare_rock
name: Bare Rock
# 'terms: rock'
terms: '<translate with synonyms or related terms for ''Bare Rock'', separated by commas>'
natural/bay:
# natural=bay
name: Bay
@@ -3076,6 +3081,7 @@ en:
natural/beach:
# natural=beach
name: Beach
# 'terms: shore'
terms: '<translate with synonyms or related terms for ''Beach'', separated by commas>'
natural/cave_entrance:
# natural=cave_entrance
@@ -3085,6 +3091,7 @@ en:
natural/cliff:
# natural=cliff
name: Cliff
# 'terms: escarpment'
terms: '<translate with synonyms or related terms for ''Cliff'', separated by commas>'
natural/coastline:
# natural=coastline
@@ -3102,6 +3109,7 @@ en:
natural/grassland:
# natural=grassland
name: Grassland
# 'terms: prairie,savanna'
terms: '<translate with synonyms or related terms for ''Grassland'', separated by commas>'
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: '<translate with synonyms or related terms for ''Peak'', separated by commas>'
natural/ridge:
# natural=ridge
name: Ridge
# 'terms: crest'
terms: '<translate with synonyms or related terms for ''Ridge'', separated by commas>'
natural/saddle:
# natural=saddle
name: Saddle
# 'terms: pass,mountain pass,top'
terms: '<translate with synonyms or related terms for ''Saddle'', separated by commas>'
natural/sand:
# natural=sand
name: Sand
# 'terms: desert'
terms: '<translate with synonyms or related terms for ''Sand'', separated by commas>'
natural/scree:
# natural=scree
name: Scree
data/presets/presets.json
+65 -23
View File
@@ -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": {
data/presets/presets/natural/bare_rock.json
+12
View File
@@ -0,0 +1,12 @@
{
"geometry": [
"area"
],
"tags": {
"natural": "bare_rock"
},
"terms": [
"rock"
],
"name": "Bare Rock"
}
data/presets/presets/natural/bay.json
+2 -2
View File
@@ -3,9 +3,9 @@
"point",
"area"
],
"terms": [],
"tags": {
"natural": "bay"
},
"terms": [],
"name": "Bay"
}
}
data/presets/presets/natural/beach.json
+4 -2
View File
@@ -6,9 +6,11 @@
"point",
"area"
],
"terms": [],
"tags": {
"natural": "beach"
},
"terms": [
"shore"
],
"name": "Beach"
}
}
data/presets/presets/natural/cave_entrance.json
+8 -2
View File
@@ -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"
}
}
data/presets/presets/natural/cliff.json
+4 -2
View File
@@ -5,9 +5,11 @@
"line",
"area"
],
"terms": [],
"tags": {
"natural": "cliff"
},
"terms": [
"escarpment"
],
"name": "Cliff"
}
}
data/presets/presets/natural/coastline.json
+4 -4
View File
@@ -2,11 +2,11 @@
"geometry": [
"line"
],
"terms": [
"shore"
],
"tags": {
"natural": "coastline"
},
"terms": [
"shore"
],
"name": "Coastline"
}
}
data/presets/presets/natural/fell.json
+1 -1
View File
@@ -2,9 +2,9 @@
"geometry": [
"area"
],
"terms": [],
"tags": {
"natural": "fell"
},
"terms": [],
"name": "Fell"
}
data/presets/presets/natural/glacier.json
+2 -2
View File
@@ -2,9 +2,9 @@
"geometry": [
"area"
],
"terms": [],
"tags": {
"natural": "glacier"
},
"terms": [],
"name": "Glacier"
}
}
data/presets/presets/natural/grassland.json
+5 -3
View File
@@ -1,11 +1,13 @@
{
"geometry": [
"point",
"area"
],
"terms": [],
"tags": {
"natural": "grassland"
},
"terms": [
"prairie",
"savanna"
],
"name": "Grassland"
}
}
data/presets/presets/natural/heath.json
+2 -2
View File
@@ -2,9 +2,9 @@
"geometry": [
"area"
],
"terms": [],
"tags": {
"natural": "heath"
},
"terms": [],
"name": "Heath"
}
}
data/presets/presets/natural/ridge.json
+12
View File
@@ -0,0 +1,12 @@
{
"geometry": [
"line"
],
"tags": {
"natural": "ridge"
},
"terms": [
"crest"
],
"name": "Ridge"
}
data/presets/presets/natural/sand.json
+12
View File
@@ -0,0 +1,12 @@
{
"geometry": [
"area"
],
"tags": {
"natural": "sand"
},
"terms": [
"desert"
],
"name": "Sand"
}
data/presets/presets/natural/scree.json
+3 -1
View File
@@ -5,6 +5,8 @@
"tags": {
"natural": "scree"
},
"terms": ["loose rocks"],
"terms": [
"loose rocks"
],
"name": "Scree"
}
data/presets/presets/natural/scrub.json
+5 -2
View File
@@ -5,6 +5,9 @@
"tags": {
"natural": "scrub"
},
"terms": ["bush","shrubs"],
"terms": [
"bush",
"shrubs"
],
"name": "Scrub"
}
}
data/presets/presets/natural/spring.json
+2 -2
View File
@@ -3,9 +3,9 @@
"point",
"vertex"
],
"terms": [],
"tags": {
"natural": "spring"
},
"terms": [],
"name": "Spring"
}
}
data/presets/presets/natural/tree.json
+2 -2
View File
@@ -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"
}
data/presets/presets/natural/tree_row.json
+2 -2
View File
@@ -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"
}
data/presets/presets/natural/water.json
+2 -2
View File
@@ -1,4 +1,5 @@
{
"icon": "water",
"fields": [
"water"
],
@@ -8,6 +9,5 @@
"tags": {
"natural": "water"
},
"icon": "water",
"name": "Water"
}
}
data/presets/presets/natural/water/lake.json
+2 -2
View File
@@ -1,4 +1,5 @@
{
"icon": "water",
"geometry": [
"area"
],
@@ -11,6 +12,5 @@
"loch",
"mere"
],
"icon": "water",
"name": "Lake"
}
}
data/presets/presets/natural/water/pond.json
+2 -2
View File
@@ -1,4 +1,5 @@
{
"icon": "water",
"geometry": [
"area"
],
@@ -13,6 +14,5 @@
"pool",
"mere"
],
"icon": "water",
"name": "Pond"
}
}
data/presets/presets/natural/water/reservoir.json
+2 -2
View File
@@ -1,4 +1,5 @@
{
"icon": "water",
"geometry": [
"area"
],
@@ -6,6 +7,5 @@
"natural": "water",
"water": "reservoir"
},
"icon": "water",
"name": "Reservoir"
}
}
data/taginfo.json
+12
View File
@@ -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"
dist/locales/en.json
Vendored
+15 -3
View File
@@ -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"