From b057d5941eefcf9f15685f2709984ffcf5d5240e Mon Sep 17 00:00:00 2001 From: Tomas Pohanka Date: Wed, 21 Feb 2024 09:08:16 +0100 Subject: [PATCH 1/2] Update GitHub Actions. (#1635) Bump GitHub Actions from v2 to v4. --- .github/workflows/integrity.yml | 4 ++-- .github/workflows/performance.yml | 12 ++++++------ .github/workflows/sql-tests.yml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/integrity.yml b/.github/workflows/integrity.yml index 5ba95030..c46aa11c 100644 --- a/.github/workflows/integrity.yml +++ b/.github/workflows/integrity.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout the changes - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Run quickstart for a small area env: @@ -27,7 +27,7 @@ jobs: ./quickstart.sh $area - name: Save quickstart.log - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: quickstart.log path: quickstart.log diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index 3266dbda..6b8649d4 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -45,7 +45,7 @@ jobs: - name: Cache test data download id: cache-testdata - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ci_cache key: "v2-${{ env.TEST_DATA_URL }}" @@ -58,7 +58,7 @@ jobs: curl --silent --show-error --location --output ci_cache/perf-test-areas-latest.osm.pbf "$TEST_DATA_URL" - name: Get code - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: # Fetch the last two commits in case this is a PR, # and we need to profile the base branch first @@ -76,10 +76,10 @@ jobs: # Take the first parent of the grafted commit (cannot use HEAD^1 with shallow clones) REV_HASH=$(git cat-file -p $REV_HASH | awk 'NR > 1 {if(/^parent/){print $2; exit}}') fi - echo "::set-output name=hash::$REV_HASH" + echo "hash=$REV_HASH" >> $GITHUB_OUTPUT - name: Set up caching for the performance results - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: perf_cache # If profiling result cache has incompatible format, increase this "v" number @@ -287,14 +287,14 @@ jobs: fi - name: Save performance artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: performance_results path: artifacts - name: Save PR message artifact if: github.event_name == 'pull_request' - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: pr_message path: pr_message diff --git a/.github/workflows/sql-tests.yml b/.github/workflows/sql-tests.yml index b301f055..895d6b88 100644 --- a/.github/workflows/sql-tests.yml +++ b/.github/workflows/sql-tests.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout the changes - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Run unit tests run: | From 44cf6c8e356d57ab6025e637ac73b0702528a95e Mon Sep 17 00:00:00 2001 From: Tomas Pohanka Date: Wed, 21 Feb 2024 11:52:29 +0100 Subject: [PATCH 2/2] 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