From 85eaca5c79030e0727640b9db62ba4335477fc20 Mon Sep 17 00:00:00 2001 From: Jason Montleon Date: Sat, 3 Jul 2021 09:28:40 -0400 Subject: [PATCH 1/5] Install python-is-python3 for openstreetmap-tiles-update-expire (#201) --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index a438d52..8a0d416 100644 --- a/Dockerfile +++ b/Dockerfile @@ -62,6 +62,7 @@ RUN apt-get install -y --no-install-recommends \ postgresql-contrib-12 \ postgresql-server-dev-12 \ protobuf-c-compiler \ + python-is-python3 \ python3-mapnik \ python3-lxml \ python3-psycopg2 \ From 7b82bcae9dd067cbfd3a59371982e3b072acace2 Mon Sep 17 00:00:00 2001 From: Alexander Overvoorde Date: Mon, 19 Jul 2021 22:05:18 +0200 Subject: [PATCH 2/5] Use indexes.sql included with openstreetmap-carto instead of own copy (fixes #204) (#205) --- Dockerfile | 5 ++--- indexes.sql | 48 ------------------------------------------------ run.sh | 4 ++-- 3 files changed, 4 insertions(+), 53 deletions(-) delete mode 100644 indexes.sql diff --git a/Dockerfile b/Dockerfile index 8a0d416..b4565be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -79,7 +79,7 @@ RUN apt-get install -y --no-install-recommends \ && rm -rf /var/lib/{apt,dpkg,cache,log}/ # Install python libraries -RUN pip3 install requests \ +RUN pip3 install requests \ && pip3 install pyyaml # Set up PostGIS @@ -132,7 +132,7 @@ RUN mkdir -p /home/renderer/src \ && cd openstreetmap-carto \ && rm -rf .git \ && npm install -g carto@0.18.2 \ - && carto project.mml > mapnik.xml + && carto project.mml > mapnik.xml # Configure renderd RUN sed -i 's/renderaccount/renderer/g' /usr/local/etc/renderd.conf \ @@ -178,7 +178,6 @@ RUN mkdir -p /home/renderer/src \ # Start running COPY run.sh / -COPY indexes.sql / ENTRYPOINT ["/run.sh"] CMD [] diff --git a/indexes.sql b/indexes.sql deleted file mode 100644 index 3f68e6a..0000000 --- a/indexes.sql +++ /dev/null @@ -1,48 +0,0 @@ --- Extracted from https://github.com/gravitystorm/openstreetmap-carto --- Comes with a CC0 license - --- These are optional but suggested indexes for rendering OpenStreetMap Carto --- with a full planet database. --- This file is generated with scripts/indexes.py - -CREATE INDEX planet_osm_roads_admin - ON planet_osm_roads USING GIST (way) - WHERE boundary = 'administrative'; -CREATE INDEX planet_osm_roads_roads_ref - ON planet_osm_roads USING GIST (way) - WHERE highway IS NOT NULL AND ref IS NOT NULL; -CREATE INDEX planet_osm_roads_admin_low - ON planet_osm_roads USING GIST (way) - WHERE boundary = 'administrative' AND admin_level IN ('0', '1', '2', '3', '4'); -CREATE INDEX planet_osm_line_ferry - ON planet_osm_line USING GIST (way) - WHERE route = 'ferry'; -CREATE INDEX planet_osm_line_river - ON planet_osm_line USING GIST (way) - WHERE waterway = 'river'; -CREATE INDEX planet_osm_line_name - ON planet_osm_line USING GIST (way) - WHERE name IS NOT NULL; -CREATE INDEX planet_osm_polygon_water - ON planet_osm_polygon USING GIST (way) - WHERE waterway IN ('dock', 'riverbank', 'canal') - OR landuse IN ('reservoir', 'basin') - OR "natural" IN ('water', 'glacier'); -CREATE INDEX planet_osm_polygon_nobuilding - ON planet_osm_polygon USING GIST (way) - WHERE building IS NULL; -CREATE INDEX planet_osm_polygon_name - ON planet_osm_polygon USING GIST (way) - WHERE name IS NOT NULL; -CREATE INDEX planet_osm_polygon_way_area_z10 - ON planet_osm_polygon USING GIST (way) - WHERE way_area > 23300; -CREATE INDEX planet_osm_polygon_military - ON planet_osm_polygon USING GIST (way) - WHERE (landuse = 'military' OR military = 'danger_area') AND building IS NULL; -CREATE INDEX planet_osm_polygon_way_area_z6 - ON planet_osm_polygon USING GIST (way) - WHERE way_area > 5980000; -CREATE INDEX planet_osm_point_place - ON planet_osm_point USING GIST (way) - WHERE place IS NOT NULL AND name IS NOT NULL; diff --git a/run.sh b/run.sh index 95e219e..dcee9d6 100755 --- a/run.sh +++ b/run.sh @@ -76,8 +76,8 @@ if [ "$1" = "import" ]; then sudo -u renderer osm2pgsql -d gis --create --slim -G --hstore --tag-transform-script /home/renderer/src/openstreetmap-carto/openstreetmap-carto.lua --number-processes ${THREADS:-4} -S /home/renderer/src/openstreetmap-carto/openstreetmap-carto.style /data.osm.pbf ${OSM2PGSQL_EXTRA_ARGS} # Create indexes - sudo -u postgres psql -d gis -f indexes.sql - + sudo -u postgres psql -d gis -f /home/renderer/src/openstreetmap-carto/indexes.sql + #Import external data sudo chown -R renderer: /home/renderer/src sudo -u renderer python3 /home/renderer/src/openstreetmap-carto/scripts/get-external-data.py -c /home/renderer/src/openstreetmap-carto/external-data.yml -D /home/renderer/src/openstreetmap-carto/data From ce176ae32e22f9c51e46c26396feec316db9c294 Mon Sep 17 00:00:00 2001 From: Alexander Overvoorde Date: Fri, 3 Sep 2021 12:46:37 +0200 Subject: [PATCH 3/5] Fix erroneous quotes around WGET_ARGS (fixes #210) --- run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run.sh b/run.sh index dcee9d6..f09d913 100755 --- a/run.sh +++ b/run.sh @@ -50,10 +50,10 @@ if [ "$1" = "import" ]; then if [ -n "$DOWNLOAD_PBF" ]; then echo "INFO: Download PBF file: $DOWNLOAD_PBF" - wget "$WGET_ARGS" "$DOWNLOAD_PBF" -O /data.osm.pbf + wget $WGET_ARGS "$DOWNLOAD_PBF" -O /data.osm.pbf if [ -n "$DOWNLOAD_POLY" ]; then echo "INFO: Download PBF-POLY file: $DOWNLOAD_POLY" - wget "$WGET_ARGS" "$DOWNLOAD_POLY" -O /data.poly + wget $WGET_ARGS "$DOWNLOAD_POLY" -O /data.poly fi fi From 60ac7657d1a0246a42f6c52557d3324e55f36be5 Mon Sep 17 00:00:00 2001 From: Alexander Overvoorde Date: Fri, 3 Sep 2021 12:51:45 +0200 Subject: [PATCH 4/5] Don't clutter output of usage instructions --- run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run.sh b/run.sh index f09d913..2fc0aa0 100755 --- a/run.sh +++ b/run.sh @@ -1,7 +1,5 @@ #!/bin/bash -set -x - function createPostgresConfig() { cp /etc/postgresql/12/main/postgresql.custom.conf.tmpl /etc/postgresql/12/main/conf.d/postgresql.custom.conf sudo -u postgres echo "autovacuum = $AUTOVACUUM" >> /etc/postgresql/12/main/conf.d/postgresql.custom.conf @@ -23,6 +21,8 @@ if [ "$#" -ne 1 ]; then exit 1 fi +set -x + if [ "$1" = "import" ]; then # Ensure that database directory is in right state chown postgres:postgres -R /var/lib/postgresql From 0a4d079b0815cf7640ae4050642d8509e6ce552f Mon Sep 17 00:00:00 2001 From: Andrey Prih Date: Tue, 7 Sep 2021 22:39:35 +0300 Subject: [PATCH 5/5] fix naciscdn.org (#212) * fix naciscdn.org * fix Co-authored-by: prih --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index b4565be..134503d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -131,6 +131,7 @@ RUN mkdir -p /home/renderer/src \ && git clone --single-branch --branch v5.3.1 https://github.com/gravitystorm/openstreetmap-carto.git --depth 1 \ && cd openstreetmap-carto \ && rm -rf .git \ + && sed -ie 's#https:\/\/naciscdn.org\/naturalearth\/110m\/cultural\/ne_110m_admin_0_boundary_lines_land.zip#https:\/\/naturalearth.s3.amazonaws.com\/110m_cultural\/ne_110m_admin_0_boundary_lines_land.zip#g' external-data.yml \ && npm install -g carto@0.18.2 \ && carto project.mml > mapnik.xml