Merge pull request #429 from osm2vectortiles/fix428

fix #428 xyz_extent() does not exist + npm error + travis testing

.travis.yml

@@ -5,7 +5,7 @@ python:
 services:
   - docker
 before_install:
-  - wget -nc -P "$TRAVIS_BUILD_DIR/import" "http://download.geofabrik.de/europe/albania-160601.osm.pbf"
+  - wget -nc -P "$TRAVIS_BUILD_DIR/import" "http://download.geofabrik.de/europe/albania-160901.osm.pbf"
   - wget -nc -O "$TRAVIS_BUILD_DIR/export/planet.mbtiles" "https://osm2vectortiles-downloads.os.zhdk.cloud.switch.ch/v2.0/planet_2016-06-20_7088ce06a738dcb3104c769adc11ac2c_z0-z5.mbtiles"
   - docker-compose pull import-external export import-osm postgis rabbitmq merge-jobs
   # Avoid building really expensive images

src/export/Dockerfile

@@ -5,14 +5,14 @@ RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
 RUN npm install -g \
-          tl@0.8.x \
-          mapnik@3.5.x \
-          mbtiles@0.8.x \
-          tilelive@5.12.x \
-          tilelive-tmsource@0.5.x \
-          tilelive-vector@3.9.x \
-          tilelive-bridge@2.3.x \
-          tilelive-mapnik@0.6.x
+          tl@0.8.1 \
+          mapnik@3.5.13 \
+          mbtiles@0.8.2 \
+          tilelive@5.12.2 \
+          tilelive-tmsource@0.5.0 \
+          tilelive-vector@3.9.3 \
+          tilelive-bridge@2.3.1 \
+          tilelive-mapnik@0.6.18
 
 RUN npm -g outdated | grep -v npm
 

src/import-sql/prepare.sh

@@ -27,8 +27,8 @@ function exec_sql_file() {
 
 function main() {
     echo "Creating functions in $OSM_DB"
-    exec_sql_file "$SQL_FUNCTIONS_FILE"
     exec_sql_file "$SQL_XYZ_EXTENT_FILE"
+    exec_sql_file "$SQL_FUNCTIONS_FILE"
     echo "Creating generated functions in $OSM_DB"
     exec_sql_file "$SQL_GENERATED_FILE"
     echo "Creating triggers in $OSM_DB"