From 156908b8b29aa9460c51d9a7f10f70e35feca17b Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Thu, 15 Sep 2016 14:35:43 +0200 Subject: [PATCH 1/3] fix https://github.com/osm2vectortiles/osm2vectortiles/issues/428 --- src/import-sql/prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/import-sql/prepare.sh b/src/import-sql/prepare.sh index 23811be..fed6b87 100755 --- a/src/import-sql/prepare.sh +++ b/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" From 2b1ed5fcd58950ac63a2fb524cc35e4b3ce84e78 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Thu, 15 Sep 2016 15:31:42 +0200 Subject: [PATCH 2/3] fix "export" npm packages Error message: "Error: Invalid tilesource protocol: tmsource" https://travis-ci.org/osm2vectortiles/osm2vectortiles/builds/160153588 --- src/export/Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/export/Dockerfile b/src/export/Dockerfile index fd228d2..4a212b4 100644 --- a/src/export/Dockerfile +++ b/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 From a320aaf82e38a0f89603582bcb6639b891dc1cb2 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Thu, 15 Sep 2016 16:25:00 +0200 Subject: [PATCH 3/3] geofabrik testdata ---> albania-160901.osm.pbf --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e7acc9c..1595526 100644 --- a/.travis.yml +++ b/.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