From 45c6c043995db0064c13f0faf224f666dee213a6 Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <ansis.brammanis@gmail.com>
Date: Fri, 8 Mar 2013 11:23:58 -0500
Subject: [PATCH] new preset build script, order is not significant

---
 Makefile                        |  5 +-
 data/presets/build.js           | 11 ----
 data/presets/build.sh           |  8 +++
 data/presets/presets/order.json | 89 ---------------------------------
 4 files changed, 12 insertions(+), 101 deletions(-)
 delete mode 100644 data/presets/build.js
 create mode 100755 data/presets/build.sh
 delete mode 100644 data/presets/presets/order.json

diff --git a/Makefile b/Makefile
index 5f84ba09e..19d5b9fb7 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ all: \
 PRESET_FILES = $(shell find data/presets/presets -type f -name '*.json')
 
 data/presets/presets.json: $(PRESET_FILES)
-	cd data/presets && node build
+	./data/presets/build.sh
 
 # TODO: write a nice node script for this
 data/data.js: \
@@ -81,3 +81,6 @@ iD.js: Makefile
 
 clean:
 	rm -f iD*.js
+
+presets:
+	./data/presets/build.sh
diff --git a/data/presets/build.js b/data/presets/build.js
deleted file mode 100644
index b67a8a183..000000000
--- a/data/presets/build.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var fs = require('fs');
-
-var wd = './';
-
-var order = JSON.parse(fs.readFileSync(wd + 'presets/order.json', 'utf8'));
-
-var presets = order.map(function(d) {
-    return JSON.parse(fs.readFileSync(wd + 'presets/' + d + '.json', 'utf8'));
-});
-
-fs.writeFileSync(wd + 'presets.json', JSON.stringify(presets, null, 4), 'utf8');
diff --git a/data/presets/build.sh b/data/presets/build.sh
new file mode 100755
index 000000000..12464b05d
--- /dev/null
+++ b/data/presets/build.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+dir=$(dirname $0)
+presets=$(find $dir/presets -name "*.json" -exec cat {} \; -exec echo , \;)
+echo [${presets%?}] > $dir/presets.json
+node -e "
+var fs = require('fs');
+fs.writeFileSync('$dir/presets.json', JSON.stringify(JSON.parse(fs.readFileSync('$dir/presets.json', 'utf8')), null, 4));
+"
diff --git a/data/presets/presets/order.json b/data/presets/presets/order.json
deleted file mode 100644
index be7e00ef6..000000000
--- a/data/presets/presets/order.json
+++ /dev/null
@@ -1,89 +0,0 @@
-[
-    "aeroway/aerodrome",
-    "aeroway/helipad",
-    "amenity/cafe",
-    "leisure/park",
-    "natural/bay",
-    "natural/beach",
-    "natural/cliff",
-    "natural/coastline",
-    "natural/glacier",
-    "natural/grassland",
-    "natural/heath",
-    "natural/peak",
-    "natural/scrub",
-    "natural/spring",
-    "natural/tree",
-    "natural/water",
-    "natural/water/lake",
-    "natural/water/pond",
-    "natural/water/reservoir",
-    "natural/wetland",
-    "natural/wood",
-    "place/island",
-    "shop/supermarket",
-    "amenity/restaurant",
-    "amenity/place_of_worship",
-    "amenity/place_of_worship/christian",
-    "amenity/place_of_worship/jewish",
-    "amenity/place_of_worship/muslim",
-    "amenity/school",
-    "amenity/university",
-    "amenity/parking",
-    "amenity/bank",
-    "amenity/fast_food",
-    "amenity/bar",
-    "amenity/pub",
-    "amenity/cinema",
-    "amenity/hospital",
-    "amenity/pharmacy",
-    "amenity/fire_station",
-    "amenity/police",
-    "amenity/post_box",
-    "amenity/library",
-    "amenity/toilets",
-    "tourism/hotel",
-    "tourism/museum",
-    "tourism/picnic_site",
-    "amenity/townhall",
-    "leisure/golf_course",
-    "waterway/river",
-    "waterway/stream",
-    "highway/motorway",
-    "highway/residential",
-    "highway/primary",
-    "highway/secondary",
-    "highway/tertiary",
-    "highway/service",
-    "highway/path",
-    "highway/track",
-    "highway/steps",
-    "landuse/allotments",
-    "landuse/cemetery",
-    "landuse/commercial",
-    "landuse/farm",
-    "landuse/farmyard",
-    "landuse/forest",
-    "landuse/grass",
-    "landuse/industrial",
-    "landuse/meadow",
-    "landuse/orchard",
-    "landuse/quarry",
-    "landuse/residential",
-    "landuse/vineyard",
-    "railway/rail",
-    "railway/subway",
-    "railway/subway_entrance",
-    "highway/trunk",
-    "highway/footway",
-    "highway/cycleway",
-    "leisure/pitch",
-    "leisure/pitch/baseball",
-    "leisure/pitch/soccer",
-    "leisure/pitch/tennis",
-    "leisure/pitch/basketball",
-    "building/*",
-    "highway/bus_stop",
-    "highway/turning_circle",
-    "highway/crossing"
-]