test: fix tests for parkserve, pwd parcels

Author: nlebovits

data/src/config/config.py

@@ -1,7 +1,7 @@
 import logging
 from pathlib import Path
 
-FORCE_RELOAD = True
+FORCE_RELOAD = False
 """ During the data load, whether to query the various GIS API services for the data to load. If True, will query the
 API services and report on data differences.  If false will read the cached data."""
 
@@ -14,7 +14,7 @@
 CACHE_FRACTION = 0.05
 """The fraction used to cache portions of the pipeline's transformed data in each step of the pipeline."""
 
-log_level: int = logging.WARN
+log_level: int = logging.INFO
 """ overall log level for the project """
 
 report_to_slack_channel: str = ""

data/src/data_utils/park_priority.py

@@ -11,35 +11,26 @@
 from ..utilities import spatial_join
 
 
-@validate_output(ParkPriorityOutputValidator)
-def park_priority(
+def _park_priority_logic(
     input_gdf: gpd.GeoDataFrame,
 ) -> Tuple[gpd.GeoDataFrame, ValidationResult]:
     """
-    Associates properties with park priority areas for Philadelphia using TPL's FeatureServer.
+    Core business logic for park priority processing.
 
-    This function loads park priority data from TPL's ESRI FeatureServer and performs
-    a spatial join with the input GeoDataFrame to associate properties with their
-    park priority scores.
+    This function contains the actual logic for:
+    - Loading park priority data from ESRI
+    - Renaming columns
+    - Performing spatial joins
+    - Returning results
+
+    This function can be tested independently without the validation decorator.
 
     Args:
         input_gdf (gpd.GeoDataFrame): The input GeoDataFrame containing property data.
 
     Returns:
         Tuple[gpd.GeoDataFrame, ValidationResult]: The input GeoDataFrame with park
         priority data joined and the validation result.
-
-    Tagline:
-        Labels high-priority park areas.
-
-    Columns Added:
-        park_priority (float): The park priority score from TPL's analysis.
-
-    Primary Feature Layer Columns Referenced:
-        opa_id, geometry
-
-    Source:
-        https://server7.tplgis.org/arcgis7/rest/services/ParkServe/ParkServe_ProdNew/FeatureServer/6/
     """
     start_time = time.time()
     print(f"Starting park_priority function at {time.strftime('%H:%M:%S')}")
@@ -118,3 +109,36 @@ def park_priority(
     print(f"Function completed at {time.strftime('%H:%M:%S')}")
 
     return merged_gdf, input_validation
+
+
+@validate_output(ParkPriorityOutputValidator)
+def park_priority(
+    input_gdf: gpd.GeoDataFrame,
+) -> Tuple[gpd.GeoDataFrame, ValidationResult]:
+    """
+    Associates properties with park priority areas for Philadelphia using TPL's FeatureServer.
+
+    This function loads park priority data from TPL's ESRI FeatureServer and performs
+    a spatial join with the input GeoDataFrame to associate properties with their
+    park priority scores.
+
+    Args:
+        input_gdf (gpd.GeoDataFrame): The input GeoDataFrame containing property data.
+
+    Returns:
+        Tuple[gpd.GeoDataFrame, ValidationResult]: The input GeoDataFrame with park
+        priority data joined and the validation result.
+
+    Tagline:
+        Labels high-priority park areas.
+
+    Columns Added:
+        park_priority (float): The park priority score from TPL's analysis.
+
+    Primary Feature Layer Columns Referenced:
+        opa_id, geometry
+
+    Source:
+        https://server7.tplgis.org/arcgis7/rest/services/ParkServe/ParkServe_ProdNew/FeatureServer/6/
+    """
+    return _park_priority_logic(input_gdf)

data/src/data_utils/pwd_parcels.py

@@ -80,8 +80,7 @@ def merge_pwd_parcels_gdf(
 
     # Calculate the area of the parcel in square feet
     merged_gdf["parcel_area_sqft"] = merged_gdf.geometry.area
-    # Fill NaN values (from point geometries) with "NA" string
-    merged_gdf["parcel_area_sqft"] = merged_gdf["parcel_area_sqft"].fillna("NA")
+    # Note: Point geometries return 0.0 from .area, not NaN, so no fillna needed
 
     return merged_gdf
 
@@ -106,8 +105,8 @@ def pwd_parcels(
         is_condo_unit (bool): Flag indicating if the property is a condominium unit.
                              Condo units are identified by duplicate geometries (multiple units at same site)
                              and retain their point geometries.
-        parcel_area_sqft (str): The area of the parcel in square feet.
-                                 Polygons will have an area value; points will have "NA".
+        parcel_area_sqft (float): The area of the parcel in square feet.
+                                 Polygons will have an area value; points will have 0.0.
 
     Columns Updated:
         geometry: The geometry column is updated with validated geometries from PWD parcels.