CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-04-22 03:36:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updates to landuse presets (closes #2518)

Browse Source 
* Do not support `landuse=*` on nodes anymore
* Add "Area" to description for `residential`, `commercial`, `industrial`, `retail`
This commit is contained in:
Bryan Housel
2015-02-03 11:12:44 -05:00
parent b07f205db9
commit 487130329d
22 changed files with 55 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+12 -12
View File
@@ -1394,8 +1394,8 @@ en:
name: Churchyard
terms: "<translate with synonyms or related terms for 'Churchyard', separated by commas>"
landuse/commercial:
name: Commercial
terms: "<translate with synonyms or related terms for 'Commercial', separated by commas>"
name: Commercial Area
terms: "<translate with synonyms or related terms for 'Commercial Area', separated by commas>"
landuse/construction:
name: Construction
terms: "<translate with synonyms or related terms for 'Construction', separated by commas>"
@@ -1403,8 +1403,8 @@ en:
name: Farm
terms: "<translate with synonyms or related terms for 'Farm', separated by commas>"
landuse/farmland:
name: Farm
terms: "<translate with synonyms or related terms for 'Farm', separated by commas>"
name: Farmland
terms: "<translate with synonyms or related terms for 'Farmland', separated by commas>"
landuse/farmyard:
name: Farmyard
terms: "<translate with synonyms or related terms for 'Farmyard', separated by commas>"
@@ -1418,8 +1418,8 @@ en:
name: Grass
terms: "<translate with synonyms or related terms for 'Grass', separated by commas>"
landuse/industrial:
name: Industrial
terms: "<translate with synonyms or related terms for 'Industrial', separated by commas>"
name: Industrial Area
terms: "<translate with synonyms or related terms for 'Industrial Area', separated by commas>"
landuse/landfill:
name: Landfill
terms: "<translate with synonyms or related terms for 'Landfill', separated by commas>"
@@ -1427,8 +1427,8 @@ en:
name: Meadow
terms: "<translate with synonyms or related terms for 'Meadow', separated by commas>"
landuse/military:
name: Military
terms: "<translate with synonyms or related terms for 'Military', separated by commas>"
name: Military Area
terms: "<translate with synonyms or related terms for 'Military Area', separated by commas>"
landuse/orchard:
name: Orchard
terms: "<translate with synonyms or related terms for 'Orchard', separated by commas>"
@@ -1436,11 +1436,11 @@ en:
name: Quarry
terms: "<translate with synonyms or related terms for 'Quarry', separated by commas>"
landuse/residential:
name: Residential
terms: "<translate with synonyms or related terms for 'Residential', separated by commas>"
name: Residential Area
terms: "<translate with synonyms or related terms for 'Residential Area', separated by commas>"
landuse/retail:
name: Retail
terms: "<translate with synonyms or related terms for 'Retail', separated by commas>"
name: Retail Area
terms: "<translate with synonyms or related terms for 'Retail Area', separated by commas>"
landuse/vineyard:
name: Vineyard
terms: "<translate with synonyms or related terms for 'Vineyard', separated by commas>"
data/presets/presets.json
+12 -29
View File
@@ -4621,7 +4621,6 @@
},
"landuse/allotments": {
"geometry": [
"point",
"area"
],
"tags": {
@@ -4632,7 +4631,6 @@
},
"landuse/basin": {
"geometry": [
"point",
"area"
],
"tags": {
@@ -4648,8 +4646,6 @@
"denomination"
],
"geometry": [
"point",
"vertex",
"area"
],
"tags": {
@@ -4675,14 +4671,13 @@
"landuse/commercial": {
"icon": "commercial",
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "commercial"
},
"terms": [],
"name": "Commercial"
"name": "Commercial Area"
},
"landuse/construction": {
"fields": [
@@ -4690,7 +4685,6 @@
"operator"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -4700,6 +4694,7 @@
"name": "Construction"
},
"landuse/farm": {
"icon": "farm",
"fields": [
"crop"
],
@@ -4712,15 +4707,14 @@
},
"terms": [],
"name": "Farm",
"icon": "farm",
"searchable": false
},
"landuse/farmland": {
"icon": "farm",
"fields": [
"crop"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -4729,23 +4723,21 @@
"terms": [
"farmland"
],
"name": "Farm",
"icon": "farm"
"name": "Farmland"
},
"landuse/farmyard": {
"icon": "farm",
"fields": [
"crop"
],
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "farmyard"
},
"terms": [],
"name": "Farmyard",
"icon": "farm"
"name": "Farmyard"
},
"landuse/forest": {
"icon": "park2",
@@ -4754,7 +4746,6 @@
"leaf_cycle"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -4777,7 +4768,6 @@
},
"landuse/grass": {
"geometry": [
"point",
"area"
],
"tags": {
@@ -4789,14 +4779,13 @@
"landuse/industrial": {
"icon": "industrial",
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "industrial"
},
"terms": [],
"name": "Industrial"
"name": "Industrial Area"
},
"landuse/landfill": {
"geometry": [
@@ -4812,7 +4801,6 @@
},
"landuse/meadow": {
"geometry": [
"point",
"area"
],
"tags": {
@@ -4829,26 +4817,24 @@
"landuse": "military"
},
"terms": [],
"name": "Military"
"name": "Military Area"
},
"landuse/orchard": {
"icon": "park2",
"fields": [
"trees"
],
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "orchard"
},
"terms": [],
"name": "Orchard",
"icon": "park2"
"name": "Orchard"
},
"landuse/quarry": {
"geometry": [
"point",
"area"
],
"tags": {
@@ -4860,29 +4846,26 @@
"landuse/residential": {
"icon": "building",
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "residential"
},
"terms": [],
"name": "Residential"
"name": "Residential Area"
},
"landuse/retail": {
"icon": "shop",
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "retail"
},
"name": "Retail"
"name": "Retail Area"
},
"landuse/vineyard": {
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/landuse/allotments.json
+1 -2
View File
@@ -1,6 +1,5 @@
{
"geometry": [
"point",
"area"
],
"tags": {
@@ -8,4 +7,4 @@
},
"terms": [],
"name": "Allotments"
}
}
data/presets/presets/landuse/basin.json
+1 -2
View File
@@ -1,6 +1,5 @@
{
"geometry": [
"point",
"area"
],
"tags": {
@@ -8,4 +7,4 @@
},
"terms": [],
"name": "Basin"
}
}
data/presets/presets/landuse/cemetery.json
-2
View File
@@ -5,8 +5,6 @@
"denomination"
],
"geometry": [
"point",
"vertex",
"area"
],
"tags": {
data/presets/presets/landuse/commercial.json
+2 -3
View File
@@ -1,12 +1,11 @@
{
"icon": "commercial",
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "commercial"
},
"terms": [],
"name": "Commercial"
}
"name": "Commercial Area"
}
data/presets/presets/landuse/construction.json
+1 -2
View File
@@ -4,7 +4,6 @@
"operator"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -12,4 +11,4 @@
},
"terms": [],
"name": "Construction"
}
}
data/presets/presets/landuse/farm.json
+1 -1
View File
@@ -1,4 +1,5 @@
{
"icon": "farm",
"fields": [
"crop"
],
@@ -11,6 +12,5 @@
},
"terms": [],
"name": "Farm",
"icon": "farm",
"searchable": false
}
data/presets/presets/landuse/farmland.json
+2 -3
View File
@@ -1,9 +1,9 @@
{
"icon": "farm",
"fields": [
"crop"
],
"geometry": [
"point",
"area"
],
"tags": {
@@ -12,6 +12,5 @@
"terms": [
"farmland"
],
"name": "Farm",
"icon": "farm"
"name": "Farmland"
}
data/presets/presets/landuse/farmyard.json
+2 -3
View File
@@ -1,15 +1,14 @@
{
"icon": "farm",
"fields": [
"crop"
],
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "farmyard"
},
"terms": [],
"name": "Farmyard",
"icon": "farm"
"name": "Farmyard"
}
data/presets/presets/landuse/forest.json
-1
View File
@@ -5,7 +5,6 @@
"leaf_cycle"
],
"geometry": [
"point",
"area"
],
"tags": {
data/presets/presets/landuse/garages.json
+1 -2
View File
@@ -5,7 +5,6 @@
"tags": {
"landuse": "garages"
},
"terms": [
],
"terms": [],
"name": "Garages"
}
data/presets/presets/landuse/grass.json
+1 -2
View File
@@ -1,6 +1,5 @@
{
"geometry": [
"point",
"area"
],
"tags": {
@@ -8,4 +7,4 @@
},
"terms": [],
"name": "Grass"
}
}
data/presets/presets/landuse/industrial.json
+2 -3
View File
@@ -1,12 +1,11 @@
{
"icon": "industrial",
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "industrial"
},
"terms": [],
"name": "Industrial"
}
"name": "Industrial Area"
}
data/presets/presets/landuse/meadow.json
+1 -2
View File
@@ -1,6 +1,5 @@
{
"geometry": [
"point",
"area"
],
"tags": {
@@ -8,4 +7,4 @@
},
"terms": [],
"name": "Meadow"
}
}
data/presets/presets/landuse/military.json
+2 -2
View File
@@ -6,5 +6,5 @@
"landuse": "military"
},
"terms": [],
"name": "Military"
}
"name": "Military Area"
}
data/presets/presets/landuse/orchard.json
+2 -3
View File
@@ -1,15 +1,14 @@
{
"icon": "park2",
"fields": [
"trees"
],
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "orchard"
},
"terms": [],
"name": "Orchard",
"icon": "park2"
"name": "Orchard"
}
data/presets/presets/landuse/quarry.json
+1 -2
View File
@@ -1,6 +1,5 @@
{
"geometry": [
"point",
"area"
],
"tags": {
@@ -8,4 +7,4 @@
},
"terms": [],
"name": "Quarry"
}
}
data/presets/presets/landuse/residential.json
+2 -3
View File
@@ -1,12 +1,11 @@
{
"icon": "building",
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "residential"
},
"terms": [],
"name": "Residential"
}
"name": "Residential Area"
}
data/presets/presets/landuse/retail.json
+2 -3
View File
@@ -1,11 +1,10 @@
{
"icon": "shop",
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "retail"
},
"name": "Retail"
}
"name": "Retail Area"
}
data/presets/presets/landuse/vineyard.json
+1 -2
View File
@@ -1,6 +1,5 @@
{
"geometry": [
"point",
"area"
],
"tags": {
@@ -8,4 +7,4 @@
},
"terms": [],
"name": "Vineyard"
}
}
dist/locales/en.json
Vendored
+6 -6
View File
@@ -2379,7 +2379,7 @@
"terms": ""
},
"landuse/commercial": {
"name": "Commercial",
"name": "Commercial Area",
"terms": ""
},
"landuse/construction": {
@@ -2391,7 +2391,7 @@
"terms": ""
},
"landuse/farmland": {
"name": "Farm",
"name": "Farmland",
"terms": "farmland"
},
"landuse/farmyard": {
@@ -2411,7 +2411,7 @@
"terms": ""
},
"landuse/industrial": {
"name": "Industrial",
"name": "Industrial Area",
"terms": ""
},
"landuse/landfill": {
@@ -2423,7 +2423,7 @@
"terms": ""
},
"landuse/military": {
"name": "Military",
"name": "Military Area",
"terms": ""
},
"landuse/orchard": {
@@ -2435,11 +2435,11 @@
"terms": ""
},
"landuse/residential": {
"name": "Residential",
"name": "Residential Area",
"terms": ""
},
"landuse/retail": {
"name": "Retail",
"name": "Retail Area",
"terms": ""
},
"landuse/vineyard": {