Numéroter les zones après tri, lire le journal par la fin et corriger l'aide -g

This commit is contained in:
Antoine Jacquin
2026-09-18 21:24:57 +02:00
parent f3708f8449
commit 91d31bcdf9
4 changed files with 28 additions and 20 deletions

View File

@ -200,7 +200,8 @@ def _apply_colormap(data, tif_file, resolution=None):
info = RGB_LEGENDS[key]
return data, None, info['title'], info['legend'], info['description'], True, None, None
# Find matching colormap — sort by key length descending so 'mslrm' matches before 'lrm'
# Find matching colormap — tri par longueur décroissante : en cas de
# chevauchement de mots-clés dans un nom de fichier, le plus long prime
for key in sorted(COLORMAPS.keys(), key=len, reverse=True):
info = COLORMAPS[key]
if key in name:
@ -369,8 +370,8 @@ def tif_to_png(tif_file, vis_dir, resolution, keep_tif=False, source_info=None,
resolution: Grid resolution in m/px.
keep_tif: If True, keep the source TIFF after conversion.
source_info: Dict with method/date/basename for metadata.
quality: Image quality (1-100). Use 100 for lossless. Default 95.
output_format: Output format ('webp' or 'avif'). Default 'webp'.
quality: Image quality (1-100). Use 100 for lossless. Default 98.
output_format: Output format ('webp' or 'avif'). Default 'avif'.
Returns:
Path to output image file, or None on failure.
@ -915,7 +916,8 @@ def generate_pdf_report(basename, vis_dir, pdf_dir, resolution):
# Sort analysis files by archaeological priority
order = ['mslrm', 'svf', 'negative_openness',
'positive_openness', 'sailore', 'hillshade_multi',
'flow_acc', 'solar', 'slope', 'roughness', 'wavelet']
'flow_acc', 'solar', 'slope', 'roughness', 'wavelet',
'aspect', 'anomaly']
def sort_key(f):
name = f.stem.lower()