asp-plot 1.12.0__tar.gz → 1.12.1__tar.gz

{asp_plot-1.12.0 → asp_plot-1.12.1}/.gitignore

@@ -142,3 +142,4 @@ CLAUDE*
 .claude/**
 scripts/
 /*.parquet
+reports/regenerate_reports.sh

{asp_plot-1.12.0 → asp_plot-1.12.1}/CHANGELOG.md

@@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.12.1] - 2026-04-14
+
+### Changed
+- **Report panel order**: Disparity maps now follow the Bundle Adjust panels, and DEM Results precedes Detailed Hillshade (was: Hillshade → DEM Results → Disparity).
+- **Input Scenes caption** clarifies that mapprojected scenes are RPC-orthorectified against a reference DEM to roughly pre-align the stereo pair prior to correlation (reducing disparity search range), which addresses confusion for readers coming from non-ASP photogrammetry workflows.
+- **Match Points caption** notes these come from `stereo_corr`'s initial interest point matching step (used to set search windows), not dense correlation.
+
+### Added
+- **Acquisition Date(s)** row on the DEM Summary title-page table, populated when recoverable from scene metadata.
+- `get_acquisition_dates()` helper in `utils.py`: reads `FIRSTLINETIME` from WorldView/Maxar XMLs and parses the capture timestamp from `AST_L1A_...` file/directory names. Deduplicates and sorts; returns an empty list if no date can be found, in which case the summary-table row is omitted.
+- Unit tests for `get_acquisition_dates()` covering WorldView XMLs, ASTER filenames (top-level and in subdirectories), dedupe, and sorting of multi-date pairs.
+
+### Fixed
+- `--report_filename` accepts absolute and relative paths (not just bare filenames), and `~` in CLI path arguments is expanded ([#113](https://github.com/uw-cryo/asp_plot/pull/113)).
+
 ## [1.12.0] - 2026-04-10
 
 ### Changed

{asp_plot-1.12.0 → asp_plot-1.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: asp_plot
-Version: 1.12.0
+Version: 1.12.1
 Summary: Package for plotting outputs Ames Stereo Pipeline processing
 Project-URL: Homepage, https://github.com/uw-cryo/asp_plot
 Project-URL: Documentation, https://asp-plot.readthedocs.io

{asp_plot-1.12.0 → asp_plot-1.12.1}/asp_plot/cli/asp_plot.py

@@ -13,7 +13,7 @@ from asp_plot.report import ReportMetadata, ReportSection, compile_report
 from asp_plot.scenes import ScenePlotter
 from asp_plot.stereo import StereoPlotter
 from asp_plot.stereo_geometry import StereoGeometryPlotter
-from asp_plot.utils import Raster, detect_planetary_body
+from asp_plot.utils import Raster, detect_planetary_body, get_acquisition_dates
 
 
 @click.command()
@@ -217,6 +217,12 @@ def main(
             elev_range = (
                 (float(valid.min()), float(valid.max())) if valid.size else (0, 0)
             )
+            acq_extra_dirs = [os.path.join(directory, stereo_directory)]
+            if bundle_adjust_directory:
+                acq_extra_dirs.append(os.path.join(directory, bundle_adjust_directory))
+            acquisition_dates = get_acquisition_dates(
+                directory, extra_dirs=acq_extra_dirs
+            )
             report_metadata = ReportMetadata(
                 dem_dimensions=(dem_raster.ds.width, dem_raster.ds.height),
                 dem_gsd_m=dem_raster.get_gsd(),
@@ -225,6 +231,7 @@ def main(
                 dem_elevation_range=elev_range,
                 dem_filename=os.path.basename(asp_dem),
                 reference_dem=reference_dem or "",
+                acquisition_dates=acquisition_dates,
             )
         except Exception as e:
             print(f"\nCould not collect DEM metadata: {e}\n")
@@ -248,7 +255,7 @@ def main(
         ReportSection(
             title="Input Scenes",
             image_path=os.path.join(plots_directory, fig_fn),
-            caption="Left and right input scenes used for stereo processing. Non-mapprojected scenes are shown after ASP's alignment step (e.g., affineepipolar), which rotates images to create horizontal epipolar lines for correlation. Mapprojected scenes require no pre-alignment and are displayed in their map-projected orientation.",
+            caption="Left and right input scenes used for stereo processing. Non-mapprojected scenes are shown after ASP's alignment step (e.g., affineepipolar), which rotates images to create horizontal epipolar lines for correlation. Mapprojected scenes have been orthorectified with RPCs against a reference DEM to roughly align the two images prior to correlation, which reduces the disparity search range; they are displayed here in their map-projected orientation.",
         )
     )
 
@@ -273,7 +280,7 @@ def main(
         ReportSection(
             title="Match Points",
             image_path=os.path.join(plots_directory, fig_fn),
-            caption="Interest point matches between left and right images identified during stereo correlation.",
+            caption="Interest point matches between left and right images. These are produced by stereo_corr during its initial interest point matching step, which is used to set the search windows for subsequent dense correlation (not the dense correlation matches themselves).",
         )
     )
 
@@ -397,17 +404,17 @@ def main(
                 f"\n\nNo bundle adjustment files found in directory {os.path.join(directory, bundle_adjust_directory):}. If you want bundle adjustment plots, make sure you run the tool and supply the correct directory to asp_plot.\n\n"
             )
 
-    # ---- Detailed Hillshade ----
+    # ---- Disparity ----
     fig_fn = f"{next(figure_counter):02}.png"
-    stereo_plotter.title = "Hillshade with details"
-    stereo_plotter.plot_detailed_hillshade(
-        subset_km=subset_km, save_dir=plots_directory, fig_fn=fig_fn
+    stereo_plotter.title = "Disparity (pixels)"
+    stereo_plotter.plot_disparity(
+        unit="pixels", quiver=True, save_dir=plots_directory, fig_fn=fig_fn
     )
     sections.append(
         ReportSection(
-            title="Detailed Hillshade",
+            title="Disparity",
             image_path=os.path.join(plots_directory, fig_fn),
-            caption="DEM hillshade. If the intersection error is available, zoomed subsets selected from low, medium, and high (left to right) uncertainty areas are displayed in the second row. If the mapprojected image is available, corresponding ortho image subsets are displayed in the bottom row.",
+            caption="Horizontal and vertical disparity maps in pixels with quiver overlay.",
         )
     )
 
@@ -423,17 +430,17 @@ def main(
         )
     )
 
-    # ---- Disparity ----
+    # ---- Detailed Hillshade ----
     fig_fn = f"{next(figure_counter):02}.png"
-    stereo_plotter.title = "Disparity (pixels)"
-    stereo_plotter.plot_disparity(
-        unit="pixels", quiver=True, save_dir=plots_directory, fig_fn=fig_fn
+    stereo_plotter.title = "Hillshade with details"
+    stereo_plotter.plot_detailed_hillshade(
+        subset_km=subset_km, save_dir=plots_directory, fig_fn=fig_fn
     )
     sections.append(
         ReportSection(
-            title="Disparity",
+            title="Detailed Hillshade",
             image_path=os.path.join(plots_directory, fig_fn),
-            caption="Horizontal and vertical disparity maps in pixels with quiver overlay.",
+            caption="DEM hillshade. If the intersection error is available, zoomed subsets selected from low, medium, and high (left to right) uncertainty areas are displayed in the second row. If the mapprojected image is available, corresponding ortho image subsets are displayed in the bottom row.",
         )
     )
 

{asp_plot-1.12.0 → asp_plot-1.12.1}/asp_plot/report.py

@@ -1,7 +1,7 @@
 import logging
 import os
 import textwrap
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 
 from fpdf import FPDF
 from PIL import Image
@@ -51,6 +51,9 @@ class ReportMetadata:
         DEM filename.
     reference_dem : str
         Reference DEM path or description.
+    acquisition_dates : list of str
+        Scene acquisition date strings (e.g. "2017-07-31 19:07:28 UTC") when
+        recoverable from scene metadata. Empty list if not found.
     """
 
     dem_dimensions: tuple = (0, 0)
@@ -60,6 +63,7 @@ class ReportMetadata:
     dem_elevation_range: tuple = (0, 0)
     dem_filename: str = ""
     reference_dem: str = ""
+    acquisition_dates: list = field(default_factory=list)
 
 
 class ASPReportPDF(FPDF):
@@ -299,6 +303,11 @@ def _add_metadata_table(pdf, metadata):
         rows.append(("Elevation Range (m)", f"{lo:.1f} to {hi:.1f}"))
     if metadata.reference_dem:
         rows.append(("Reference DEM", metadata.reference_dem))
+    if metadata.acquisition_dates:
+        if len(metadata.acquisition_dates) == 1:
+            rows.append(("Acquisition Date", metadata.acquisition_dates[0]))
+        else:
+            rows.append(("Acquisition Dates", "; ".join(metadata.acquisition_dates)))
 
     if not rows:
         return

{asp_plot-1.12.0 → asp_plot-1.12.1}/asp_plot/utils.py

@@ -4,6 +4,7 @@ import os
 import re
 import subprocess
 import warnings
+from datetime import datetime
 
 import contextily as ctx
 import matplotlib.colors
@@ -1227,6 +1228,77 @@ def detect_vantor_satellite(directory):
     return False
 
 
+def get_acquisition_dates(directory, extra_dirs=None):
+    """Extract scene acquisition date(s) from metadata in a processing directory.
+
+    Looks for WorldView/Maxar-style XML camera files (using the ``FIRSTLINETIME``
+    tag) and ASTER L1A file or directory names (which encode the capture date in
+    the filename: ``AST_L1A_<prodcode><MMDDYYYY><HHMMSS>_...``). Returns a sorted,
+    deduplicated list of date strings. An empty list is returned if nothing is
+    found.
+
+    Parameters
+    ----------
+    directory : str
+        Top-level ASP processing directory to search (non-recursive for XMLs,
+        recursive for ASTER L1A filenames).
+    extra_dirs : list of str, optional
+        Additional directories to search non-recursively for XML files (e.g. a
+        stereo or bundle-adjust subdirectory).
+
+    Returns
+    -------
+    list of str
+        Acquisition datetime strings formatted as ``YYYY-MM-DD HH:MM:SS UTC``.
+    """
+    directory = os.path.expanduser(directory)
+    dates = {}
+
+    search_dirs = [directory]
+    if extra_dirs:
+        for d in extra_dirs:
+            if d and d not in search_dirs:
+                search_dirs.append(d)
+
+    # WorldView/Maxar XMLs: FIRSTLINETIME
+    for d in search_dirs:
+        try:
+            xml_files = glob_file(d, "*.[Xx][Mm][Ll]", all_files=True)
+        except Exception:
+            xml_files = None
+        if not xml_files:
+            continue
+        xml_files = [f for f in xml_files if not re.search(r".*ortho.*\.xml", f)]
+        for xml_file in xml_files:
+            try:
+                first_line_time = get_xml_tag(xml_file, "FIRSTLINETIME")
+                dt = datetime.strptime(first_line_time, "%Y-%m-%dT%H:%M:%S.%fZ")
+            except (ValueError, Exception):
+                continue
+            key = dt.replace(microsecond=0).isoformat()
+            dates.setdefault(key, dt.replace(microsecond=0))
+
+    # ASTER L1A: capture date encoded in filename
+    # Pattern: AST_L1A_<3-digit production code><MM><DD><YYYY><HH><MM><SS>_...
+    aster_re = re.compile(r"AST_L1A_\d{3}(\d{2})(\d{2})(\d{4})(\d{2})(\d{2})(\d{2})")
+    skip_dirs = {"tmp_asp_report_plots", ".git", "__pycache__"}
+    for root, dirnames, filenames in os.walk(directory):
+        dirnames[:] = [d for d in dirnames if d not in skip_dirs]
+        for name in list(dirnames) + list(filenames):
+            m = aster_re.search(name)
+            if not m:
+                continue
+            mo, day, yr, hh, mi, ss = (int(x) for x in m.groups())
+            try:
+                dt = datetime(yr, mo, day, hh, mi, ss)
+            except ValueError:
+                continue
+            key = dt.isoformat()
+            dates.setdefault(key, dt)
+
+    return [dt.strftime("%Y-%m-%d %H:%M:%S UTC") for dt in sorted(dates.values())]
+
+
 def add_copyright_overlay(ax):
     """Add Vantor copyright text overlay to the bottom-right of a matplotlib axes.
 

{asp_plot-1.12.0 → asp_plot-1.12.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "asp_plot"
-version = "1.12.0"
+version = "1.12.1"
 license = {text = "BSD-3-Clause"}
 authors = [
   { name="Ben Purinton", email="purinton@uw.edu" },