From 2957fb6048169cb76aaa4a79f5a35185a519a647 Mon Sep 17 00:00:00 2001
From: ImreSamu <ImreSamu@users.noreply.github.com>
Date: Sun, 27 Nov 2016 11:31:43 +0100
Subject: [PATCH] using geofabrik-download for quickstart

---
 Makefile                         | 34 ++++++++++++++++++++++++++++++++
 docker-compose-test-override.yml |  8 --------
 quickstart.sh                    | 31 +++++++++++++++++++++++++----
 3 files changed, 61 insertions(+), 12 deletions(-)
 delete mode 100644 docker-compose-test-override.yml

diff --git a/Makefile b/Makefile
index c6c3626..8911620 100644
--- a/Makefile
+++ b/Makefile
@@ -56,3 +56,37 @@ clean:
 
 clean_build:
 	rm -f build/openmaptiles.tm2source/data.yml && rm -f build/mapping.yaml && rm -f build/tileset.sql
+
+psql:
+	docker-compose run --rm import-osm /usr/src/app/psql.sh
+
+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 area :   $(area)
+	docker-compose run --rm import-osm  ./download-geofabrik.sh $(area)
+	ls ./data/*
+
+download-geofabrik-list:
+	docker-compose run --rm import-osm  ./download-geofabrik-list.sh
+
+etlgraph:
+	generate-etlgraph layers/boundary/boundary.yaml
+	generate-etlgraph layers/highway/highway.yaml
+	generate-etlgraph layers/housenumber/housenumber.yaml
+	generate-etlgraph layers/landuse/landuse.yaml
+	generate-etlgraph layers/poi/poi.yaml
+	generate-etlgraph layers/water/water.yaml
+	generate-etlgraph layers/waterway/waterway.yaml
+	generate-etlgraph layers/building/building.yaml
+	generate-etlgraph layers/highway_name/highway_name.yaml
+	generate-etlgraph layers/landcover/landcover.yaml
+	generate-etlgraph layers/place/place.yaml
+	generate-etlgraph layers/railway/railway.yaml
+	generate-etlgraph layers/water_name/water_name.yaml
+	
+		
\ No newline at end of file
diff --git a/docker-compose-test-override.yml b/docker-compose-test-override.yml
deleted file mode 100644
index 0ae9e4a..0000000
--- a/docker-compose-test-override.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-version: "2"
-
-services:
-  generate-vectortiles:
-    environment:
-      BBOX: "8.25,46.97,9.58,47.52"
-      MIN_ZOOM: "0"
-      MAX_ZOOM: "7"
diff --git a/quickstart.sh b/quickstart.sh
index 081affb..1393219 100755
--- a/quickstart.sh
+++ b/quickstart.sh
@@ -3,6 +3,15 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
+if [ $# -eq 0 ]; then
+    echo "No parameter - set area=albania "
+    osm_area=albania
+else    
+    osm_area=$1
+fi
+
+testdata=${osm_area}.osm.pbf
+
 ##
 ##  OpenMapTiles quickstart.sh for x86_64 linux
 ##  
@@ -75,20 +84,30 @@ echo "--------------------------------------------------------------------------
 echo "====> : Removing old MBTILES if exists ( ./data/*.mbtiles ) "
 rm -f ./data/*.mbtiles
 
-testdata=zurich_switzerland.osm.pbf
-testdataurl=https://s3.amazonaws.com/metro-extracts.mapzen.com/$testdata
+
 if [ !  -f ./data/${testdata} ]; then
     echo " "
     echo "-------------------------------------------------------------------------------------"
     echo "====> : Downloading testdata $testdata   "
     rm -f ./data/*
-    wget $testdataurl  -P ./data
+    #wget $testdataurl  -P ./data
+    docker-compose run --rm import-osm  ./download-geofabrik.sh ${osm_area}
 else
     echo " "
     echo "-------------------------------------------------------------------------------------"
     echo "====> : The testdata ./data/$testdata exists, we don't need to download! "    
 fi
 
+
+if [ !  -f ./data/${testdata} ]; then
+    echo " "
+    echo "Missing ./data/$testdata , Download error? "
+    exit 404
+fi
+
+
+
+
 echo " "
 echo "-------------------------------------------------------------------------------------"
 echo "====> : Remove old generated source files ( ./build/* ) ( if they exist ) "
@@ -162,7 +181,7 @@ echo "      :  "
 echo "      : You will see a lot of deprecated warning in the log! This is normal!  "
 echo "      :    like :  Mapnik LOG>  ... is deprecated and will be removed in Mapnik 4.x ... "
 
-docker-compose -f docker-compose.yml -f docker-compose-test-override.yml  run --rm generate-vectortiles
+docker-compose -f docker-compose.yml -f ./data/docker-compose-config.yml  run --rm generate-vectortiles
 
 echo " "
 echo "-------------------------------------------------------------------------------------"
@@ -209,6 +228,10 @@ echo "      : We created from $testdata ( file moddate: $MODDATE ) "
 echo "      : Size: "
 ls ./data/*.mbtiles -la
 
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo " Acknowledgments "
+echo " Thanks to all free, open source software developers and Open Data Contributors !    "  
 echo " "
 echo "-------------------------------------------------------------------------------------"
 echo "The quickstart.sh is finished! "