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

Pretty-print to make merge conflicts less likely

Browse Source
This commit is contained in:
John Firebaugh
2013-03-14 14:35:50 -07:00
parent 0af060a5d5
commit 7b96f9bbbb
3 changed files with 2562 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.js
+2 -2
View File
@@ -18,12 +18,12 @@ var fields = {};
glob.sync(__dirname + '/data/presets/fields/*.json').forEach(function(file) {
fields[path.basename(file, '.json')] = read(file);
});
fs.writeFileSync('data/presets/fields.json', JSON.stringify(fields));
fs.writeFileSync('data/presets/fields.json', JSON.stringify(fields, null, 4));
fs.writeFileSync('data/presets/presets.json', JSON.stringify(
glob.sync(__dirname + '/data/presets/presets/**/*.json').map(function(file) {
return read(file);
})));
}), null, 4));
fs.writeFileSync('data/data.js', 'iD.data = ' + JSON.stringify({
deprecated: r('deprecated.json'),
data/presets/fields.json
+268 -1
View File
@@ -1 +1,268 @@
{"access":{"key":"access","type":"combo"},"address":{"type":"address","keys":["addr:housename","addr:housenumber","addr:street","addr:city"],"icon":"address","universal":true},"aeroway":{"key":"aeroway","type":"combo"},"amenity":{"key":"amenity","type":"combo"},"atm":{"key":"atm","type":"check"},"bicycle_parking":{"key":"bicycle_parking","type":"combo"},"building":{"key":"building","type":"combo"},"building_area":{"key":"building","type":"check","default":"yes","geometry":"area"},"building_yes":{"key":"building","type":"combo","default":"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","icon":"elevation","universal":true},"emergency":{"key":"emergency","type":"check"},"fax":{"key":"fax","type":"tel"},"fee":{"key":"fee","type":"check"},"highway":{"key":"highway","type":"combo"},"historic":{"key":"historic","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"},"note":{"key":"note","type":"textarea","universal":true},"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","icon":"telephone","universal":true},"place":{"key":"place","type":"combo"},"railway":{"key":"railway","type":"combo"},"religion":{"key":"religion","type":"combo","options":["christian","muslim","buddhist","jewish","hindu","shinto","taoist"]},"roadtype":{"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","icon":"source","universal":true},"sport":{"key":"sport","type":"combo"},"surface":{"key":"surface","type":"combo"},"tourism":{"key":"tourism","type":"combo"},"water":{"key":"water","type":"combo"},"waterway":{"key":"waterway","type":"combo"},"website":{"key":"website","type":"url","icon":"website","universal":true},"wetland":{"key":"wetland","type":"combo"},"wikipedia":{"key":"wikipedia","type":"text","icon":"wikipedia","universal":true},"wood":{"key":"wood","type":"combo"}}
{
"access": {
"key": "access",
"type": "combo"
},
"address": {
"type": "address",
"keys": [
"addr:housename",
"addr:housenumber",
"addr:street",
"addr:city"
],
"icon": "address",
"universal": true
},
"aeroway": {
"key": "aeroway",
"type": "combo"
},
"amenity": {
"key": "amenity",
"type": "combo"
},
"atm": {
"key": "atm",
"type": "check"
},
"bicycle_parking": {
"key": "bicycle_parking",
"type": "combo"
},
"building": {
"key": "building",
"type": "combo"
},
"building_area": {
"key": "building",
"type": "check",
"default": "yes",
"geometry": "area"
},
"building_yes": {
"key": "building",
"type": "combo",
"default": "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",
"icon": "elevation",
"universal": true
},
"emergency": {
"key": "emergency",
"type": "check"
},
"fax": {
"key": "fax",
"type": "tel"
},
"fee": {
"key": "fee",
"type": "check"
},
"highway": {
"key": "highway",
"type": "combo"
},
"historic": {
"key": "historic",
"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"
},
"note": {
"key": "note",
"type": "textarea",
"universal": true
},
"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",
"icon": "telephone",
"universal": true
},
"place": {
"key": "place",
"type": "combo"
},
"railway": {
"key": "railway",
"type": "combo"
},
"religion": {
"key": "religion",
"type": "combo",
"options": [
"christian",
"muslim",
"buddhist",
"jewish",
"hindu",
"shinto",
"taoist"
]
},
"roadtype": {
"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",
"icon": "source",
"universal": true
},
"sport": {
"key": "sport",
"type": "combo"
},
"surface": {
"key": "surface",
"type": "combo"
},
"tourism": {
"key": "tourism",
"type": "combo"
},
"water": {
"key": "water",
"type": "combo"
},
"waterway": {
"key": "waterway",
"type": "combo"
},
"website": {
"key": "website",
"type": "url",
"icon": "website",
"universal": true
},
"wetland": {
"key": "wetland",
"type": "combo"
},
"wikipedia": {
"key": "wikipedia",
"type": "text",
"icon": "wikipedia",
"universal": true
},
"wood": {
"key": "wood",
"type": "combo"
}
}
data/presets/presets.json
+2292 -1
View File
File diff suppressed because one or more lines are too long