deployment, favicon, livereload, mapzen apikey

.gitignore

@@ -2,3 +2,4 @@
 lib/tangram.min.js
 node_modules/
 _public
+npm-debug.log

deploy

@@ -9,7 +9,7 @@ if [ `git rev-list HEAD...$upstream/master --count` -ne 0 ]; then
   echo "not deploying"
   exit 1
 fi
-npm i
+npm start --version && [ -d "./node_modules/tangram" ] || npm i
 rm -rf _public
 
 # use --reference when not in shallow clone

gulpfile.js

@@ -1,32 +1,61 @@
 var gulp = require('gulp');
+var bs = require('browser-sync').create();
 
-build_path = '_public';
+var reload = bs.reload;
+var build_path = '_public';
 
-gulp.task('index', function() {
-  return gulp.src([
-      'index.html',
-      'main.js',
-      'scene.yaml'])
-    .pipe(gulp.dest(build_path));
-});
 
 gulp.task('env', function() {
-  return gulp.src([
+  gulp.src([
       '.env',
       '.static'])
     .pipe(gulp.dest(build_path));
 });
 
+
+gulp.task('index', function() {
+  gulp.src('index.html')
+    .pipe(gulp.dest(build_path));
+});
+
+gulp.task('favicons', function() {
+  gulp.src('res/favicon.ico')
+    .pipe(gulp.dest(build_path));
+});
+
 gulp.task('libs', function() {
-  return gulp.src('lib/**')
+  gulp.src('lib/**')
     .pipe(gulp.dest(build_path + '/lib'));
 });
 
+
 gulp.task('tangram', function() {
-  return gulp.src('node_modules/tangram/dist/tangram.min.js')
+  gulp.src('node_modules/tangram/dist/tangram.min.js')
     .pipe(gulp.dest(build_path + '/lib'));
 });
 
-gulp.task('build', ['index', 'env', 'libs', 'tangram']);
+gulp.task('setting', function() {
+  gulp.src([
+      'main.js',
+      'scene.yaml'])
+    .pipe(gulp.dest(build_path));
+});
+
+
+gulp.task('server', function() {
+  bs.init({
+    server: {
+      baseDir: build_path,
+    }
+  });
+  gulp.watch(['main.js','scene.yaml'], ['setting']);
+  gulp.watch(['index.html'], ['index']);
+
+  gulp.watch(['index.html'], {cwd: build_path}, reload);
+  gulp.watch(['main.js','scene.yaml'], {cwd: build_path}, reload);
+});
+
 
+gulp.task('build', ['env', 'index', 'favicons', 'libs', 'tangram', 'setting']);
+gulp.task('dev', ['build', 'server']);
 gulp.task('default', ['build']);

index.html

@@ -13,6 +13,7 @@
     <title>alternatives berlin</title>
 
     <link rel="stylesheet" href="lib/leaflet/leaflet.css" />
+    <link rel="icon" href="/favicon.ico" type="image/x-icon" />
 
     <style>
         body {

package.json

@@ -4,13 +4,15 @@
   "description": "Eine interaktive 3D Karte zur Darstellung der dynamiken des alternativen Berlins.",
   "main": "main.js",
   "dependencies": {
+    "gulp": "^3.9.0",
     "tangram": "tangrams/tangram"
   },
   "devDependencies": {
-    "gulp": "^3.9.0"
+    "browser-sync": "^2.9.8"
   },
   "scripts": {
     "start": "node_modules/gulp/bin/gulp.js",
+    "serve": "node_modules/gulp/bin/gulp.js server",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {

scene.yaml

@@ -18,7 +18,7 @@ styles:
 sources:
     osm:
         type: TopoJSONTiles
-        url:  //vector.mapzen.com/osm/all/{z}/{x}/{y}.topojson
+        url:  //vector.mapzen.com/osm/all/{z}/{x}/{y}.topojson?api_key=vector-tiles-VLxfzaw
 layers:
     water:
         data: { source: osm }
@@ -73,4 +73,4 @@ layers:
                 text:
                     font:
                         fill: white
-                        typeface: 100 11px Helvetica
+                        typeface: 100 11px Helvetica