ECOv002-calval-tables 1.0.1__py3-none-any.whl → 1.1.0__py3-none-any.whl

ECOv002_calval_tables/ECOv002_calval_tables.py

@@ -1,6 +1,8 @@
 
 import pandas as pd
 import os
+import geopandas as gpd
+from shapely.geometry import Point
 
 def load_combined_eco_flux_ec_filtered() -> pd.DataFrame:
     """
@@ -12,11 +14,62 @@ def load_combined_eco_flux_ec_filtered() -> pd.DataFrame:
     return pd.read_csv(os.path.join(os.path.dirname(__file__), 'combined_eco_flux_EC_filtered.csv'))
 
 
-def load_metadata_ebc_filt() -> pd.DataFrame:
+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.
     """
-    return pd.read_csv(os.path.join(os.path.dirname(__file__), 'metadata_ebc_filt.csv'))
+    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/version.py

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

{ecov002_calval_tables-1.0.1.dist-info → ecov002_calval_tables-1.1.0.dist-info}/METADATA

@@ -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.1.0.dist-info/RECORD

@@ -0,0 +1,10 @@
+ECOv002_calval_tables/ECOv002_calval_tables.py,sha256=7BZhZRcFYsVcsNtgYmmrTrVP0bFqIwvXgEqspN-Kvyc,2905
+ECOv002_calval_tables/__init__.py,sha256=oO0pVascuJs247UwpXq2o23wQPThM1bWEwUhSYiNzMY,60
+ECOv002_calval_tables/combined_eco_flux_EC_filtered.csv,sha256=uSRv1CBMJKUWBgtMlRHB1359kiUFUL1ez2c4m7C4DxU,745225
+ECOv002_calval_tables/metadata_ebc_filt.csv,sha256=74AeCH5DG2Zu8ZFBXUZAW95hlsCjK9K3t6BWRRReR3s,13975
+ECOv002_calval_tables/version.py,sha256=DOnf2BIAf7HAp9SIUIetrDgRoZDL0o7JuKSiC7_ZT_I,87
+ecov002_calval_tables-1.1.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ecov002_calval_tables-1.1.0.dist-info/METADATA,sha256=I6MyKw_lS1PHF5n8we7wwMk43HEknc48bHw4UvEYruI,3171
+ecov002_calval_tables-1.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ecov002_calval_tables-1.1.0.dist-info/top_level.txt,sha256=ePbA84g_XQHWQUAQEVo6gmyuW0WLUzPg2IfHyoGqUqg,22
+ecov002_calval_tables-1.1.0.dist-info/RECORD,,

ecov002_calval_tables-1.0.1.dist-info/RECORD

@@ -1,9 +0,0 @@
-ECOv002_calval_tables/ECOv002_calval_tables.py,sha256=t06ICMGPlyhuB_9EUkuASu8P_jXYk8CKbTRfTi7JOn8,1094
-ECOv002_calval_tables/__init__.py,sha256=oO0pVascuJs247UwpXq2o23wQPThM1bWEwUhSYiNzMY,60
-ECOv002_calval_tables/combined_eco_flux_EC_filtered.csv,sha256=uSRv1CBMJKUWBgtMlRHB1359kiUFUL1ez2c4m7C4DxU,745225
-ECOv002_calval_tables/metadata_ebc_filt.csv,sha256=74AeCH5DG2Zu8ZFBXUZAW95hlsCjK9K3t6BWRRReR3s,13975
-ecov002_calval_tables-1.0.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ecov002_calval_tables-1.0.1.dist-info/METADATA,sha256=rFDwBUarZI1w2sFpcy_EE8p7fTW2hxNk9JUd20NoXGo,3010
-ecov002_calval_tables-1.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ecov002_calval_tables-1.0.1.dist-info/top_level.txt,sha256=ePbA84g_XQHWQUAQEVo6gmyuW0WLUzPg2IfHyoGqUqg,22
-ecov002_calval_tables-1.0.1.dist-info/RECORD,,