diff --git a/.env b/.env index d664449c..5a182c86 100644 --- a/.env +++ b/.env @@ -29,21 +29,13 @@ MAX_ZOOM=7 # Use true (case sensitive) to allow data updates DIFF_MODE=false -# 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 - # The current setup assumes this file is placed inside the data/ dir MBTILES_FILE=tiles.mbtiles + # This is the current repl_config.json location, pre-configured in the tools Dockerfile # Makefile and quickstart replace it with the dynamically generated one, but we keep it here in case some other method is used to run. IMPOSM_CONFIG_FILE=/usr/src/app/config/repl_config.json -# import-borders temp files - set them here to defaults, and override in the Makefile based on the area -BORDERS_CLEANUP_FILE=data/borders/cleanup.pbf -BORDERS_PBF_FILE=data/borders/filtered.pbf -BORDERS_CSV_FILE=data/borders/lines.csv - # Number of parallel processes to use when importing sql files MAX_PARALLEL_PSQL=5 diff --git a/LICENSE.md b/LICENSE.md index 626555b4..52c81b85 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2023, MapTiler.com & OpenMapTiles contributors. +Copyright (c) 2024, MapTiler.com & OpenMapTiles contributors. All rights reserved. The vector tile schema has been developed by Klokan Technologies GmbH and diff --git a/Makefile b/Makefile index b7c22a00..03132cb3 100644 --- a/Makefile +++ b/Makefile @@ -289,7 +289,7 @@ ifeq (,$(wildcard build/sql/run_last.sql)) $(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools bash -c \ 'generate-sql $(TILESET_FILE) --dir ./build/sql \ && generate-sqltomvt $(TILESET_FILE) \ - --key --gzip --postgis-ver 3.0.1 \ + --key --gzip --postgis-ver 3.2.3 \ --function --fname=getmvt >> ./build/sql/run_last.sql' endif diff --git a/README.md b/README.md index 2341cc3c..c4afc403 100644 --- a/README.md +++ b/README.md @@ -187,7 +187,7 @@ To change the name of the output filename, you can modify the variable `MBTILES_ All code in this repository is under the [BSD license](./LICENSE.md). Design and the cartography decisions encoded in the schema and SQL are licensed under [CC-BY](./LICENSE.md). -Products or services using maps derived from OpenMapTiles schema need to visibly credit "OpenMapTiles.org" or reference "OpenMapTiles" with a link to https://openmaptiles.org/. Exceptions to attribution requirement can be granted on request. +Products or services using maps derived from OpenMapTiles schema need to **visibly credit "OpenMapTiles.org"** or **reference "OpenMapTiles"** with a link to https://openmaptiles.org/. Exceptions to attribution requirement can be granted on request. For a browsable electronic map based on OpenMapTiles and OpenStreetMap data, the credit should appear in the corner of the map. For example: diff --git a/quickstart.sh b/quickstart.sh index a7e17940..41585cd0 100755 --- a/quickstart.sh +++ b/quickstart.sh @@ -351,8 +351,11 @@ echo " Acknowledgments " echo " Generated vector tiles are produced work of OpenStreetMap data. " echo " Such tiles are reusable under CC-BY license granted by OpenMapTiles team: " echo " https://github.com/openmaptiles/openmaptiles/#license " -echo " Maps made with these vector tiles must display a visible credit: " +echo "-------------------------------------------------------------------------------------" +echo " " +echo -e "\033[1m Maps made with these vector tiles must display a visible credit:\033[0m " echo " © OpenMapTiles © OpenStreetMap contributors " echo " " +echo "-------------------------------------------------------------------------------------" echo " Thanks to all free, open source software developers and Open Data Contributors! " echo "-------------------------------------------------------------------------------------"