ECOv002-calval-tables 1.0.1__tar.gz → 1.1.0__tar.gz

ecov002_calval_tables-1.1.0/ECOv002_calval_tables/ECOv002_calval_tables.py

@@ -0,0 +1,75 @@
+
+import pandas as pd
+import os
+import geopandas as gpd
+from shapely.geometry import Point
+
+def load_combined_eco_flux_ec_filtered() -> pd.DataFrame:
+    """
+    Load the filtered eddy covariance (EC) flux dataset used for ECOSTRESS Collection 2 ET product validation.
+    This dataset contains site-level, quality-controlled flux measurements that serve as ground truth for evaluating ECOSTRESS evapotranspiration estimates.
+    Returns:
+        pd.DataFrame: DataFrame of filtered EC flux data for validation analysis.
+    """
+    return pd.read_csv(os.path.join(os.path.dirname(__file__), 'combined_eco_flux_EC_filtered.csv'))
+
+
+def load_metadata_ebc_filt() -> gpd.GeoDataFrame:
+    """
+    Load the metadata for the filtered eddy covariance (EC) flux sites used in the ECOSTRESS Collection 2 validation study.
+    This table provides site information (location, climate, land cover, etc.) for interpreting and grouping the flux data in the validation analysis.
+    Returns:
+        pd.DataFrame: DataFrame of site metadata for the filtered EC flux dataset.
+    """
+    df = pd.read_csv(os.path.join(os.path.dirname(__file__), 'metadata_ebc_filt.csv'))
+    
+    if 'Lat' not in df.columns or 'Long' not in df.columns:
+        raise ValueError("metadata_ebc_filt.csv must contain 'Lat' and 'Long' columns.")
+    
+    geometry = [Point(xy) for xy in zip(df['Long'], df['Lat'])]
+    gdf = gpd.GeoDataFrame(df, geometry=geometry, crs="EPSG:4326")
+
+    return gdf
+
+def load_calval_table() -> gpd.GeoDataFrame:
+    """
+    Load the combined ECOSTRESS Collection 2 validation table, which includes both the filtered eddy covariance flux data
+    and the associated site metadata.
+    
+    Returns:
+        gpd.GeoDataFrame: Combined GeoDataFrame of EC flux data and site metadata for validation analysis.
+    """
+    tower_locations_gdf = load_metadata_ebc_filt()
+    tower_IDs = list(tower_locations_gdf["Site ID"])
+    tower_names = list(tower_locations_gdf.Name)
+    tower_geometries = tower_locations_gdf.geometry
+    tower_data_df = load_combined_eco_flux_ec_filtered()
+
+    tower_static_data_gdf = gpd.GeoDataFrame({
+        "ID": tower_IDs,
+        "name": tower_names,
+        "geometry": tower_geometries
+    }, crs="EPSG:4326")
+
+    observation_tower_IDs = list(tower_data_df.ID)
+    observation_tower_times_UTC = tower_data_df.eco_time_utc
+
+    model_inputs_df = pd.DataFrame({
+        "ID": observation_tower_IDs,
+        "time_UTC": observation_tower_times_UTC
+    })
+
+    merged_df = pd.merge(
+        left=model_inputs_df,
+        right=tower_static_data_gdf,
+        left_on="ID",
+        right_on="ID",
+        how="left"
+    )
+
+    # Convert merged DataFrame to GeoDataFrame
+    gdf = gpd.GeoDataFrame(merged_df, geometry=merged_df["geometry"], crs="EPSG:4326")
+    # Optionally, drop rows with missing geometry if needed:
+    # gdf = gdf[gdf.geometry.notnull()]
+    return gdf
+    return gdf

ecov002_calval_tables-1.1.0/ECOv002_calval_tables/version.py

@@ -0,0 +1,3 @@
+from importlib.metadata import version
+
+__version__ = version("ECOv002-calval-tables")

{ecov002_calval_tables-1.0.1 → ecov002_calval_tables-1.1.0}/ECOv002_calval_tables.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ECOv002-calval-tables
-Version: 1.0.1
+Version: 1.1.0
 Summary: Priestley-Taylor Jet Propulsion Laboratory Soil Moisutre Evapotranspiration Model
 Author-email: Gregory Halverson <gregory.h.halverson@jpl.nasa.gov>, Zoe Pierrat <zoe.a.pierrat@jpl.nasa.gov>
 Project-URL: Homepage, https://github.com/gregory-halverson/ECOv002-calval-tables
@@ -21,10 +21,12 @@ Requires-Dist: twine; extra == "dev"
 Dynamic: license-file
 
 
-# ECOSTRESS Collection 2 Calibration/Validation Data Tables (Python Package)
+# ECOSTRESS Collection 2 Calibration/Validation Data Tables
 
 This Python package provides calibration and validation data tables used in the evaluation of the ECOSTRESS Collection 2 Evapotranspiration (ET) data products. The included datasets and loader functions support reproducible research and validation workflows for ET modeling and remote sensing studies.
 
+The CSV files used in this repository were sourced from the [@zoepierrat/ECOSTRESS_C2_L3_ET_Validation](https://github.com/zoepierrat/ECOSTRESS_C2_L3_ET_Validation) repository.
+
 ## Authors
 
 Zoe Pierrat (she/her)  

{ecov002_calval_tables-1.0.1 → ecov002_calval_tables-1.1.0}/ECOv002_calval_tables.egg-info/SOURCES.txt

@@ -5,8 +5,13 @@ ECOv002_calval_tables/ECOv002_calval_tables.py
 ECOv002_calval_tables/__init__.py
 ECOv002_calval_tables/combined_eco_flux_EC_filtered.csv
 ECOv002_calval_tables/metadata_ebc_filt.csv
+ECOv002_calval_tables/version.py
 ECOv002_calval_tables.egg-info/PKG-INFO
 ECOv002_calval_tables.egg-info/SOURCES.txt
 ECOv002_calval_tables.egg-info/dependency_links.txt
 ECOv002_calval_tables.egg-info/requires.txt
-ECOv002_calval_tables.egg-info/top_level.txt
+ECOv002_calval_tables.egg-info/top_level.txt
+tests/test_import_ECOv002_calval_tables.py
+tests/test_import_dependencies.py
+tests/test_load_calval_table.py
+tests/test_load_metadata_ebc_filt.py

{ecov002_calval_tables-1.0.1 → ecov002_calval_tables-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ECOv002-calval-tables
-Version: 1.0.1
+Version: 1.1.0
 Summary: Priestley-Taylor Jet Propulsion Laboratory Soil Moisutre Evapotranspiration Model
 Author-email: Gregory Halverson <gregory.h.halverson@jpl.nasa.gov>, Zoe Pierrat <zoe.a.pierrat@jpl.nasa.gov>
 Project-URL: Homepage, https://github.com/gregory-halverson/ECOv002-calval-tables
@@ -21,10 +21,12 @@ Requires-Dist: twine; extra == "dev"
 Dynamic: license-file
 
 
-# ECOSTRESS Collection 2 Calibration/Validation Data Tables (Python Package)
+# ECOSTRESS Collection 2 Calibration/Validation Data Tables
 
 This Python package provides calibration and validation data tables used in the evaluation of the ECOSTRESS Collection 2 Evapotranspiration (ET) data products. The included datasets and loader functions support reproducible research and validation workflows for ET modeling and remote sensing studies.
 
+The CSV files used in this repository were sourced from the [@zoepierrat/ECOSTRESS_C2_L3_ET_Validation](https://github.com/zoepierrat/ECOSTRESS_C2_L3_ET_Validation) repository.
+
 ## Authors
 
 Zoe Pierrat (she/her)  

{ecov002_calval_tables-1.0.1 → ecov002_calval_tables-1.1.0}/README.md

@@ -1,8 +1,10 @@
 
-# ECOSTRESS Collection 2 Calibration/Validation Data Tables (Python Package)
+# ECOSTRESS Collection 2 Calibration/Validation Data Tables
 
 This Python package provides calibration and validation data tables used in the evaluation of the ECOSTRESS Collection 2 Evapotranspiration (ET) data products. The included datasets and loader functions support reproducible research and validation workflows for ET modeling and remote sensing studies.
 
+The CSV files used in this repository were sourced from the [@zoepierrat/ECOSTRESS_C2_L3_ET_Validation](https://github.com/zoepierrat/ECOSTRESS_C2_L3_ET_Validation) repository.
+
 ## Authors
 
 Zoe Pierrat (she/her)  

{ecov002_calval_tables-1.0.1 → ecov002_calval_tables-1.1.0}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"]
 
 [project]
 name = "ECOv002-calval-tables"
-version = "1.0.1"
+version = "1.1.0"
 description = "Priestley-Taylor Jet Propulsion Laboratory Soil Moisutre Evapotranspiration Model"
 readme = "README.md"
 authors = [

ecov002_calval_tables-1.1.0/tests/test_import_ECOv002_calval_tables.py

@@ -0,0 +1,2 @@
+def test_import_ECOv002_calval_tables():
+    import ECOv002_calval_tables

ecov002_calval_tables-1.1.0/tests/test_import_dependencies.py

@@ -0,0 +1,12 @@
+import pytest
+
+# List of dependencies
+dependencies = [
+    "pandas",
+    "geopandas"
+]
+
+# Generate individual test functions for each dependency
+@pytest.mark.parametrize("dependency", dependencies)
+def test_dependency_import(dependency):
+    __import__(dependency)

ecov002_calval_tables-1.1.0/tests/test_load_calval_table.py

@@ -0,0 +1,14 @@
+import unittest
+import geopandas as gpd
+from ECOv002_calval_tables import load_calval_table
+
+class TestLoadCalvalTable(unittest.TestCase):
+    def test_returns_geodataframe_with_valid_geometry(self):
+        gdf = load_calval_table()
+        self.assertIsInstance(gdf, gpd.GeoDataFrame)
+        self.assertIn('geometry', gdf.columns)
+        self.assertTrue(all(gdf.geometry.geom_type == 'Point'))
+        self.assertTrue(gdf.geometry.is_valid.all())
+
+if __name__ == "__main__":
+    unittest.main()

ecov002_calval_tables-1.1.0/tests/test_load_metadata_ebc_filt.py

@@ -0,0 +1,15 @@
+import unittest
+import geopandas as gpd
+from ECOv002_calval_tables import load_metadata_ebc_filt
+
+class TestLoadMetadataEbcFilt(unittest.TestCase):
+    def test_returns_geodataframe_with_valid_geometry(self):
+        gdf = load_metadata_ebc_filt()
+        self.assertIsInstance(gdf, gpd.GeoDataFrame)
+        self.assertIn('geometry', gdf.columns)
+        # Check all geometries are valid Points
+        self.assertTrue(all(gdf.geometry.geom_type == 'Point'))
+        self.assertTrue(gdf.geometry.is_valid.all())
+
+if __name__ == "__main__":
+    unittest.main()

ecov002_calval_tables-1.0.1/ECOv002_calval_tables/ECOv002_calval_tables.py

@@ -1,22 +0,0 @@
-
-import pandas as pd
-import os
-
-def load_combined_eco_flux_ec_filtered() -> pd.DataFrame:
-    """
-    Load the filtered eddy covariance (EC) flux dataset used for ECOSTRESS Collection 2 ET product validation.
-    This dataset contains site-level, quality-controlled flux measurements that serve as ground truth for evaluating ECOSTRESS evapotranspiration estimates.
-    Returns:
-        pd.DataFrame: DataFrame of filtered EC flux data for validation analysis.
-    """
-    return pd.read_csv(os.path.join(os.path.dirname(__file__), 'combined_eco_flux_EC_filtered.csv'))
-
-
-def load_metadata_ebc_filt() -> pd.DataFrame:
-    """
-    Load the metadata for the filtered eddy covariance (EC) flux sites used in the ECOSTRESS Collection 2 validation study.
-    This table provides site information (location, climate, land cover, etc.) for interpreting and grouping the flux data in the validation analysis.
-    Returns:
-        pd.DataFrame: DataFrame of site metadata for the filtered EC flux dataset.
-    """
-    return pd.read_csv(os.path.join(os.path.dirname(__file__), 'metadata_ebc_filt.csv'))