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

{ecov002_calval_tables-1.1.0 → ecov002_calval_tables-1.2.0}/ECOv002_calval_tables/ECOv002_calval_tables.py

@@ -1,7 +1,9 @@
+import os
 
+import numpy as np
 import pandas as pd
-import os
 import geopandas as gpd
+
 from shapely.geometry import Point
 
 def load_combined_eco_flux_ec_filtered() -> pd.DataFrame:
@@ -40,36 +42,23 @@ def load_calval_table() -> gpd.GeoDataFrame:
         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
-    })
-
+    # Merge all columns from both tables, matching tower_data_df.ID to tower_locations_gdf["Site ID"]
     merged_df = pd.merge(
-        left=model_inputs_df,
-        right=tower_static_data_gdf,
+        tower_data_df,
+        tower_locations_gdf,
         left_on="ID",
-        right_on="ID",
-        how="left"
+        right_on="Site ID",
+        how="left",
+        suffixes=("", "_meta")
     )
 
+    merged_df["time_UTC"] = merged_df["eco_time_utc"]
+    merged_df["ST_K"] = np.array(merged_df.LST)
+    merged_df["ST_C"] = merged_df.ST_K - 273.15
+    merged_df["Ta_C"] = np.array(merged_df.Ta)
+
     # 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-1.2.0}/ECOv002_calval_tables.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ECOv002-calval-tables
-Version: 1.1.0
+Version: 1.2.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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ECOv002-calval-tables
-Version: 1.1.0
+Version: 1.2.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

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

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