asp-plot 3.6.0__tar.gz → 3.6.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {asp_plot-3.6.0 → asp_plot-3.6.1}/ARCHITECTURE.md +1 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/CHANGELOG.md +13 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/PKG-INFO +1 -1
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/icesat2_source.py +121 -4
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/report_pipeline.py +20 -12
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/stereo_geometry.py +6 -5
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/utils.py +4 -1
- {asp_plot-3.6.0 → asp_plot-3.6.1}/pyproject.toml +1 -1
- {asp_plot-3.6.0 → asp_plot-3.6.1}/.flake8 +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/.github/ISSUE_TEMPLATE/config.yml +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/.github/ISSUE_TEMPLATE/problem-report.yml +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/.github/workflows/claude-code-review.yml +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/.github/workflows/claude.yml +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/.github/workflows/release.yml +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/.github/workflows/run-tests.yml +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/.gitignore +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/.pre-commit-config.yaml +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/.readthedocs.yaml +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/AGENTS.md +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/CLAUDE.md +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/LICENSE +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/README.md +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/__init__.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/alignment.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/altimetry.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/altimetry_plots.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/altimetry_source.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/asp_log.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/bodies.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/bundle_adjust.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/cli/__init__.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/cli/asp_report.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/cli/bundle_adjust_cameras.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/cli/csm_camera_plot.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/cli/dem_benchmark.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/cli/gallery.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/cli/request_planetary_altimetry.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/cli/stereo_geom.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/csm_analysis.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/csm_camera.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/csm_io.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/dem_benchmark.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/gallery.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/mapproject.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/planetary_source.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/processing_parameters.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/report.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/report_captions.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/scenes.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/selections.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/sensors/__init__.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/sensors/aster.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/sensors/base.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/sensors/dimap.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/sensors/dimap_v1.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/sensors/rpc.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/sensors/worldview.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/stereo.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/asp_plot/stereopair_metadata_parser.py +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/conda-forge-recipe/meta.yaml +0 -0
- {asp_plot-3.6.0 → asp_plot-3.6.1}/environment.yml +0 -0
|
@@ -160,6 +160,7 @@ The package is organized by functionality, with each module focused on a specifi
|
|
|
160
160
|
**`icesat2_source.py`** - `Icesat2Source(AltimetrySource)` (Earth / ICESat-2)
|
|
161
161
|
- Requests/processes ICESat-2 ATL06-SR via the SlideRule x-series API (`sliderule_api.run("atl03x")`) with lazy init (`_ensure_sliderule()` — connects only when ICESat-2 methods run). SlideRule logging silenced (`verbose=False`, WARNING, explicit filter on `sliderule.session`)
|
|
162
162
|
- `request_atl06sr_multi_processing()` decomposed (#140) into a short request/cache/ingest loop over helpers: `_print_time_filter_summary`, `_build_level_parms`, `_load_cached_atl06sr`, `_params_match_cache`, `_request_atl06sr_level`, `_ingest_atl06sr`. Parquet cache saved to `self.alt.directory` (not CWD); the param comparison strips the `output` key (SlideRule injects a random temp path into `parms` during `run()`) and only the comparison is wrapped in `try/except` so SlideRule API errors propagate
|
|
163
|
+
- **Granule limit**: the server rejects an `atl03x` request matching more than 300 granules. `_request_atl06sr_level()` lists them first (`_list_granules()`, one query, which raises `max_resources` because the server applies the same limit to listings) and, above `MAX_GRANULES_PER_REQUEST` (250, a margin because the client's count can differ from the server's), `_run_granule_batches()` sends them as `resources` batches and concatenates. Batching by granule rather than by date means no point is returned twice. The parquet records the overall `parms`, so `_params_match_cache()` still recognizes a repeat. If the listing fails, the request goes as one, as before.
|
|
163
164
|
- Server-side time filtering via `_resolve_time_range(...)`: default `"all"` = full mission (2018-10-14 → today UTC midnight); `"buffered"` cascades explicit `t0`/`t1` > `scene_date` ± `time_buffer_days` > XML metadata ± buffer > `"all"`. `t1` truncated to midnight UTC for stable caching
|
|
164
165
|
- ESA WorldCover sampling: `sample_esa_worldcover()` / `_sample_worldcover_into_gdf()` read 10m values directly from public AWS S3 COGs (`esa-worldcover.s3.amazonaws.com/v200/2021/map/`) via `rasterio` vsicurl, batched per tile, persisted into the parquet cache (much faster than SlideRule's server-side `samples`). `_worldcover_tile_url(lat, lon)` maps a coord to the 3×3° tile URL (flat layout). Anonymous reads (unsigned AWS session) so SSO configs don't crash
|
|
165
166
|
- `filter_outliers(n_sigma=3)`: drops dh beyond `n_sigma × std` from the mean (true std, not NMAD) after the 30-NMAD gross-outlier gate (`_outlier_mask`); called automatically by `atl06sr_to_dem_dh()`; pass `None` to skip. When an aligned DEM is set, `icesat_minus_aligned_dem` is blanked wherever `icesat_minus_dem` is NaN (same in `planetary_to_dem_dh()`): `pc_align`'s translation moves the DEM's holes, so a point that sampled NaN before alignment — and therefore passed the cut untested — must not enter the aligned residuals when it lands on data afterwards
|
|
@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
|
7
7
|
|
|
8
8
|
## [Unreleased]
|
|
9
9
|
|
|
10
|
+
## [3.6.1] - 2026-11-06
|
|
11
|
+
|
|
12
|
+
In this release:
|
|
13
|
+
|
|
14
|
+
- A large footprint over the full ICESat-2 mission no longer fails at SlideRule's limit of 300 granules per request.
|
|
15
|
+
- A SlideRule request that returns nothing raises a clear error instead of `AttributeError`.
|
|
16
|
+
- A failed basemap logs a warning and keeps the figure, and is no longer reported as missing bundle adjustment files.
|
|
17
|
+
|
|
18
|
+
### Fixed
|
|
19
|
+
- **A SlideRule request that returns nothing now raises a clear error.** The client returns `None` when it cannot open its output file, and asp_plot passed that on, so the caller got `AttributeError: 'NoneType' object has no attribute 'columns'`. The new `RuntimeError` names the region and time range and lists the likely causes: no ICESat-2 granules, more than the 300 granules the server allows per request, or a temporary failure. A request that ran and found no points for one processing level still continues, now with a warning.
|
|
20
|
+
- **ICESat-2 requests over SlideRule's granule limit now work.** The server rejects an `atl03x` request that matches more than 300 granules, which a large footprint over the full mission can reach: `asp_report --atl06sr-time-range all`, the default, failed for these footprints, and ICESat-2 keeps adding granules. asp_plot now lists the granules first and, above 250, sends them in batches and combines the results. Other requests are unchanged, apart from the one extra query to list the granules.
|
|
21
|
+
- **A failed basemap no longer disappears silently or looks like missing bundle adjustment files.** `StereoGeometryPlotter` dropped a basemap that failed without saying so, and now logs a warning with the exception. `Plotter.plot_geodataframe` had no guard, so a basemap error stopped the plot; it now logs the same warning and keeps the figure, without a basemap. The report's bundle adjustment section printed "No bundle adjustment files found" for any `ValueError`, including ones from plotting, and dropped the residual and geodiff pages. That message now comes only from the file lookup, and a plotting error is reported as one.
|
|
22
|
+
|
|
10
23
|
## [3.6.0] - 2026-10-30
|
|
11
24
|
|
|
12
25
|
In this release:
|
|
@@ -20,6 +20,7 @@ from datetime import datetime, timedelta, timezone
|
|
|
20
20
|
import geopandas as gpd
|
|
21
21
|
import numpy as np
|
|
22
22
|
import pandas as pd
|
|
23
|
+
from sliderule import earthdata as sliderule_earthdata
|
|
23
24
|
from sliderule import sliderule as sliderule_api
|
|
24
25
|
|
|
25
26
|
from asp_plot.altimetry_source import AltimetrySource
|
|
@@ -29,6 +30,14 @@ from asp_plot.utils import nmad as _nmad
|
|
|
29
30
|
|
|
30
31
|
logger = logging.getLogger(__name__)
|
|
31
32
|
|
|
33
|
+
# SlideRule's atl03x endpoint rejects a request whose search matches more than
|
|
34
|
+
# 300 granules. The client's own CMR search can differ from the server's by a
|
|
35
|
+
# few granules, so requests are split well below that.
|
|
36
|
+
MAX_GRANULES_PER_REQUEST = 250
|
|
37
|
+
# Listing granules goes through the same server, which applies that 300 limit
|
|
38
|
+
# to the listing too unless the query asks for more.
|
|
39
|
+
MAX_GRANULES_LISTED = 10000
|
|
40
|
+
|
|
32
41
|
#: ESA WorldCover class codes (see ``WORLDCOVER_NAMES``) grouped under the
|
|
33
42
|
#: names :meth:`Icesat2Source.filter_esa_worldcover` accepts.
|
|
34
43
|
WORLDCOVER_GROUPS = {
|
|
@@ -480,16 +489,124 @@ class Icesat2Source(AltimetrySource):
|
|
|
480
489
|
def _request_atl06sr_level(self, parms, fn, save_to_parquet):
|
|
481
490
|
"""Fetch one processing level from SlideRule and sample WorldCover.
|
|
482
491
|
|
|
483
|
-
Runs the ``atl03x`` request,
|
|
484
|
-
the
|
|
485
|
-
|
|
492
|
+
Runs the ``atl03x`` request, split into batches of granules if it would
|
|
493
|
+
pass the server's limit, samples ESA WorldCover before caching so the
|
|
494
|
+
column is persisted in the parquet (and need not be re-sampled on later
|
|
495
|
+
runs), and optionally writes the parquet to ``fn``. The parquet records
|
|
496
|
+
``parms``, not the batches, so a repeated request is a cache hit.
|
|
497
|
+
|
|
498
|
+
Raises
|
|
499
|
+
------
|
|
500
|
+
RuntimeError
|
|
501
|
+
If SlideRule returns ``None``. See :meth:`_run_atl03x`.
|
|
502
|
+
|
|
503
|
+
Notes
|
|
504
|
+
-----
|
|
505
|
+
A request that ran but found no points returns a frame with its columns
|
|
506
|
+
and no rows. That is a valid result for one level (no canopy points over
|
|
507
|
+
bare ground, say), so it only logs a warning.
|
|
486
508
|
"""
|
|
487
|
-
|
|
509
|
+
granules = self._list_granules(parms)
|
|
510
|
+
if len(granules) > MAX_GRANULES_PER_REQUEST:
|
|
511
|
+
atl06sr = self._run_granule_batches(parms, granules)
|
|
512
|
+
else:
|
|
513
|
+
atl06sr = self._run_atl03x(parms)
|
|
514
|
+
if atl06sr.empty:
|
|
515
|
+
logger.warning(
|
|
516
|
+
f"SlideRule found no points for {self._describe_request(parms)}."
|
|
517
|
+
)
|
|
488
518
|
atl06sr = self._sample_worldcover_into_gdf(atl06sr)
|
|
489
519
|
if save_to_parquet:
|
|
490
520
|
self._save_to_parquet(fn, atl06sr, parms)
|
|
491
521
|
return atl06sr
|
|
492
522
|
|
|
523
|
+
@staticmethod
|
|
524
|
+
def _list_granules(parms):
|
|
525
|
+
"""List the ATL03 granules a request would search, oldest name first.
|
|
526
|
+
|
|
527
|
+
Returns an empty list if the search fails, so that the request goes to
|
|
528
|
+
SlideRule as one request, as it would have without this check.
|
|
529
|
+
"""
|
|
530
|
+
try:
|
|
531
|
+
sliderule_earthdata.set_max_resources(MAX_GRANULES_LISTED)
|
|
532
|
+
return sorted(
|
|
533
|
+
sliderule_earthdata.cmr(
|
|
534
|
+
short_name="ATL03",
|
|
535
|
+
polygon=parms["poly"],
|
|
536
|
+
time_start=parms["t0"],
|
|
537
|
+
time_end=parms["t1"],
|
|
538
|
+
)
|
|
539
|
+
)
|
|
540
|
+
except Exception as e:
|
|
541
|
+
logger.warning(f"Could not list ATL03 granules for the request: {e!r}")
|
|
542
|
+
return []
|
|
543
|
+
|
|
544
|
+
def _run_granule_batches(self, parms, granules):
|
|
545
|
+
"""Run ``atl03x`` on ``granules`` in batches and combine the results.
|
|
546
|
+
|
|
547
|
+
Each granule is in exactly one batch, so no point is returned twice, as
|
|
548
|
+
it could be from splitting the time range at a date inside a granule.
|
|
549
|
+
"""
|
|
550
|
+
batches = [
|
|
551
|
+
granules[i : i + MAX_GRANULES_PER_REQUEST]
|
|
552
|
+
for i in range(0, len(granules), MAX_GRANULES_PER_REQUEST)
|
|
553
|
+
]
|
|
554
|
+
print(f"Splitting {len(granules)} granules into {len(batches)} requests")
|
|
555
|
+
frames = []
|
|
556
|
+
for number, batch in enumerate(batches, start=1):
|
|
557
|
+
print(f"Request {number} of {len(batches)}")
|
|
558
|
+
label = f"batch {number} of {len(batches)} of "
|
|
559
|
+
frames.append(self._run_atl03x({**parms, "resources": batch}, label))
|
|
560
|
+
# Frames with no rows can lose their dtypes in a concat.
|
|
561
|
+
with_points = [frame for frame in frames if not frame.empty]
|
|
562
|
+
return pd.concat(with_points) if with_points else frames[0]
|
|
563
|
+
|
|
564
|
+
def _run_atl03x(self, parms, label=""):
|
|
565
|
+
"""Run one ``atl03x`` request, raising an error if nothing comes back.
|
|
566
|
+
|
|
567
|
+
Parameters
|
|
568
|
+
----------
|
|
569
|
+
parms : dict
|
|
570
|
+
SlideRule request parameters.
|
|
571
|
+
label : str, optional
|
|
572
|
+
Prefix for the request in the error message.
|
|
573
|
+
|
|
574
|
+
Raises
|
|
575
|
+
------
|
|
576
|
+
RuntimeError
|
|
577
|
+
If SlideRule returns ``None``. The client returns ``None`` whenever
|
|
578
|
+
it cannot open its output file and discards the reason. That
|
|
579
|
+
happens for a request with no ICESat-2 granules, one over the
|
|
580
|
+
server's granule limit, and transient server or client failures.
|
|
581
|
+
"""
|
|
582
|
+
atl06sr = sliderule_api.run("atl03x", parms)
|
|
583
|
+
if atl06sr is None:
|
|
584
|
+
raise RuntimeError(
|
|
585
|
+
f"SlideRule returned no result for {label}"
|
|
586
|
+
f"{self._describe_request(parms)}. "
|
|
587
|
+
"The client does not report the reason, but SlideRule's log "
|
|
588
|
+
"messages may. Likely causes: no ICESat-2 granules in the region "
|
|
589
|
+
"and time range; more than the 300 granules the server allows per "
|
|
590
|
+
"request, which a narrower time range avoids (--atl06sr-time-range "
|
|
591
|
+
"in asp_report); or a temporary failure, in which case the same "
|
|
592
|
+
"request may succeed if repeated."
|
|
593
|
+
)
|
|
594
|
+
return atl06sr
|
|
595
|
+
|
|
596
|
+
@staticmethod
|
|
597
|
+
def _describe_request(parms):
|
|
598
|
+
"""One-line summary of a SlideRule request for messages to the user."""
|
|
599
|
+
poly = parms["poly"]
|
|
600
|
+
region = poly
|
|
601
|
+
if all(isinstance(point, dict) for point in poly):
|
|
602
|
+
lons = [point["lon"] for point in poly]
|
|
603
|
+
lats = [point["lat"] for point in poly]
|
|
604
|
+
region = (
|
|
605
|
+
f"lon {min(lons):.4f} to {max(lons):.4f}, "
|
|
606
|
+
f"lat {min(lats):.4f} to {max(lats):.4f}"
|
|
607
|
+
)
|
|
608
|
+
return f"the atl03x request over {region}, from {parms['t0']} to {parms['t1']}"
|
|
609
|
+
|
|
493
610
|
def _ingest_atl06sr(self, key, atl06sr, h_sigma_quantile=1.0):
|
|
494
611
|
"""
|
|
495
612
|
Normalize and quality-filter a raw ATL06-SR dataframe and store it.
|
|
@@ -235,12 +235,21 @@ def _build_match_points(ctx: ReportContext) -> List[object]:
|
|
|
235
235
|
def _build_bundle_adjust(ctx: ReportContext) -> List[object]:
|
|
236
236
|
cfg = ctx.config
|
|
237
237
|
sections: List[object] = []
|
|
238
|
+
|
|
239
|
+
# Only the file lookup can mean "no bundle adjustment files": a ValueError
|
|
240
|
+
# from plotting has to be reported as a plotting failure.
|
|
238
241
|
try:
|
|
239
242
|
ba_files = ReadBundleAdjustFiles(
|
|
240
243
|
cfg.directory, ctx.ba_directory, stem=ctx.ba_stem
|
|
241
244
|
)
|
|
242
245
|
resid_initial_gdf, resid_final_gdf = ba_files.get_initial_final_residuals_gdfs()
|
|
246
|
+
except ValueError:
|
|
247
|
+
print(
|
|
248
|
+
f"\n\nNo bundle adjustment files found in directory {os.path.join(cfg.directory, ctx.ba_directory):}. If you want bundle adjustment plots, make sure you run the tool and supply the correct --bundle-adjust-prefix to asp_report.\n\n"
|
|
249
|
+
)
|
|
250
|
+
return sections + _build_bundle_adjust_cameras(ctx)
|
|
243
251
|
|
|
252
|
+
try:
|
|
244
253
|
plotter = PlotBundleAdjustFiles(
|
|
245
254
|
[resid_initial_gdf, resid_final_gdf],
|
|
246
255
|
lognorm=True,
|
|
@@ -288,7 +297,9 @@ def _build_bundle_adjust(ctx: ReportContext) -> List[object]:
|
|
|
288
297
|
# Map-projected residuals (requires reference DEM in bundle_adjust)
|
|
289
298
|
try:
|
|
290
299
|
resid_mapprojected_gdf = ba_files.get_mapproj_residuals_gdf()
|
|
291
|
-
|
|
300
|
+
except ValueError as e:
|
|
301
|
+
print(f"\n\nSkipping map-projected residuals plot: {e}\n\n")
|
|
302
|
+
else:
|
|
292
303
|
plotter = PlotBundleAdjustFiles(
|
|
293
304
|
[resid_mapprojected_gdf],
|
|
294
305
|
title="Bundle Adjust Midpoint distance between\nfinal interest points projected onto reference DEM",
|
|
@@ -310,15 +321,17 @@ def _build_bundle_adjust(ctx: ReportContext) -> List[object]:
|
|
|
310
321
|
caption=captions.MAP_PROJECTED_RESIDUALS,
|
|
311
322
|
)
|
|
312
323
|
)
|
|
313
|
-
except ValueError as e:
|
|
314
|
-
print(f"\n\nSkipping map-projected residuals plot: {e}\n\n")
|
|
315
324
|
|
|
316
325
|
# Geodiff plots (requires reference DEM in bundle_adjust with --mapproj-dem flag)
|
|
317
326
|
try:
|
|
318
327
|
geodiff_initial_gdf, geodiff_final_gdf = (
|
|
319
328
|
ba_files.get_initial_final_geodiff_gdfs()
|
|
320
329
|
)
|
|
321
|
-
|
|
330
|
+
except ValueError as e:
|
|
331
|
+
print(
|
|
332
|
+
f"\n\nSkipping geodiff plots (requires --mapproj-dem flag in bundle_adjust): {e}\n\n"
|
|
333
|
+
)
|
|
334
|
+
else:
|
|
322
335
|
plotter = PlotBundleAdjustFiles(
|
|
323
336
|
[geodiff_initial_gdf, geodiff_final_gdf],
|
|
324
337
|
lognorm=False,
|
|
@@ -343,15 +356,10 @@ def _build_bundle_adjust(ctx: ReportContext) -> List[object]:
|
|
|
343
356
|
caption=captions.GEODIFF,
|
|
344
357
|
)
|
|
345
358
|
)
|
|
346
|
-
except ValueError as e:
|
|
347
|
-
print(
|
|
348
|
-
f"\n\nSkipping geodiff plots (requires --mapproj-dem flag in bundle_adjust): {e}\n\n"
|
|
349
|
-
)
|
|
350
359
|
|
|
351
|
-
except ValueError:
|
|
352
|
-
print(
|
|
353
|
-
|
|
354
|
-
)
|
|
360
|
+
except ValueError as e:
|
|
361
|
+
print(f"\n\nBundle adjustment plots stopped by a plotting error: {e}\n\n")
|
|
362
|
+
|
|
355
363
|
sections.extend(_build_bundle_adjust_cameras(ctx))
|
|
356
364
|
return sections
|
|
357
365
|
|
|
@@ -604,7 +604,8 @@ class StereoGeometryPlotter:
|
|
|
604
604
|
|
|
605
605
|
Very large extents make contextily's auto-zoom resolve to an invalid
|
|
606
606
|
(negative) zoom that errors; fall back to a coarse continental zoom so the
|
|
607
|
-
overview still gets a basemap instead of silently dropping it.
|
|
607
|
+
overview still gets a basemap instead of silently dropping it. If that
|
|
608
|
+
fails too, the figure is drawn without a basemap and a warning says why.
|
|
608
609
|
"""
|
|
609
610
|
import contextily as ctx
|
|
610
611
|
|
|
@@ -613,8 +614,8 @@ class StereoGeometryPlotter:
|
|
|
613
614
|
except Exception:
|
|
614
615
|
try:
|
|
615
616
|
ctx.add_basemap(ax, crs=map_crs, attribution=False, zoom=6)
|
|
616
|
-
except Exception:
|
|
617
|
-
|
|
617
|
+
except Exception as e:
|
|
618
|
+
logger.warning("Basemap skipped: %r", e)
|
|
618
619
|
|
|
619
620
|
def _overview_title(self, scenes):
|
|
620
621
|
"""Acquisition summary title for the overview figure (no pair metrics)."""
|
|
@@ -880,8 +881,8 @@ class StereoGeometryPlotter:
|
|
|
880
881
|
import contextily as ctx
|
|
881
882
|
|
|
882
883
|
ctx.add_basemap(ax0, crs=map_crs, attribution=False)
|
|
883
|
-
except Exception:
|
|
884
|
-
|
|
884
|
+
except Exception as e:
|
|
885
|
+
logger.warning("Basemap skipped: %r", e)
|
|
885
886
|
ax0.tick_params(labelsize=7)
|
|
886
887
|
|
|
887
888
|
# Row 1: Roll, pitch, yaw, either computed from quaternions or
|
|
@@ -1425,7 +1425,10 @@ class Plotter:
|
|
|
1425
1425
|
)
|
|
1426
1426
|
|
|
1427
1427
|
if ctx_kwargs:
|
|
1428
|
-
|
|
1428
|
+
try:
|
|
1429
|
+
ctx.add_basemap(ax=ax, **ctx_kwargs)
|
|
1430
|
+
except Exception as e:
|
|
1431
|
+
logger.warning("Basemap skipped: %r", e)
|
|
1429
1432
|
|
|
1430
1433
|
|
|
1431
1434
|
# SATID prefixes for the DigitalGlobe -> Maxar -> Vantor satellite heritage, all
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|