AI Assistant
9bf79a15ed
PMTiles was loaded via HTTP from MinIO (10.10.10.166:9002) on an HTTPS page, causing browser mixed-content blocking — parcels invisible on geoportal. Fixes: - tile-cache nginx proxies /pmtiles/ → MinIO with Range header support - PMTILES_URL changed to relative path (resolves to HTTPS automatically) - clickableLayers includes PMTiles fill layers (click on parcels works) - Selection highlight uses PMTiles source at z13+ (was Martin z17+ only) - tippecanoe per-layer zoom ranges (terenuri z13-z18, cladiri z14-z18) skips processing millions of features at z0-z12 — faster rebuild Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
119 lines
4.8 KiB
Bash
119 lines
4.8 KiB
Bash
#!/usr/bin/env bash
|
|
# rebuild-overview-tiles.sh — Export all overview layers from PostGIS, generate PMTiles, upload to MinIO
|
|
# Includes: UAT boundaries, administrativ, simplified terenuri (z10-z14), simplified cladiri (z12-z14)
|
|
# Usage: ./scripts/rebuild-overview-tiles.sh
|
|
# Dependencies: ogr2ogr (GDAL), tippecanoe, mc (MinIO client)
|
|
|
|
set -euo pipefail
|
|
|
|
# ── Configuration ──
|
|
DB_HOST="${DB_HOST:-10.10.10.166}"
|
|
DB_PORT="${DB_PORT:-5432}"
|
|
DB_NAME="${DB_NAME:-architools_db}"
|
|
DB_USER="${DB_USER:-architools_user}"
|
|
DB_PASS="${DB_PASS:-stictMyFon34!_gonY}"
|
|
|
|
MINIO_ALIAS="${MINIO_ALIAS:-myminio}"
|
|
MINIO_BUCKET="${MINIO_BUCKET:-tiles}"
|
|
MINIO_ENDPOINT="${MINIO_ENDPOINT:-http://10.10.10.166:9002}"
|
|
MINIO_ACCESS_KEY="${MINIO_ACCESS_KEY:-admin}"
|
|
MINIO_SECRET_KEY="${MINIO_SECRET_KEY:-MinioStrongPass123}"
|
|
|
|
TMPDIR="${TMPDIR:-/tmp/tile-rebuild}"
|
|
OUTPUT_FILE="overview.pmtiles"
|
|
|
|
PG_CONN="PG:host=${DB_HOST} port=${DB_PORT} dbname=${DB_NAME} user=${DB_USER} password=${DB_PASS}"
|
|
|
|
echo "[$(date -Iseconds)] Starting overview tile rebuild..."
|
|
|
|
# ── Setup ──
|
|
mkdir -p "$TMPDIR"
|
|
cd "$TMPDIR"
|
|
|
|
# ── Step 1: Export views from PostGIS (parallel) ──
|
|
echo "[$(date -Iseconds)] Exporting PostGIS views to FlatGeobuf..."
|
|
|
|
# UAT boundaries (4 zoom levels)
|
|
ogr2ogr -f FlatGeobuf -s_srs EPSG:3844 -t_srs EPSG:4326 \
|
|
uats_z0.fgb "$PG_CONN" \
|
|
-sql "SELECT name, siruta, geom FROM gis_uats_z0 WHERE geom IS NOT NULL" &
|
|
|
|
ogr2ogr -f FlatGeobuf -s_srs EPSG:3844 -t_srs EPSG:4326 \
|
|
uats_z5.fgb "$PG_CONN" \
|
|
-sql "SELECT name, siruta, geom FROM gis_uats_z5 WHERE geom IS NOT NULL" &
|
|
|
|
ogr2ogr -f FlatGeobuf -s_srs EPSG:3844 -t_srs EPSG:4326 \
|
|
uats_z8.fgb "$PG_CONN" \
|
|
-sql "SELECT name, siruta, county, geom FROM gis_uats_z8 WHERE geom IS NOT NULL" &
|
|
|
|
ogr2ogr -f FlatGeobuf -s_srs EPSG:3844 -t_srs EPSG:4326 \
|
|
uats_z12.fgb "$PG_CONN" \
|
|
-sql "SELECT name, siruta, county, geom FROM gis_uats_z12 WHERE geom IS NOT NULL" &
|
|
|
|
# Administrativ (intravilan, arii speciale)
|
|
ogr2ogr -f FlatGeobuf -s_srs EPSG:3844 -t_srs EPSG:4326 \
|
|
administrativ.fgb "$PG_CONN" \
|
|
-sql "SELECT object_id, siruta, layer_id, cadastral_ref, geom FROM gis_administrativ WHERE geom IS NOT NULL" &
|
|
|
|
# Terenuri for overview — let tippecanoe handle simplification
|
|
ogr2ogr -f FlatGeobuf -s_srs EPSG:3844 -t_srs EPSG:4326 \
|
|
terenuri_overview.fgb "$PG_CONN" \
|
|
-sql "SELECT object_id, siruta, cadastral_ref, area_value, layer_id, geom
|
|
FROM gis_terenuri WHERE geom IS NOT NULL" &
|
|
|
|
# Cladiri for overview — let tippecanoe handle simplification
|
|
ogr2ogr -f FlatGeobuf -s_srs EPSG:3844 -t_srs EPSG:4326 \
|
|
cladiri_overview.fgb "$PG_CONN" \
|
|
-sql "SELECT object_id, siruta, cadastral_ref, area_value, layer_id, geom
|
|
FROM gis_cladiri WHERE geom IS NOT NULL" &
|
|
|
|
wait
|
|
echo "[$(date -Iseconds)] Export complete."
|
|
|
|
# ── Step 2: Generate PMTiles with tippecanoe ──
|
|
echo "[$(date -Iseconds)] Generating PMTiles..."
|
|
|
|
# Per-layer zoom ranges — avoids processing features at zoom levels where they won't appear
|
|
# UAT boundaries: only at their respective zoom bands (saves processing z13-z18 for simple polygons)
|
|
# Terenuri/Cladiri: only z13+/z14+ (the expensive layers skip z0-z12 entirely)
|
|
tippecanoe \
|
|
-o "$OUTPUT_FILE" \
|
|
-L'{"layer":"gis_uats_z0","file":"uats_z0.fgb","minzoom":0,"maxzoom":5}' \
|
|
-L'{"layer":"gis_uats_z5","file":"uats_z5.fgb","minzoom":5,"maxzoom":8}' \
|
|
-L'{"layer":"gis_uats_z8","file":"uats_z8.fgb","minzoom":8,"maxzoom":12}' \
|
|
-L'{"layer":"gis_uats_z12","file":"uats_z12.fgb","minzoom":12,"maxzoom":14}' \
|
|
-L'{"layer":"gis_administrativ","file":"administrativ.fgb","minzoom":10,"maxzoom":16}' \
|
|
-L'{"layer":"gis_terenuri","file":"terenuri_overview.fgb","minzoom":13,"maxzoom":18}' \
|
|
-L'{"layer":"gis_cladiri","file":"cladiri_overview.fgb","minzoom":14,"maxzoom":18}' \
|
|
--base-zoom=18 \
|
|
--drop-densest-as-needed \
|
|
--detect-shared-borders \
|
|
--simplification=10 \
|
|
--no-tile-stats \
|
|
--hilbert \
|
|
--force
|
|
|
|
echo "[$(date -Iseconds)] PMTiles generated: $(du -h "$OUTPUT_FILE" | cut -f1)"
|
|
|
|
# ── Step 3: Upload to MinIO (atomic swap) ──
|
|
echo "[$(date -Iseconds)] Uploading to MinIO..."
|
|
|
|
# Configure MinIO client alias (idempotent)
|
|
mc alias set "$MINIO_ALIAS" "$MINIO_ENDPOINT" "$MINIO_ACCESS_KEY" "$MINIO_SECRET_KEY" --api S3v4 2>/dev/null || true
|
|
|
|
# Ensure bucket exists
|
|
mc mb --ignore-existing "${MINIO_ALIAS}/${MINIO_BUCKET}" 2>/dev/null || true
|
|
|
|
# Upload as temp file first
|
|
mc cp "$OUTPUT_FILE" "${MINIO_ALIAS}/${MINIO_BUCKET}/overview_new.pmtiles"
|
|
|
|
# Atomic rename (zero-downtime swap)
|
|
mc mv "${MINIO_ALIAS}/${MINIO_BUCKET}/overview_new.pmtiles" "${MINIO_ALIAS}/${MINIO_BUCKET}/overview.pmtiles"
|
|
|
|
echo "[$(date -Iseconds)] Upload complete."
|
|
|
|
# ── Step 4: Cleanup ──
|
|
rm -f uats_z0.fgb uats_z5.fgb uats_z8.fgb uats_z12.fgb administrativ.fgb \
|
|
terenuri_overview.fgb cladiri_overview.fgb "$OUTPUT_FILE"
|
|
echo "[$(date -Iseconds)] Rebuild finished successfully."
|