From ce4d5f61fb67ebf2b10e3fc853c49c036fcefb59 Mon Sep 17 00:00:00 2001 From: Conrad Schulz Date: Sun, 31 May 2026 06:54:29 +0000 Subject: [PATCH] fix: planetiler via docker, korrekte font/style urls --- scripts/download-data.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/download-data.sh b/scripts/download-data.sh index 7673398..3c6516b 100755 --- a/scripts/download-data.sh +++ b/scripts/download-data.sh @@ -26,14 +26,15 @@ MODE="${1:-all}" PLANETILER_RAM="${PLANETILER_RAM:-8g}" download_osm() { - local jar="$DATA_DIR/planetiler.jar" local out="$DATA_DIR/osm.mbtiles" echo "[OSM] Ziel: $out RAM: -Xmx${PLANETILER_RAM}" - if [[ ! -f "$jar" ]]; then - echo "[OSM] Lade Planetiler JAR..." - curl -L --progress-bar -o "$jar" "https://github.com/onthegomap/planetiler/releases/latest/download/planetiler.jar" - fi - java "-Xmx${PLANETILER_RAM}" -jar "$jar" --download --output="$out" --force 2>&1 | tee "$LOG_DIR/osm-planetiler.log" + echo "[OSM] Starte Planetiler via Docker..." + docker run --rm \ + -v "$DATA_DIR:/data" \ + -e JAVA_TOOL_OPTIONS="-Xmx${PLANETILER_RAM}" \ + ghcr.io/onthegomap/planetiler:latest \ + --download --area=planet --output=/data/osm.mbtiles --force \ + 2>&1 | tee "$LOG_DIR/osm-planetiler.log" echo "[OSM] Fertig: $out" } @@ -51,13 +52,13 @@ download_assets() { if [[ ! "$(ls -A "$fonts_dir" 2>/dev/null)" ]]; then echo "[Assets] Lade Fonts..." TMP=$(mktemp -d) - curl -L --progress-bar -o "$TMP/fonts.zip" "https://github.com/openmaptiles/fonts/releases/latest/download/v3.0.zip" && unzip -q "$TMP/fonts.zip" -d "$fonts_dir" && echo "[Assets] Fonts installiert." || echo "[Assets] WARNUNG: Font-Download fehlgeschlagen." + curl -L --progress-bar -o "$TMP/fonts.zip" "https://github.com/openmaptiles/fonts/releases/download/v2.0/v2.0.zip" && unzip -q "$TMP/fonts.zip" -d "$fonts_dir" && echo "[Assets] Fonts installiert." || echo "[Assets] WARNUNG: Font-Download fehlgeschlagen." rm -rf "$TMP" fi if [[ ! -d "$styles_dir/osm-bright" ]]; then echo "[Assets] Lade OSM Bright Style..." TMP=$(mktemp -d) - curl -L --progress-bar -o "$TMP/style.zip" "https://github.com/openmaptiles/osm-bright-gl-style/releases/latest/download/v1.9.zip" && unzip -q "$TMP/style.zip" -d "$TMP/x" && mv "$TMP/x/"*/ "$styles_dir/osm-bright" && echo "[Assets] Style installiert." || echo "[Assets] WARNUNG: Style-Download fehlgeschlagen." + curl -L --progress-bar -o "$TMP/style.zip" "https://github.com/openmaptiles/osm-bright-gl-style/releases/download/v1.11/v1.11.zip" && unzip -q "$TMP/style.zip" -d "$TMP/x" && mv "$TMP/x/"*/ "$styles_dir/osm-bright" && echo "[Assets] Style installiert." || echo "[Assets] WARNUNG: Style-Download fehlgeschlagen." rm -rf "$TMP" fi }