simplified PR for immediate issue

.github/workflows/build-and-test.yaml

@@ -5,7 +5,7 @@ on:
     branches:
     - master
     tags:
-    - 'v[0-9]+.[0-9]+.[0-9]+'
+    - 'v*'
   pull_request:
     branches:
     - master
@@ -21,65 +21,49 @@ env:
 
 jobs:
 
-  build:
+  test:
-    strategy:
-      matrix:
-        include:
-        - arch    : amd64
-          mode    : build-and-test
-        - arch    : arm64
-          variant : v8
-          mode    : build-only
     runs-on: ubuntu-latest
     env:
       VOLUME    : osm-db
       CONTAINER : osm-www
       MOUNT     : /data/database/
-      PLATFORM  : linux/${{ matrix.arch }}${{ (matrix.variant != '' && format('/{0}', matrix.variant)) || '' }}
     steps:
     -
       name: Checkout
       uses: actions/checkout@v3
     -
       name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+      uses: docker/setup-qemu-action@v1
-      with:
-        platforms: ${{ matrix.arch }}
     -
       name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v1
     -
       name: Environment
       run : |
         echo  IMAGE=$(echo ${{ env.IMAGE }} | tr '[:upper:]' '[:lower:]')  >>$GITHUB_ENV
     -
       name: Docker build
-      uses: docker/build-push-action@v3
+      uses: docker/build-push-action@v2
       with:
         pull       : true
-        load       : ${{ matrix.mode == 'build-and-test' }}
+        load       : true
-        platforms  : ${{ env.PLATFORM }}
         context    : .
         file       : ./Dockerfile
-        tags       : ${{ env.IMAGE }}:${{ env.TAG }}
+        tags       : ${{env.IMAGE}}:${{env.TAG}}
-        cache-from : type=gha,scope=${{ github.workflow }}:${{ env.PLATFORM }}
+        cache-from : type=gha,scope=${{ github.workflow }}
-        cache-to   : type=gha,scope=${{ github.workflow }}:${{ env.PLATFORM }},mode=max
+        cache-to   : type=gha,scope=${{ github.workflow }},mode=max
     -
       name: Import Luxembourg
-      if  : ${{ matrix.mode == 'build-and-test' }}
       run : |
         docker  volume  create  ${VOLUME}
         docker  run  --rm  --shm-size=128M  -v ${VOLUME}:${MOUNT}  -e UPDATES=enabled  ${IMAGE}:${TAG}  import
     -
       name: Start server
-      if  : ${{ matrix.mode == 'build-and-test' }}
       run : |
-        docker  run  --shm-size=128M  -v ${VOLUME}:${MOUNT}  -e UPDATES=enabled  -p 80:80  -d  --name ${CONTAINER}  ${IMAGE}:${TAG}  run
+        docker  run  --rm  --shm-size=128M  -v ${VOLUME}:${MOUNT}  -e UPDATES=enabled  -p 80:80  -d  --name ${CONTAINER}  ${IMAGE}:${TAG}  run
         sleep 30
-        docker  logs  ${CONTAINER}
     -
       name: Download tiles
-      if  : ${{ matrix.mode == 'build-and-test' }}
       run : |
         curl  http://localhost/tile/0/0/0.png            --fail  -o 000.png
         curl  http://localhost/tile/1/0/0.png            --fail  -o 100.png
@@ -90,14 +74,12 @@ jobs:
         curl  http://localhost/tile/18/135536/89345.png  --fail  -o example.png
     -
       name: Upload tiles
-      if  : ${{ matrix.mode == 'build-and-test' }}
       uses: actions/upload-artifact@v3
       with:
         name: tiles
         path: '*.png'
     -
       name: Verify tiles
-      if  : ${{ matrix.mode == 'build-and-test' }}
       run : |
         sha1sum  *.png
         sha1sum  --check  <<EOF
@@ -118,7 +100,6 @@ jobs:
         done
     -
       name: Cleanup
-      if  : ${{ matrix.mode == 'build-and-test' }}
       run : |
         docker  rm  --force  --volumes  ${CONTAINER}
         docker  volume  rm  --force  ${VOLUME}
@@ -127,7 +108,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     needs:
-    - build
+    - test
     if: ${{ github.event_name != 'pull_request' }}
     steps:
     -
@@ -141,7 +122,7 @@ jobs:
     -
       name: Docker meta
       id: meta
-      uses: docker/metadata-action@v4
+      uses: docker/metadata-action@v3
       with:
         images: |
           ${{ env.DOCKERHUB_IMAGE }}
@@ -153,37 +134,33 @@ jobs:
           type=semver,pattern={{major}}
     -
       name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+      uses: docker/setup-qemu-action@v1
-      with:
-        platforms: amd64,arm64
     -
       name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v1
     -
       name: Login to DockerHub
-      uses: docker/login-action@v2
+      uses: docker/login-action@v1
       if: ${{ env.DOCKERHUB_IMAGE != '' }}
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_PASSWORD }}
     -
       name: Login to GHCR
