Commit 6ed6297a authored by Bauck, Kirsten (Contractor) Hailey's avatar Bauck, Kirsten (Contractor) Hailey
Browse files

Merge branch 'ppio' into 'main' 

Fixes ppio issue

See merge request astrogeology/autocnet!675
parents d80dea5b d2eac647

CHANGELOG.md

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ When preparing for a bug fix release create a new 2nd heading above the Fixed 
heading to indicate that only the bug fixes and security fixes are in the bug fix

release.

-->

## [Unreleased]



### Fixed

- `place_points_in_overlap` bug where if any of the points in the overlap failed to project into an image, all points in the overlap were lost. This was caused by #580, which allowed for multiple (a list) of inputs. The error handling was removed from the `image_to_ground` call so the `except` in `place_points_in_overlap` was never called.

## [1.0.0-rc2]



### Changed

autocnet/spatial/overlap.py

+4 −6
Original line number Diff line number Diff line
@@ -186,11 +186,9 @@ def place_points_in_overlap(overlap, 
            # reference_index is the index into the list of measures for the image that is not shifted and is set at the

            # reference against which all other images are registered.

            if cam_type == "isis":

                try:

                sample, line = isis.ground_to_image(node["image_path"], lon, lat)

                except CalledProcessError as e:

                    if 'Requested position does not project in camera model' in e.stderr:

                        log.exception(f'point ({lon}, {lat}) does not project to reference image {node["image_path"]}')

                if sample == None or line == None:

                    log.warning(f'point ({lon}, {lat}) does not project to reference image {node["image_path"]}')

                    continue

            if cam_type == "csm":

                lon_og, lat_og = oc2og(lon, lat, semi_major, semi_minor)