diff --git a/README.rst b/README.rst
index e8eb54ff582f1b8d6bc063399e0c467151a41bf0..45ccf027e7fb490f193deba9150784064e1d332c 100644
--- a/README.rst
+++ b/README.rst
@@ -8,9 +8,7 @@ the `OpenBuildingMap <https://openbuildingmap.org>`__ layer stack.
It contains and assembles:
* a database (`Docker OBM Database <https://git.gfz-potsdam.de/dynamicexposure/server-components/containers/docker-obm-database>`__)
-* a raster tile server (`Docker OBM Tiles Raster <https://git.gfz-potsdam.de/dynamicexposure/server-components/containers/docker-obm-tiles-raster>`__)
-* raster layer styles (`Tiles Raster Styles <https://git.gfz-potsdam.de/dynamicexposure/openbuildingmap/tiles-raster-styles>`__)
-
+* a vector tile server (`Docker OBM Tiles Vector <https://git.gfz-potsdam.de/dynamicexposure/server-components/containers/docker-obm-tiles-vector>`__)
Requirements
------------
@@ -19,7 +17,6 @@ The following dependencies must be installed on the system:
* `Docker <https://www.docker.com/>`__
* `Docker Compose <https://docs.docker.com/compose/>`__
-* Check out the Raster Layer Styles into the `data` directory
Run the setup
-------------
diff --git a/conf/all-buildings/renderd.conf b/conf/all-buildings/renderd.conf
deleted file mode 100644
index d83653cee3242ec6eb2e09daa30df1a1c377a4ca..0000000000000000000000000000000000000000
--- a/conf/all-buildings/renderd.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[renderd]
-stats_file=/run/renderd/renderd.stats
-socketname=/run/renderd/renderd.sock
-num_threads=4
-tile_dir=/var/cache/renderd/tiles
-
-[mapnik]
-plugins_dir=/usr/lib/mapnik/3.0/input
-font_dir=/usr/share/fonts/truetype
-font_dir_recurse=true
-
-[all-buildings]
-URI=/all-buildings
-XML=/srv/mapnik/obm-all-buildings.xml
diff --git a/conf/building-levels/renderd.conf b/conf/building-levels/renderd.conf
deleted file mode 100644
index e49a5068ae230f74af78f54fffa82a80f0c18b5e..0000000000000000000000000000000000000000
--- a/conf/building-levels/renderd.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[renderd]
-stats_file=/run/renderd/renderd.stats
-socketname=/run/renderd/renderd.sock
-num_threads=4
-tile_dir=/var/cache/renderd/tiles
-
-[mapnik]
-plugins_dir=/usr/lib/mapnik/3.0/input
-font_dir=/usr/share/fonts/truetype
-font_dir_recurse=true
-
-[building-levels]
-URI=/building-levels
-XML=/srv/mapnik/obm-building-levels.xml
diff --git a/conf/floor-space/renderd.conf b/conf/floor-space/renderd.conf
deleted file mode 100644
index 32a7b920ed060fc49ed7744f7f164c31cddbe8f1..0000000000000000000000000000000000000000
--- a/conf/floor-space/renderd.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[renderd]
-stats_file=/run/renderd/renderd.stats
-socketname=/run/renderd/renderd.sock
-num_threads=4
-tile_dir=/var/cache/renderd/tiles
-
-[mapnik]
-plugins_dir=/usr/lib/mapnik/3.0/input
-font_dir=/usr/share/fonts/truetype
-font_dir_recurse=true
-
-[floor-space]
-URI=/floor-space
-XML=/srv/mapnik/obm-floor-space.xml
diff --git a/conf/ground-area/renderd.conf b/conf/ground-area/renderd.conf
deleted file mode 100644
index f4590e57c08ac6e41a36344c9da9284ead404e94..0000000000000000000000000000000000000000
--- a/conf/ground-area/renderd.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[renderd]
-stats_file=/run/renderd/renderd.stats
-socketname=/run/renderd/renderd.sock
-num_threads=4
-tile_dir=/var/cache/renderd/tiles
-
-[mapnik]
-plugins_dir=/usr/lib/mapnik/3.0/input
-font_dir=/usr/share/fonts/truetype
-font_dir_recurse=true
-
-[ground-area]
-URI=/ground-area
-XML=/srv/mapnik/obm-ground-area.xml
diff --git a/conf/occupancy/renderd.conf b/conf/occupancy/renderd.conf
deleted file mode 100644
index a3ac1987abd6cea1808bf3dbb61af717b4ee1de7..0000000000000000000000000000000000000000
--- a/conf/occupancy/renderd.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[renderd]
-stats_file=/run/renderd/renderd.stats
-socketname=/run/renderd/renderd.sock
-num_threads=4
-tile_dir=/var/cache/renderd/tiles
-
-[mapnik]
-plugins_dir=/usr/lib/mapnik/3.0/input
-font_dir=/usr/share/fonts/truetype
-font_dir_recurse=true
-
-[occupancy]
-URI=/occupancy
-XML=/srv/mapnik/obm-occupancy.xml
diff --git a/conf/pg_tileserv.toml b/conf/pg_tileserv.toml
new file mode 100644
index 0000000000000000000000000000000000000000..0e618647f5c928e95c1327eca17744bb4ea09f16
--- /dev/null
+++ b/conf/pg_tileserv.toml
@@ -0,0 +1,2 @@
+# Database connection
+DbConnection = "user=postgres host=openbuildingmap-db-buildings dbname=obm_buildings"
diff --git a/conf/position/renderd.conf b/conf/position/renderd.conf
deleted file mode 100644
index 222d707721e45780dc91f144b2ab70e139024dc4..0000000000000000000000000000000000000000
--- a/conf/position/renderd.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[renderd]
-stats_file=/run/renderd/renderd.stats
-socketname=/run/renderd/renderd.sock
-num_threads=4
-tile_dir=/var/cache/renderd/tiles
-
-[mapnik]
-plugins_dir=/usr/lib/mapnik/3.0/input
-font_dir=/usr/share/fonts/truetype
-font_dir_recurse=true
-
-[position]
-URI=/position
-XML=/srv/mapnik/obm-position.xml
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index c51363ca6d92c1e98ceb03e33b975f87c899e398..229a4d996f356491b9e9558280ce4c3289b4da06 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -21,26 +21,6 @@ services:
openbuildingmap-db-buildings:
build: ../../containers/docker-obm-database/
- # OpenBuildingMap raster tile layer for all-buildings
- raster-all-buildings:
- build: ../../containers/docker-obm-tiles-raster/
-
- # OpenBuildingMap raster tile layer for building-levels
- raster-building-levels:
- build: ../../containers/docker-obm-tiles-raster/
-
- # OpenBuildingMap raster tile layer for floor-space
- raster-floor-space:
- build: ../../containers/docker-obm-tiles-raster/
-
- # OpenBuildingMap raster tile layer for ground-area
- raster-ground-area:
- build: ../../containers/docker-obm-tiles-raster/
-
- # OpenBuildingMap raster tile layer for occupancy
- raster-occupancy:
- build: ../../containers/docker-obm-tiles-raster/
-
- # OpenBuildingMap raster tile layer for position
- raster-position:
- build: ../../containers/docker-obm-tiles-raster/
+ # OpenBuildingMap vector tile layer server
+ openbuildingmap-vector-tiles:
+ build: ../../containers/docker-obm-tiles-vector/
diff --git a/docker-compose.yml b/docker-compose.yml
index 0428cf8f8624f72564bca71a486a8a66578868b3..95fc6f6edd8cc6c7d8e9bd50a0d49bfaebb89b3c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,50 +28,12 @@ services:
environment:
POSTGRES_HOST_AUTH_METHOD: trust
- # OpenBuildingMap raster tile layer for all-buildings
- raster-all-buildings:
- build: https://git.gfz-potsdam.de/dynamicexposure/server-components/containers/docker-obm-tiles-raster.git
+ # OpenBuildingMap vector tile layer server
+ openbuildingmap-vector-tiles:
+ build: https://git.gfz-potsdam.de/dynamicexposure/server-components/containers/docker-obm-tiles-vector.git
+ ports:
+ - 7800:7800
+ depends_on:
+ - openbuildingmap-db-buildings
volumes:
- - ./conf/all-buildings/renderd.conf:/etc/renderd.conf
- - ./data/tiles/all-buildings:/var/cache/renderd/tiles/all-buildings
- - ./data/raster-styles:/srv/mapnik
-
- # OpenBuildingMap raster tile layer for building-levels
- raster-building-levels:
- build: https://git.gfz-potsdam.de/dynamicexposure/server-components/containers/docker-obm-tiles-raster.git
- volumes:
- - ./conf/building-levels/renderd.conf:/etc/renderd.conf
- - ./data/tiles/building-levels:/var/cache/renderd/tiles/building-levels
- - ./data/raster-styles:/srv/mapnik
-
- # OpenBuildingMap raster tile layer for floor-space
- raster-floor-space:
- build: https://git.gfz-potsdam.de/dynamicexposure/server-components/containers/docker-obm-tiles-raster.git
- volumes:
- - ./conf/floor-space/renderd.conf:/etc/renderd.conf
- - ./data/tiles/floor-space:/var/cache/renderd/tiles/floor-space
- - ./data/raster-styles:/srv/mapnik
-
- # OpenBuildingMap raster tile layer for ground-area
- raster-ground-area:
- build: https://git.gfz-potsdam.de/dynamicexposure/server-components/containers/docker-obm-tiles-raster.git
- volumes:
- - ./conf/ground-area/renderd.conf:/etc/renderd.conf
- - ./data/tiles/ground-area:/var/cache/renderd/tiles/ground-area
- - ./data/raster-styles:/srv/mapnik
-
- # OpenBuildingMap raster tile layer for occupancy
- raster-occupancy:
- build: https://git.gfz-potsdam.de/dynamicexposure/server-components/containers/docker-obm-tiles-raster.git
- volumes:
- - ./conf/occupancy/renderd.conf:/etc/renderd.conf
- - ./data/tiles/occupancy:/var/cache/renderd/tiles/occupancy
- - ./data/raster-styles:/srv/mapnik
-
- # OpenBuildingMap raster tile layer for position
- raster-position:
- build: https://git.gfz-potsdam.de/dynamicexposure/server-components/containers/docker-obm-tiles-raster.git
- volumes:
- - ./conf/position/renderd.conf:/etc/renderd.conf
- - ./data/tiles/position:/var/cache/renderd/tiles/position
- - ./data/raster-styles:/srv/mapnik
+ - ./conf:/config