From 34f2be75cdcb36dba0a7e71965c008d6752c99a0 Mon Sep 17 00:00:00 2001 From: Robin Date: Fri, 25 Mar 2022 00:24:27 +0100 Subject: [PATCH] Allow changing Basemap Base-Url (#143) --- planetiler-basemap/README.md | 10 ++++++++-- .../com/onthegomap/planetiler/basemap/Generate.java | 6 ++++-- scripts/regenerate-openmaptiles.sh | 5 ++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/planetiler-basemap/README.md b/planetiler-basemap/README.md index 9771ff72..c940b6d4 100644 --- a/planetiler-basemap/README.md +++ b/planetiler-basemap/README.md @@ -1,6 +1,6 @@ # Planetiler Basemap Profile -This basemap profile is based on [OpenMapTiles](https://github.com/openmaptiles/openmaptiles) v3.12.2. +This basemap profile is based on [OpenMapTiles](https://github.com/openmaptiles/openmaptiles) v3.13. See [README.md](../README.md) in the parent directory for instructions on how to run. ## Differences from OpenMapTiles @@ -41,11 +41,17 @@ To run `Generate.java`, use [scripts/regenerate-openmaptiles.sh](../scripts/rege OpenMapTiles release tag: ```bash -./scripts/regenerate-openmaptiles.sh v3.12.2 +./scripts/regenerate-openmaptiles.sh v3.13 ``` Then follow the instructions it prints for reformatting generated code. +If you want to regenerate from a different repository than the default openmaptiles, you can specify the url like this: + +```bash +./scripts/regenerate-openmaptiles.sh v3.13 https://raw.githubusercontent.com/openmaptiles/openmaptiles/ +``` + ## License and Attribution OpenMapTiles code is licensed under the BSD 3-Clause License, which appears at the top of any file ported from diff --git a/planetiler-basemap/src/main/java/com/onthegomap/planetiler/basemap/Generate.java b/planetiler-basemap/src/main/java/com/onthegomap/planetiler/basemap/Generate.java index 1ab032a6..554ee321 100644 --- a/planetiler-basemap/src/main/java/com/onthegomap/planetiler/basemap/Generate.java +++ b/planetiler-basemap/src/main/java/com/onthegomap/planetiler/basemap/Generate.java @@ -128,8 +128,10 @@ public class Generate { public static void main(String[] args) throws IOException { Arguments arguments = Arguments.fromArgsOrConfigFile(args); PlanetilerConfig planetilerConfig = PlanetilerConfig.from(arguments); - String tag = arguments.getString("tag", "openmaptiles tag to use", "v3.12.2"); - String base = "https://raw.githubusercontent.com/openmaptiles/openmaptiles/" + tag + "/"; + String tag = arguments.getString("tag", "openmaptiles tag to use", "v3.13"); + String baseUrl = arguments.getString("base-url", "the url used to download the openmaptiles.yml", + "https://raw.githubusercontent.com/openmaptiles/openmaptiles/"); + String base = baseUrl + tag + "/"; // start crawling from openmaptiles.yaml // then crawl schema from each layers//.yaml file that it references diff --git a/scripts/regenerate-openmaptiles.sh b/scripts/regenerate-openmaptiles.sh index cf42cbd1..3a4c59b6 100755 --- a/scripts/regenerate-openmaptiles.sh +++ b/scripts/regenerate-openmaptiles.sh @@ -7,11 +7,14 @@ set -o nounset TAG="${1:-"v3.13"}" echo "tag=${TAG}" +BASE_URL="${2:-"https://raw.githubusercontent.com/openmaptiles/openmaptiles/"}" +echo "base-url=${BASE_URL}" + echo "Building..." ./mvnw -DskipTests=true --projects planetiler-dist -am package echo "Running..." -java -cp planetiler-dist/target/*-with-deps.jar com.onthegomap.planetiler.basemap.Generate -tag="${TAG}" +java -cp planetiler-dist/target/*-with-deps.jar com.onthegomap.planetiler.basemap.Generate -tag="${TAG}" -base-url="${BASE_URL}" echo "Formatting..." ./scripts/format.sh