RadGEEToolbox 1.6.8__py3-none-any.whl → 1.6.9__py3-none-any.whl

RadGEEToolbox/LandsatCollection.py

@@ -2879,6 +2879,7 @@ class LandsatCollection:
     def iterate_zonal_stats(
         self,
         geometries,
+        band=None,
         reducer_type="mean",
         scale=30,
         geometry_names=None,
@@ -2894,6 +2895,7 @@ class LandsatCollection:
 
         Args:
             geometries (ee.Geometry, ee.Feature, ee.FeatureCollection, list, or tuple): Input geometries for which to extract statistics. Can be a single ee.Geometry, an ee.Feature, an ee.FeatureCollection, a list of (lon, lat) tuples, or a list of ee.Geometry objects. Be careful to NOT provide coordinates as (lat, lon)!
+            band (str, optional): The name of the band to use for statistics. If None, the first band is used. Defaults to None.
             reducer_type (str, optional): The ee.Reducer to use, e.g., 'mean', 'median', 'max', 'sum'. Defaults to 'mean'. Any ee.Reducer method can be used.
             scale (int, optional): Pixel scale in meters for the reduction. Defaults to 30.
             geometry_names (list, optional): A list of string names for the geometries. If provided, must match the number of geometries. Defaults to None.
@@ -2911,6 +2913,12 @@ class LandsatCollection:
             TypeError: If geometries input type is unsupported.
         """
         img_collection_obj = self
+        if band:
+            img_collection_obj = LandsatCollection(collection=img_collection_obj.collection.select(band))
+        else: 
+            first_image = img_collection_obj.image_grab(0)
+            first_band = first_image.bandNames().get(0)
+            img_collection_obj = LandsatCollection(collection=img_collection_obj.collection.select([first_band]))
         # Filter collection by dates if provided
         if dates:
             img_collection_obj = LandsatCollection(
@@ -2993,18 +3001,33 @@ class LandsatCollection:
             stats_fc = image.reduceRegions(
                 collection=features, reducer=reducer, scale=scale, tileScale=tileScale
             )
-            return stats_fc.map(lambda f: f.set('image_date', image_date))
+
+            def guarantee_reducer_property(f):
+                has_property = f.propertyNames().contains(reducer_type)
+                return ee.Algorithms.If(has_property, f, f.set(reducer_type, -9999))
+            fixed_stats_fc = stats_fc.map(guarantee_reducer_property)
+
+            return fixed_stats_fc.map(lambda f: f.set('image_date', image_date))
 
         results_fc = ee.FeatureCollection(img_collection_obj.collection.map(calculate_stats_for_image)).flatten()
         df = LandsatCollection.ee_to_df(results_fc, remove_geom=True)
 
         # Checking for issues
         if df.empty: 
-            print("No results found for the given parameters. Check if the geometries intersect with the images, if the dates filter is too restrictive, or if the provided bands are empty.")
-            return df
+            # print("No results found for the given parameters. Check if the geometries intersect with the images, if the dates filter is too restrictive, or if the provided bands are empty.")
+            # return df
+            raise ValueError("No results found for the given parameters. Check if the geometries intersect with the images, if the dates filter is too restrictive, or if the provided bands are empty.")
         if reducer_type not in df.columns:
             print(f"Warning: Reducer '{reducer_type}' not found in results.")
-            return df
+            # return df
+
+        # Get the number of rows before dropping nulls for a helpful message
+        initial_rows = len(df)
+        df.dropna(subset=[reducer_type], inplace=True)
+        df = df[df[reducer_type] != -9999]
+        dropped_rows = initial_rows - len(df)
+        if dropped_rows > 0:
+            print(f"Warning: Discarded {dropped_rows} results due to failed reductions (e.g., no valid pixels in geometry).")
 
         # Reshape DataFrame to have dates as index and geometry names as columns
         pivot_df = df.pivot(index='image_date', columns='geo_name', values=reducer_type)

RadGEEToolbox/Sentinel1Collection.py

@@ -1634,6 +1634,7 @@ class Sentinel1Collection:
     def iterate_zonal_stats(
         self,
         geometries,
+        band=None,
         reducer_type="mean",
         scale=10,
         geometry_names=None,
@@ -1649,6 +1650,7 @@ class Sentinel1Collection:
 
         Args:
             geometries (ee.Geometry, ee.Feature, ee.FeatureCollection, list, or tuple): Input geometries for which to extract statistics. Can be a single ee.Geometry, an ee.Feature, an ee.FeatureCollection, a list of (lon, lat) tuples, or a list of ee.Geometry objects. Be careful to NOT provide coordinates as (lat, lon)!
+            band (str, optional): The name of the band to use for statistics. If None, the first band is used. Defaults to None.
             reducer_type (str, optional): The ee.Reducer to use, e.g., 'mean', 'median', 'max', 'sum'. Defaults to 'mean'. Any ee.Reducer method can be used.
             scale (int, optional): Pixel scale in meters for the reduction. Defaults to 10.
             geometry_names (list, optional): A list of string names for the geometries. If provided, must match the number of geometries. Defaults to None.
@@ -1666,6 +1668,12 @@ class Sentinel1Collection:
             TypeError: If geometries input type is unsupported.
         """
         img_collection_obj = self
+        if band:
+            img_collection_obj = Sentinel1Collection(collection=img_collection_obj.collection.select(band))
+        else: 
+            first_image = img_collection_obj.image_grab(0)
+            first_band = first_image.bandNames().get(0)
+            img_collection_obj = Sentinel1Collection(collection=img_collection_obj.collection.select([first_band]))
         # Filter collection by dates if provided
         if dates:
             img_collection_obj = Sentinel1Collection(
@@ -1748,18 +1756,33 @@ class Sentinel1Collection:
             stats_fc = image.reduceRegions(
                 collection=features, reducer=reducer, scale=scale, tileScale=tileScale
             )
-            return stats_fc.map(lambda f: f.set('image_date', image_date))
+
+            def guarantee_reducer_property(f):
+                has_property = f.propertyNames().contains(reducer_type)
+                return ee.Algorithms.If(has_property, f, f.set(reducer_type, -9999))
+            fixed_stats_fc = stats_fc.map(guarantee_reducer_property)
+
+            return fixed_stats_fc.map(lambda f: f.set('image_date', image_date))
 
         results_fc = ee.FeatureCollection(img_collection_obj.collection.map(calculate_stats_for_image)).flatten()
         df = Sentinel1Collection.ee_to_df(results_fc, remove_geom=True)
 
         # Checking for issues
         if df.empty: 
-            print("No results found for the given parameters. Check if the geometries intersect with the images, if the dates filter is too restrictive, or if the provided bands are empty.")
-            return df
+            # print("No results found for the given parameters. Check if the geometries intersect with the images, if the dates filter is too restrictive, or if the provided bands are empty.")
+            # return df
+            raise ValueError("No results found for the given parameters. Check if the geometries intersect with the images, if the dates filter is too restrictive, or if the provided bands are empty.")
         if reducer_type not in df.columns:
             print(f"Warning: Reducer '{reducer_type}' not found in results.")
-            return df
+            # return df
+
+        # Get the number of rows before dropping nulls for a helpful message
+        initial_rows = len(df)
+        df.dropna(subset=[reducer_type], inplace=True)
+        df = df[df[reducer_type] != -9999]
+        dropped_rows = initial_rows - len(df)
+        if dropped_rows > 0:
+            print(f"Warning: Discarded {dropped_rows} results due to failed reductions (e.g., no valid pixels in geometry).")
 
         # Reshape DataFrame to have dates as index and geometry names as columns
         pivot_df = df.pivot(index='image_date', columns='geo_name', values=reducer_type)

RadGEEToolbox/Sentinel2Collection.py

@@ -4,7 +4,7 @@ import numpy as np
 
 
 # ---- Reflectance scaling for Sentinel-2 L2A (HARMONIZED) ----
-_S2_SR_BANDS = ["B1","B2","B3","B4","B5","B6","B7","B8","B8A","B9","B10","B11","B12"]
+_S2_SR_BANDS = ["B1","B2","B3","B4","B5","B6","B7","B8","B8A","B9","B11","B12"]
 _S2_SCALE = 0.0001  # offset 0.0
 
 def _scale_s2_sr(img):
@@ -2497,18 +2497,33 @@ class Sentinel2Collection:
             stats_fc = image.reduceRegions(
                 collection=features, reducer=reducer, scale=scale, tileScale=tileScale
             )
-            return stats_fc.map(lambda f: f.set('image_date', image_date))
+
+            def guarantee_reducer_property(f):
+                has_property = f.propertyNames().contains(reducer_type)
+                return ee.Algorithms.If(has_property, f, f.set(reducer_type, -9999))
+            fixed_stats_fc = stats_fc.map(guarantee_reducer_property)
+
+            return fixed_stats_fc.map(lambda f: f.set('image_date', image_date))
 
         results_fc = ee.FeatureCollection(img_collection_obj.collection.map(calculate_stats_for_image)).flatten()
         df = Sentinel2Collection.ee_to_df(results_fc, remove_geom=True)
 
         # Checking for issues
         if df.empty: 
-            print("No results found for the given parameters. Check if the geometries intersect with the images, if the dates filter is too restrictive, or if the provided bands are empty.")
-            return df
+            # print("No results found for the given parameters. Check if the geometries intersect with the images, if the dates filter is too restrictive, or if the provided bands are empty.")
+            # return df
+            raise ValueError("No results found for the given parameters. Check if the geometries intersect with the images, if the dates filter is too restrictive, or if the provided bands are empty.")
         if reducer_type not in df.columns:
             print(f"Warning: Reducer '{reducer_type}' not found in results.")
-            return df
+            # return df
+
+        # Get the number of rows before dropping nulls for a helpful message
+        initial_rows = len(df)
+        df.dropna(subset=[reducer_type], inplace=True)
+        df = df[df[reducer_type] != -9999]
+        dropped_rows = initial_rows - len(df)
+        if dropped_rows > 0:
+            print(f"Warning: Discarded {dropped_rows} results due to failed reductions (e.g., no valid pixels in geometry).")
 
         # Reshape DataFrame to have dates as index and geometry names as columns
         pivot_df = df.pivot(index='image_date', columns='geo_name', values=reducer_type)

RadGEEToolbox/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.6.8"
+__version__ = "1.6.9"
 
 from .CollectionStitch import CollectionStitch, MosaicByDate
 from .GetPalette import get_palette

{radgeetoolbox-1.6.8.dist-info → radgeetoolbox-1.6.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RadGEEToolbox
-Version: 1.6.8
+Version: 1.6.9
 Summary: Streamlined Multispectral & SAR Analysis for Google Earth Engine Python API
 Home-page: https://github.com/radwinskis/RadGEEToolbox
 Author: Mark Radwin
@@ -172,15 +172,15 @@ _____________
 
 ### Installing via pip
 
-To install `RadGEEToolbox` version 1.6.8 using pip (NOTE: it is recommended to create a new virtual environment):
+To install `RadGEEToolbox` version 1.6.9 using pip (NOTE: it is recommended to create a new virtual environment):
 
 ```bash
-pip install RadGEEToolbox==1.6.8
+pip install RadGEEToolbox==1.6.9
 ```
 
 ### Installing via Conda
 
-To install `RadGEEToolbox` version 1.6.8 using conda-forge (NOTE: it is recommended to create a new virtual environment):
+To install `RadGEEToolbox` version 1.6.9 using conda-forge (NOTE: it is recommended to create a new virtual environment):
 
 ```bash
 conda install conda-forge::radgeetoolbox
@@ -211,7 +211,7 @@ To verify that `RadGEEToolbox` was installed correctly:
 python -c "import RadGEEToolbox; print(RadGEEToolbox.__version__)"
 ```
 
-You should see `1.6.8` printed as the version number.
+You should see `1.6.9` printed as the version number.
 
 ### Want to Visualize Data? Install These Too
 

radgeetoolbox-1.6.9.dist-info/RECORD

@@ -0,0 +1,12 @@
+RadGEEToolbox/CollectionStitch.py,sha256=dLRzJZLZ1QTJqqbWPElyTjxb1m0T_WuBTo6wNzcCXq4,3884
+RadGEEToolbox/GetPalette.py,sha256=YpAE9lzI5aXWHJKs1SXwZ62e8nKo8zfjKSpz5oJQSA8,2872
+RadGEEToolbox/LandsatCollection.py,sha256=HlO-J2occ5Do5tCijI-cR1OJsbX_Zz7qASuLO-cMRYQ,146542
+RadGEEToolbox/Sentinel1Collection.py,sha256=mG0JiRcds5oyjNtOrToMTQunBaJgwZJsvM8gIpfTypc,87632
+RadGEEToolbox/Sentinel2Collection.py,sha256=Y4aAupQgx6H9-oRZN9u7Qyc4pR2gWVGnkoqLt6hSQtM,116567
+RadGEEToolbox/VisParams.py,sha256=4aQV4l_IA-CjMBUXYDDLQ2fQyA3USSRN0A3VY07dGQ8,8571
+RadGEEToolbox/__init__.py,sha256=ef7g5CJ2yM82g3fFlJc0wVcC-9qRN-B_uibyz8At1Lo,530
+radgeetoolbox-1.6.9.dist-info/licenses/LICENSE.txt,sha256=5Xj9dwVkawz6d8zhCwJy0SmXvm0U4K_msJnOrkHLO1w,1089
+radgeetoolbox-1.6.9.dist-info/METADATA,sha256=KTRVJ2W4wLn-_L-eaZB6dWJWbQa3onEfKJInNJk4Fs4,15571
+radgeetoolbox-1.6.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radgeetoolbox-1.6.9.dist-info/top_level.txt,sha256=W2E520tugQoptDkhctKFbzsheL2l_DyYLKqKXkD9G_E,14
+radgeetoolbox-1.6.9.dist-info/RECORD,,

radgeetoolbox-1.6.8.dist-info/RECORD

@@ -1,12 +0,0 @@
-RadGEEToolbox/CollectionStitch.py,sha256=dLRzJZLZ1QTJqqbWPElyTjxb1m0T_WuBTo6wNzcCXq4,3884
-RadGEEToolbox/GetPalette.py,sha256=YpAE9lzI5aXWHJKs1SXwZ62e8nKo8zfjKSpz5oJQSA8,2872
-RadGEEToolbox/LandsatCollection.py,sha256=_ATVLz_7NDYbPZeg1mpk9RVltI9RA9H001phS71uHns,145106
-RadGEEToolbox/Sentinel1Collection.py,sha256=zd5XlxOZk80SeCN7OlOlpJfYstfXD90EawIWD9Mvghs,86192
-RadGEEToolbox/Sentinel2Collection.py,sha256=EGKq2bREsge7LCXrBmcVNFUafHIzykj9QajZmLmimb8,115660
-RadGEEToolbox/VisParams.py,sha256=4aQV4l_IA-CjMBUXYDDLQ2fQyA3USSRN0A3VY07dGQ8,8571
-RadGEEToolbox/__init__.py,sha256=Ij9uuIlvwFR39Ms6xYq5kih7AdjmO0366kYnME_KTsI,530
-radgeetoolbox-1.6.8.dist-info/licenses/LICENSE.txt,sha256=5Xj9dwVkawz6d8zhCwJy0SmXvm0U4K_msJnOrkHLO1w,1089
-radgeetoolbox-1.6.8.dist-info/METADATA,sha256=xAnfdPUVfPG54h5dJIiiYxHodaECGTeOMN5NmdVMvjw,15571
-radgeetoolbox-1.6.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radgeetoolbox-1.6.8.dist-info/top_level.txt,sha256=W2E520tugQoptDkhctKFbzsheL2l_DyYLKqKXkD9G_E,14
-radgeetoolbox-1.6.8.dist-info/RECORD,,