Add web map with zone generation API, side job queue, and restore historical DTM hole rendering
- webapp.py: FastAPI serving the continuous map (port 8973) with /api/preview, /api/generate and /api/status; tiles are downloaded from IGN and processed in a logged subprocess, tracked live in a side "File de génération" panel that survives page reloads - fetch_ign.py: download missing 1 km LiDAR HD tiles from the IGN geoplateforme before processing - index.py: tile thumbnails and 500 m subtiles are now invalidated by mtime so regenerating a tile refreshes its cached images; progress logging per tile - dtm.py: back to the historical gap handling (small gaps filled by fillnodata only, larger holes left as nodata rendered black); lowest-return floor only via --bare-earth, IGN class selection via --ign-classes - cli.py: positional input now optional (--rebuild-index works alone) - docker-compose.yml: serve (GPU, port 8973) and process services; launch via docker compose only (documented in AGENTS.md/AGENTS.md) - tests: 131 passing, incl. regressions for thumbnail staleness, --rebuild-index without input, and nodata rendering
This commit is contained in:
Antoine Jacquin
79
run.sh
79
run.sh
@ -11,7 +11,9 @@
|
||||
# -f / --force Régénérer tous les fichiers
|
||||
# --keep-tif Conserver les fichiers TIFF
|
||||
# --force-classification
|
||||
# --ground-classification {auto,smrf,csf}
|
||||
# --ground-classification {auto,ign,smrf,csf}
|
||||
# --ign-classes CLASSES
|
||||
# Classes LAS pour le MNT IGN (ex: sol,unclassified ; défaut: sol)
|
||||
# --quality N Qualité image 1-100 (défaut: 98)
|
||||
# --lossless Compression lossless
|
||||
# --format FMT Format de sortie : avif (défaut) ou webp
|
||||
@ -44,8 +46,11 @@ if [ $# -eq 0 ]; then
|
||||
echo " --force-classification"
|
||||
echo " Reclassifier le sol même si le fichier .las existe"
|
||||
echo " --keep-tif Conserver les TIFF pour régénérer les AVIF"
|
||||
echo " --ground-classification {auto,smrf,csf}"
|
||||
echo " Méthode de classification du sol (défaut: auto)"
|
||||
echo " --ground-classification {auto,ign,smrf,csf}"
|
||||
echo " Méthode de classification du sol (défaut: auto = pré-classification IGN)"
|
||||
echo " --ign-classes CLASSES"
|
||||
echo " Classes LAS pour le MNT IGN : sol,unclassified,eau,virtuel,pont,sursol"
|
||||
echo " ou codes (ex: 2,1). Mode pur, aucune retouche. (défaut: sol)"
|
||||
echo " --quality N Qualité image 1-100 (défaut: 98, 100=lossless)"
|
||||
echo " --lossless Compression lossless (équivalent à --quality 100)"
|
||||
echo " --format FMT Format de sortie : avif (défaut) ou webp"
|
||||
@ -83,6 +88,7 @@ VERBOSE_FLAG=""
|
||||
FORCE_FLAG=""
|
||||
FILE_ARGS=""
|
||||
GROUND_METHOD=""
|
||||
IGN_CLASSES_FLAG=""
|
||||
FORCE_CLASSIFY_FLAG=""
|
||||
KEEP_TIF_FLAG=""
|
||||
QUALITY=""
|
||||
@ -92,6 +98,9 @@ SKIP_FLAG=""
|
||||
TEST_FLAG=0
|
||||
REBUILD_INDEX_FLAG=""
|
||||
NO_INDEX_FLAG=""
|
||||
FETCH_TILES_ARGS=""
|
||||
SERVE_FLAG=0
|
||||
SERVE_PORT=8973
|
||||
|
||||
# Parse arguments manually (more robust than getopts for mixed short/long options)
|
||||
while [ $# -gt 0 ]; do
|
||||
@ -117,6 +126,8 @@ while [ $# -gt 0 ]; do
|
||||
--keep-tif) KEEP_TIF_FLAG="--keep-tif"; shift ;;
|
||||
--ground-classification) GROUND_METHOD="$2"; shift 2 ;;
|
||||
--ground-classification=*) GROUND_METHOD="${1#--ground-classification=}"; shift ;;
|
||||
--ign-classes) IGN_CLASSES_FLAG="--ign-classes $2"; shift 2 ;;
|
||||
--ign-classes=*) IGN_CLASSES_FLAG="--ign-classes=${1#--ign-classes=}"; shift ;;
|
||||
--quality) QUALITY="--quality $2"; shift 2 ;;
|
||||
--lossless) QUALITY="--lossless"; shift ;;
|
||||
--format) FORMAT_FLAG="--format $2"; shift 2 ;;
|
||||
@ -125,7 +136,12 @@ while [ $# -gt 0 ]; do
|
||||
--file) shift; while [ $# -gt 0 ] && [[ ! "$1" =~ ^- ]]; do FILE_ARGS="$FILE_ARGS $1"; shift; done ;;
|
||||
--rebuild-index) REBUILD_INDEX_FLAG="--rebuild-index"; shift ;;
|
||||
--no-index) NO_INDEX_FLAG="--no-index"; shift ;;
|
||||
--test) TEST_FLAG=1 ;;
|
||||
--fetch-tiles) shift; while [ $# -gt 0 ] && [[ ! "$1" =~ ^- ]]; do FETCH_TILES_ARGS="$FETCH_TILES_ARGS $1"; shift; done ;;
|
||||
--test) TEST_FLAG=1; shift ;;
|
||||
--serve)
|
||||
SERVE_FLAG=1; shift
|
||||
if [ $# -gt 0 ] && [[ ! "$1" =~ ^- ]]; then SERVE_PORT="$1"; shift; fi
|
||||
;;
|
||||
-h|--help|-help)
|
||||
echo "Pipeline LiDAR Archéologique"
|
||||
echo ""
|
||||
@ -141,14 +157,20 @@ while [ $# -gt 0 ]; do
|
||||
echo " --force-classification"
|
||||
echo " Reclassifier le sol même si le fichier .las existe"
|
||||
echo " --keep-tif Conserver les TIFF pour régénérer les AVIF"
|
||||
echo " --ground-classification {auto,smrf,csf}"
|
||||
echo " Méthode de classification du sol (défaut: auto)"
|
||||
echo " --ground-classification {auto,ign,smrf,csf}"
|
||||
echo " Méthode de classification du sol (défaut: auto = pré-classification IGN)"
|
||||
echo " --ign-classes CLASSES"
|
||||
echo " Classes LAS pour le MNT IGN : sol,unclassified,eau,virtuel,pont,sursol"
|
||||
echo " ou codes (ex: 2,1). Mode pur, aucune retouche. (défaut: sol)"
|
||||
echo " --quality N Qualité image 1-100 (défaut: 98, 100=lossless)"
|
||||
echo " --lossless Compression lossless (équivalent à --quality 100)"
|
||||
echo " --format FMT Format de sortie : avif (défaut) ou webp"
|
||||
echo " --only VIZ... Générer uniquement ces visualisations"
|
||||
echo " --skip VIZ... Exclure ces visualisations"
|
||||
echo " --file NOM... Traiter un ou plusieurs fichiers LAZ"
|
||||
echo " --fetch-tiles COL,ROW..."
|
||||
echo " Télécharger ces dalles depuis l'IGN puis les traiter"
|
||||
echo " --serve [PORT] Servir la carte + API de génération de zones (défaut: 8973)"
|
||||
echo " --test Exécuter les tests unitaires"
|
||||
echo " -h Afficher cette aide"
|
||||
echo ""
|
||||
@ -181,6 +203,13 @@ done
|
||||
|
||||
# Trim FILE_ARGS whitespace
|
||||
FILE_ARGS=$(echo "$FILE_ARGS" | xargs)
|
||||
FETCH_TILES_ARGS=$(echo "$FETCH_TILES_ARGS" | xargs)
|
||||
|
||||
# input/ en lecture seule sauf si --fetch-tiles (téléchargement IGN dans input/)
|
||||
INPUT_RO=":ro"
|
||||
if [ -n "$FETCH_TILES_ARGS" ]; then
|
||||
INPUT_RO=""
|
||||
fi
|
||||
|
||||
# Check for --test flag first
|
||||
if [ "$TEST_FLAG" -eq 1 ]; then
|
||||
@ -207,6 +236,31 @@ fi
|
||||
# Créer les répertoires s'ils n'existent pas
|
||||
mkdir -p "$INPUT_DIR" "$OUTPUT_DIR"
|
||||
|
||||
# Mode --serve : carte + API de génération (input/ en écriture)
|
||||
if [ "$SERVE_FLAG" -eq 1 ]; then
|
||||
echo "============================================"
|
||||
echo " Carte LiDAR + API de génération"
|
||||
echo "============================================"
|
||||
echo " http://127.0.0.1:${SERVE_PORT}/"
|
||||
echo " GPU : $([ -n "$GPU_FLAG" ] && echo 'OUI' || echo 'non')"
|
||||
echo " Bouton « + Zone » : dessiner un rectangle → téléchargement IGN + rendu"
|
||||
echo "============================================"
|
||||
GPU_ENV_FLAG=""
|
||||
[ -n "$GPU_FLAG" ] && GPU_ENV_FLAG="-e LIDAR_GPU=1"
|
||||
if [ -n "$GPU_ARG" ] && [ "$GPU_ARG" != "all" ]; then
|
||||
GPU_ENV_FLAG="-e LIDAR_GPU=1 -e CUDA_VISIBLE_DEVICES=${GPU_ARG} --gpus '""device=${GPU_ARG}""'"
|
||||
fi
|
||||
exec docker run --rm --init $GPU_FLAG $CUDA_ENV_FLAG \
|
||||
--user 1000:1000 \
|
||||
-p "${SERVE_PORT}:8973" \
|
||||
-v "${INPUT_DIR}:/data/input" \
|
||||
-v "${OUTPUT_DIR}:/data/output" \
|
||||
-e LIDAR_INPUT_DIR=/data/input -e LIDAR_OUTPUT_DIR=/data/output \
|
||||
$GPU_ENV_FLAG \
|
||||
"$IMAGE_NAME" \
|
||||
python3 -m uvicorn lidar_pipeline.webapp:app --host 0.0.0.0 --port 8973
|
||||
fi
|
||||
|
||||
# Lancer le pipeline
|
||||
echo "============================================"
|
||||
echo " Pipeline LiDAR Archéologique"
|
||||
@ -220,7 +274,7 @@ echo " Force classif.: $([ -n "$FORCE_CLASSIFY_FLAG" ] && echo 'OUI' || echo 'n
|
||||
echo " Keep TIFF : $([ -n "$KEEP_TIF_FLAG" ] && echo 'OUI' || echo 'non')"
|
||||
echo " Qualité image : $([ -n "$QUALITY" ] && echo "$QUALITY" || echo '98')"
|
||||
echo " Format : $([ -n "$FORMAT_FLAG" ] && echo "${FORMAT_FLAG#--format }" || echo 'avif')"
|
||||
echo " Classification sol : $([ -n "$GROUND_METHOD" ] && echo "$GROUND_METHOD" || echo 'auto')"
|
||||
echo " Classification sol : $([ -n "$GROUND_METHOD" ] && echo "$GROUND_METHOD" || echo 'auto')$([ -n "$IGN_CLASSES_FLAG" ] && echo " ${IGN_CLASSES_FLAG#--ign-classes }")"
|
||||
if [ -n "$ONLY_FLAG" ]; then
|
||||
echo " Visualisations: uniquement${ONLY_FLAG#--only}"
|
||||
elif [ -n "$SKIP_FLAG" ]; then
|
||||
@ -229,6 +283,9 @@ fi
|
||||
if [ -n "$FILE_ARGS" ]; then
|
||||
echo " Fichiers :${FILE_ARGS}"
|
||||
fi
|
||||
if [ -n "$FETCH_TILES_ARGS" ]; then
|
||||
echo " Dalles IGN :${FETCH_TILES_ARGS} (input/ monté en écriture)"
|
||||
fi
|
||||
echo "============================================"
|
||||
|
||||
CMD_ARGS="-o /data/output -r $RESOLUTION -w $WORKERS $VERBOSE_FLAG $FORCE_FLAG $FORCE_CLASSIFY_FLAG $KEEP_TIF_FLAG $QUALITY $FORMAT_FLAG"
|
||||
@ -241,6 +298,9 @@ fi
|
||||
if [ -n "$GROUND_METHOD" ]; then
|
||||
CMD_ARGS="$CMD_ARGS --ground-classification $GROUND_METHOD"
|
||||
fi
|
||||
if [ -n "$IGN_CLASSES_FLAG" ]; then
|
||||
CMD_ARGS="$CMD_ARGS $IGN_CLASSES_FLAG"
|
||||
fi
|
||||
if [ -n "$ONLY_FLAG" ]; then
|
||||
CMD_ARGS="$CMD_ARGS $ONLY_FLAG"
|
||||
fi
|
||||
@ -256,6 +316,9 @@ fi
|
||||
if [ -n "$NO_INDEX_FLAG" ]; then
|
||||
CMD_ARGS="$CMD_ARGS $NO_INDEX_FLAG"
|
||||
fi
|
||||
if [ -n "$FETCH_TILES_ARGS" ]; then
|
||||
CMD_ARGS="$CMD_ARGS --fetch-tiles $FETCH_TILES_ARGS"
|
||||
fi
|
||||
|
||||
# Build CUDA_VISIBLE_DEVICES env var from GPU_ARG
|
||||
CUDA_ENV_FLAG=""
|
||||
@ -271,7 +334,7 @@ fi
|
||||
|
||||
docker run --rm --init $GPU_FLAG $CUDA_ENV_FLAG \
|
||||
--user 1000:1000 \
|
||||
-v "${INPUT_DIR}:/data/input:ro" \
|
||||
-v "${INPUT_DIR}:/data/input${INPUT_RO}" \
|
||||
-v "${OUTPUT_DIR}:/data/output" \
|
||||
"$IMAGE_NAME" \
|
||||
python3 -m lidar_pipeline /data/input \
|
||||
|
||||
Reference in New Issue
Block a user