From 246f85855f4c3e4054bc3382d087270a5bb97698 Mon Sep 17 00:00:00 2001 From: lukasmartinelli Date: Thu, 23 Jun 2016 14:13:56 +0200 Subject: [PATCH] Fix issue with world job still being rendered --- docker-compose.yml | 2 +- src/generate-jobs/generate_jobs.py | 2 -- src/generate-jobs/generate_world_jobs.sh | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e01e165..78f545c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -106,7 +106,7 @@ export-worker: AWS_SECRET_ACCESS_KEY: "${AWS_SECRET_ACCESS_KEY}" AWS_S3_HOST: "${AWS_S3_HOST}" BUCKET_NAME: "osm2vectortiles-testing" - RENDER_TIMEOUT: "1200" + RENDER_TIMEOUT: "300" export: image: "osm2vectortiles/export" command: ./export-local.sh diff --git a/src/generate-jobs/generate_jobs.py b/src/generate-jobs/generate_jobs.py index 0825e10..9bf891f 100755 --- a/src/generate-jobs/generate_jobs.py +++ b/src/generate-jobs/generate_jobs.py @@ -110,8 +110,6 @@ def pyramid_jobs(x, y, z, job_zoom, max_zoom): yield create_pyramid_job(tile.x, tile.y, min_zoom=tile.z, max_zoom=max_zoom, bounds=bounds) - bounds = mercantile.bounds(0 , 0 , 0) - yield create_pyramid_job(0, 0, min_zoom=0, max_zoom=job_zoom-1, bounds=bounds) if __name__ == '__main__': args = docopt(__doc__, version='0.1') diff --git a/src/generate-jobs/generate_world_jobs.sh b/src/generate-jobs/generate_world_jobs.sh index 90e6f5d..4fd1a2f 100755 --- a/src/generate-jobs/generate_world_jobs.sh +++ b/src/generate-jobs/generate_world_jobs.sh @@ -17,7 +17,7 @@ function generate_world_jobs() { python generate_jobs.py pyramid "$TILE_X" "$TILE_Y" "$TILE_Z" --job-zoom="$JOB_ZOOM" > $jobs_file - if [ "$WORLD_JOB" = true ] ; then + if [ "$WORLD_JOB" == "true" ] ; then python generate_jobs.py pyramid "0" "0" "0" --job-zoom="0" --max-zoom="$((JOB_ZOOM-1))" >> $jobs_file fi