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

Remove inline forms

Browse Source 
No good way to give them IDs; better to be consistent.
This commit is contained in:
John Firebaugh
2013-03-12 17:19:11 -07:00
parent fb57c64caa
commit 8509d9f620
49 changed files with 184 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/presets/forms.json
View File

@@ -1 +1 @@
{"access":{"key":"access","type":"combo"},"address":{"type":"address","keys":["addr:housename","addr:housenumber","addr:street","addr:city"],"universal":true},"atm":{"key":"atm","type":"check"},"building":{"key":"building","type":"combo"},"building_area":{"key":"building","type":"check","default":{"area":"yes"}},"building_yes":{"key":"building","type":"combo","default":{"area":"yes"}},"capacity":{"key":"capacity","type":"text"},"cuisine":{"key":"cuisine","type":"combo","indexed":true},"denomination":{"key":"denomination","type":"combo"},"elevation":{"key":"ele","type":"number","universal":true},"emergency":{"key":"emergency","type":"check"},"fax":{"key":"fax","type":"tel"},"fee":{"key":"fee","type":"check"},"internet_access":{"key":"internet_access","type":"combo","options":["yes","no","wlan","wired","terminal"]},"layer":{"key":"layer","type":"combo"},"levels":{"key":"building:levels","type":"number"},"maxspeed":{"key":"maxspeed","type":"combo"},"network":{"key":"network","type":"text"},"oneway":{"key":"oneway","type":"check"},"opening_hours":{"key":"opening_hours","type":"text"},"operator":{"key":"operator","type":"text"},"phone":{"key":"phone","type":"tel"},"religion":{"key":"religion","type":"combo","options":["christian","muslim","buddhist","jewish","hindu","shinto","taoist"]},"roadtype":{"title":" ","type":"radio","options":["bridge","tunnel","embankment","cutting"]},"shelter":{"key":"shelter","type":"check"},"source":{"key":"source","type":"text","universal":true},"surface":{"key":"surface","type":"combo"},"telephone":{"key":"phone","type":"tel","universal":true},"website":{"key":"website","type":"url","universal":true},"wikipedia":{"key":"wikipedia","type":"text","universal":true}}
{"access":{"key":"access","type":"combo"},"address":{"type":"address","keys":["addr:housename","addr:housenumber","addr:street","addr:city"],"universal":true},"aeroway":{"key":"aeroway","type":"combo"},"amenity":{"key":"amenity","type":"combo"},"atm":{"key":"atm","type":"check"},"building":{"key":"building","type":"combo"},"building_area":{"key":"building","type":"check","default":{"area":"yes"}},"building_yes":{"key":"building","type":"combo","default":{"area":"yes"}},"capacity":{"key":"capacity","type":"text"},"collection_times":{"key":"collection_times","type":"text"},"construction":{"key":"construction","type":"combo"},"crossing":{"key":"crossing","type":"combo"},"cuisine":{"key":"cuisine","type":"combo","indexed":true},"denomination":{"key":"denomination","type":"combo"},"denotation":{"key":"denotation","type":"combo"},"elevation":{"key":"ele","type":"number","universal":true},"emergency":{"key":"emergency","type":"check"},"fax":{"key":"fax","type":"tel"},"fee":{"key":"fee","type":"check"},"highway":{"key":"highway","type":"combo"},"internet_access":{"key":"internet_access","type":"combo","options":["yes","no","wlan","wired","terminal"]},"landuse":{"key":"landuse","type":"combo"},"layer":{"key":"layer","type":"combo"},"leisure":{"key":"leisure","type":"combo"},"levels":{"key":"building:levels","type":"number"},"man_made":{"key":"man_made","type":"combo"},"maxspeed":{"key":"maxspeed","type":"combo"},"natural":{"key":"natural","type":"combo"},"network":{"key":"network","type":"text"},"office":{"key":"office","type":"combo"},"oneway":{"key":"oneway","type":"check"},"opening_hours":{"key":"opening_hours","type":"text"},"operator":{"key":"operator","type":"text"},"phone":{"key":"phone","type":"tel"},"place":{"key":"place","type":"combo"},"railway":{"key":"railway","type":"combo"},"religion":{"key":"religion","type":"combo","options":["christian","muslim","buddhist","jewish","hindu","shinto","taoist"]},"roadtype":{"title":" ","type":"radio","options":["bridge","tunnel","embankment","cutting"]},"service":{"key":"service","type":"combo","options":["parking_aisle","driveway","alley","drive-through","emergency_access"]},"shelter":{"key":"shelter","type":"check"},"shop":{"key":"shop","type":"combo"},"source":{"key":"source","type":"text","universal":true},"sport":{"key":"sport","type":"combo"},"surface":{"key":"surface","type":"combo"},"telephone":{"key":"phone","type":"tel","universal":true},"tourism":{"key":"tourism","type":"combo"},"water":{"key":"water","type":"combo"},"waterway":{"key":"waterway","type":"combo"},"website":{"key":"website","type":"url","universal":true},"wetland":{"key":"wetland","type":"combo"},"wikipedia":{"key":"wikipedia","type":"text","universal":true},"wood":{"key":"wood","type":"combo"}}

