fix: planetiler via docker, korrekte font/style urls
This commit is contained in:
parent
6f8c9258b8
commit
ce4d5f61fb
1 changed files with 9 additions and 8 deletions
|
|
@ -26,14 +26,15 @@ MODE="${1:-all}"
|
||||||
PLANETILER_RAM="${PLANETILER_RAM:-8g}"
|
PLANETILER_RAM="${PLANETILER_RAM:-8g}"
|
||||||
|
|
||||||
download_osm() {
|
download_osm() {
|
||||||
local jar="$DATA_DIR/planetiler.jar"
|
|
||||||
local out="$DATA_DIR/osm.mbtiles"
|
local out="$DATA_DIR/osm.mbtiles"
|
||||||
echo "[OSM] Ziel: $out RAM: -Xmx${PLANETILER_RAM}"
|
echo "[OSM] Ziel: $out RAM: -Xmx${PLANETILER_RAM}"
|
||||||
if [[ ! -f "$jar" ]]; then
|
echo "[OSM] Starte Planetiler via Docker..."
|
||||||
echo "[OSM] Lade Planetiler JAR..."
|
docker run --rm \
|
||||||
curl -L --progress-bar -o "$jar" "https://github.com/onthegomap/planetiler/releases/latest/download/planetiler.jar"
|
-v "$DATA_DIR:/data" \
|
||||||
fi
|
-e JAVA_TOOL_OPTIONS="-Xmx${PLANETILER_RAM}" \
|
||||||
java "-Xmx${PLANETILER_RAM}" -jar "$jar" --download --output="$out" --force 2>&1 | tee "$LOG_DIR/osm-planetiler.log"
|
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"
|
echo "[OSM] Fertig: $out"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -51,13 +52,13 @@ download_assets() {
|
||||||
if [[ ! "$(ls -A "$fonts_dir" 2>/dev/null)" ]]; then
|
if [[ ! "$(ls -A "$fonts_dir" 2>/dev/null)" ]]; then
|
||||||
echo "[Assets] Lade Fonts..."
|
echo "[Assets] Lade Fonts..."
|
||||||
TMP=$(mktemp -d)
|
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"
|
rm -rf "$TMP"
|
||||||
fi
|
fi
|
||||||
if [[ ! -d "$styles_dir/osm-bright" ]]; then
|
if [[ ! -d "$styles_dir/osm-bright" ]]; then
|
||||||
echo "[Assets] Lade OSM Bright Style..."
|
echo "[Assets] Lade OSM Bright Style..."
|
||||||
TMP=$(mktemp -d)
|
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"
|
rm -rf "$TMP"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue