fix(elevations.py::sample_reach_elevations): another geopandas-related error for case of measured elevations supplied in a csv

Author: aleaf

docs/source/config-summary.yaml

@@ -80,6 +80,7 @@ model:
   load_only: None
   forgive: False
   check: True
+  extra_pkgs: None
   # MODFLOW-6 information
   # (arguments to flopy.mf6.MFSimulation.get_model):
   model_name: None
@@ -93,6 +94,10 @@ dem:
   # keyword arguments to sfrmaker.SFRData.sample_reach_elevations:
   buffer_distance: 100
   smooth: True
+  elevation_data: None
+  elevation_data_crs: None
+  elevation_data_layer: None
+  elevation_data_errors: raise
 
 inflows:
   # Option to add specified inflows

sfrmaker/elevations.py

@@ -327,7 +327,9 @@ def get_min(x):
             x_coords = measured_elevations['x'].astype(float)
             y_coords = measured_elevations['y'].astype(float)
             measured_elevations['geometry'] = [Point(x, y) for x, y in zip(x_coords, y_coords)]
-            measured_elevations = gpd.GeoDataFrame(measured_elevations, crs=elevation_data_crs)
+            measured_elevations = gpd.GeoDataFrame(measured_elevations)
+            if elevation_data_crs is not None:
+                measured_elevations.set_crs(elevation_data_crs, allow_override=True)
         measured_elevations['elevation'] = measured_elevations['elevation'].astype(float)
 
         if measured_elevations.crs is None:

sfrmaker/test/test_elevations.py

@@ -36,7 +36,8 @@ def test_sample_elevations(dem, tylerforks_sfrdata, datapath, method):
     pytest.param('df', 26715, [0, 0, 0], 'raise', marks=pytest.mark.xfail), 
     ('gdf', 26715, [692396.7, 5140825.5, 392.], 'raise'),
     ('gdf', 4326, [-90.497579, 46.395510, 392], 'raise'),
-    ('csv', None, [692396.7, 5140825.5, 392.], 'raise'),
+    ('csv', 26715, [692396.7, 5140825.5, 392.], 'raise'),
+    ('csv', None, [692396.7, 5140825.5, 392.], 'raise'), 
     ('shp', 4326, [-90.497579, 46.395510, 392], 'raise'),
     pytest.param('shp', None, [46.395510,-90.497579, 392], 'raise', marks=pytest.mark.xfail), 
     ('gpkg', 26715, [692396.7, 5140825.5, 392.], 'raise'),