Add dimensions, improve make situation for presets.

Makefile

@@ -17,11 +17,12 @@ data/presets/presets.json: $(PRESET_FILES)
 
 # TODO: write a nice node script for this
 data/data.js: \
+	data \
 	data/deprecated.json \
 	data/discarded.json \
 	data/imagery.json \
 	data/keys.json
-	node data/make.js
+	node build.js
 
 .INTERMEDIATE iD.js: \
 	js/lib/bootstrap-tooltip.js \
@@ -77,7 +78,7 @@ iD.js: Makefile
 
 %.min.js: %.js Makefile
 	@rm -f $@
-	$(JS_COMPILER) $< -c -m -o $@
+	$(JS_COMPILER) $< -m -o $@
 
 clean:
 	rm -f iD*.js

css/app.css

@@ -133,6 +133,7 @@ a:hover {
 textarea,
 input[type=text],
 input[type=search],
+input[type=number],
 input[type=url],
 input[type=tel],
 input[type=email] {

data/make.js

@@ -1,16 +0,0 @@
-var fs = require('fs');
-
-function r(f) { return JSON.parse(fs.readFileSync(__dirname + '/' + f)); }
-function rp(f) { return r('presets/' + f); }
-
-fs.writeFileSync('data.js', 'iD.data = ' + JSON.stringify({
-    deprecated: r('deprecated.json'),
-    discarded: r('discarded.json'),
-    keys: r('keys.json'),
-    presets: {
-        presets: rp('presets.json'),
-        defaults: rp('defaults.json'),
-        categories: rp('categories.json'),
-        forms: rp('forms.json')
-    }
-}));

data/presets/build.sh

@@ -1,8 +0,0 @@
-#!/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));
-"

data/presets/forms.json

@@ -41,6 +41,11 @@
         "type": "combo",
         "default": { "area": "yes" }
     },
+    "levels": {
+        "key": "building:levels",
+        "type": "number",
+        "title": "Levels"
+    },
     "fee": {
         "key": "fee",
         "type": "check"

data/presets/presets/building/*.json

@@ -12,6 +12,7 @@
     "icon": "warehouse",
     "form": [
         "building_yes",
+        "levels",
         "address"
     ]
-}
+}

js/id/ui/preset.js

@@ -80,6 +80,13 @@ iD.ui.preset = function(context) {
                     .attr('placeholder', 'http://example.com/')
                     .call(iD.behavior.accept().on('accept', event.close));
                 break;
+            case 'number':
+                i = this.append('input')
+                    .attr('type', 'number')
+                    .attr('id', 'input-' + d.key)
+                    .attr('placeholder', '0')
+                    .call(iD.behavior.accept().on('accept', event.close));
+                break;
             case 'check':
                 wrap = this.append('span').attr('class', 'input-wrap-position'),
                 i = wrap.append('input').attr('type', 'text');
@@ -87,7 +94,6 @@ iD.ui.preset = function(context) {
                 wrap.call(check);
                 event.on('setTags.' + d.key, check.update);
                 break;
-
             case 'select':
                 wrap = this.append('span').attr('class', 'input-wrap-position'),
                 i = wrap.append('input').attr('type', 'text');
@@ -122,6 +128,8 @@ iD.ui.preset = function(context) {
                     }));
                 });
                 break;
+            default:
+                throw 'Unknown input type ' + d.type;
         }
         if (i) {
             i.on('change', key);

package.json

@@ -21,6 +21,7 @@
   "license": "WTFPL",
   "devDependencies": {
     "uglify-js": "~2.2.2",
-    "mocha-phantomjs": "~1.1.1"
+    "mocha-phantomjs": "~1.1.1",
+    "glob": "~3.1.21"
   }
 }