4
data/presets/forms/aeroway.json Normal file
View File

@@ -0,0 +1,4 @@
{
"key": "aeroway",
"type": "combo"
}

4
data/presets/forms/amenity.json Normal file
View File

@@ -0,0 +1,4 @@
{
"key": "amenity",
"type": "combo"
}

4
data/presets/forms/collection_times.json Normal file
View File

@@ -0,0 +1,4 @@
{
"key": "collection_times",
"type": "text"
}

4
data/presets/forms/construction.json Normal file
View File

@@ -0,0 +1,4 @@
{
"key": "construction",
"type": "combo"
}

4
data/presets/forms/crossing.json Normal file
View File

@@ -0,0 +1,4 @@
{
"key": "crossing",
"type": "combo"
}

4
data/presets/forms/denotation.json Normal file
View File

@@ -0,0 +1,4 @@
{
"key": "denotation",
"type": "combo"
}

4
data/presets/forms/highway.json Normal file
View File

@@ -0,0 +1,4 @@
{
"key": "highway",
"type": "combo"
}

4
data/presets/forms/landuse.json Normal file
View File

@@ -0,0 +1,4 @@
{
"key": "landuse",
"type": "combo"
}

4
data/presets/forms/leisure.json Normal file
View File

@@ -0,0 +1,4 @@
{
"key": "leisure",
"type": "combo"
}

4
data/presets/forms/man_made.json Normal file
View File

@@ -0,0 +1,4 @@
{
"key": "man_made",
"type": "combo"
}

4
data/presets/forms/natural.json Normal file
View File

@@ -0,0 +1,4 @@
{
"key": "natural",
"type": "combo"
}

4
data/presets/forms/office.json Normal file
View File

@@ -0,0 +1,4 @@
{
"key": "office",
"type": "combo"
}

4
data/presets/forms/place.json Normal file
View File

@@ -0,0 +1,4 @@
{
"key": "place",
"type": "combo"
}

4
data/presets/forms/railway.json Normal file
View File

@@ -0,0 +1,4 @@
{
"key": "railway",
"type": "combo"
}

5
data/presets/forms/service.json Normal file
View File

@@ -0,0 +1,5 @@
{
"key": "service",
"type": "combo",
"options": ["parking_aisle", "driveway", "alley", "drive-through", "emergency_access"]
}

4
data/presets/forms/shop.json Normal file
View File

@@ -0,0 +1,4 @@
{
"key": "shop",
"type": "combo"
}

4
data/presets/forms/sport.json Normal file
View File

@@ -0,0 +1,4 @@
{
"key": "sport",
"type": "combo"
}

4
data/presets/forms/tourism.json Normal file
View File

@@ -0,0 +1,4 @@
{
"key": "tourism",
"type": "combo"
}

