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

Fix recycling field keys (fixes #2140)

Browse Source
This commit is contained in:
John Firebaugh
2014-02-28 09:08:49 -08:00
parent 33242db40c
commit 7c7c8a40bc
9 changed files with 52 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/presets.yaml
+8 -9
View File
@@ -53,7 +53,6 @@ en:
address:
label: Address
placeholders:
housename: Housename
number: "123"
street: Street
city: City
@@ -101,8 +100,6 @@ en:
label: Building
building_area:
label: Building
cans:
label: Accepts Cans
capacity:
label: Capacity
placeholder: "50, 100, 200..."
@@ -113,8 +110,6 @@ en:
options:
clockwise: Clockwise
anticlockwise: Counterclockwise
clothes:
label: Accepts Clothes
collection_times:
label: Collection Times
construction:
@@ -158,8 +153,6 @@ en:
label: Source
generator/type:
label: Type
glass:
label: Accepts Glass
golf_hole:
label: Reference
placeholder: "Hole number (1-18)"
@@ -226,8 +219,6 @@ en:
label: Hours
operator:
label: Operator
paper:
label: Accepts Paper
par:
label: Par
placeholder: "3, 4, 5..."
@@ -250,6 +241,14 @@ en:
label: Type
railway:
label: Type
recycling/cans:
label: Accepts Cans
recycling/clothes:
label: Accepts Clothes
recycling/glass:
label: Accepts Glass
recycling/paper:
label: Accepts Paper
ref:
label: Reference
relation:
data/presets/fields.json
+20 -22
View File
@@ -60,7 +60,6 @@
"address": {
"type": "address",
"keys": [
"addr:housename",
"addr:housenumber",
"addr:street",
"addr:city",
@@ -71,7 +70,6 @@
"label": "Address",
"strings": {
"placeholders": {
"housename": "Housename",
"number": "123",
"street": "Street",
"city": "City",
@@ -194,11 +192,6 @@
"geometry": "area",
"label": "Building"
},
"cans": {
"key": "cans",
"type": "check",
"label": "Accepts Cans"
},
"capacity": {
"key": "capacity",
"type": "number",
@@ -242,11 +235,6 @@
}
}
},
"clothes": {
"key": "clothes",
"type": "check",
"label": "Accepts Clothes"
},
"collection_times": {
"key": "collection_times",
"type": "text",
@@ -368,11 +356,6 @@
"type": "combo",
"label": "Type"
},
"glass": {
"key": "glass",
"type": "check",
"label": "Accepts Glass"
},
"golf_hole": {
"key": "ref",
"type": "text",
@@ -533,11 +516,6 @@
"type": "text",
"label": "Operator"
},
"paper": {
"key": "paper",
"type": "check",
"label": "Accepts Paper"
},
"par": {
"key": "par",
"type": "number",
@@ -601,6 +579,26 @@
"type": "typeCombo",
"label": "Type"
},
"recycling/cans": {
"key": "recycling:cans",
"type": "check",
"label": "Accepts Cans"
},
"recycling/clothes": {
"key": "recycling:clothes",
"type": "check",
"label": "Accepts Clothes"
},
"recycling/glass": {
"key": "recycling:glass",
"type": "check",
"label": "Accepts Glass"
},
"recycling/paper": {
"key": "recycling:paper",
"type": "check",
"label": "Accepts Paper"
},
"ref": {
"key": "ref",
"type": "text",
data/presets/fields/cans.json → data/presets/fields/recycling/cans.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"key": "cans",
"key": "recycling:cans",
"type": "check",
"label": "Accepts Cans"
}
data/presets/fields/clothes.json → data/presets/fields/recycling/clothes.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"key": "clothes",
"key": "recycling:clothes",
"type": "check",
"label": "Accepts Clothes"
}
data/presets/fields/glass.json → data/presets/fields/recycling/glass.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"key": "glass",
"key": "recycling:glass",
"type": "check",
"label": "Accepts Glass"
}
data/presets/fields/paper.json → data/presets/fields/recycling/paper.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"key": "paper",
"key": "recycling:paper",
"type": "check",
"label": "Accepts Paper"
}
data/presets/presets.json
+4 -4
View File
@@ -1241,10 +1241,10 @@
"amenity/recycling": {
"icon": "recycling",
"fields": [
"cans",
"glass",
"paper",
"clothes"
"recycling/cans",
"recycling/glass",
"recycling/paper",
"recycling/clothes"
],
"geometry": [
"point",
data/presets/presets/amenity/recycling.json
+4 -4
View File
@@ -1,10 +1,10 @@
{
"icon": "recycling",
"fields": [
"cans",
"glass",
"paper",
"clothes"
"recycling/cans",
"recycling/glass",
"recycling/paper",
"recycling/clothes"
],
"geometry": [
"point",
dist/locales/en.json
Vendored
+12 -13
View File
@@ -470,7 +470,6 @@
"address": {
"label": "Address",
"placeholders": {
"housename": "Housename",
"number": "123",
"street": "Street",
"city": "City",
@@ -540,9 +539,6 @@
"building_area": {
"label": "Building"
},
"cans": {
"label": "Accepts Cans"
},
"capacity": {
"label": "Capacity",
"placeholder": "50, 100, 200..."
@@ -557,9 +553,6 @@
"anticlockwise": "Counterclockwise"
}
},
"clothes": {
"label": "Accepts Clothes"
},
"collection_times": {
"label": "Collection Times"
},
@@ -624,9 +617,6 @@
"generator/type": {
"label": "Type"
},
"glass": {
"label": "Accepts Glass"
},
"golf_hole": {
"label": "Reference",
"placeholder": "Hole number (1-18)"
@@ -721,9 +711,6 @@
"operator": {
"label": "Operator"
},
"paper": {
"label": "Accepts Paper"
},
"par": {
"label": "Par",
"placeholder": "3, 4, 5..."
@@ -756,6 +743,18 @@
"railway": {
"label": "Type"
},
"recycling/cans": {
"label": "Accepts Cans"
},
"recycling/clothes": {
"label": "Accepts Clothes"
},
"recycling/glass": {
"label": "Accepts Glass"
},
"recycling/paper": {
"label": "Accepts Paper"
},
"ref": {
"label": "Reference"
},