Use tools v4 with on-the-fly boundary generation (#750)
* Switch OMT to use the new tools v4.0.0 * borders are dynamically generated from the PBF file instead of downloading a prepared CSV file * all tools are executed as current user instead of root, thus files are easier to modify/delete if needed * all data is stored in the local file system instead of docker volumes (Docker currently has a limitation of non-root operation for internal volumes). This also makes it easier to examine and test it. * New `init-dirs` make target creates all the needed dirs - `build, data, cache` * `make clean` deletes the whole `build` dir instead of individual files. * `clean-docker` for backward compatibility deletes `cache` dirs (it used to be a volume) * all `psql` calls are now done with `ON_ERROR_STOP=1` * got rid of `pgclimb-*` targets -- same results can be done with `psql` (`pgclimb-list-views` & `pgclimb-list-tables` renamed to `list-views` and `list-tables`)
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
version: "2"
|
||||
volumes:
|
||||
pgdata:
|
||||
cache:
|
||||
services:
|
||||
postgres:
|
||||
image: "openmaptiles/postgis:${TOOLS_VERSION}"
|
||||
@@ -37,12 +36,7 @@ services:
|
||||
volumes:
|
||||
- ./data:/import
|
||||
- ./build:/mapping
|
||||
- cache:/cache
|
||||
import-osmborder:
|
||||
image: "openmaptiles/import-osmborder:${TOOLS_VERSION}"
|
||||
env_file: .env
|
||||
networks:
|
||||
- postgres_conn
|
||||
- ./cache:/cache
|
||||
import-osm-diff:
|
||||
image: "openmaptiles/import-osm:${TOOLS_VERSION}"
|
||||
env_file: .env
|
||||
@@ -54,7 +48,7 @@ services:
|
||||
volumes:
|
||||
- ./data:/import
|
||||
- ./build:/mapping
|
||||
- cache:/cache
|
||||
- ./cache:/cache
|
||||
update-osm:
|
||||
image: "openmaptiles/import-osm:${TOOLS_VERSION}"
|
||||
env_file: .env
|
||||
@@ -66,7 +60,7 @@ services:
|
||||
volumes:
|
||||
- ./data:/import
|
||||
- ./build:/mapping
|
||||
- cache:/cache
|
||||
- ./cache:/cache
|
||||
openmaptiles-tools:
|
||||
image: "openmaptiles/openmaptiles-tools:${TOOLS_VERSION}"
|
||||
env_file: .env
|
||||
@@ -74,6 +68,7 @@ services:
|
||||
- postgres_conn
|
||||
volumes:
|
||||
- .:/tileset
|
||||
- ./data:/import
|
||||
- ./build:/sql
|
||||
openmaptiles-tools-latest:
|
||||
# This target exists for experimental tools that have not yet been published.
|
||||
@@ -84,6 +79,7 @@ services:
|
||||
- postgres_conn
|
||||
volumes:
|
||||
- .:/tileset
|
||||
- ./data:/import
|
||||
- ./build:/sql
|
||||
generate-changed-vectortiles:
|
||||
image: "openmaptiles/generate-vectortiles:${TOOLS_VERSION}"
|
||||
|
||||
Reference in New Issue
Block a user