CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-07 03:41:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove extra "name" field from Plant Nursery preset

Browse Source 
(closes #3678)

Also:
* changed Plant Nursery to be area geometry only, not point
* added "plant" field to Plant Nursery preset
* added "operator" field to this and other related presets
* added search terms for this and other related presets
This commit is contained in:
Bryan Housel
2016-12-25 14:10:38 -05:00
parent d2952cf929
commit 99bf8d4dbd
11 changed files with 84 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
data/presets.yaml
View File

@@ -898,6 +898,9 @@ en:
place:
# place=*
label: Type
plant:
# plant=*
label: Plant
population:
# population=*
label: Population
@@ -2650,10 +2653,12 @@ en:
landuse/farmland:
# landuse=farmland
name: Farmland
# 'terms: crop,grow,plant'
terms: '<translate with synonyms or related terms for ''Farmland'', separated by commas>'
landuse/farmyard:
# landuse=farmyard
name: Farmyard
# 'terms: crop,grow,plant'
terms: '<translate with synonyms or related terms for ''Farmyard'', separated by commas>'
landuse/forest:
# landuse=forest
@@ -2688,11 +2693,12 @@ en:
landuse/orchard:
# landuse=orchard
name: Orchard
# 'terms: fruit'
terms: '<translate with synonyms or related terms for ''Orchard'', separated by commas>'
landuse/plant_nursery:
# landuse=plant_nursery
name: Plant Nursery
# 'terms: vivero'
# 'terms: flower,garden,grow,vivero'
terms: '<translate with synonyms or related terms for ''Plant Nursery'', separated by commas>'
landuse/quarry:
# landuse=quarry
@@ -2714,6 +2720,7 @@ en:
landuse/vineyard:
# landuse=vineyard
name: Vineyard
# 'terms: grape,wine'
terms: '<translate with synonyms or related terms for ''Vineyard'', separated by commas>'
leisure:
# leisure=*

5
data/presets/fields.json
View File

@@ -1183,6 +1183,11 @@
"type": "typeCombo",
"label": "Type"
},
"plant": {
"key": "plant",
"type": "combo",
"label": "Plant"
},
"population": {
"key": "population",
"type": "text",

5
data/presets/fields/plant.json Normal file
View File

@@ -0,0 +1,5 @@
{
"key": "plant",
"type": "combo",
"label": "Plant"
}

35
data/presets/presets.json
View File

@@ -5790,6 +5790,7 @@
"landuse/farm": {
"icon": "farm",
"fields": [
"operator",
"crop"
],
"geometry": [
@@ -5883,6 +5884,7 @@
"landuse/farmland": {
"icon": "farm",
"fields": [
"operator",
"crop"
],
"geometry": [
@@ -5891,12 +5893,17 @@
"tags": {
"landuse": "farmland"
},
"terms": [],
"terms": [
"crop",
"grow",
"plant"
],
"name": "Farmland"
},
"landuse/farmyard": {
"icon": "farm",
"fields": [
"operator",
"crop"
],
"geometry": [
@@ -5905,7 +5912,11 @@
"tags": {
"landuse": "farmyard"
},
"terms": [],
"terms": [
"crop",
"grow",
"plant"
],
"name": "Farmyard"
},
"landuse/forest": {
@@ -5992,6 +6003,7 @@
"landuse/orchard": {
"icon": "park2",
"fields": [
"operator",
"trees"
],
"geometry": [
@@ -6000,22 +6012,27 @@
"tags": {
"landuse": "orchard"
},
"terms": [],
"terms": [
"fruit"
],
"name": "Orchard"
},
"landuse/plant_nursery": {
"icon": "garden",
"fields": [
"name"
"operator",
"plant"
],
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "plant_nursery"
},
"terms": [
"flower",
"garden",
"grow",
"vivero"
],
"name": "Plant Nursery"
@@ -6064,13 +6081,19 @@
"name": "Retail Area"
},
"landuse/vineyard": {
"fields": [
"operator"
],
"geometry": [
"area"
],
"tags": {
"landuse": "vineyard"
},
"terms": [],
"terms": [
"grape",
"wine"
],
"name": "Vineyard"
},
"leisure": {

1
data/presets/presets/landuse/_farm.json
View File

@@ -1,6 +1,7 @@
{
"icon": "farm",
"fields": [
"operator",
"crop"
],
"geometry": [

7
data/presets/presets/landuse/farmland.json
View File

@@ -1,6 +1,7 @@
{
"icon": "farm",
"fields": [
"operator",
"crop"
],
"geometry": [
@@ -9,6 +10,10 @@
"tags": {
"landuse": "farmland"
},
"terms": [],
"terms": [
"crop",
"grow",
"plant"
],
"name": "Farmland"
}

7
data/presets/presets/landuse/farmyard.json
View File

@@ -1,6 +1,7 @@
{
"icon": "farm",
"fields": [
"operator",
"crop"
],
"geometry": [
@@ -9,6 +10,10 @@
"tags": {
"landuse": "farmyard"
},
"terms": [],
"terms": [
"crop",
"grow",
"plant"
],
"name": "Farmyard"
}

5
data/presets/presets/landuse/orchard.json
View File

@@ -1,6 +1,7 @@
{
"icon": "park2",
"fields": [
"operator",
"trees"
],
"geometry": [
@@ -9,6 +10,8 @@
"tags": {
"landuse": "orchard"
},
"terms": [],
"terms": [
"fruit"
],
"name": "Orchard"
}

7
data/presets/presets/landuse/plant_nursery.json
View File

@@ -1,16 +1,19 @@
{
"icon": "garden",
"fields": [
"name"
"operator",
"plant"
],
"geometry": [
"point",
"area"
],
"tags": {
"landuse": "plant_nursery"
},
"terms": [
"flower",
"garden",
"grow",
"vivero"
],
"name": "Plant Nursery"

8
data/presets/presets/landuse/vineyard.json
View File

@@ -1,10 +1,16 @@
{
"fields": [
"operator"
],
"geometry": [
"area"
],
"tags": {
"landuse": "vineyard"
},
"terms": [],
"terms": [
"grape",
"wine"
],
"name": "Vineyard"
}

13
dist/locales/en.json vendored
View File

@@ -1468,6 +1468,9 @@
"place": {
"label": "Type"
},
"plant": {
"label": "Plant"
},
"population": {
"label": "Population"
},
@@ -3064,11 +3067,11 @@
},
"landuse/farmland": {
"name": "Farmland",
"terms": ""
"terms": "crop,grow,plant"
},
"landuse/farmyard": {
"name": "Farmyard",
"terms": ""
"terms": "crop,grow,plant"
},
"landuse/forest": {
"name": "Forest",
@@ -3100,11 +3103,11 @@
},
"landuse/orchard": {
"name": "Orchard",
"terms": ""
"terms": "fruit"
},
"landuse/plant_nursery": {
"name": "Plant Nursery",
"terms": "vivero"
"terms": "flower,garden,grow,vivero"
},
"landuse/quarry": {
"name": "Quarry",
@@ -3124,7 +3127,7 @@
},
"landuse/vineyard": {
"name": "Vineyard",
"terms": ""
"terms": "grape,wine"
},
"leisure": {
"name": "Leisure",