4
data/presets/forms/water.json Normal file
View File

@@ -0,0 +1,4 @@
{
"key": "water",
"type": "combo"
}

4
data/presets/forms/waterway.json Normal file
View File

@@ -0,0 +1,4 @@
{
"key": "waterway",
"type": "combo"
}

4
data/presets/forms/wetland.json Normal file
View File

@@ -0,0 +1,4 @@
{
"key": "wetland",
"type": "combo"
}

4
data/presets/forms/wood.json Normal file
View File

@@ -0,0 +1,4 @@
{
"key": "wood",
"type": "combo"
}

2
data/presets/presets.json
View File

File diff suppressed because one or more lines are too long

5
data/presets/presets/aeroway.json
View File

@@ -12,9 +12,6 @@
}
},
"form": [
{
"key": "aeroway",
"type": "combo"
}
"aeroway"
]
}

5
data/presets/presets/amenity.json
View File

@@ -10,9 +10,6 @@
}
},
"form": [
{
"key": "amenity",
"type": "combo"
}
"amenity"
]
}

5
data/presets/presets/amenity/post_box.json
View File

@@ -19,9 +19,6 @@
"icon": "post",
"form": [
"operator",
{
"key": "collection_times",
"type": "text"
}
"collection_times"
]
}

5
data/presets/presets/highway.json
View File

@@ -12,9 +12,6 @@
}
},
"form": [
{
"key": "highway",
"type": "combo"
}
"highway"
]
}

5
data/presets/presets/highway/crossing.json
View File

@@ -13,9 +13,6 @@
]
},
"form": [
{
"key": "crossing",
"type": "combo"
}
"crossing"
]
}

6
data/presets/presets/highway/service.json
View File

@@ -11,11 +11,7 @@
},
"icon": "highway-service",
"form": [
{
"key": "service",
"type": "combo",
"options": ["parking_aisle", "driveway", "alley", "drive-through", "emergency_access"]
},
"service",
"oneway",
"roadtype",
"access",

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

@@ -10,9 +10,6 @@
}
},
"form": [
{
"key": "landuse",
"type": "combo"
}
"landuse"
]
}

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

@@ -12,10 +12,7 @@
]
},
"form": [
{
"key": "construction",
"type": "combo"
},
"construction",
"operator"
]
}

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

@@ -11,10 +11,7 @@
"terms": []
},
"form": [
{
"key": "wood",
"type": "combo"
}
"wood"
],
"icon": "park2"
}

5
data/presets/presets/leisure.json
View File

@@ -10,9 +10,6 @@
}
},
"form": [
{
"key": "leisure",
"type": "combo"
}
"leisure"
]
}

5
data/presets/presets/leisure/pitch.json
View File

@@ -12,10 +12,7 @@
},
"icon": "pitch",
"form": [
{
"key": "sport",
"type": "combo"
},
"sport",
"surface"
]
}

5
data/presets/presets/man_made.json
View File

@@ -12,9 +12,6 @@
}
},
"form": [
{
"key": "man_made",
"type": "combo"
}
"man_made"
]
}

5
data/presets/presets/natural.json
View File

@@ -10,9 +10,6 @@
}
},
"form": [
{
"key": "natural",
"type": "combo"
}
"natural"
]
}

5
data/presets/presets/natural/tree.json
View File

@@ -12,10 +12,7 @@
}
},
"form": [
{
"key": "denotation",
"type": "combo"
}
"denotation"
],
"icon": "park"
}

5
data/presets/presets/natural/water.json
View File

@@ -10,9 +10,6 @@
"terms": []
},
"form": [
{
"key": "water",
"type": "combo"
}
"water"
]
}

5
data/presets/presets/natural/wetland.json
View File

@@ -11,9 +11,6 @@
"terms": []
},
"form": [
{
"key": "wetland",
"type": "combo"
}
"wetland"
]
}

5
data/presets/presets/natural/wood.json
View File

