asp-plot 1.2.0__tar.gz → 1.2.1__tar.gz

{asp_plot-1.2.0 → asp_plot-1.2.1}/CHANGELOG.md

@@ -5,6 +5,17 @@ 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.2.1] - 2025-10-19
+
+### Added
+- New `notebooks/Mars_MOC` example
+
+### Fixed
+- Added a regular hillshade fallback to `StereoPlotter.plot_detailed_hillshade()` for the case where `*-IntersectionErr.tif` was not produced and is not available for detailed hillshade plots.
+
+### Internal
+- Extracted common hillshade plotting logic in `StereoPlotter` to utility function.
+
 ## [1.2.0] - 2025-10-12
 
 ### Added

{asp_plot-1.2.0 → asp_plot-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: asp_plot
-Version: 1.2.0
+Version: 1.2.1
 Summary: Package for plotting outputs Ames Stereo Pipeline processing
 Project-URL: Homepage, https://github.com/uw-cryo/asp_plot
 Project-URL: Issues, https://github.com/uw-cryo/asp_plot/issues
@@ -69,6 +69,7 @@ Examples of the modular usage of the package can be found in the `notebooks/` di
 
 - `notebooks/WorldView` for WorldView example processing
 - `notebooks/LRO_NAC` for Lunar Reconnaissance Orbiter Narrow Angle Camera example processing
+- etc.
 
 ## CLI usage: `asp_plot`
 

{asp_plot-1.2.0 → asp_plot-1.2.1}/README.md

@@ -54,6 +54,7 @@ Examples of the modular usage of the package can be found in the `notebooks/` di
 
 - `notebooks/WorldView` for WorldView example processing
 - `notebooks/LRO_NAC` for Lunar Reconnaissance Orbiter Narrow Angle Camera example processing
+- etc.
 
 ## CLI usage: `asp_plot`
 

{asp_plot-1.2.0 → asp_plot-1.2.1}/asp_plot/stereo.py

@@ -477,6 +477,9 @@ class StereoPlotter(Plotter):
         different levels of intersection error. If the images are map-projected,
         it also shows the corresponding optical image for each subset.
 
+        If the intersection error file is missing, it falls back to a plain
+        hillshade plot without the detailed subsets.
+
         Parameters
         ----------
         intersection_error_percentiles : list, optional
@@ -502,6 +505,25 @@ class StereoPlotter(Plotter):
         of intersection error, representing areas with different quality
         levels in the DEM.
         """
+        if not self.intersection_error_fn:
+            logger.warning(
+                "\n\nIntersection error file not found. Plotting hillshade without details.\n\n"
+            )
+            fig, ax = plt.subplots(1, 1, figsize=(6, 4), dpi=220)
+            fig.suptitle(self.title, size=10)
+
+            raster = Raster(self.dem_fn)
+            dem = raster.read_array()
+            gsd = raster.get_gsd()
+            hs = raster.hillshade()
+            self._plot_hillshade_with_overlay(ax, dem, hs, gsd)
+
+            fig.tight_layout()
+            if save_dir and fig_fn:
+                save_figure(fig, save_dir, fig_fn)
+
+            return
+
         # Set up the plot
         fig = plt.figure(figsize=(10, 15), dpi=220)
         gs = gridspec.GridSpec(3, 3, height_ratios=[2, 1, 1])
@@ -530,17 +552,8 @@ class StereoPlotter(Plotter):
             image = Raster(self.left_image_fn)
 
         # Full hillshade with DEM overlay
-        self.plot_array(ax=ax_top, array=hs, cmap="gray", add_cbar=False)
-        self.plot_array(
-            ax=ax_top,
-            array=dem,
-            cmap="viridis",
-            cbar_label="Elevation (m HAE)",
-            alpha=0.5,
-        )
+        self._plot_hillshade_with_overlay(ax_top, dem, hs, gsd)
         ax_top.set_title(self.title, size=14)
-        scalebar = ScaleBar(gsd)
-        ax_top.add_artist(scalebar)
 
         # Calculate subset size in pixels
         subset_size = int(subset_km * 1000 / gsd)
@@ -622,14 +635,7 @@ class StereoPlotter(Plotter):
                 idx[0] * subset_size : (idx[0] + 1) * subset_size,
                 idx[1] * subset_size : (idx[1] + 1) * subset_size,
             ]
-            self.plot_array(ax=ax_hs, array=hs_subset, cmap="gray", add_cbar=False)
-            self.plot_array(
-                ax=ax_hs,
-                array=dem_subset,
-                cmap="viridis",
-                cbar_label="Elevation (m HAE)",
-                alpha=0.5,
-            )
+            self._plot_hillshade_with_overlay(ax_hs, dem_subset, hs_subset, gsd)
 
             with rio.open(self.dem_fn) as src:
                 transform = src.transform
@@ -664,9 +670,6 @@ class StereoPlotter(Plotter):
                     spine.set_color(color)
                     spine.set_linewidth(4)
 
-            scalebar = ScaleBar(gsd)
-            ax_hs.add_artist(scalebar)
-
         fig.tight_layout()
         if save_dir and fig_fn:
             save_figure(fig, save_dir, fig_fn)
@@ -709,6 +712,46 @@ class StereoPlotter(Plotter):
                 )
         return diff
 
+    def _plot_hillshade_with_overlay(
+        self, ax, dem, hillshade, gsd, clim=None, add_scalebar=True
+    ):
+        """
+        Plot hillshade with semi-transparent DEM overlay.
+
+        Parameters
+        ----------
+        ax : matplotlib.axes.Axes
+            Axes to plot on
+        dem : numpy.ndarray
+            DEM array to overlay
+        hillshade : numpy.ndarray
+            Hillshade array (grayscale background)
+        gsd : float
+            Ground sample distance in meters for scalebar
+        clim : tuple or None, optional
+            Color limits for DEM, default is None (auto)
+        add_scalebar : bool, optional
+            Whether to add a scalebar to the plot, default is True
+
+        Notes
+        -----
+        This is a helper method to reduce code duplication across plotting
+        methods. It creates the standard hillshade + DEM visualization used
+        throughout the StereoPlotter class.
+        """
+        self.plot_array(ax=ax, array=hillshade, cmap="gray", add_cbar=False)
+        self.plot_array(
+            ax=ax,
+            array=dem,
+            clim=clim,
+            cmap="viridis",
+            cbar_label="Elevation (m HAE)",
+            alpha=0.5,
+        )
+        if add_scalebar:
+            scalebar = ScaleBar(gsd)
+            ax.add_artist(scalebar)
+
     def plot_dem_results(
         self, el_clim=None, ie_clim=None, diff_clim=None, save_dir=None, fig_fn=None
     ):
@@ -755,20 +798,8 @@ class StereoPlotter(Plotter):
             raster = Raster(self.dem_fn)
             dem = raster.read_array()
             gsd = raster.get_gsd()
-
             hs = raster.hillshade()
-            self.plot_array(ax=axa[0], array=hs, cmap="gray", add_cbar=False)
-            self.plot_array(
-                ax=axa[0],
-                array=dem,
-                clim=el_clim,
-                cmap="viridis",
-                cbar_label="Elevation (m HAE)",
-                alpha=0.5,
-            )
-
-            scalebar = ScaleBar(gsd)
-            axa[0].add_artist(scalebar)
+            self._plot_hillshade_with_overlay(axa[0], dem, hs, gsd, clim=el_clim)
         else:
             axa[0].text(
                 0.5,

asp_plot-1.2.0/notebooks/LRO_NAC/lunar_recon_orbiter_example_1.ipynb → asp_plot-1.2.1/notebooks/LRO_NAC/lunar_recon_orbiter.ipynb

@@ -101,7 +101,7 @@
       "Figure saved to /Users/ben/Dropbox/UW_Shean/asp_plot-test_data/docs_examples/docs_sect_4_1_lunar_LRO_NAC/LRONAC_example/tmp_asp_report_plots/04.png\n",
       "\n",
       "\n",
-      "Report saved to /Users/ben/Dropbox/UW_Shean/asp_plot-test_data/docs_examples/docs_sect_4_1_lunar_LRO_NAC/LRONAC_example/run/asp_plot_report_LRONAC_example_20251012_202538.pdf\n",
+      "Report saved to /Users/ben/Dropbox/UW_Shean/asp_plot-test_data/docs_examples/docs_sect_4_1_lunar_LRO_NAC/LRONAC_example/run/asp_plot_report_LRONAC_example_20251019_191919.pdf\n",
       "\n",
       "\n"
      ]