From 44cf6c8e356d57ab6025e637ac73b0702528a95e Mon Sep 17 00:00:00 2001
From: Tomas Pohanka <TomPohys@gmail.com>
Date: Wed, 21 Feb 2024 11:52:29 +0100
Subject: [PATCH] Default output filename as `tiles.mbtiles` (#1633)

Keep the default output filename as `tiles.mbtiles`. `tiles.mbtiles` is expected to start TileServer.

Using the `area` as the name causes TileServer not to run. The name could be changed by the user by
 - change `MBTILES_FILE` in `.env`
 - use MBTILES_FILE as an environmental variable before running `quickstart.sh` or `generate-tiles-pg`

Co-authored-by: Adam Laza <@lazaa32>
---
 README.md     |  6 ++++--
 quickstart.sh | 17 ++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index ebfb8536..2341cc3c 100644
--- a/README.md
+++ b/README.md
@@ -160,7 +160,7 @@ make build-style
 Now you are ready to **generate the vector tiles**. By default, `./.env` specifies the entire planet BBOX for zooms 0-7, but running `generate-bbox-file` will analyze the data file and set the `BBOX` param to limit tile generation.
 
 ```
-make generate-bbox-file  # compute data bbox -- not needed for the whole planet
+make generate-bbox-file  # compute data bbox -- not needed for the whole planet or for downloaded area by `make download`
 make generate-tiles-pg   # generate tiles
 ```
 
@@ -175,11 +175,13 @@ make download area=albania  # download albania .osm.pbf file -- can be skipped i
 make import-osm             # import data into postgres
 make import-wikidata        # import Wikidata
 make import-sql             # create / import sql functions 
-make generate-bbox-file     # compute data bbox -- not needed for the whole planet
+make generate-bbox-file     # compute data bbox -- not needed for the whole planet or for downloaded area by `make download`
 make generate-tiles-pg      # generate tiles
 ```
 Instead of calling `make download area=albania` you can add a .osm.pbf file in the `data` folder `openmaptiles/data/your_area_file.osm.pbf`
 
+To change the name of the output filename, you can modify the variable `MBTILES_FILE` in the `.env` file or set up the environment variable `MBTILES_FILE` before running `./quickstart.sh` or `make generate-tiles-pg` (e.g., `MBTILES_FILENAME=monaco.mbtiles ./quickstart.sh monaco`).
+
 
 ## License
 
diff --git a/quickstart.sh b/quickstart.sh
index d82b4470..a7e17940 100755
--- a/quickstart.sh
+++ b/quickstart.sh
@@ -163,12 +163,7 @@ else
     echo " "
 fi
 
-# override the output filename based on the area if the default `tiles.mbtiles` is found
-if [[ "$(source .env ; echo "$MBTILES_FILE")" = "tiles.mbtiles" ]]; then
-  MBTILES_FILENAME=${area}.mbtiles
-else
-  MBTILES_FILENAME=$(source .env ; echo "$MBTILES_FILE")
-fi
+MBTILES_FILE=${MBTILES_FILE:-$(source .env ; echo "$MBTILES_FILE")}
 
 echo " "
 echo "-------------------------------------------------------------------------------------"
@@ -187,8 +182,8 @@ make init-dirs
 
 echo " "
 echo "-------------------------------------------------------------------------------------"
-echo "====> : Removing old MBTILES if exists ( ./data/$MBTILES_FILENAME ) "
-rm -f "./data/$MBTILES_FILENAME"
+echo "====> : Removing old MBTILES if exists ( ./data/$MBTILES_FILE ) "
+rm -f "./data/$MBTILES_FILE"
 
 echo " "
 echo "-------------------------------------------------------------------------------------"
@@ -299,9 +294,9 @@ fi
 echo " "
 echo "-------------------------------------------------------------------------------------"
 echo "====> : Start generating MBTiles (containing gzipped MVT PBF) using PostGIS. "
-echo "      : Output MBTiles: $MBTILES_FILENAME  "
+echo "      : Output MBTiles: $MBTILES_FILE  "
 echo "      : Source code: https://github.com/openmaptiles/openmaptiles-tools/blob/master/bin/generate-tiles "
-MBTILES_FILE=$MBTILES_FILENAME make generate-tiles-pg
+make generate-tiles-pg
 
 echo " "
 echo "-------------------------------------------------------------------------------------"
@@ -332,7 +327,7 @@ docker images | grep openmaptiles
 
 echo " "
 echo "-------------------------------------------------------------------------------------"
-echo "====> : (disk space) We have created the new vectortiles ( ./data/$MBTILES_FILENAME ) "
+echo "====> : (disk space) We have created the new vectortiles ( ./data/$MBTILES_FILE ) "
 echo "      : Please respect the licenses (OdBL for OSM data) of the sources when distributing the MBTiles file."
 echo "      : Data directory content:"
 ls -la ./data