Use on-the-fly boundary generation

This uses the new (not yet released) tool to parse planet
data file and generate a new table directly from it,
instead of downloading a prepared CSV file.

Makefile

@@ -113,6 +113,10 @@ import-osmsql: db-start all
 	docker-compose run $(DC_OPTS) import-osm
 	docker-compose run $(DC_OPTS) openmaptiles-tools import-sql
 
+.PHONY: import-borders
+import-borders: db-start
+	docker-compose run $(DC_OPTS) openmaptiles-tools import-borders
+
 .PHONY: generate-tiles
 generate-tiles: db-start all
 	rm -rf data/tiles.mbtiles

README.md

@@ -103,7 +103,6 @@ Import external data from [OpenStreetMapData](http://osmdata.openstreetmap.de/),
 docker-compose run import-water
 docker-compose run import-natural-earth
 docker-compose run import-lakelines
-docker-compose run import-osmborder
 ```
 
 **[Optional]**
@@ -124,10 +123,11 @@ wget http://download.geofabrik.de/europe/albania-latest.osm.pbf
 ```
 
 [Import OpenStreetMap data](https://github.com/openmaptiles/openmaptiles-tools/tree/master/docker/import-osm) with the mapping rules from
-`build/mapping.yaml` (which has been created by `make`).
+`build/mapping.yaml` (which has been created by `make`).  Also create borders table using extra processing with [osmborder](https://github.com/pnorman/osmborder) tool.
 
 ```bash
-docker-compose run import-osm
+make import-osm
+make import-borders
 ```
 
 ### Work on Layers

docker-compose.yml

@@ -38,11 +38,6 @@ services:
       - ./data:/import
       - ./build:/mapping
       - cache:/cache
-  import-osmborder:
-    image: "openmaptiles/import-osmborder:${TOOLS_VERSION}"
-    env_file: .env
-    networks:
-      - postgres_conn
   import-osm-diff:
     image: "openmaptiles/import-osm:${TOOLS_VERSION}"
     env_file: .env
@@ -93,6 +88,7 @@ services:
       - postgres_conn
     volumes:
       - .:/tileset
+      - ./data:/import
       - ./build:/sql
   generate-changed-vectortiles:
     image: "openmaptiles/generate-vectortiles:${TOOLS_VERSION}"

quickstart.sh

@@ -203,14 +203,6 @@ echo "      : Data license: https://osmdata.openstreetmap.de/info/license.html "
 echo "      : Thank you: https://osmdata.openstreetmap.de/info/ "
 docker-compose run $DC_OPTS import-water
 
-echo " "
-echo "-------------------------------------------------------------------------------------"
-echo "====> : Start importing border data from http://openstreetmap.org into PostgreSQL "
-echo "      : Source code:  https://github.com/openmaptiles/openmaptiles-tools/tree/master/docker/import-osmborder"
-echo "      : Data license: http://www.openstreetmap.org/copyright"
-echo "      : Thank you: https://github.com/pnorman/osmborder "
-docker-compose run $DC_OPTS import-osmborder
-
 echo " "
 echo "-------------------------------------------------------------------------------------"
 echo "====> : Start importing  http://www.naturalearthdata.com  into PostgreSQL "
@@ -235,7 +227,15 @@ echo "      :   Thank you Omniscale! "
 echo "      :   Source code: https://github.com/openmaptiles/openmaptiles-tools/tree/master/docker/import-osm "
 echo "      : The OpenstreetMap data license: https://www.openstreetmap.org/copyright (ODBL) "
 echo "      : Thank you OpenStreetMap Contributors ! "
-docker-compose run $DC_OPTS import-osm
+make import-osm
+
+echo " "
+echo "-------------------------------------------------------------------------------------"
+echo "====> : Start importing border data from ./data/${testdata} into PostgreSQL using osmborder"
+echo "      : Source code: https://github.com/pnorman/osmborder"
+echo "      : Data license: http://www.openstreetmap.org/copyright"
+echo "      : Thank you: Paul Norman"
+make import-borders
 
 echo " "
 echo "-------------------------------------------------------------------------------------"