CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-04-21 19:26:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Presets (volcano, saddle, adit, tree_row)

Browse Source 
Squashed commit of the following:

commit a100cc377da4d0790582fb2bd69e691d99084f0c
Author: Bryan Housel <bryan@7thposition.com>
Date:   Tue Jun 30 10:26:12 2015 -0400

    run make

commit cedd5d1c3dd43576ee42a6ab211d2f26eaaa732c
Author: jmespadero <josemiguel.espadero@urjc.es>
Date:   Mon Jun 29 18:53:36 2015 +0200

    Update volcano.json

commit 38c4a782f6941064f3c8132bce61896ea14e70e9
Author: jmespadero <josemiguel.espadero@urjc.es>
Date:   Mon Jun 29 16:28:28 2015 +0200

    Solver problem in man_made/adit/depth

commit 5e6d35dc3ed822ff1716cf0c80e6606545e337bd
Author: jmespadero <josemiguel.espadero@urjc.es>
Date:   Mon Jun 29 16:12:13 2015 +0200

    Solver problem in man_made/adit/resource

commit bb582143ce90ec00b5d2a7b1efd8fb2415cca16d
Author: jmespadero <josemiguel.espadero@urjc.es>
Date:   Mon Jun 29 13:54:29 2015 +0200

    Revert changes to ES locale

commit 8537162ad1bc6f6377c90f41cd6f24c103561ca5
Author: jmespadero <josemiguel.espadero@urjc.es>
Date:   Mon Jun 29 13:50:49 2015 +0200

    Some natural and man_made presets

