pycontrails 0.55.0__cp310-cp310-macosx_11_0_arm64.whl → 0.56.0__cp310-cp310-macosx_11_0_arm64.whl

pycontrails/datalib/sentinel.py

@@ -7,12 +7,23 @@ from collections.abc import Iterable
 from xml.etree import ElementTree
 
 import numpy as np
+import numpy.typing as npt
 import pandas as pd
 import xarray as xr
 
 from pycontrails.core import Flight, cache
-from pycontrails.datalib._leo_utils import search
-from pycontrails.datalib._leo_utils.vis import equalize, normalize
+from pycontrails.datalib.leo_utils import correction, search
+from pycontrails.datalib.leo_utils.sentinel_metadata import (
+    _band_id,
+    get_detector_id,
+    get_time_delay_detectors,
+    parse_ephemeris_sentinel,
+    parse_high_res_viewing_incidence_angles,
+    parse_sensing_time,
+    parse_sentinel_crs,
+    read_image_coordinates,
+)
+from pycontrails.datalib.leo_utils.vis import equalize, normalize
 from pycontrails.utils import dependencies
 
 try:
@@ -53,7 +64,7 @@ ROI_QUERY_FILENAME = _path_to_static / "sentinel_roi_query.sql"
 BQ_TABLE = "bigquery-public-data.cloud_storage_geo_index.sentinel_2_index"
 
 #: Default columns to include in queries
-BQ_DEFAULT_COLUMNS = ["base_url", "granule_id", "sensing_time"]
+BQ_DEFAULT_COLUMNS = ["base_url", "granule_id", "sensing_time", "source_url"]
 
 #: Default spatial extent for queries
 BQ_DEFAULT_EXTENT = search.GLOBAL_EXTENT
@@ -84,10 +95,10 @@ def query(
         Start of time period for search
     end_time : np.datetime64
         End of time period for search
-    extent : str, optional
+    extent : str | None, optional
         Spatial region of interest as a GeoJSON string. If not provided, defaults
         to a global extent.
-    columns : list[str], optional
+    columns : list[str] | None, optional
         Columns to return from Google
         `BigQuery table <https://console.cloud.google.com/bigquery?p=bigquery-public-data&d=cloud_storage_geo_index&t=landsat_index&page=table&_ga=2.90807450.1051800793.1716904050-255800408.1705955196>`__.
         By default, returns imagery base URL, granule ID, and sensing time.
@@ -124,7 +135,7 @@ def intersect(
     ----------
     flight : Flight
         Flight for intersection
-    columns : list[str], optional.
+    columns : list[str] | None, optional
         Columns to return from Google
         `BigQuery table <https://console.cloud.google.com/bigquery?p=bigquery-public-data&d=cloud_storage_geo_index&t=landsat_index&page=table&_ga=2.90807450.1051800793.1716904050-255800408.1705955196>`__.
         By default, returns imagery base URL, granule ID, and sensing time.
@@ -139,18 +150,18 @@ def intersect(
     :func:`search.intersect`
     """
     columns = columns or BQ_DEFAULT_COLUMNS
-    return search.intersect(BQ_TABLE, flight, columns)
+    scenes = search.intersect(BQ_TABLE, flight, columns)
+
+    # overwrite the base_url with source_url.
+    # After 2024-03-14 there is a mistake in the Google BigQuery table,
+    # such that the base_url is written to the source_url column
+    scenes["base_url"] = scenes["base_url"].fillna(scenes["source_url"])
+    return scenes
 
 
 class Sentinel:
     """Support for Sentinel-2 data handling.
 
-    This class uses the `PROJ <https://proj.org/en/9.4/index.html>`__ coordinate
-    transformation software through the
-    `pyproj <https://pyproj4.github.io/pyproj/stable/index.html>`__ python interface.
-    pyproj is installed as part of the ``sat`` set of optional dependencies
-    (``pip install pycontrails[sat]``), but PROJ must be installed manually.
-
     Parameters
     ----------
     base_url : str
@@ -159,7 +170,7 @@ class Sentinel:
     granule_id : str
         Granule ID of Sentinel-2 scene. To find URLs for Sentinel-2 scenes at
         specific locations and times, see :func:`query` and :func:`intersect`.
-    bands : str | set[str] | None
+    bands : str | Iterable[str] | None
         Set of bands to retrieve. The 13 possible bands are represented by
         the string "B01" to "B12" plus "B8A". For the true color scheme, set
         ``bands=("B02", "B03", "B04")``. By default, bands for the true color scheme
@@ -169,7 +180,7 @@ class Sentinel:
         - B05-B07, B8A, B11, B12: 20 m
         - B01, B09, B10: 60 m
 
-    cachestore : cache.CacheStore, optional
+    cachestore : cache.CacheStore | None, optional
         Cache store for Landsat data. If None, a :class:`DiskCacheStore` is used.
 
     See Also
@@ -210,23 +221,163 @@ class Sentinel:
 
         Parameters
         ----------
-        reflective : str = {"raw", "reflectance"}, optional
-            Whether to return raw values or rescaled reflectances for reflective bands.
+        reflective : str, optional
+            Set to "raw" to return raw values or "reflectance" for rescaled reflectances.
             By default, return reflectances.
 
         Returns
         -------
-        xr.DataArray
-            DataArray of Sentinel-2 data.
+        xr.Dataset
+            Dataset of Sentinel-2 data.
         """
-        if reflective not in ["raw", "reflectance"]:
-            msg = "reflective band processing must be one of ['raw', 'radiance', 'reflectance']"
+        available = ("raw", "reflectance")
+        if reflective not in available:
+            msg = f"reflective band processing must be one of {available}"
             raise ValueError(msg)
 
-        ds = xr.Dataset()
-        for band in self.bands:
-            ds[band] = self._get(band, reflective)
-        return ds
+        data = {band: self._get(band, reflective) for band in self.bands}
+        return xr.Dataset(data)
+
+    def get_viewing_angle_metadata(self, scale: int = 10) -> xr.Dataset:
+        """Return the dataset with viewing angles.
+
+        See :func:`parse_high_res_viewing_incidence_angles` for details.
+        """
+        granule_meta_path, _ = self._get_meta()
+        _, detector_band_path = self._get_correction_meta()
+        return parse_high_res_viewing_incidence_angles(
+            granule_meta_path, detector_band_path, scale=scale
+        )
+
+    def get_detector_id(
+        self, x: npt.NDArray[np.floating], y: npt.NDArray[np.floating]
+    ) -> npt.NDArray[np.integer]:
+        """Return the detector_id of the Sentinel-2 detector that imaged the given points.
+
+        Parameters
+        ----------
+        x : npt.NDArray[np.floating]
+            x coordinates of points in the Sentinel-2 image CRS
+        y : npt.NDArray[np.floating]
+            y coordinates of points in the Sentinel-2 image CRS
+
+        Returns
+        -------
+        npt.NDArray[np.integer]
+            Detector IDs for each point. If a point is outside the image, the detector ID is 0.
+        """
+        granule_sink, _ = self._get_meta()
+        _, detector_band_sink = self._get_correction_meta()
+        return get_detector_id(detector_band_sink, granule_sink, x, y)
+
+    def get_time_delay_detector(
+        self, detector_id: npt.NDArray[np.integer], band: str = "B03"
+    ) -> npt.NDArray[np.timedelta64]:
+        """Return the time delay for the given detector IDs."""
+        datastrip_sink, _ = self._get_correction_meta()
+        delays = get_time_delay_detectors(datastrip_sink, band)
+
+        # Map the delays to the input array
+        unique_ids, inverse = np.unique(detector_id, return_inverse=True)
+
+        # Get offsets for each unique detector
+        offset_list = []
+        for did in unique_ids:
+            if did == 0:
+                offset_list.append(np.timedelta64("NaT"))
+            else:
+                offset_list.append(delays.get(did, np.timedelta64("NaT")))
+        offset_values = np.array(offset_list, dtype="timedelta64[ns]")
+
+        # Map back to the original array
+        return offset_values[inverse]
+
+    def get_ephemeris(self) -> pd.DataFrame:
+        """Return the satellite ephemeris as a :class:`pandas.DataFrame`."""
+        datastrip_sink, _ = self._get_correction_meta()
+
+        return parse_ephemeris_sentinel(datastrip_sink)
+
+    def get_crs(self) -> pyproj.CRS:
+        """Return the CRS of the satellite image."""
+        granule_meta_path, _ = self._get_meta()
+        return parse_sentinel_crs(granule_meta_path)
+
+    def get_sensing_time(self) -> pd.Timestamp:
+        """Return the sensing_time of the satellite image."""
+        granule_meta_path, _ = self._get_meta()
+        return parse_sensing_time(granule_meta_path)
+
+    def colocate_flight(
+        self,
+        flight: Flight,
+        band: str = "B03",
+    ) -> tuple[float, float, np.datetime64]:
+        """Colocate a flight track with satellite image pixels.
+
+        This function first projects flight waypoints into the UTM coordinate system
+        of the satellite image, then applies a viewing angle correction to estimate
+        the actual ground position imaged by the satellite. Next, the scan time for
+        each point is estimated based on the satellite meta data. Finally, the
+        point along the flight track is found where the flight time matches the
+        satellite scan time.
+
+        Parameters
+        ----------
+        flight : Flight
+            The flight object.
+        band : str, optional
+            Spectral band to use for geometry parsing. Default is "B03".
+
+        Returns
+        -------
+        tuple[float, float, np.datetime64]
+            A tuple containing the x and y coordinates of the flight position in the
+            satellite image CRS, and the corrected sensing_time of the satellite image.
+        """
+        utm_crs = self.get_crs()
+
+        # Project from WGS84 to the x and y coordinates in the UTM coordinate system
+        transformer = pyproj.Transformer.from_crs("EPSG:4326", utm_crs, always_xy=True)
+        x, y = transformer.transform(flight["longitude"], flight["latitude"])
+        z = flight.altitude
+
+        # Apply sensing angle correction
+        ds_angles = self.get_viewing_angle_metadata()
+        x_proj, y_proj = correction.scan_angle_correction(ds_angles, x, y, z, maxiter=3)
+
+        # Get the satellite ephemeris data prepared
+        ephemeris = self.get_ephemeris()
+
+        # Estimate the scan time for each point
+        scan_time_no_offset = correction.estimate_scan_time(ephemeris, utm_crs, x_proj, y_proj)
+
+        detector_id = self.get_detector_id(x_proj, y_proj)
+        offset = self.get_time_delay_detector(detector_id, band=band)
+        scan_time = scan_time_no_offset + offset
+
+        # To finish up, find the point along the project flight track at which the satellite
+        # scan time equals the flight time
+        # It's possible that if the flight has a really fine time resolution, that
+        # the diff_times array will have multiple zeros. This is okay, as np.interp
+        # will just return the first one.
+        valid = np.isfinite(x_proj) & np.isfinite(y_proj) & np.isfinite(scan_time)
+
+        diff_times = flight["time"][valid] - scan_time[valid]
+        if diff_times[0] > np.timedelta64(0) or diff_times[-1] < np.timedelta64(0):
+            msg = "Flight track does not overlap with satellite image in time."
+            raise ValueError(msg)
+
+        index = np.arange(len(diff_times))
+        frac_idx = np.interp(0, diff_times.astype(int), index)
+
+        x1 = np.interp(frac_idx, index, x_proj[valid]).item()
+        y1 = np.interp(frac_idx, index, y_proj[valid]).item()
+        t1 = np.interp(frac_idx, index, scan_time[valid].astype(int)).item()
+
+        return x1, y1, np.datetime64(int(t1), "ns")
+
+    # -------------------------------------------------------------------------------------
 
     def _get(self, band: str, processing: str) -> xr.DataArray:
         """Download Sentinel-2 band to the :attr:`cachestore` and return processed data."""
@@ -278,6 +429,61 @@ class Sentinel:
 
         return granule_sink, safe_sink
 
+    def _get_correction_meta(self) -> tuple[str, str]:
+        """Download Sentinel-2 metadata files and return path to cached files.
+
+        Note that two XML files must be retrieved: one inside the GRANULE
+        subdirectory, and one at the top level of the SAFE archive.
+        """
+        fs = self.fs
+        base_url = self.base_url
+        granule_id = self.granule_id
+
+        # Resolve the unknown subfolder in DATASTRIP using glob
+        # Probably there is a better method, but this worked for now
+        pattern = f"{base_url}/DATASTRIP/*"
+        matches = fs.glob(pattern)
+        if not matches:
+            raise FileNotFoundError(f"No DATASTRIP MTD_MDS.xml file found at pattern: {pattern}")
+        if len(matches) > 2:
+            raise RuntimeError(f"Multiple DATASTRIP MTD_MDS.xml files found: {matches}")
+
+        datastrip_id = matches[0].split("/")[-1].replace("_$folder$", "")
+        url = f"{base_url}/DATASTRIP/{datastrip_id}/MTD_DS.xml"
+        datastrip_sink = self.cachestore.path(url.removeprefix(GCP_STRIP_PREFIX))
+        if not self.cachestore.exists(datastrip_sink):
+            fs.get(url, datastrip_sink)
+
+        # Path to the QI_DATA folder
+        qi_data_url = f"{base_url}/GRANULE/{granule_id}/QI_DATA/"
+
+        # List files in QI_DATA (assuming fs can list directories)
+        files = fs.ls(qi_data_url)
+
+        # Filter for the detector mask files
+        mask_files = [f for f in files if "MSK_DETFOO_B03" in f]
+
+        if not mask_files:
+            raise FileNotFoundError(f"No detector mask found in {qi_data_url}")
+
+        # Choose the first available file (could prioritize .jp2 over .gml if needed)
+        mask_file = None
+        for ext in [".jp2", ".gml"]:
+            for f in mask_files:
+                if f.endswith(ext):
+                    mask_file = f
+                    break
+            if mask_file:
+                break
+
+        if mask_file is not None:
+            # Path where the file will be cached
+            detector_band_sink = self.cachestore.path(mask_file.removeprefix(GCP_STRIP_PREFIX))
+            if not self.cachestore.exists(detector_band_sink):
+                fs.get(mask_file, detector_band_sink)
+
+        return datastrip_sink, detector_band_sink
+
 
 def _parse_bands(bands: str | Iterable[str] | None) -> set[str]:
     """Check that the bands are valid and return as a set."""
@@ -328,7 +534,7 @@ def _read(path: str, granule_meta: str, safe_meta: str, band: str, processing: s
     epsg = int(elem.text.split(":")[1])
     crs = pyproj.CRS.from_epsg(epsg)
 
-    x, y = _read_image_coordinates(granule_meta, band)
+    x, y = read_image_coordinates(granule_meta, band)
 
     da = xr.DataArray(
         data=img,
@@ -345,22 +551,6 @@ def _read(path: str, granule_meta: str, safe_meta: str, band: str, processing: s
     return da
 
 
-def _band_resolution(band: str) -> int:
-    """Get band resolution in meters."""
-    return (
-        60 if band in ("B01", "B09", "B10") else 10 if band in ("B02", "B03", "B04", "B08") else 20
-    )
-
-
-def _band_id(band: str) -> int:
-    """Get band ID used in some metadata files."""
-    if band in (f"B{i:2d}" for i in range(1, 9)):
-        return int(band[1:]) - 1
-    if band == "B8A":
-        return 8
-    return int(band[1:])
-
-
 def _read_band_reflectance_rescaling(meta: str, band: str) -> tuple[float, float]:
     """Read reflectance rescaling factors from metadata file.
 
@@ -393,65 +583,18 @@ def _read_band_reflectance_rescaling(meta: str, band: str) -> tuple[float, float
     raise ValueError(msg)
 
 
-def _read_image_coordinates(meta: str, band: str) -> tuple[np.ndarray, np.ndarray]:
-    """Read image x and y coordinates."""
-
-    # convenience function that satisfies mypy
-    def _text_from_tag(parent: ElementTree.Element, tag: str) -> str:
-        elem = parent.find(tag)
-        if elem is None or elem.text is None:
-            msg = f"Could not find text in {tag} element"
-            raise ValueError(msg)
-        return elem.text
-
-    resolution = _band_resolution(band)
-
-    # find coordinates of upper left corner and pixel size
-    tree = ElementTree.parse(meta)
-    elems = tree.findall(".//Geoposition")
-    for elem in elems:
-        if int(elem.attrib["resolution"]) == resolution:
-            ulx = float(_text_from_tag(elem, "ULX"))
-            uly = float(_text_from_tag(elem, "ULY"))
-            dx = float(_text_from_tag(elem, "XDIM"))
-            dy = float(_text_from_tag(elem, "YDIM"))
-            break
-    else:
-        msg = f"Could not find image geoposition for resolution of {resolution} m"
-        raise ValueError(msg)
-
-    # find image size
-    elems = tree.findall(".//Size")
-    for elem in elems:
-        if int(elem.attrib["resolution"]) == resolution:
-            nx = int(_text_from_tag(elem, "NCOLS"))
-            ny = int(_text_from_tag(elem, "NROWS"))
-            break
-    else:
-        msg = f"Could not find image size for resolution of {resolution} m"
-        raise ValueError(msg)
-
-    # compute pixel coordinates
-    xlim = (ulx, ulx + (nx - 1) * dx)
-    ylim = (uly, uly + (ny - 1) * dy)  # dy is < 0
-    x = np.linspace(xlim[0], xlim[1], nx)
-    y = np.linspace(ylim[0], ylim[1], ny)
-
-    return x, y
-
-
 def extract_sentinel_visualization(
     ds: xr.Dataset, color_scheme: str = "true"
-) -> tuple[np.ndarray, pyproj.CRS, tuple[float, float, float, float]]:
+) -> tuple[npt.NDArray[np.float32], pyproj.CRS, tuple[float, float, float, float]]:
     """Extract artifacts for visualizing Sentinel data with the given color scheme.
 
     Parameters
     ----------
     ds : xr.Dataset
         Dataset of Sentinel data as returned by :meth:`Sentinel.get`.
-    color_scheme : str = {"true"}
+    color_scheme : str, optional
         Color scheme to use for visualization. The true color scheme
-        (the only option currently implemented) requires bands B02, B03, and B04.
+        (`"true"`, the only option currently implemented) requires bands B02, B03, and B04.
 
     Returns
     -------
@@ -459,7 +602,7 @@ def extract_sentinel_visualization(
         3D RGB array of shape ``(height, width, 3)``.
     src_crs : pyproj.CRS
         Imagery projection
-    src_extent : tuple[float,float,float,float]
+    src_extent : tuple[float, float, float, float]
         Imagery extent in projected coordinates
     """
 

pycontrails/models/dry_advection.py

@@ -171,7 +171,6 @@ class DryAdvection(models.Model):
 
         interp_kwargs = self.interp_kwargs
 
-        dt_integration = self.params["dt_integration"]
         sedimentation_rate = self.params["sedimentation_rate"]
         dz_m = self.params["dz_m"]
         max_depth = self.params["max_depth"]
@@ -179,6 +178,7 @@ class DryAdvection(models.Model):
         source_time = self.source["time"]
 
         if timesteps is None:
+            dt_integration = self.params["dt_integration"]
             t0 = pd.Timestamp(source_time.min()).floor(pd.Timedelta(dt_integration)).to_numpy()
             t1 = source_time.max()
             timesteps = np.arange(

pycontrails/models/extended_k15.py

@@ -410,7 +410,7 @@ def droplet_apparent_emission_index(
     T_exhaust: npt.NDArray[np.floating],
     air_pressure: npt.NDArray[np.floating],
     nvpm_ei_n: npt.NDArray[np.floating],
-    vpm_ei_n: npt.NDArray[np.floating],
+    vpm_ei_n: float,
     G: npt.NDArray[np.floating],
     particles: list[Particle] | None = None,
     n_plume_points: int = 50,
@@ -429,7 +429,7 @@ def droplet_apparent_emission_index(
         Pressure altitude at each waypoint, [:math:`Pa`]
     nvpm_ei_n : npt.NDArray[np.floating]
         nvPM number emissions index, [:math:`kg^{-1}`]
-    vpm_ei_n : npt.NDArray[np.floating]
+    vpm_ei_n : float
         vPM number emissions index, [:math:`kg^{-1}`]
     G : npt.NDArray[np.floating]
         Slope of the mixing line in a temperature-humidity diagram.
@@ -471,8 +471,8 @@ def droplet_apparent_emission_index(
     particles = particles or _default_particles()
 
     # Confirm all parameters are broadcastable
-    specific_humidity, T_ambient, T_exhaust, air_pressure, G, nvpm_ei_n, vpm_ei_n = np.atleast_1d(
-        specific_humidity, T_ambient, T_exhaust, air_pressure, G, nvpm_ei_n, vpm_ei_n
+    specific_humidity, T_ambient, T_exhaust, air_pressure, G, nvpm_ei_n = np.atleast_1d(
+        specific_humidity, T_ambient, T_exhaust, air_pressure, G, nvpm_ei_n
     )
     try:
         np.broadcast(specific_humidity, T_ambient, T_exhaust, air_pressure, G, nvpm_ei_n, vpm_ei_n)
@@ -665,7 +665,7 @@ def water_droplet_activation(
     T_plume: npt.NDArray[np.floating],
     T_ambient: npt.NDArray[np.floating],
     nvpm_ei_n: npt.NDArray[np.floating],
-    vpm_ei_n: npt.NDArray[np.floating],
+    vpm_ei_n: float,
     S_mw: npt.NDArray[np.floating],
     dilution: npt.NDArray[np.floating],
     rho_air: npt.NDArray[np.floating],
@@ -683,7 +683,7 @@ def water_droplet_activation(
         Ambient temperature for each waypoint, [:math:`K`].
     nvpm_ei_n : npt.NDArray[np.floating]
         nvPM number emissions index, [:math:`kg^{-1}`].
-    vpm_ei_n : npt.NDArray[np.floating]
+    vpm_ei_n : float
         vPM number emissions index, [:math:`kg^{-1}`].
     S_mw : npt.NDArray[np.floating]
         Water saturation ratio in the aircraft plume without droplet condensation.
@@ -790,7 +790,7 @@ def entrained_ambient_droplet_number_concentration(
 
 
 def emissions_index_to_number_concentration(
-    number_ei: npt.NDArray[np.floating],
+    number_ei: npt.NDArray[np.floating] | float,
     rho_air: npt.NDArray[np.floating],
     dilution: npt.NDArray[np.floating],
     nu_0: float,
@@ -799,7 +799,7 @@ def emissions_index_to_number_concentration(
 
     Parameters
     ----------
-    number_ei : npt.NDArray[np.floating]
+    number_ei : npt.NDArray[np.floating] | float
         Particle number emissions index, [:math:`kg^{-1}`].
     rho_air : npt.NDArray[np.floating]
         Air density at each waypoint, [:math:`kg m^{-3}`].

{pycontrails-0.55.0.dist-info → pycontrails-0.56.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycontrails
-Version: 0.55.0
+Version: 0.56.0
 Summary: Python library for modeling aviation climate impacts
 Author-email: "Contrails.org" <py@contrails.org>
 License-Expression: Apache-2.0
@@ -88,12 +88,14 @@ Requires-Dist: cartopy>=0.22; extra == "sat"
 Requires-Dist: db-dtypes>=1.2; extra == "sat"
 Requires-Dist: gcsfs>=2022.3; extra == "sat"
 Requires-Dist: geojson>=3.1; extra == "sat"
+Requires-Dist: geopandas>=1.1.1; extra == "sat"
 Requires-Dist: google-cloud-bigquery>=3.23; extra == "sat"
 Requires-Dist: google-cloud-bigquery-storage>=2.25; extra == "sat"
 Requires-Dist: pillow>=10.3; extra == "sat"
 Requires-Dist: pyproj>=3.5; extra == "sat"
 Requires-Dist: rasterio>=1.3; extra == "sat"
 Requires-Dist: scikit-image>=0.18; extra == "sat"
+Requires-Dist: shapely>=2.0; extra == "sat"
 Provides-Extra: open3d
 Requires-Dist: open3d>=0.14; extra == "open3d"
 Provides-Extra: pyproj

{pycontrails-0.55.0.dist-info → pycontrails-0.56.0.dist-info}/RECORD

@@ -1,32 +1,32 @@
-pycontrails-0.55.0.dist-info/RECORD,,
-pycontrails-0.55.0.dist-info/WHEEL,sha256=11kMdE9gzbsaQG30fRcsAYxBLEVRsqJo098Y5iL60Xo,136
-pycontrails-0.55.0.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
-pycontrails-0.55.0.dist-info/METADATA,sha256=H2xDW4TtardGnAmR-wScAjXNDEk5BRx1vGaFOca92NY,9036
-pycontrails-0.55.0.dist-info/licenses/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
-pycontrails-0.55.0.dist-info/licenses/NOTICE,sha256=fiBPdjYibMpDzf8hqcn7TvAQ-yeK10q_Nqq24DnskYg,1962
-pycontrails/_version.py,sha256=MUSeiBePddUfMUmju5N5hbz2jr6ICfnUqMwuaH-AT0Y,714
+pycontrails-0.56.0.dist-info/RECORD,,
+pycontrails-0.56.0.dist-info/WHEEL,sha256=11kMdE9gzbsaQG30fRcsAYxBLEVRsqJo098Y5iL60Xo,136
+pycontrails-0.56.0.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
+pycontrails-0.56.0.dist-info/METADATA,sha256=V-rmySZx3DVD4x1SN4wcN9yqATXqErO7zoaXg6l2JNc,9128
+pycontrails-0.56.0.dist-info/licenses/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
+pycontrails-0.56.0.dist-info/licenses/NOTICE,sha256=fiBPdjYibMpDzf8hqcn7TvAQ-yeK10q_Nqq24DnskYg,1962
+pycontrails/_version.py,sha256=2_q1TRVy1QpIW3N_C_ZBLtNup6qZoUaN3O-tBxeD494,714
 pycontrails/__init__.py,sha256=9ypSB2fKZlKghTvSrjWo6OHm5qfASwiTIvlMew3Olu4,2037
 pycontrails/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycontrails/core/vector.py,sha256=X_g8lzY6plJ6oeUHigSjt9qcPv34a3m1DeK1pqocrDw,73627
+pycontrails/core/vector.py,sha256=mQG1NmULztZjTK7O4waiggiR_4dA7LhTeuyQnLJRHsE,73650
 pycontrails/core/models.py,sha256=3mDTqp1V5aae9akuYwbMGIUEkESKSYTjZeyu2IiMW7s,43915
 pycontrails/core/interpolation.py,sha256=wovjj3TAf3xonVxjarclpvZLyLq6N7wZQQXsI9hT3YA,25713
-pycontrails/core/fleet.py,sha256=0hi_N4R93St-7iD29SE0EnadpBEl_p9lSGtDwpWvGkk,16704
-pycontrails/core/rgi_cython.cpython-310-darwin.so,sha256=3re4urYJmrg5WBv-BLynhlUlsKzmbZM3-26G0qfDD1U,343056
-pycontrails/core/flight.py,sha256=kQ78YdvjPZI6v2Bj_2Fr1MgNmrrtIN6j21l4fwcRW4E,81380
+pycontrails/core/fleet.py,sha256=3uRByONZW8yHiS2gmgwOozVm6ksUVdsy6Gyf6jYjSPY,16703
+pycontrails/core/rgi_cython.cpython-310-darwin.so,sha256=YqyXkw5wBU18DdWEyO--Z495pq_wHGOgjubrnHuQLzo,343056
+pycontrails/core/flight.py,sha256=_a4AJjewA_lcW_qjBPga9z6JlVAev-es_M8TFVyX_1E,81590
 pycontrails/core/fuel.py,sha256=kJZ3P1lPm1L6rdPREM55XQ-VfJ_pt35cP4sO2Nnvmjs,4332
 pycontrails/core/polygon.py,sha256=g7YqWzUbOHWT65XrLqLUZLrQXYcx_x1NcJ041-Cj7UY,18070
-pycontrails/core/cache.py,sha256=IIyx726zN7JzNSKV0JJDksMI9OhCLdnJShmBVStRqzI,28154
+pycontrails/core/cache.py,sha256=Zng2edpSKYNyrkD4j1omYMCzJ7Lm762YJnUmqoVu1Z4,28161
 pycontrails/core/__init__.py,sha256=p0O09HxdeXU0X5Z3zrHMlTfXa92YumT3fJ8wJBI5ido,856
 pycontrails/core/flightplan.py,sha256=0mvA3IO19Sap-7gwpmEIV35_mg6ChvajwhurvjZZt_U,7521
 pycontrails/core/met.py,sha256=O9W6RaEwUsg7ZERR47Q-6fYjg13BzOZtcQdw92444xg,103987
 pycontrails/core/aircraft_performance.py,sha256=Kk_Rb61jDOWPmCQHwn2jR5vMPmB8b3aq1iTWfiUMj9U,28232
-pycontrails/core/airports.py,sha256=ubYo-WvxKPd_dUcADx6yew9Tqh1a4VJDgX7aFqLYwB8,6775
-pycontrails/core/met_var.py,sha256=lAbp3cko_rzMk_u0kq-F27sUXUxUKikUvCNycwp9ILY,12020
+pycontrails/core/airports.py,sha256=CzZrgJNZ7wtNv8vg9sJczMhFov7k0gmrGR4tRKCH8i8,6782
+pycontrails/core/met_var.py,sha256=g69vqbxpJeXEQU8vrrcoUR1PX3zCo2-k3au1Lv2TiIw,12027
 pycontrails/core/coordinates.py,sha256=0ySsHtqTon7GMbuwmmxMbI92j3ueMteJZh4xxNm5zto,5391
 pycontrails/datalib/goes.py,sha256=_TB32tGWxumASOEZUQ_PwGWz8QMZPTJf8pG4jbPR-WY,34358
-pycontrails/datalib/landsat.py,sha256=r6366rEF7fOA7mT5KySCPGJplgGE5LvBw5fMqk-U1oM,19697
+pycontrails/datalib/landsat.py,sha256=6ylDkAjnyX7b4ZbHn4bprO8HB8ADPFyMkwWehIs8FLg,20915
 pycontrails/datalib/__init__.py,sha256=hW9NWdFPC3y_2vHMteQ7GgQdop3917MkDaf5ZhU2RBY,369
-pycontrails/datalib/sentinel.py,sha256=hYSxIlQnyJHqtHWlKn73HOK_1pm-_IbGebmkHnh4UcA,17172
+pycontrails/datalib/sentinel.py,sha256=ed1l1avq8lBvQinY_vNSsWRcpqxUdAPY61AGyPcLawo,23532
 pycontrails/datalib/_met_utils/metsource.py,sha256=B4Gd9gkfMMlXe-xc_xcNNZAJ0gOeRelvrBsFyk6tEs4,24151
 pycontrails/datalib/ecmwf/arco_era5.py,sha256=7HXQU5S02PzX9Ew2ZrDKSp0tDEG1eeVAvbP3decmm20,12437
 pycontrails/datalib/ecmwf/era5.py,sha256=4ULNdDlUN0kP6Tbp8D_-Bc12nAsLf0iNfZaDoj_AoZU,18952
@@ -39,15 +39,19 @@ pycontrails/datalib/ecmwf/common.py,sha256=qRMSzDQikGMi3uqvz-Y57e3biHPzSoVMfUwOu
 pycontrails/datalib/ecmwf/model_levels.py,sha256=_kgpnogaS6MlfvTX9dB5ASTHFUlZuQ_DRb-VADwEa0k,16996
 pycontrails/datalib/ecmwf/ifs.py,sha256=0swHe6tFc5Fbu9e4_jREW0H-xYHYLtxjNoE3aUUlgvc,10761
 pycontrails/datalib/ecmwf/static/model_level_dataframe_v20240418.csv,sha256=PmvGLRzn6uuCKSwiasSuVcehvvmSaqP7cnLuN6hhCQQ,9788
-pycontrails/datalib/_leo_utils/vis.py,sha256=-fLcm1D5cP6lThVHovV3MJSiadWyTUAvYDMvr4drMU4,1802
-pycontrails/datalib/_leo_utils/search.py,sha256=r87T2OV4qH1pYI2YznvsBL042f4RKxD3OA2snd3-kDI,8687
-pycontrails/datalib/_leo_utils/static/bq_roi_query.sql,sha256=xq6-tJyz0-bUwW0KjQymqygjH3WlQBmyBtP7Ci7SBe8,260
 pycontrails/datalib/gfs/gfs.py,sha256=3tFiR7IObHcFmhGOdb-SJ7QQJSk6tF_6qkyi-pLrIdE,22393
 pycontrails/datalib/gfs/variables.py,sha256=4ALR4zhYW8tQVlNVHrd0CK8oRNSe_2OkW3ELeaImtAI,3135
 pycontrails/datalib/gfs/__init__.py,sha256=pXNjb9cJC6ngpuCnoHnmVZ2RHzbHZ0AlsyGvgcdcl2E,684
 pycontrails/datalib/spire/spire.py,sha256=h25BVgSr7E71Ox3-y9WgqFvp-54L08yzb2Ou-iMl7wM,24242
 pycontrails/datalib/spire/__init__.py,sha256=3-My8yQItS6PL0DqXgNaltLqvN6T7nbnNnLD-sy7kt4,186
 pycontrails/datalib/spire/exceptions.py,sha256=U0V_nZTLhxJwrzldvU9PdESx8-zLddRH3FmzkJyFyrI,1714
+pycontrails/datalib/leo_utils/sentinel_metadata.py,sha256=h5ieEwtmeAAtiIBdfOF8HaoE121ba0DrKb7dLvuaAeI,25506
+pycontrails/datalib/leo_utils/landsat_metadata.py,sha256=B455-Yq6HTj0Se0dS4c_2F5ZjcATu2yNK1gyoIlgLMg,10628
+pycontrails/datalib/leo_utils/__init__.py,sha256=-SEAc1f7zEbJHcKjgwLuhnIwte9W-ystFNLvfC4RE94,213
+pycontrails/datalib/leo_utils/vis.py,sha256=-fLcm1D5cP6lThVHovV3MJSiadWyTUAvYDMvr4drMU4,1802
+pycontrails/datalib/leo_utils/search.py,sha256=KbHQ2GARacDuUz3zEJuATSga-R32dQFVTqhZgndHUZI,8686
+pycontrails/datalib/leo_utils/correction.py,sha256=cHf4PhHNYMqdVAFYNiTnjcVyqr1vCBMCKi0IjKB_3pw,9564
+pycontrails/datalib/leo_utils/static/bq_roi_query.sql,sha256=xq6-tJyz0-bUwW0KjQymqygjH3WlQBmyBtP7Ci7SBe8,260
 pycontrails/ext/synthetic_flight.py,sha256=wROBQErfr_IhEPndC97fuWbnZQega2Z89VhzoXzZMO8,16802
 pycontrails/ext/cirium.py,sha256=DFPfRwLDwddpucAPRQhyT4bDGh0VvvoViMUd3pidam8,415
 pycontrails/ext/empirical_grid.py,sha256=FPNQA0x4nVwBXFlbs3DgIapSrXFYhoc8b8IX0M4xhBc,4363
@@ -58,14 +62,14 @@ pycontrails/utils/types.py,sha256=1AaY1x_qGlYAl08xg6PS0MPKm3OZwFBM7xLI_nHK7EY,48
 pycontrails/utils/temp.py,sha256=lGU0b_R8ze4yKlsOusHIIBaoNFBrmrB3vBjgHRlfcXk,1109
 pycontrails/utils/json.py,sha256=oTiO8xh603esfBGaGVmA5eUzR0NhAqNpQCegMMgnSbg,5896
 pycontrails/utils/dependencies.py,sha256=ATP45xYdUbIyGFzgbOe5SbokMytvB84TcexUEFnEUZE,2559
-pycontrails/models/extended_k15.py,sha256=2-j7ScdQnQLrZhzYJMTCUnOPBwy08p0fqZUNA3rYwSM,48058
+pycontrails/models/extended_k15.py,sha256=uZ32wC5HNCJ5M9u4V4x10QoXn2hZRZy1tKcSvNJE0K4,47978
 pycontrails/models/pcc.py,sha256=0Qdl4u8PmUEpNYd398glTChkbTwsh83wYPt0Bmi8qd8,11068
 pycontrails/models/tau_cirrus.py,sha256=2Z4egt-QFprkyITRgtarA5alOTTQRQbjzgmSqE49_1g,5778
 pycontrails/models/__init__.py,sha256=dQTOLQb7RdUdUwslt5se__5y_ymbInBexQmNrmAeOdE,33
 pycontrails/models/issr.py,sha256=_qIKDgO0Owxeb0Q4WJlxcn1FJEvF3QDU-cqh2fpDsBo,7404
 pycontrails/models/sac.py,sha256=8Vx5wg4-Kb8l4GK67wp7VNVpdFM4Wyux1xKuNrjZ_IQ,15516
 pycontrails/models/accf.py,sha256=_tunWpw1sYW8ES8RvpdhNahXwaf4LwdHMEdXhv7-cCI,13566
-pycontrails/models/dry_advection.py,sha256=fy2Oa6FtYvjG-IrX2vMQe1QJ6pnRaRj4ZonECBdg5KA,20492
+pycontrails/models/dry_advection.py,sha256=3Vf-oug6an4WRHBOMlXZMsD7B6lx-ieMr-8mkSQyP3c,20496
 pycontrails/models/pcr.py,sha256=Xde0aF8cMV9jTQ_uI2UvdHSLqotVUgPutb1Wgq7LtfY,5374
 pycontrails/models/emissions/__init__.py,sha256=CZB2zIkLUI3NGNmq2ddvRYjEtiboY6PWJjiEiXj_zII,478
 pycontrails/models/emissions/ffm2.py,sha256=mAvBHnp-p3hIn2fjKGq50eaMHi0jcb5hA5uXbJGeE9I,12068