From 5d193ba147943c412b847fcae6e910acd3bd79a5 Mon Sep 17 00:00:00 2001 From: MartinMikita Date: Fri, 27 Jul 2018 09:53:39 +0200 Subject: [PATCH] Updated Makefile to use make generate-tiles for custom PBF. --- Makefile | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index efb8668f..95660fa2 100644 --- a/Makefile +++ b/Makefile @@ -100,12 +100,6 @@ psql-analyze: @echo "Start - postgresql: ANALYZE VERBOSE ;" docker-compose run --rm import-osm /usr/src/app/psql.sh -P pager=off -c 'ANALYZE VERBOSE;' -import-sql-dev: - docker-compose run --rm import-sql /bin/bash - -import-osm-dev: - docker-compose run --rm import-osm /bin/bash - download-geofabrik: @echo =============== download-geofabrik ======================= @echo Download area : $(area) @@ -133,12 +127,18 @@ cfg-remake: docker-compose run --rm openmaptiles-tools make clean docker-compose run --rm openmaptiles-tools make + import-osmsql: docker-compose run --rm openmaptiles-tools make clean docker-compose run --rm openmaptiles-tools make docker-compose run --rm import-osm docker-compose run --rm import-sql +import-osm: + docker-compose run --rm openmaptiles-tools make clean + docker-compose run --rm openmaptiles-tools make + docker-compose run --rm import-osm + import-sql: docker-compose run --rm openmaptiles-tools make clean docker-compose run --rm openmaptiles-tools make @@ -151,7 +151,11 @@ generate-tiles: rm -rf data/tiles.mbtiles docker-compose run --rm openmaptiles-tools make clean docker-compose run --rm openmaptiles-tools make - docker-compose -f docker-compose.yml -f ./data/docker-compose-config.yml run --rm generate-vectortiles + if [ -f ./data/docker-compose-config.yml ]; then \ + docker-compose -f docker-compose.yml -f ./data/docker-compose-config.yml run --rm generate-vectortiles; \ + else \ + docker-compose run --rm generate-vectortiles; \ + fi docker-compose run --rm openmaptiles-tools generate-metadata ./data/tiles.mbtiles docker-compose run --rm openmaptiles-tools chmod 666 ./data/tiles.mbtiles @@ -198,3 +202,9 @@ generate-devdoc: docker run --rm -v $$(pwd):/tileset openmaptiles/openmaptiles-tools generate-etlgraph layers/water/water.yaml ./build/devdoc docker run --rm -v $$(pwd):/tileset openmaptiles/openmaptiles-tools generate-etlgraph layers/water_name/water_name.yaml ./build/devdoc docker run --rm -v $$(pwd):/tileset openmaptiles/openmaptiles-tools generate-etlgraph layers/waterway/waterway.yaml ./build/devdoc + +import-sql-dev: + docker-compose run --rm import-sql /bin/bash + +import-osm-dev: + docker-compose run --rm import-osm /bin/bash