-      uses: docker/login-action@v2
+      uses: docker/login-action@v1
       with:
         registry : ghcr.io
         username : ${{ github.repository_owner }}
         password : ${{ secrets.GITHUB_TOKEN }}
     -
       name: Build and push
-      uses: docker/build-push-action@v3
+      uses: docker/build-push-action@v2
       with:
         pull       : true
         push       : true
-        platforms  : linux/amd64,linux/arm64/v8
         context    : .
         file       : ./Dockerfile
         tags       : ${{ steps.meta.outputs.tags }}
         labels     : ${{ steps.meta.outputs.labels }}
-        cache-from: |
+        cache-from : type=gha,scope=${{ github.workflow }}
-          type=gha,scope=${{ github.workflow }}:linux/amd64
+        cache-to   : type=gha,scope=${{ github.workflow }},mode=max
-          type=gha,scope=${{ github.workflow }}:linux/arm64/v8

.gitignore

@@ -1,6 +0,0 @@
-pbf/*.pbf
-pbf/*.poly
-tiles/*
-!tiles/.gitkeep
-database/*
-!database/.gitkeep

.travis.yml

@@ -7,6 +7,7 @@ services:
 before_install:
 - echo "Before install"
 before_script:
+- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 - docker pull overv/openstreetmap-tile-server || true
 script:
 - docker build --pull --cache-from overv/openstreetmap-tile-server --tag overv/openstreetmap-tile-server .
@@ -21,7 +22,6 @@ after_success:
 - if [[ "$TRAVIS_BRANCH" == "master" ]];
   then
   docker images ;
-  echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin ;
   docker push overv/openstreetmap-tile-server ;
   fi
 notifications:

Dockerfile

@@ -1,17 +1,81 @@
-FROM ubuntu:22.04 AS compiler-common
+FROM ubuntu:20.04 AS compiler-common
 ENV DEBIAN_FRONTEND=noninteractive
-ENV LANG C.UTF-8
-ENV LC_ALL C.UTF-8
 
 RUN apt-get update \
 && apt-get install -y --no-install-recommends \
- ca-certificates gnupg lsb-release locales \
+ git-core \
- wget curl \
+ checkinstall \
- git-core unzip unrar \
+ g++ \
-&& locale-gen $LANG && update-locale LANG=$LANG \
+ gnupg2 \
-&& sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' \
+ make \
+ tar \
+ wget \
+ ca-certificates \
+&& apt-get update
+
+###########################################################################################################
+
+FROM compiler-common AS compiler-postgis
+RUN echo "deb http://apt.postgresql.org/pub/repos/apt focal-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
 && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-&& apt-get update && apt-get -y upgrade
+&& apt-get update \
+&& apt-get install -y --no-install-recommends \
+ postgresql-server-dev-14 \
+ libxml2-dev \
+ libgeos-dev \
+ libproj-dev \
+&& wget https://download.osgeo.org/postgis/source/postgis-3.2.1.tar.gz -O postgis.tar.gz \
+&& mkdir -p postgis_src \
+&& tar -xvzf postgis.tar.gz --strip 1 -C postgis_src \
+&& rm postgis.tar.gz \
+&& cd postgis_src \
+&& ./configure --without-protobuf --without-raster \
+&& make -j $(nproc) \
+&& checkinstall --pkgversion="3.2.1" --install=no --default make install
+
+###########################################################################################################
+
+FROM compiler-common AS compiler-osm2pgsql
+RUN apt-get install -y --no-install-recommends \
+ cmake \
+ libboost-dev \
+ libboost-system-dev \
+ libboost-filesystem-dev \
+ libexpat1-dev \
+ zlib1g-dev \
+ libbz2-dev \
+ libpq-dev \
+ libproj-dev \
+ lua5.3 \
+ liblua5.3-dev \
+ pandoc
+RUN cd ~ \
+&& git clone -b master --single-branch https://github.com/openstreetmap/osm2pgsql.git --depth 1 \
+&& cd osm2pgsql \
+&& mkdir build \
+&& cd build \
+&& cmake .. \
+&& make -j $(nproc) \
+&& checkinstall --pkgversion="1" --install=no --default make install
+
+###########################################################################################################
+
+FROM compiler-common AS compiler-modtile-renderd
+RUN apt-get install -y --no-install-recommends \
+ apache2-dev \
+ automake \
+ autoconf \
+ autotools-dev \
+ libtool \
+ libmapnik-dev
+RUN cd ~ \
+&& git clone -b switch2osm --single-branch https://github.com/SomeoneElseOSM/mod_tile.git --depth 1 \
+&& cd mod_tile \
+&& ./autogen.sh \
+&& ./configure \
+&& make -j $(nproc) \
+&& checkinstall --pkgversion="1" --install=no --pkgname "renderd" --default make install \
+&& checkinstall --pkgversion="1" --install=no --pkgname "mod_tile" --default make install-mod_tile
 
 ###########################################################################################################
 
@@ -19,10 +83,6 @@ FROM compiler-common AS compiler-stylesheet
 RUN cd ~ \
 && git clone --single-branch --branch v5.4.0 https://github.com/gravitystorm/openstreetmap-carto.git --depth 1 \
 && cd openstreetmap-carto \
-&& sed -i 's/, "unifont Medium", "Unifont Upper Medium"//g' style/fonts.mss \
-&& sed -i 's/"Noto Sans Tibetan Regular",//g' style/fonts.mss \
-&& sed -i 's/"Noto Sans Tibetan Bold",//g' style/fonts.mss \
-&& sed -i 's/Noto Sans Syriac Eastern Regular/Noto Sans Syriac Regular/g' style/fonts.mss \
 && rm -rf .git
 
 ###########################################################################################################
@@ -37,17 +97,13 @@ RUN mkdir -p /home/renderer/src \
 
 ###########################################################################################################
 
-FROM compiler-common AS final
+FROM ubuntu:20.04 AS final
 
 # Based on
 # https://switch2osm.org/serving-tiles/manually-building-a-tile-server-18-04-lts/
 ENV DEBIAN_FRONTEND=noninteractive
 ENV AUTOVACUUM=on
 ENV UPDATES=disabled
-ENV REPLICATION_URL=https://planet.openstreetmap.org/replication/hour/
-ENV MAX_INTERVAL_SECONDS=3600
-ENV PG_VERSION 15
-
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 # Get packages
@@ -55,73 +111,58 @@ RUN apt-get update \
 && apt-get install -y --no-install-recommends \
  apache2 \
  cron \
- dateutils \
- fonts-hanazono \
  fonts-noto-cjk \
  fonts-noto-hinted \
  fonts-noto-unhinted \
- fonts-unifont \
  gnupg2 \
  gdal-bin \
  liblua5.3-dev \
  lua5.3 \
  mapnik-utils \
  npm \
- osm2pgsql \
  osmium-tool \
  osmosis \
- postgresql-$PG_VERSION \
- postgresql-$PG_VERSION-postgis-3 \
- postgresql-$PG_VERSION-postgis-3-scripts \
- postgis \
  python-is-python3 \
  python3-mapnik \
  python3-lxml \
  python3-psycopg2 \
  python3-shapely \
  python3-pip \
- renderd \
  sudo \
- vim \
+ ttf-unifont \
+ wget \
+&& echo "deb http://apt.postgresql.org/pub/repos/apt focal-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
+&& wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+&& apt-get update \
+&& apt-get install -y --no-install-recommends postgresql-14 \
 && apt-get clean autoclean \
 && apt-get autoremove --yes \
 && rm -rf /var/lib/{apt,dpkg,cache,log}/
 
 RUN adduser --disabled-password --gecos "" renderer
 
-# Get Noto Emoji Regular font, despite it being deprecated by Google
-RUN wget https://github.com/googlefonts/noto-emoji/blob/9a5261d871451f9b5183c93483cbd68ed916b1e9/fonts/NotoEmoji-Regular.ttf?raw=true --content-disposition -P /usr/share/fonts/
-
-# For some reason this one is missing in the default packages
-RUN wget https://github.com/stamen/terrain-classic/blob/master/fonts/unifont-Medium.ttf?raw=true --content-disposition -P /usr/share/fonts/
-
 # Install python libraries
 RUN pip3 install \
  requests \
  osmium \
  pyyaml
-
+ 
 # Install carto for stylesheet
 RUN npm install -g carto@0.18.2
 
 # Configure Apache
-RUN echo "LoadModule tile_module /usr/lib/apache2/modules/mod_tile.so" >> /etc/apache2/conf-available/mod_tile.conf \
+RUN mkdir /var/lib/mod_tile \
+&& chown renderer /var/lib/mod_tile \
+&& mkdir /var/run/renderd \
+&& chown renderer /var/run/renderd \
+&& echo "LoadModule tile_module /usr/lib/apache2/modules/mod_tile.so" >> /etc/apache2/conf-available/mod_tile.conf \
 && echo "LoadModule headers_module /usr/lib/apache2/modules/mod_headers.so" >> /etc/apache2/conf-available/mod_headers.conf \
 && a2enconf mod_tile && a2enconf mod_headers
 COPY apache.conf /etc/apache2/sites-available/000-default.conf
+COPY leaflet-demo.html /var/www/html/index.html
 RUN ln -sf /dev/stdout /var/log/apache2/access.log \
 && ln -sf /dev/stderr /var/log/apache2/error.log
 
-# leaflet
-COPY leaflet-demo.html /var/www/html/index.html
-RUN cd /var/www/html/ \
-&& wget https://github.com/Leaflet/Leaflet/releases/download/v1.8.0/leaflet.zip \
-&& unzip leaflet.zip \
-&& rm leaflet.zip
-
-# Icon
-RUN wget -O /var/www/html/favicon.ico https://www.openstreetmap.org/favicon.ico
-
 # Copy update scripts
 COPY openstreetmap-tiles-update-expire.sh /usr/bin/
 RUN chmod +x /usr/bin/openstreetmap-tiles-update-expire.sh \
@@ -131,36 +172,50 @@ RUN chmod +x /usr/bin/openstreetmap-tiles-update-expire.sh \
 && echo "* * * * *   renderer    openstreetmap-tiles-update-expire.sh\n" >> /etc/crontab
 
 # Configure PosgtreSQL
-COPY postgresql.custom.conf.tmpl /etc/postgresql/$PG_VERSION/main/
+COPY postgresql.custom.conf.tmpl /etc/postgresql/14/main/
 RUN chown -R postgres:postgres /var/lib/postgresql \
-&& chown postgres:postgres /etc/postgresql/$PG_VERSION/main/postgresql.custom.conf.tmpl \
+&& chown postgres:postgres /etc/postgresql/14/main/postgresql.custom.conf.tmpl \
-&& echo "host all all 0.0.0.0/0 scram-sha-256" >> /etc/postgresql/$PG_VERSION/main/pg_hba.conf \
+&& echo "host all all 0.0.0.0/0 md5" >> /etc/postgresql/14/main/pg_hba.conf \
-&& echo "host all all ::/0 scram-sha-256" >> /etc/postgresql/$PG_VERSION/main/pg_hba.conf
+&& echo "host all all ::/0 md5" >> /etc/postgresql/14/main/pg_hba.conf
 
 # Create volume directories
-RUN mkdir -p /run/renderd/ \
+RUN   mkdir  -p  /data/database/  \
-  &&  mkdir  -p  /data/database/  \
   &&  mkdir  -p  /data/style/  \
   &&  mkdir  -p  /home/renderer/src/  \
   &&  chown  -R  renderer:  /data/  \
   &&  chown  -R  renderer:  /home/renderer/src/  \
-  &&  chown  -R  renderer:  /run/renderd  \
+  &&  mv  /var/lib/postgresql/14/main/  /data/database/postgres/  \
-  &&  mv  /var/lib/postgresql/$PG_VERSION/main/  /data/database/postgres/  \
+  &&  mv  /var/lib/mod_tile/            /data/tiles/     \
-  &&  mv  /var/cache/renderd/tiles/            /data/tiles/     \
+  &&  ln  -s  /data/database/postgres  /var/lib/postgresql/14/main             \
-  &&  chown  -R  renderer: /data/tiles \
-  &&  ln  -s  /data/database/postgres  /var/lib/postgresql/$PG_VERSION/main             \
   &&  ln  -s  /data/style              /home/renderer/src/openstreetmap-carto  \
-  &&  ln  -s  /data/tiles              /var/cache/renderd/tiles                \
+  &&  ln  -s  /data/tiles              /var/lib/mod_tile                       \
 ;
 
-RUN echo '[default] \n\
+# Install PostGIS
-URI=/tile/ \n\
+COPY --from=compiler-postgis postgis_src/postgis-src_3.2.1-1_amd64.deb .
-TILEDIR=/var/cache/renderd/tiles \n\
+RUN dpkg -i postgis-src_3.2.1-1_amd64.deb \
-XML=/home/renderer/src/openstreetmap-carto/mapnik.xml \n\
+&& rm postgis-src_3.2.1-1_amd64.deb
-HOST=localhost \n\
+
-TILESIZE=256 \n\
+# Install osm2pgsql
-MAXZOOM=20' >> /etc/renderd.conf \
+COPY --from=compiler-osm2pgsql /root/osm2pgsql/build/build_1-1_amd64.deb .
- && sed -i 's,/usr/share/fonts/truetype,/usr/share/fonts,g' /etc/renderd.conf
+RUN dpkg -i build_1-1_amd64.deb \
+&& rm build_1-1_amd64.deb
+
+# Install renderd
+COPY --from=compiler-modtile-renderd /root/mod_tile/renderd_1-1_amd64.deb .
+RUN dpkg -i renderd_1-1_amd64.deb \
+&& rm renderd_1-1_amd64.deb \
+&& sed -i 's/renderaccount/renderer/g' /usr/local/etc/renderd.conf \
+&& sed -i 's/\/truetype//g' /usr/local/etc/renderd.conf \
+&& sed -i 's/hot/tile/g' /usr/local/etc/renderd.conf
+
+# Install mod_tile
+COPY --from=compiler-modtile-renderd /root/mod_tile/mod-tile_1-1_amd64.deb .
+RUN dpkg -i mod-tile_1-1_amd64.deb \
+ && ldconfig \
+ && rm mod-tile_1-1_amd64.deb
+
+COPY --from=compiler-modtile-renderd /root/mod_tile/osmosis-db_replag /usr/bin/osmosis-db_replag
 
 # Install helper script
 COPY --from=compiler-helper-script /home/renderer/src/regional /home/renderer/src/regional

README.md

@@ -1,74 +1,5 @@
 # openstreetmap-tile-server
 
-
-## Champs-libres fork
-
-This is an adaptation of https://github.com/Overv/openstreetmap-tile-server/ for testing different cartoCss styles and generating tiles.
-
-### Use with docker-compose
-
-#### Fresh install
-
-```bash
-#docker volume create osm-data
-docker-compose build
-```
-
-For entering into the container, use the "terminal" argument of the run.sh script:
-
-```bash
-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
-
-Then, you can import the OSM data by doing this command:
-
-```bash
-docker-compose run --rm map import
-```
-
-This will take a while, about 15 min for Luxembourg for example.
-
-You should end with :
-
-```
-...
-INFO:root:  Importing into database
-INFO:root:  Import complete
-+ sudo -u renderer touch /data/database/planet-import-complete
-+ service postgresql stop
- * Stopping PostgreSQL 15 database server                                                                                                                                                       [ OK ]
-+ exit 0
-```
-
-#### Run the server to produce and view tiles
-
-```bash
-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...)
-
-#### Generate tiles from a list
-
-There's a script in utils to generate a list of tiles to be used to generate the tiles.
-
-```bash
-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
-```
-
-
-## Original README
-
 [![Build Status](https://travis-ci.org/Overv/openstreetmap-tile-server.svg?branch=master)](https://travis-ci.org/Overv/openstreetmap-tile-server) [![](https://images.microbadger.com/badges/image/overv/openstreetmap-tile-server.svg)](https://microbadger.com/images/overv/openstreetmap-tile-server "openstreetmap-tile-server")
 [![Docker Image Version (latest semver)](https://img.shields.io/docker/v/overv/openstreetmap-tile-server?label=docker%20image)](https://hub.docker.com/r/overv/openstreetmap-tile-server/tags)
 
@@ -136,10 +67,10 @@ By default the container will use openstreetmap-carto if it is not specified. Ho
 docker run \
     -e DOWNLOAD_PBF=https://download.geofabrik.de/europe/luxembourg-latest.osm.pbf \
     -e DOWNLOAD_POLY=https://download.geofabrik.de/europe/luxembourg.poly \
-    -e NAME_LUA=sample.lua \
+    -e NAME_LUA=sample.lua
-    -e NAME_STYLE=test.style \
+    -e NAME_STYLE=test.style
-    -e NAME_MML=project.mml \
+    -e NAME_MML=project.mml
-    -e NAME_SQL=test.sql \
+    -e NAME_SQL=test.sql
     -v /home/user/openstreetmap-carto-modified:/data/style/ \
     -v osm-data:/data/database/ \
     overv/openstreetmap-tile-server \
@@ -195,8 +126,6 @@ Given that you've set up your import as described in the *Automatic updates* sec
 ```
 docker run \
     -p 8080:80 \
-    -e REPLICATION_URL=https://planet.openstreetmap.org/replication/minute/ \
-    -e MAX_INTERVAL_SECONDS=60 \
     -e UPDATES=enabled \
     -v osm-data:/data/database/ \
     -v osm-tiles:/data/tiles/ \
@@ -206,29 +135,6 @@ docker run \
 
 This will enable a background process that automatically downloads changes from the OpenStreetMap server, filters them for the relevant region polygon you specified, updates the database and finally marks the affected tiles for rerendering.
 
-### Tile expiration (optional)
-
-Specify custom tile expiration settings to control which zoom level tiles are marked as expired when an update is performed. Tiles can be marked as expired in the cache (TOUCHFROM), but will still be served
-until a new tile has been rendered, or deleted from the cache (DELETEFROM), so nothing will be served until a new tile has been rendered.
-
-The example tile expiration values below are the default values.
-
-```
-docker run \
-    -p 8080:80 \
-    -e REPLICATION_URL=https://planet.openstreetmap.org/replication/minute/ \
-    -e MAX_INTERVAL_SECONDS=60 \
-    -e UPDATES=enabled \
-    -e EXPIRY_MINZOOM=13 \
-    -e EXPIRY_TOUCHFROM=13 \
-    -e EXPIRY_DELETEFROM=19 \
-    -e EXPIRY_MAXZOOM=20 \
-    -v osm-data:/data/database/ \
-    -v osm-tiles:/data/tiles/ \
-    -d overv/openstreetmap-tile-server \
-    run
-```
-
 ### Cross-origin resource sharing
 
 To enable the `Access-Control-Allow-Origin` header to be able to retrieve tiles from other domains, simply set the `ALLOW_CORS` variable to `enabled`:
@@ -326,8 +232,6 @@ docker run \
     import
 ```
 
-Warning: enabling `FLAT_NOTES` together with `UPDATES` only works for entire planet imports (without a `.poly` file).  Otherwise this will break the automatic update script. This is because trimming the differential updates to the specific regions currently isn't supported when using flat nodes.
-
 ### Benchmarks
 
 You can find an example of the import performance to expect with this image on the [OpenStreetMap wiki](https://wiki.openstreetmap.org/wiki/Osm2pgsql/benchmarks#debian_9_.2F_openstreetmap-tile-server).
@@ -338,7 +242,7 @@ You can find an example of the import performance to expect with this image on t
 
 If you encounter such entries in the log, it will mean that the default shared memory limit (64 MB) is too low for the container and it should be raised:
 ```
-renderd[121]: ERROR: failed to render TILE default 2 0-3 0-3
+renderd[121]: ERROR: failed to render TILE ajt 2 0-3 0-3
 renderd[121]: reason: Postgis Plugin: ERROR: could not resize shared memory segment "/PostgreSQL.790133961" to 12615680 bytes: ### No space left on device
 ```
 To raise it use `--shm-size` parameter. For example:

apache.conf

@@ -1,9 +1,8 @@
 <VirtualHost *:80>
     ServerAdmin webmaster@localhost
 
-    AddTileConfig /tile/ default
+    LoadTileConfigFile /usr/local/etc/renderd.conf
-    LoadTileConfigFile /etc/renderd.conf
+    ModTileRenderdSocketName /var/run/renderd/renderd.sock
-    ModTileRenderdSocketName /run/renderd/renderd.sock
     ModTileRequestTimeout 0
     ModTileMissingRequestTimeout 30
 

docker-compose.yml

@@ -4,16 +4,11 @@ services:
   map:
     image: overv/openstreetmap-tile-server
     volumes:
-      #- osm-data:/data/database/
+      - osm-data:/data/database/
-      - ./database:/data/database/
-      - ./tiles:/data/tiles/
-      - ./run.sh:/run.sh # for dev
-      - ./pbf/luxembourg-latest.osm.pbf:/data/region.osm.pbf # change here your pbf
-      - ./pbf/luxembourg.poly:/data/region.poly # and your poly
     ports:
       - "8080:80"
     command: "run"
 
-# volumes:
+volumes:
-#   osm-data:
+  osm-data:
-#     external: true
+    external: true

leaflet-demo.html

@@ -6,8 +6,8 @@
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-        <link rel="stylesheet" href="leaflet.css"/>
+        <link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css" integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A==" crossorigin="" />
-        <script src="leaflet.js"></script>
+        <script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js" integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA==" crossorigin=""></script>
 
         <style>
             html, body, #map {

openstreetmap-tiles-update-expire.sh

@@ -3,7 +3,7 @@
 set -e
 
 #------------------------------------------------------------------------------
-# Change directory to mod_tile directory so that we can run replag
+# AJT - change directory to mod_tile directory so that we can run replag
 # and other things directly from this script when run from cron.
 # Change the actual location to wherever installed locally.
 #------------------------------------------------------------------------------
@@ -56,10 +56,10 @@ RUNLOG=$LOG_DIR/run.log
 # Here we expire (but don't immediately rerender) tiles between zoom levels
 # 13 and 18 and delete between 19 and 20.
 #------------------------------------------------------------------------------
-EXPIRY_MINZOOM=${EXPIRY_MINZOOM:="13"}
+EXPIRY_MINZOOM=13
-EXPIRY_TOUCHFROM=${EXPIRY_TOUCHFROM:="13"}
+EXPIRY_TOUCHFROM=13
-EXPIRY_DELETEFROM=${EXPIRY_DELETEFROM:="19"}
+EXPIRY_DELETEFROM=19
-EXPIRY_MAXZOOM=${EXPIRY_MAXZOOM:="20"}
+EXPIRY_MAXZOOM=20
 
 #*************************************************************************
 #*************************************************************************
@@ -109,16 +109,14 @@ freelock()
 if [ $# -eq 1 ] ; then
     m_info "Initialising Osmosis replication system to $1"
     mkdir -p $WORKOSM_DIR
-    $OSMOSIS_BIN -v 5 --read-replication-interval-init workingDirectory=$WORKOSM_DIR 1>&2 2> "$OSMOSISLOG"
 
-    init_seq=$(/usr/lib/python3-pyosmium/pyosmium-get-changes --server $REPLICATION_URL -D $1)
+    $OSMOSIS_BIN --read-replication-interval-init workingDirectory=$WORKOSM_DIR 1>&2 2> "$OSMOSISLOG"
-    url_dynamicPart=$(printf %09d $init_seq | sed 's_\([0-9][0-9][0-9]\)\([0-9][0-9][0-9]\)\([0-9][0-9][0-9]\)_\1/\2/\3_')
-    wget $REPLICATION_URL/$url_dynamicPart.state.txt -O $WORKOSM_DIR/state.txt
 
-    cat > $WORKOSM_DIR/configuration.txt <<- EOM
+    wget "https://replicate-sequences.osm.mazdermind.de/?"$1"T00:00:00Z" -O $WORKOSM_DIR/state.txt
-baseUrl=$REPLICATION_URL
+
-maxInterval=$MAX_INTERVAL_SECONDS
+    mv $WORKOSM_DIR/configuration.txt $WORKOSM_DIR/configuration_orig.txt
-EOM
+    sed "s!baseUrl=http://planet.openstreetmap.org/replication/minute!baseUrl=https://planet.openstreetmap.org/replication/minute!" $WORKOSM_DIR/configuration_orig.txt > $WORKOSM_DIR/configuration.txt
+    exit 0
 fi
 
 # make sure the lockfile is removed when we exit and then claim it
@@ -143,9 +141,8 @@ if `python -c "import os, sys; st=os.statvfs('$BASE_DIR'); sys.exit(1 if st.f_ba
 fi
 
 seq=`cat $WORKOSM_DIR/state.txt | grep sequenceNumber | cut -d= -f2`
-replag=`dateutils.ddiff $(cat $WORKOSM_DIR/state.txt | grep timestamp | cut -d "=" -f 2 | sed 's,\\\,,g') now`
 
-m_ok "start import from seq-nr $seq, replag is $replag"
+m_ok "start import from seq-nr $seq, replag is `osmosis-db_replag -h`"
 
 /bin/cp $WORKOSM_DIR/state.txt $WORKOSM_DIR/last.state.txt
 m_ok "downloading diff"
@@ -185,13 +182,15 @@ fi
 m_ok "expiring tiles"
 
 #------------------------------------------------------------------------------
+# When expiring tiles we need to define the style sheet if it's not "default".
+# In this case it's "ajt".
 # Previously all tiles on the "dirty" list between $EXPIRY_MINZOOM and
 # $EXPIRY_MAXZOOM were dirtied.  We currently re-render
 # tiles >= $EXPIRY_MINZOOM and < $EXPIRY_DELETEFROM, expiry from 14 and
 # delete >= $EXPIRY_DELETEFROM and <= $EXPIRY_MAXZOOM.
 # The default path to renderd.sock is fixed.
 #------------------------------------------------------------------------------
-if ! render_expired --map=default --min-zoom=$EXPIRY_MINZOOM --touch-from=$EXPIRY_TOUCHFROM --delete-from=$EXPIRY_DELETEFROM --max-zoom=$EXPIRY_MAXZOOM -s /run/renderd/renderd.sock < "$EXPIRY_FILE.$$" 2>&1 | tail -8 >> "$EXPIRYLOG"; then
+if ! render_expired --map=ajt --min-zoom=$EXPIRY_MINZOOM --touch-from=$EXPIRY_TOUCHFROM --delete-from=$EXPIRY_DELETEFROM --max-zoom=$EXPIRY_MAXZOOM -s /var/run/renderd/renderd.sock < "$EXPIRY_FILE.$$" 2>&1 | tail -8 >> "$EXPIRYLOG"; then
     m_info "Expiry failed"
 fi
 

run.sh

@@ -3,9 +3,9 @@
 set -euo pipefail
 
 function createPostgresConfig() {
-  cp /etc/postgresql/$PG_VERSION/main/postgresql.custom.conf.tmpl /etc/postgresql/$PG_VERSION/main/conf.d/postgresql.custom.conf
+  cp /etc/postgresql/14/main/postgresql.custom.conf.tmpl /etc/postgresql/14/main/conf.d/postgresql.custom.conf
-  sudo -u postgres echo "autovacuum = $AUTOVACUUM" >> /etc/postgresql/$PG_VERSION/main/conf.d/postgresql.custom.conf
+  sudo -u postgres echo "autovacuum = $AUTOVACUUM" >> /etc/postgresql/14/main/conf.d/postgresql.custom.conf
-  cat /etc/postgresql/$PG_VERSION/main/conf.d/postgresql.custom.conf
+  cat /etc/postgresql/14/main/conf.d/postgresql.custom.conf
 }
 
 function setPostgresPassword() {
@@ -40,17 +40,11 @@ if [ ! -f /data/style/mapnik.xml ]; then
     carto ${NAME_MML:-project.mml} > mapnik.xml
 fi
 
-if [ "$1" == "terminal" ]; then
-    bash
-fi
-
 if [ "$1" == "import" ]; then
     # Ensure that database directory is in right state
-    mkdir -p /data/database/postgres/
-    chown renderer: /data/database/
     chown -R postgres: /var/lib/postgresql /data/database/postgres/
     if [ ! -f /data/database/postgres/PG_VERSION ]; then
-        sudo -u postgres /usr/lib/postgresql/$PG_VERSION/bin/pg_ctl -D /data/database/postgres/ initdb -o "--locale C.UTF-8"
+        sudo -u postgres /usr/lib/postgresql/14/bin/pg_ctl -D /data/database/postgres/ initdb -o "--locale C.UTF-8"
     fi
 
     # Initialize PostgreSQL
@@ -74,7 +68,7 @@ if [ "$1" == "import" ]; then
     if [ -n "${DOWNLOAD_PBF:-}" ]; then
         echo "INFO: Download PBF file: $DOWNLOAD_PBF"
         wget ${WGET_ARGS:-} "$DOWNLOAD_PBF" -O /data/region.osm.pbf
-        if [ -n "${DOWNLOAD_POLY:-}" ]; then
+        if [ -n "$DOWNLOAD_POLY" ]; then
             echo "INFO: Download PBF-POLY file: $DOWNLOAD_POLY"
             wget ${WGET_ARGS:-} "$DOWNLOAD_POLY" -O /data/region.poly
         fi
@@ -82,10 +76,10 @@ if [ "$1" == "import" ]; then
 
     if [ "${UPDATES:-}" == "enabled" ] || [ "${UPDATES:-}" == "1" ]; then
         # determine and set osmosis_replication_timestamp (for consecutive updates)
-        REPLICATION_TIMESTAMP=`osmium fileinfo -g header.option.osmosis_replication_timestamp /data/region.osm.pbf`
+        REPLICATION_TIMESTAMP=`osmium fileinfo /data/region.osm.pbf | grep 'osmosis_replication_timestamp=' | cut -b35-44`
 
         # initial setup of osmosis workspace (for consecutive updates)
-        sudo -E -u renderer openstreetmap-tiles-update-expire.sh $REPLICATION_TIMESTAMP
+        sudo -u renderer openstreetmap-tiles-update-expire.sh $REPLICATION_TIMESTAMP
     fi
 
     # copy polygon file if available
@@ -172,16 +166,11 @@ if [ "$1" == "run" ]; then
     setPostgresPassword
 
     # Configure renderd threads
-    sed -i -E "s/num_threads=[0-9]+/num_threads=${THREADS:-4}/g" /etc/renderd.conf
+    sed -i -E "s/num_threads=[0-9]+/num_threads=${THREADS:-4}/g" /usr/local/etc/renderd.conf
 
     # start cron job to trigger consecutive updates
     if [ "${UPDATES:-}" == "enabled" ] || [ "${UPDATES:-}" == "1" ]; then
         /etc/init.d/cron start
-        sudo -u renderer touch /var/log/tiles/run.log; tail -f /var/log/tiles/run.log >> /proc/1/fd/1 &
-        sudo -u renderer touch /var/log/tiles/osmosis.log; tail -f /var/log/tiles/osmosis.log >> /proc/1/fd/1 &
-        sudo -u renderer touch /var/log/tiles/expiry.log; tail -f /var/log/tiles/expiry.log >> /proc/1/fd/1 &
-        sudo -u renderer touch /var/log/tiles/osm2pgsql.log; tail -f /var/log/tiles/osm2pgsql.log >> /proc/1/fd/1 &
-
     fi
 
     # Run while handling docker stop's SIGTERM
@@ -190,7 +179,7 @@ if [ "$1" == "run" ]; then
     }
     trap stop_handler SIGTERM
 
-    sudo -u renderer renderd -f -c /etc/renderd.conf &
+    sudo -u renderer renderd -f -c /usr/local/etc/renderd.conf &
     child=$!
     wait "$child"
 
@@ -199,15 +188,5 @@ if [ "$1" == "run" ]; then
     exit 0
 fi
 
-if [ "$1" == "generate_tiles" ]; then
-
-    service postgresql start
-    service apache2 restart
-
-    sudo -u renderer renderd -c /etc/renderd.conf
-
-    cat /data/tiles/default/tiles.list | render_list --map default
-fi
-
 echo "invalid command"
 exit 1

utils/generate-tiles-list.py

@@ -1,35 +0,0 @@
-# usage: python3 generate-tiles-list.py > tiles.list
-
-import math
-
-def deg2num(lat_deg, lon_deg, zoom):
-  lat_rad = math.radians(lat_deg)
-  n = 2.0 ** zoom
-  xtile = int((lon_deg + 180.0) / 360.0 * n)
-  ytile = int((1.0 - math.asinh(math.tan(lat_rad)) / math.pi) / 2.0 * n)
-
-  return (xtile, ytile)
-
-# GD lux coordinates
-max_x = 6.531
-max_y = 50.184
-min_x = 5.735
-min_y = 49.452
-
-min_z = 9
-max_z = 17
-
-for z in range(min_z, max_z+1):
-    x1_tile, y1_tile = deg2num(max_y, max_x, z)
-    x2_tile, y2_tile = deg2num(min_y, min_x, z)
-    min_x_tile = x1_tile if x1_tile < x2_tile else x2_tile
-    max_x_tile = x1_tile if x1_tile > x2_tile else x2_tile
-    min_y_tile = y1_tile if y1_tile < y2_tile else y2_tile
-    max_y_tile = y1_tile if y1_tile > y2_tile else y2_tile
-    for tx in range(min_x_tile, max_x_tile):
-        if tx % 8 != 0:
-            continue
-        for ty in range(min_y_tile, max_y_tile):
-            if ty % 8 != 0:
-                continue
-            print("{} {} {}".format(tx, ty, z))