Include imagery data, tweak Makefile

Makefile

@@ -10,18 +10,8 @@ all: \
 	iD.js \
 	iD.min.js
 
-PRESET_FILES = $(shell find data/presets/presets -type f -name '*.json')
-
-data/presets/presets.json: $(PRESET_FILES)
-	./data/presets/build.sh
-
-# TODO: write a nice node script for this
-data/data.js: \
-	data \
-	data/deprecated.json \
-	data/discarded.json \
-	data/imagery.json \
-	data/keys.json
+DATA_FILES = $(shell find data -type f -name '*.json')
+data/data.js: $(DATA_FILES)
 	node build.js
 
 .INTERMEDIATE iD.js: \
@@ -82,6 +72,3 @@ iD.js: Makefile
 
 clean:
 	rm -f iD*.js
-
-presets:
-	./data/presets/build.sh

build.js

@@ -22,6 +22,7 @@ fs.writeFileSync('data/data.js', 'iD.data = ' + JSON.stringify({
     deprecated: r('deprecated.json'),
     discarded: r('discarded.json'),
     keys: r('keys.json'),
+    imagery: r('imagery.json'),
     presets: {
         presets: rp('presets.json'),
         defaults: rp('defaults.json'),