Merge remote-tracking branch 'origin/v0.4.0' into issue-56

flowrean · Sep 14, 2017 · 01d609b · 01d609b
2 parents bc852c8 + fd1dc91
commit 01d609b
Show file tree

Hide file tree

Showing 46 changed files with 3,469 additions and 775 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,8 +13,12 @@ services:
 
 addons:
   postgresql: "9.4"
+  apt:
+    packages:
+    - postgresql-9.4-postgis-2.3
 
 install:
+  - bash ci/build_bindata.sh
   - bash ci/config_postgis.sh
 
 before_deploy:

diff --git a/ci/build_bindata.sh b/ci/build_bindata.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -ex
+
+#	uses go-bindata & go-bindata-assetfs to convert the tegola internal viewer static assets into binary 
+#	so they can be compiled into the tegola binary
+build_bindata() {
+	#	fetch our bindata tooling
+	go get -u github.com/jteeuwen/go-bindata/...
+	go get github.com/elazarl/go-bindata-assetfs/...
+
+	#	change directory to the location of this script
+	cd "$(dirname "$0")"
+	#	move to our server directory
+	cd ../server
+
+	#	build bindata
+	go-bindata-assetfs -pkg=server -ignore=.DS_Store static/...
+}
+
+build_bindata
diff --git a/cmd/tegola/config_bonn.toml b/cmd/tegola/config_bonn.toml
diff --git a/cmd/tegola/config_landuse.toml b/cmd/tegola/config_landuse.toml