remove fiona from all functions

Author: lily-tomkovic-DWR

docsrc/conf.py

@@ -27,8 +27,17 @@
 tls_verify = False
 # using mock to avoid nodepy documentation which is hard to import
 # and to reduce time with the spatial stack
-autodoc_mock_imports = ["nodepy","gdal","osgeo","rasterio","fiona","pyproj",
-    "geopandas","shapely","netCDF4","rtree","param"
+autodoc_mock_imports = [
+    "nodepy",
+    "gdal",
+    "osgeo",
+    "rasterio",
+    "pyproj",
+    "geopandas",
+    "shapely",
+    "netCDF4",
+    "rtree",
+    "param",
 ]
 # -- General configuration ---------------------------------------------
 

schimpy/convert_linestrings.py

@@ -7,7 +7,6 @@
 from schimpy.prepare_schism import get_structures_from_yaml
 from schimpy.schism_setup import check_and_suggest
 from schimpy.util.yaml_load import yaml_from_file
-import fiona
 from shapely.geometry import LineString, mapping
 import click
 
@@ -23,21 +22,20 @@ def convert_structures_main(input_yaml, output_fn):
         inputs = yaml_from_file(input_yaml)
         structures = inputs.get("structures")
         structures = get_structures_from_yaml(structures)
-        with fiona.open(
-            output_fn, "w", driver="ESRI Shapefile", schema=schema, crs="EPSG:26910"
-        ) as shp:
-            for struct in structures:
-                line = LineString(struct["end_points"])
-                shp.write(
-                    {
-                        "geometry": mapping(line),
-                        "properties": {
-                            "name": struct["name"],
-                            "type": struct["type"],
-                            "configuration": str(struct["configuration"]),
-                        },
-                    }
-                )
+        # Build GeoDataFrame
+        gdf = gpd.GeoDataFrame(
+            [
+                {
+                    "geometry": LineString(struct["end_points"]),
+                    "name": struct["name"],
+                    "type": struct["type"],
+                    "configuration": str(struct["configuration"]),
+                }
+                for struct in structures
+            ],
+            crs="EPSG:26910",
+        )
+        gdf.to_file(output_fn, driver="ESRI Shapefile")
     else:
         raise ValueError(
             "Unsupported input file type. Only YAML (.yaml) supported for structures."

schimpy/convert_points.py

@@ -2,28 +2,22 @@
 # -*- coding: utf-8 -*-
 """Command line tool to convert SCHISM points (source and sink) in YAML to Shapefile"""
 import click
-import fiona
+import geopandas as gpd
+import pandas as pd
+from shapely.geometry import Point
 
 
 def df_to_shp(fpath, df):
-    """Convert a DataFrame to a Shapefile."""
-    # Open a fiona object
-    pointShp = fiona.open(
-        fpath,
-        mode="w",
-        driver="ESRI Shapefile",
-        schema={"geometry": "Point", "properties": [("site", "str"), ("stype", "str")]},
+    """Convert a DataFrame to a Shapefile using geopandas."""
+    gdf = gpd.GeoDataFrame(
+        df,
+        geometry=[Point(row.x, row.y) for _, row in df.iterrows()],
         crs="EPSG:26910",
     )
-
-    for index, row in df.iterrows():
-        rowDict = {
-            "geometry": {"type": "Point", "coordinates": (row.x, row.y)},
-            "properties": {"site": row.sites, "stype": row.stype},
-        }
-        pointShp.write(rowDict)
-
-    pointShp.close()
+    # Only keep relevant columns
+    gdf = gdf[["geometry", "sites", "stype"]]
+    gdf = gdf.rename(columns={"sites": "site"})
+    gdf.to_file(fpath, driver="ESRI Shapefile")
 
 
 def read_points(fpath):

schimpy/mesh_volume_tvd.py

@@ -61,11 +61,8 @@
 
 try:
     from shapely.geometry import Point, LineString, mapping
-    import fiona
 except Exception:
-    raise SystemExit(
-        "This script requires shapely and fiona (pip install shapely, pip install fiona)."
-    )
+    raise SystemExit("This script requires shapely (pip install shapely).")
 
 EdgeLabel = str  # 'deep' | 'shore'