From dc47871a5d32e6fa2ac6dc410a19feb3d3ce229c Mon Sep 17 00:00:00 2001 From: "Robin C. Ladiges" Date: Wed, 25 May 2022 22:21:56 +0200 Subject: [PATCH 1/2] warn about FLAT_NODES w/ UPDATES incompatibility (#282) See https://github.com/Zverik/regional/issues/17 --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 2d0efdc..65409df 100644 --- a/README.md +++ b/README.md @@ -232,6 +232,8 @@ 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). From ed4dbb0c9bdb9b7fcb5bdb29be579ccb03c61e34 Mon Sep 17 00:00:00 2001 From: galewis2 <62433564+galewis2@users.noreply.github.com> Date: Tue, 14 Jun 2022 11:51:17 -0400 Subject: [PATCH 2/2] Bad conflict resolve --- run.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/run.sh b/run.sh index 7141981..1328dc3 100755 --- a/run.sh +++ b/run.sh @@ -2,8 +2,6 @@ set -euo pipefail -declare -p | grep -Ev 'BASHOPTS|BASH_VERSINFO|EUID|PPID|SHELLOPTS|UID' > /container.env - function createPostgresConfig() { 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/14/main/conf.d/postgresql.custom.conf