diff --git a/tools/RAiDER/llreader.py b/tools/RAiDER/llreader.py index bd1e2d5d..4bdd0eaf 100644 --- a/tools/RAiDER/llreader.py +++ b/tools/RAiDER/llreader.py @@ -14,6 +14,8 @@ import pyproj import xarray as xr +from RAiDER.utilFcns import transform_bbox + try: import pandas as pd @@ -330,14 +332,11 @@ def __init__(self, path: Path, is_dem=False, cube_spacing_in_m: Optional[float]= self._filename = path self.p = rio_profile(path) - self._bounding_box = rio_extents(self.p) + self._bounding_box = transform_bbox(rio_extents(self.p), dest_crs=4326, src_crs=self.p['crs']) self._is_dem = is_dem _, self._proj, self._geotransform = rio_stats(path) self._type = 'geocoded_file' - try: - self.crs = self.p['crs'] - except KeyError: - self.crs = None + self.crs = CRS.from_epsg(4326) def readLL(self) -> tuple[np.ndarray, np.ndarray]: # ll_bounds are SNWE diff --git a/tools/RAiDER/utilFcns.py b/tools/RAiDER/utilFcns.py index 30f22d08..5915f323 100644 --- a/tools/RAiDER/utilFcns.py +++ b/tools/RAiDER/utilFcns.py @@ -4,7 +4,7 @@ import pathlib import re from pathlib import Path -from typing import Any, Optional, Union, cast +from typing import TYPE_CHECKING, Any, Optional, Union, cast import numpy as np import numpy.typing as npt @@ -20,11 +20,15 @@ from RAiDER.constants import _THRESHOLD_SECONDS from RAiDER.constants import _g0 as G0 from RAiDER.constants import _g1 as G1 -from RAiDER.llreader import AOI from RAiDER.logger import logger from RAiDER.types import BB, RIO, CRSLike, FloatArray2D, FloatArray3D +# Only used for type annotations +if TYPE_CHECKING: + from RAiDER.llreader import AOI + + # Optional imports try: import pandas as pd @@ -420,7 +424,7 @@ def round_time(datetime: dt.datetime, roundTo: int=60) -> dt.datetime: def writeDelays( - aoi: AOI, #: AOI, + aoi: 'AOI', wetDelay: ndarray, hydroDelay: ndarray, wet_path: Path,