commit 4c41d88f63950787ca5372414ebcda4609458d26
Author: jmespadero <josemiguel.espadero@urjc.es>
Date:   Fri Jun 26 15:57:38 2015 +0200

    Some natural/* and man_made/* translations
This commit is contained in:
Bryan Housel
2015-06-30 10:27:24 -04:00
parent 728036be51
commit 720b26142f
10 changed files with 210 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+21
View File
@@ -2404,6 +2404,11 @@ en:
# 'man_made=*'
name: Man Made
terms: "<translate with synonyms or related terms for 'Man Made', separated by commas>"
man_made/adit:
# man_made=adit
name: Adit
# 'terms: entrance,underground,mine,cave'
terms: "<translate with synonyms or related terms for 'Adit', separated by commas>"
man_made/breakwater:
# man_made=breakwater
name: Breakwater
@@ -2513,6 +2518,7 @@ en:
natural/cave_entrance:
# natural=cave_entrance
name: Cave Entrance
# 'terms: cavern,hollow,grotto,shelter,cavity'
terms: "<translate with synonyms or related terms for 'Cave Entrance', separated by commas>"
natural/cliff:
# natural=cliff
@@ -2544,6 +2550,11 @@ 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/saddle:
# natural=saddle
name: Saddle
# 'terms: pass,mountain pass,top'
terms: "<translate with synonyms or related terms for 'Saddle', separated by commas>"
natural/scree:
# natural=scree
name: Scree
@@ -2552,6 +2563,7 @@ en:
natural/scrub:
# natural=scrub
name: Scrub
# 'terms: bush,shrubs'
terms: "<translate with synonyms or related terms for 'Scrub', separated by commas>"
natural/spring:
# natural=spring
@@ -2561,6 +2573,15 @@ en:
# natural=tree
name: Tree
terms: "<translate with synonyms or related terms for 'Tree', separated by commas>"
natural/tree_row:
# natural=tree_row
name: Tree row
terms: "<translate with synonyms or related terms for 'Tree row', separated by commas>"
natural/volcano:
# natural=volcano
name: Volcano
# 'terms: mountain,crater'
terms: "<translate with synonyms or related terms for 'Volcano', separated by commas>"
natural/water:
# natural=water
name: Water
data/presets/presets.json
+83 -2
View File
@@ -5417,6 +5417,25 @@
},
"name": "Man Made"
},
"man_made/adit": {
"geometry": [
"point",
"area"
],
"fields": [
"operator"
],
"terms": [
"entrance",
"underground",
"mine",
"cave"
],
"tags": {
"man_made": "adit"
},
"name": "Adit"
},
"man_made/breakwater": {
"geometry": [
"line",
@@ -5774,7 +5793,13 @@
"fee",
"access_simple"
],
"terms": [],
"terms": [
"cavern",
"hollow",
"grotto",
"shelter",
"cavity"
],
"tags": {
"natural": "cave_entrance"
},
@@ -5875,6 +5900,25 @@
],
"name": "Peak"
},
"natural/saddle": {
"icon": "triangle-stroked",
"fields": [
"elevation"
],
"geometry": [
"point",
"vertex"
],
"tags": {
"natural": "saddle"
},
"terms": [
"pass",
"mountain pass",
"top"
],
"name": "Saddle"
},
"natural/scree": {
"geometry": [
"area"
@@ -5894,7 +5938,10 @@
"tags": {
"natural": "scrub"
},
"terms": [],
"terms": [
"bush",
"shrubs"
],
"name": "Scrub"
},
"natural/spring": {
@@ -5925,6 +5972,40 @@
},
"name": "Tree"
},
"natural/tree_row": {
"fields": [
"leaf_type",
"leaf_cycle",
"denotation"
],
"icon": "park",
"geometry": [
"line"
],
"terms": [],
"tags": {
"natural": "tree_row"
},
"name": "Tree row"
},
"natural/volcano": {
"icon": "triangle",
"fields": [
"elevation"
],
"geometry": [
"point",
"vertex"
],
"tags": {
"natural": "volcano"
},
"terms": [
"mountain",
"crater"
],
"name": "Volcano"
},
"natural/water": {
"fields": [
"water"
data/presets/presets/man_made/adit.json
+17
View File
@@ -0,0 +1,17 @@
{
"geometry": [
"point",
"area"
],
"fields": [
"operator"
],
"terms": ["entrance",
"underground",
"mine",
"cave"],
"tags": {
"man_made": "adit"
},
"name": "Adit"
}
data/presets/presets/natural/cave_entrance.json
+1 -1
View File
@@ -7,7 +7,7 @@
"fee",
"access_simple"
],
"terms": [],
"terms": ["cavern","hollow","grotto","shelter","cavity"],
"tags": {
"natural": "cave_entrance"
},
data/presets/presets/natural/saddle.json
+19
View File
@@ -0,0 +1,19 @@
{
"icon": "triangle-stroked",
"fields": [
"elevation"
],
"geometry": [
"point",
"vertex"
],
"tags": {
"natural": "saddle"
},
"terms": [
"pass",
"mountain pass",
"top"
],
"name": "Saddle"
}
data/presets/presets/natural/scrub.json
+1 -1
View File
@@ -5,6 +5,6 @@
"tags": {
"natural": "scrub"
},
"terms": [],
"terms": ["bush","shrubs"],
"name": "Scrub"
}
data/presets/presets/natural/tree_row.json
+16
View File
@@ -0,0 +1,16 @@
{
"fields": [
"leaf_type",
"leaf_cycle",
"denotation"
],
"icon": "park",
"geometry": [
"line"
],
"terms": [],
"tags": {
"natural": "tree_row"
},
"name": "Tree row"
}
data/presets/presets/natural/volcano.json
+18
View File
@@ -0,0 +1,18 @@
{
"icon": "triangle",
"fields": [
"elevation"
],
"geometry": [
"point",
"vertex"
],
"tags": {
"natural": "volcano"
},
"terms": [
"mountain",
"crater"
],
"name": "Volcano"
}
data/taginfo.json
+16
View File
@@ -1259,6 +1259,10 @@
{
"key": "man_made"
},
{
"key": "man_made",
"value": "adit"
},
{
"key": "man_made",
"value": "breakwater"
@@ -1390,6 +1394,10 @@
"key": "natural",
"value": "peak"
},
{
"key": "natural",
"value": "saddle"
},
{
"key": "natural",
"value": "scree"
@@ -1406,6 +1414,14 @@
"key": "natural",
"value": "tree"
},
{
"key": "natural",
"value": "tree_row"
},
{
"key": "natural",
"value": "volcano"
},
{
"key": "natural",
"value": "water"
dist/locales/en.json
Vendored
+18 -2
View File
@@ -2693,6 +2693,10 @@
"name": "Man Made",
"terms": ""
},
"man_made/adit": {
"name": "Adit",
"terms": "entrance,underground,mine,cave"
},
"man_made/breakwater": {
"name": "Breakwater",
"terms": ""
@@ -2795,7 +2799,7 @@
},
"natural/cave_entrance": {
"name": "Cave Entrance",
"terms": ""
"terms": "cavern,hollow,grotto,shelter,cavity"
},
"natural/cliff": {
"name": "Cliff",
@@ -2825,13 +2829,17 @@
"name": "Peak",
"terms": "acme,aiguille,alp,climax,crest,crown,hill,mount,mountain,pinnacle,summit,tip,top"
},
"natural/saddle": {
"name": "Saddle",
"terms": "pass,mountain pass,top"
},
"natural/scree": {
"name": "Scree",
"terms": "loose rocks"
},
"natural/scrub": {
"name": "Scrub",
"terms": ""
"terms": "bush,shrubs"
},
"natural/spring": {
"name": "Spring",
@@ -2841,6 +2849,14 @@
"name": "Tree",
"terms": ""
},
"natural/tree_row": {
"name": "Tree row",
"terms": ""
},
"natural/volcano": {
"name": "Volcano",
"terms": "mountain,crater"
},
"natural/water": {
"name": "Water",
"terms": ""