CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 09:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use semiCombo field for output tags

Browse Source 
* crop, produce, product, trees, grape_variety
This commit is contained in:
Bryan Housel
2017-03-17 12:26:07 -04:00
parent c6ed067120
commit 1cd8ca3851
10 changed files with 54 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
data/presets.yaml
View File

@@ -356,7 +356,7 @@ en:
label: Type
crop:
# crop=*
label: Crop
label: Crops
crossing:
# crossing=*
label: Type
@@ -537,6 +537,9 @@ en:
label: Reference
# golf_hole field placeholder
placeholder: Hole number (1-18)
grape_variety:
# grape_variety=*
label: Grape Varieties
handicap:
# handicap=*
label: Handicap
@@ -977,7 +980,7 @@ en:
label: Produce
product:
# product=*
label: Product
label: Products
railway:
# railway=*
label: Type

17
data/presets/fields.json
View File

@@ -465,8 +465,8 @@
},
"crop": {
"key": "crop",
"type": "combo",
"label": "Crop"
"type": "semiCombo",
"label": "Crops"
},
"crossing": {
"key": "crossing",
@@ -743,6 +743,11 @@
"label": "Reference",
"placeholder": "Hole number (1-18)"
},
"grape_variety": {
"key": "grape_variety",
"type": "semiCombo",
"label": "Grape Varieties"
},
"handicap": {
"key": "handicap",
"type": "number",
@@ -1287,13 +1292,13 @@
},
"produce": {
"key": "produce",
"type": "combo",
"type": "semiCombo",
"label": "Produce"
},
"product": {
"key": "product",
"type": "combo",
"label": "Product"
"type": "semiCombo",
"label": "Products"
},
"railway": {
"key": "railway",
@@ -1738,7 +1743,7 @@
},
"trees": {
"key": "trees",
"type": "combo",
"type": "semiCombo",
"label": "Trees"
},
"tunnel": {

4
data/presets/fields/crop.json
View File

@@ -1,5 +1,5 @@
{
"key": "crop",
"type": "combo",
"label": "Crop"
"type": "semiCombo",
"label": "Crops"
}

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

@@ -0,0 +1,5 @@
{
"key": "grape_variety",
"type": "semiCombo",
"label": "Grape Varieties"
}

2
data/presets/fields/produce.json
View File

@@ -1,5 +1,5 @@
{
"key": "produce",
"type": "combo",
"type": "semiCombo",
"label": "Produce"
}

4
data/presets/fields/product.json
View File

@@ -1,5 +1,5 @@
{
"key": "product",
"type": "combo",
"label": "Product"
"type": "semiCombo",
"label": "Products"
}

2
data/presets/fields/trees.json
View File

@@ -1,5 +1,5 @@
{
"key": "trees",
"type": "combo",
"type": "semiCombo",
"label": "Trees"
}

12
data/presets/presets.json
View File

@@ -6889,7 +6889,8 @@
},
"landuse/vineyard": {
"fields": [
"operator"
"operator",
"grape_variety"
],
"geometry": [
"area"
@@ -6897,6 +6898,15 @@
"tags": {
"landuse": "vineyard"
},
"addTags": {
"landuse": "vineyard",
"crop": "grape"
},
"removeTags": {
"landuse": "vineyard",
"crop": "grape",
"grape_variety": "*"
},
"terms": [
"grape",
"wine"

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

@@ -1,6 +1,7 @@
{
"fields": [
"operator"
"operator",
"grape_variety"
],
"geometry": [
"area"
@@ -8,6 +9,15 @@
"tags": {
"landuse": "vineyard"
},
"addTags": {
"landuse": "vineyard",
"crop": "grape"
},
"removeTags": {
"landuse": "vineyard",
"crop": "grape",
"grape_variety": "*"
},
"terms": [
"grape",
"wine"

7
dist/locales/en.json vendored
View File

@@ -1041,7 +1041,7 @@
"label": "Type"
},
"crop": {
"label": "Crop"
"label": "Crops"
},
"crossing": {
"label": "Type"
@@ -1208,6 +1208,9 @@
"label": "Reference",
"placeholder": "Hole number (1-18)"
},
"grape_variety": {
"label": "Grape Varieties"
},
"handicap": {
"label": "Handicap",
"placeholder": "1-18"
@@ -1560,7 +1563,7 @@
"label": "Produce"
},
"product": {
"label": "Product"
"label": "Products"
},
"railway": {
"label": "Type"