From 0524d471f4dba6b1e20f9599edbedc3d8b5da255 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 18 Mar 2024 16:01:44 +0100
Subject: [PATCH] update README and run.sh

---
 README.md | 18 ++++++++++--------
 run.sh    |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index edca410..582cae6 100644
--- a/README.md
+++ b/README.md
@@ -5,29 +5,29 @@
 
 This is an adaptation of https://github.com/Overv/openstreetmap-tile-server/ for testing different cartoCss styles and generating tiles.
 
-### Use with docker-compose
+### Use with docker compose
 
 #### Fresh install
 
 ```bash
 #docker volume create osm-data
-docker-compose build
+docker compose build
 ```
 
 For entering into the container, use the "terminal" argument of the run.sh script:
 
 ```bash
-docker-compose run --rm map terminal
+docker compose run --rm map terminal
 ```
 
 #### Do an import
 
-Download a pbf and a poly file of your choice on https://download.geofabrik.de and put it in the `pbf` folder. Change the lines of the pbf and poly paths in the volumes in the `docker-compose.yml` file
+Download a pbf and a poly file of your choice on https://download.geofabrik.de and put it in the `pbf` folder. Change the lines of the pbf and poly paths in the volumes in the `docker compose.yml` file
 
 Then, you can import the OSM data by doing this command:
 
 ```bash
-docker-compose run --rm map import
+docker compose run --rm map import
 ```
 
 This will take a while, about 15 min for Luxembourg for example.
@@ -47,7 +47,7 @@ INFO:root:  Import complete
 #### Run the server to produce and view tiles
 
 ```bash
-docker-compose run --rm map run
+docker compose run --rm map run
 ```
 
 The tiles are available on http://192.168.176.2/ or something like that. Have a look at the docker container to know which is the IP address: there is a message like "Could not reliably determine the server's fully qualified domain name, using 192.168.176.2.". (should be on http://localhost:8080/ though...)
@@ -63,11 +63,13 @@ python3 generate-tiles-list.py > tiles.list
 Move this `tiles.list` file in the `/tiles/` directory and then run:
 
 ```bash
-docker-compose run --rm map generate_tiles
+docker compose run --rm map generate_tiles
 ```
 
 For Belgium up to zoom 18, it might take >48 hours!
 
+NB: use `cat tiles.list | grep " 18" > tiles_18.list` to split the tiles.list per zoom level
+
 #### Transfer the tiles to tiles.champs-libres.be
 
 
@@ -186,7 +188,7 @@ Your tiles will now be available at `http://localhost:8080/tile/{z}/{x}/{y}.png`
 
 ### Using Docker Compose
 
-The `docker-compose.yml` file included with this repository shows how the aforementioned command can be used with Docker Compose to run your server.
+The `docker compose.yml` file included with this repository shows how the aforementioned command can be used with Docker Compose to run your server.
 
 ### Preserving rendered tiles
 
diff --git a/run.sh b/run.sh
index 0f7eb3f..9406d79 100755
--- a/run.sh
+++ b/run.sh
@@ -22,7 +22,7 @@ function compileStyle() {
     mkdir /data/style/scripts/
     mv /data/style/openstreetmap-carto-be/scripts/* /data/style/scripts/
     mv /data/style/openstreetmap-carto-be/external-data.yml /data/style/external-data.yml
-    carto openstreetmap-carto-be/project-fr.mml > mapnik.xml
+    carto openstreetmap-carto-be/project.mml > mapnik.xml
 }
 
 
@@ -213,7 +213,7 @@ if [ "$1" == "generate_tiles" ]; then
 
     sudo -u renderer renderd -c /etc/renderd.conf
 
-    cat /data/tiles/osmbe/tiles.list | render_list --map osmbe
+    cat /data/tiles/osmbe/tiles.list | render_list --map osmbe -n 1
 
     bash
 fi