@@ -11,10 +11,7 @@
"terms": []
},
"form": [
{
"key": "wood",
"type": "combo"
}
"wood"
],
"icon": "park2"
}

5
data/presets/presets/office.json
View File

@@ -12,10 +12,7 @@
},
"icon": "commercial",
"form": [
{
"key": "office",
"type": "combo"
},
"office",
"address",
"opening_hours"
]

5
data/presets/presets/place.json
View File

@@ -10,9 +10,6 @@
}
},
"form": [
{
"key": "place",
"type": "combo"
}
"place"
]
}

5
data/presets/presets/railway.json
View File

@@ -12,9 +12,6 @@
}
},
"form": [
{
"key": "railway",
"type": "combo"
}
"railway"
]
}

5
data/presets/presets/shop.json
View File

@@ -12,10 +12,7 @@
},
"icon": "shop",
"form": [
{
"key": "shop",
"type": "combo"
},
"shop",
"address",
"opening_hours"
]

5
data/presets/presets/tourism.json
View File

@@ -10,9 +10,6 @@
}
},
"form": [
{
"key": "tourism",
"type": "combo"
}
"tourism"
]
}

5
data/presets/presets/waterway.json
View File

@@ -12,9 +12,6 @@
}
},
"form": [
{
"key": "waterway",
"type": "combo"
}
"waterway"
]
}

6
js/id/presets/preset.js
View File

@@ -7,11 +7,7 @@ iD.presets.Preset = function(preset, forms) {
preset.additional = preset.additional ? preset.additional.map(getForms) : [];
function getForms(f) {
if (typeof f === 'string') {
return forms[f];
} else {
return iD.presets.Form(f, f.key);
}
return forms[f];
}
preset.matchGeometry = function(entity, resolver) {

69
locale/en.js
View File

@@ -257,6 +257,12 @@ locale.en = {
"city": "City"
}
},
"aeroway": {
"label": "Type"
},
"amenity": {
"label": "Type"
},
"atm": {
"label": "ATM"
},
@@ -272,12 +278,24 @@ locale.en = {
"capacity": {
"label": "Capacity"
},
"collection_times": {
"label": "Collection Times"
},
"construction": {
"label": "Type"
},
"crossing": {
"label": "Type"
},
"cuisine": {
"label": "Cuisine"
},
"denomination": {
"label": "Denomination"
},
"denotation": {
"label": "Denotation"
},
"elevation": {
"label": "Elevation"
},
@@ -290,6 +308,9 @@ locale.en = {
"fee": {
"label": "Fee"
},
"highway": {
"label": "Type"
},
"internet_access": {
"label": "Internet Access",
"options": {
@@ -300,18 +321,33 @@ locale.en = {
"terminal": "Terminal"
}
},
"landuse": {
"label": "Type"
},
"layer": {
"label": "Layer"
},
"leisure": {
"label": "Type"
},
"levels": {
"label": "Levels"
},
"man_made": {
"label": "Type"
},
"maxspeed": {
"label": "Speed Limit"
},
"natural": {
"label": "Natural"
},
"network": {
"label": "Network"
},
"office": {
"label": "Type"
},
"oneway": {
"label": "One Way"
},
@@ -324,6 +360,12 @@ locale.en = {
"phone": {
"label": "Phone"
},
"place": {
"label": "Type"
},
"railway": {
"label": "Type"
},
"religion": {
"label": "Religion",
"options": {
@@ -345,14 +387,41 @@ locale.en = {
"cutting": "Cutting"
}
},
"service": {
"label": "Type"
},
"shelter": {
"label": "Shelter"
},
"shop": {
"label": "Type"
},
"source": {
"label": "Source"
},
"sport": {
"label": "Sport"
},
"surface": {
"label": "Surface"
},
"tourism": {
"label": "Type"
},
"wikipedia": {
"label": "Wikipedia"
},
"water": {
"label": "Type"
},
"waterway": {
"label": "Type"
},
"wetland": {
"label": "Type"
},
"wood": {
"label": "Type"
}
}
}