Restore generated files in git and 4 space json

https://github.com/openstreetmap/iD/commit/90cd412bbe0bf0cfbe0631a8073a5c8d415093f3#commitcomment-15780969

.gitignore

@@ -5,8 +5,4 @@ npm-debug.log
 dist/*.js
 dist/*.css
 dist/img/*.svg
-dist/locales/en.json
-data/presets/categories.json
-data/presets/fields.json
-data/presets/presets.json
 data/data.js

build.js

@@ -235,9 +235,9 @@ validateCategoryPresets(categories, presets);
 validatePresetFields(presets, fields);
 
 // Save individual data files
-fs.writeFileSync('data/presets/categories.json', JSON.stringify(categories));
-fs.writeFileSync('data/presets/fields.json', JSON.stringify(fields));
-fs.writeFileSync('data/presets/presets.json', JSON.stringify(presets));
+fs.writeFileSync('data/presets/categories.json', JSON.stringify(categories, null, 4));
+fs.writeFileSync('data/presets/fields.json', JSON.stringify(fields, null, 4));
+fs.writeFileSync('data/presets/presets.json', JSON.stringify(presets, null, 4));
 fs.writeFileSync('data/presets.yaml',
     YAML.dump({en: {presets: translate}}, {sortKeys: sortKeys})
         .replace(/\'.*#\':/g, '#')
@@ -278,13 +278,13 @@ _.forEach(presets, function(preset) {
     taginfo.tags.push(tag);
 });
 
-fs.writeFileSync('data/taginfo.json', JSON.stringify(taginfo, null, 1));
+fs.writeFileSync('data/taginfo.json', JSON.stringify(taginfo, null, 4));
 
 // Push changes from data/core.yaml into en.json
 var core = YAML.load(fs.readFileSync('data/core.yaml', 'utf8'));
 var presets = {en: {presets: translations}};
 var en = _.merge(core, presets);
-fs.writeFileSync('dist/locales/en.json', JSON.stringify(en.en, null, 1));
+fs.writeFileSync('dist/locales/en.json', JSON.stringify(en.en, null, 4));
 
 fs.writeFileSync('data/data.js', 'iD.data = ' + JSON.stringify({
     deprecated: r('deprecated.json'),

data/presets/categories.json

@@ -0,0 +1,152 @@
+{
+    "category-building": {
+        "geometry": "area",
+        "name": "Building",
+        "icon": "building",
+        "members": [
+            "building/house",
+            "building/apartments",
+            "building/commercial",
+            "building/industrial",
+            "building/residential",
+            "building"
+        ]
+    },
+    "category-golf": {
+        "geometry": "area",
+        "name": "Golf",
+        "icon": "golf",
+        "members": [
+            "golf/fairway",
+            "golf/green",
+            "golf/lateral_water_hazard",
+            "golf/rough",
+            "golf/bunker",
+            "golf/tee",
+            "golf/water_hazard"
+        ]
+    },
+    "category-landuse": {
+        "geometry": "area",
+        "name": "Land Use",
+        "icon": "land-use",
+        "members": [
+            "landuse/residential",
+            "landuse/industrial",
+            "landuse/commercial",
+            "landuse/retail",
+            "landuse/farmland",
+            "landuse/farmyard",
+            "landuse/forest",
+            "landuse/meadow",
+            "landuse/cemetery",
+            "landuse/military"
+        ]
+    },
+    "category-path": {
+        "geometry": "line",
+        "name": "Path",
+        "icon": "category-path",
+        "members": [
+            "highway/pedestrian",
+            "highway/footway",
+            "highway/cycleway",
+            "highway/bridleway",
+            "highway/path",
+            "highway/steps"
+        ]
+    },
+    "category-rail": {
+        "geometry": "line",
+        "name": "Rail",
+        "icon": "category-rail",
+        "members": [
+            "railway/rail",
+            "railway/subway",
+            "railway/tram",
+            "railway/monorail",
+            "railway/disused",
+            "railway/abandoned"
+        ]
+    },
+    "category-restriction": {
+        "geometry": "relation",
+        "name": "Restriction",
+        "icon": "restriction",
+        "members": [
+            "type/restriction/no_left_turn",
+            "type/restriction/no_right_turn",
+            "type/restriction/no_straight_on",
+            "type/restriction/no_u_turn",
+            "type/restriction/only_left_turn",
+            "type/restriction/only_right_turn",
+            "type/restriction/only_straight_on",
+            "type/restriction"
+        ]
+    },
+    "category-road": {
+        "geometry": "line",
+        "name": "Road",
+        "icon": "category-roads",
+        "members": [
+            "highway/residential",
+            "highway/motorway",
+            "highway/trunk",
+            "highway/primary",
+            "highway/secondary",
+            "highway/tertiary",
+            "highway/service",
+            "highway/motorway_link",
+            "highway/trunk_link",
+            "highway/primary_link",
+            "highway/secondary_link",
+            "highway/tertiary_link",
+            "highway/unclassified",
+            "highway/track",
+            "highway/road"
+        ]
+    },
+    "category-route": {
+        "geometry": "relation",
+        "name": "Route",
+        "icon": "route",
+        "members": [
+            "type/route/road",
+            "type/route/bicycle",
+            "type/route/foot",
+            "type/route/hiking",
+            "type/route/bus",
+            "type/route/train",
+            "type/route/tram",
+            "type/route/ferry",
+            "type/route/power",
+            "type/route/pipeline",
+            "type/route/detour",
+            "type/route_master",
+            "type/route"
+        ]
+    },
+    "category-water-area": {
+        "geometry": "area",
+        "name": "Water",
+        "icon": "water",
+        "members": [
+            "natural/water/lake",
+            "natural/water/pond",
+            "natural/water/reservoir",
+            "natural/water"
+        ]
+    },
+    "category-water-line": {
+        "geometry": "line",
+        "name": "Water",
+        "icon": "category-water",
+        "members": [
+            "waterway/river",
+            "waterway/stream",
+            "waterway/canal",
+            "waterway/ditch",
+            "waterway/drain"
+        ]
+    }
+}

data/update_imagery.js

@@ -102,4 +102,4 @@ imagery.sort(function(a, b) {
     return a.name.localeCompare(b.name);
 });
 
-fs.writeFileSync('data/imagery.json', JSON.stringify(imagery, null, 1));
+fs.writeFileSync('data/imagery.json', JSON.stringify(imagery, null, 4));

data/update_locales.js

@@ -38,10 +38,10 @@ asyncMap(resources, getResource, function(err, locales) {
     for (var i in locale) {
         if (i === 'en' || _.isEmpty(locale[i])) continue;
         codes.push(i);
-        fs.writeFileSync(outdir + i + '.json', JSON.stringify(locale[i], null, 1));
+        fs.writeFileSync(outdir + i + '.json', JSON.stringify(locale[i], null, 4));
     }
 
-    fs.writeFileSync('data/locales.json', JSON.stringify(codes, null, 1));
+    fs.writeFileSync('data/locales.json', JSON.stringify(codes, null, 4));
 });
 
 function getResource(resource, callback) {