Use tools v6.1, improve .env docs (#1281)

* Add info about using MID_ZOOM to optimize tile generation
* Remove params for generation that are now automatically detected


Co-authored-by: Tomas Pohanka <TomPohys@gmail.com>
pull/1315/head
Yuri Astrakhan 2021-11-26 05:31:01 -05:00 zatwierdzone przez GitHub
rodzic 207396269e
commit 4eb8feb0ad
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 10 dodań i 14 usunięć

15
.env
Wyświetl plik

@ -4,7 +4,7 @@
TILESET_FILE=openmaptiles.yaml
# Use 3-part patch version to ignore patch updates, e.g. 5.0.0
TOOLS_VERSION=6.0
TOOLS_VERSION=6.1
# Make sure these values are in sync with the ones in .env-postgres file
PGDATABASE=openmaptiles
@ -18,16 +18,17 @@ PGPORT=5432
# By default, the Makefile will use the content of data/$(area).bbox file if it exists.
BBOX=-180.0,-85.0511,180.0,85.0511
# Which zooms to generate in make generate-tiles
# Which zooms to generate with make generate-tiles-pg
MIN_ZOOM=0
MAX_ZOOM=7
# `MID_ZOOM` setting only works with `make generate-tiles-pg` command. Make sure MID_ZOOM < MAX_ZOOM.
# See https://github.com/openmaptiles/openmaptiles-tools/pull/383
# MID_ZOOM=11
# Use true (case sensitive) to allow data updates
DIFF_MODE=false
# Hide some output from Mapnik tile generation for clarity
FILTER_MAPNIK_OUTPUT=1
# Some area data like openstreetmap.fr can contain invalid references
# that must be cleaned up before using it for borders -- set it to true.
BORDERS_CLEANUP=false
@ -49,7 +50,5 @@ MAX_PARALLEL_PSQL=5
# Number of parallel threads to use when generating vector map tiles
COPY_CONCURRENCY=10
# Variables for generate tiles using PGquery
# Variables for generate tiles using tilelive-pgquery
PGHOSTS_LIST=
NO_GZIP=1
USE_KEY_COLUMN=1

Wyświetl plik

@ -163,12 +163,7 @@ jobs:
# Get database total size, in MB
# Once Makefile has a few more improvements, we can use this approach instead:
# echo $'\\set QUIET on \\a \\x off \\t \\\\ select pg_database_size(current_database())/1024/1024;' | make -s psql
if grep -qE '^ import-osm:$' docker-compose.yml; then
# old version using dedicated import-osm docker image
DB_SIZE_MB=$(docker-compose run --rm -u $(id -u):$(id -g) import-osm ./psql.sh -qtAc 'select pg_database_size(current_database())/1024/1024;')
else
DB_SIZE_MB=$(docker-compose run --rm -u $(id -u):$(id -g) openmaptiles-tools psql.sh -qtAc 'select pg_database_size(current_database())/1024/1024;')
fi
docker-compose run --rm -u $(id -u):$(id -g) openmaptiles-tools pg_dump --schema-only > "${PROFILE_DIR}/schema.sql"
echo "$DB_SIZE_MB" > "${PROFILE_DIR}/db_size.tsv"
}
@ -188,6 +183,7 @@ jobs:
git reset --hard ${CURRENT_SHA}^1
fi
docker-compose pull
PROFILE_DIR=../perf_cache
create_db
if [ ! -f ../ci_cache/wikidata-cache.json ]; then
@ -209,6 +205,7 @@ jobs:
echo "Found cached performance results"
fi
docker-compose pull
pushd ../perf_cache
echo "Should be in perf_cache"
pwd