feat: added DSM2 virtual xsects view

Author: dwr-psandhu

pydelmod/cli.py

@@ -176,7 +176,14 @@ def exec_create_ann_inputs():
     type=click.Choice(["screened"], case_sensitive=False),
     default="screened",
 )
-def datastore_to_dss(datastore_dir, dssfile, param, repo_level="screened"):
+@click.option(
+    "--unit-name",
+    type=str,
+    default=None,
+)
+def datastore_to_dss(
+    datastore_dir, dssfile, param, repo_level="screened", unit_name=None
+):
     """
     Reads datastore timeseries files and writes to a DSS file
 
@@ -191,7 +198,7 @@ def datastore_to_dss(datastore_dir, dssfile, param, repo_level="screened"):
         e.g one of "flow","elev", "ec", etc.
     """
     datastore2dss.read_from_datastore_write_to_dss(
-        datastore_dir, dssfile, param, repo_level
+        datastore_dir, dssfile, param, repo_level, unit_name=unit_name
     )
 
 
@@ -334,6 +341,7 @@ def dsm2_analyze(config_file):
 main.add_command(ptm_animator.ptm_animate)
 main.add_command(dsm2_analyze)
 main.add_command(deltacduimgr.show_deltacd_ui)
+main.add_command(dsm2ui.show_dsm2_tidefile_xsect_ui)
 
 if __name__ == "__main__":
     sys.exit(main())  # pragma: no cover

pydelmod/datastore2dss.py

@@ -20,7 +20,7 @@ def find_lastest_fname(pattern, dir="."):
 
 
 def read_from_datastore_write_to_dss(
-    datastore_dir, dssfile, param, repo_level="screened"
+    datastore_dir, dssfile, param, repo_level="screened", unit_name=None
 ):
     """
     Reads datastore timeseries files and writes to a DSS file
@@ -58,7 +58,12 @@ def read_from_datastore_write_to_dss(
             epart = ts.index.freqstr
             pathname = f'/{apart}/{bpart}/{row["param"]}///{fpart}/'
             print("Writing to ", pathname)
-            f.write_rts(pathname, ts, row["unit"], "INST-VAL")
+            f.write_rts(
+                pathname,
+                ts,
+                unit_name if unit_name is not None else row["unit"],
+                "INST-VAL",
+            )
     print("Done")
 
 

pydelmod/dsm2study.py

@@ -116,9 +116,25 @@ def join_channels_info_with_dsm2_channel_line(dsm2_chan_lines, tables, geo_id="i
 
 
 def load_dsm2_flowline_shapefile(shapefile):
-    dsm2_chans = gpd.read_file(shapefile).to_crs(epsg=3857)
-    dsm2_chans.geometry = dsm2_chans.geometry.simplify(tolerance=50)
-    dsm2_chans.geometry = dsm2_chans.geometry.buffer(250, cap_style=1, join_style=1)
+    dsm2_chans = gpd.read_file(shapefile).to_crs(epsg=26910)
+
+    # First, filter out invalid geometries
+    valid_mask = dsm2_chans.geometry.is_valid & dsm2_chans.geometry.notna()
+    if not valid_mask.all():
+        print(
+            f"Warning: {(~valid_mask).sum()} invalid or null geometries found and will be excluded from simplification"
+        )
+
+    # Apply simplify only to valid geometries
+    valid_indices = valid_mask[valid_mask].index
+    if len(valid_indices) > 0:
+        dsm2_chans.loc[valid_indices, "geometry"] = dsm2_chans.loc[
+            valid_indices, "geometry"
+        ].simplify(tolerance=50)
+        dsm2_chans.loc[valid_indices, "geometry"] = dsm2_chans.loc[
+            valid_indices, "geometry"
+        ].buffer(250, cap_style=1, join_style=1)
+
     return dsm2_chans