ngiab-data-preprocess 4.2.0__py3-none-any.whl → 4.2.1__py3-none-any.whl

data_processing/gpkg_utils.py

@@ -290,6 +290,7 @@ def update_geopackage_metadata(gpkg: Path) -> None:
 
     con.close()
 
+
 def subset_table_by_vpu(table: str, vpu: str, hydrofabric: Path, subset_gpkg_name: Path) -> None:
     """
     Subset the specified table from the hydrofabric database by vpuid and save it to the subset geopackage.
@@ -306,9 +307,9 @@ def subset_table_by_vpu(table: str, vpu: str, hydrofabric: Path, subset_gpkg_nam
     dest_db = sqlite3.connect(subset_gpkg_name)
 
     if vpu == "03":
-        vpus = ["03N","03S","03W"]
+        vpus = ["03N", "03S", "03W"]
     elif vpu == "10":
-        vpus = ["10L","10U"]
+        vpus = ["10L", "10U"]
     else:
         vpus = [vpu]
 
@@ -335,7 +336,6 @@ def subset_table_by_vpu(table: str, vpu: str, hydrofabric: Path, subset_gpkg_nam
 
     insert_data(dest_db, table, contents)
 
-
     if table in get_feature_tables(file_paths.conus_hydrofabric):
         fids = [str(x[0]) for x in contents]
         copy_rTree_tables(table, fids, source_db, dest_db)
@@ -372,6 +372,14 @@ def subset_table(table: str, ids: List[str], hydrofabric: Path, subset_gpkg_name
         sql_query = "SELECT divide_id FROM 'divides'"
         contents = dest_db.execute(sql_query).fetchall()
         ids = [str(x[0]) for x in contents]
+
+    if table == "nexus":
+        # add the nexuses in the toid column from the flowpaths table
+        sql_query = "SELECT toid FROM 'flowpaths'"
+        contents = dest_db.execute(sql_query).fetchall()
+        new_ids = [str(x[0]) for x in contents]
+        ids.extend(new_ids)
+
     ids = [f"'{x}'" for x in ids]
     key_name = "id"
     if table in table_keys:
@@ -409,6 +417,7 @@ def get_table_crs_short(gpkg: str, table: str) -> str:
         crs = con.execute(sql_query).fetchone()[0]
     return crs
 
+
 def get_table_crs(gpkg: str, table: str) -> str:
     """
     Get the CRS of the specified table in the specified geopackage.
@@ -510,7 +519,6 @@ def get_available_tables(gpkg: Path) -> List[str]:
 
 
 def get_cat_to_nhd_feature_id(gpkg: Path = file_paths.conus_hydrofabric) -> dict:
-
     available_tables = get_available_tables(gpkg)
     possible_tables = ["flowpath_edge_list", "network"]
 

data_processing/subset.py

@@ -22,7 +22,7 @@ subset_tables = [
     "flowpath-attributes-ml",
     "flowpaths",
     "hydrolocations",
-    "nexus",
+    "nexus",  # depends on flowpaths in some cases e.g. gage delineation
     "pois",  # requires flowpaths
     "lakes",  # requires pois
     "network",
@@ -52,8 +52,9 @@ def create_subset_gpkg(
     update_geopackage_metadata(output_gpkg_path)
 
 
-def subset_vpu(vpu_id: str, output_gpkg_path: Path, hydrofabric: Path = file_paths.conus_hydrofabric):
-
+def subset_vpu(
+    vpu_id: str, output_gpkg_path: Path, hydrofabric: Path = file_paths.conus_hydrofabric
+):
     if output_gpkg_path.exists():
         os.remove(output_gpkg_path)
 

{ngiab_data_preprocess-4.2.0.dist-info → ngiab_data_preprocess-4.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngiab_data_preprocess
-Version: 4.2.0
+Version: 4.2.1
 Summary: Graphical Tools for creating Next Gen Water model input data.
 Author-email: Josh Cunningham <jcunningham8@ua.edu>
 Project-URL: Homepage, https://github.com/CIROH-UA/NGIAB_data_preprocess

{ngiab_data_preprocess-4.2.0.dist-info → ngiab_data_preprocess-4.2.1.dist-info}/RECORD

@@ -3,10 +3,10 @@ data_processing/dataset_utils.py,sha256=4qmRmK3qMWPkiWZHXhXv3c-ISbtOwr7QhciEl2ok
 data_processing/datasets.py,sha256=BB_X0IvGnUrjBmj-wryn6-Nv5cd0Lje3zly3p896eU4,4822
 data_processing/file_paths.py,sha256=Cp3BxbO6sD50464ciTshjb3Z0vTvL0ZeSbOJgNdOqQ0,4698
 data_processing/forcings.py,sha256=6Q9fSXa67OrXg_r9li0K9widsclN2DQUp1-oUH2tZwo,19208
-data_processing/gpkg_utils.py,sha256=j-j6TkCwlkOzM5ATMHi44raYS-xrJMzk5V0XQZ_0dzQ,20220
+data_processing/gpkg_utils.py,sha256=edyPR1ps4pkdtntGNcyXmXZUuzYPYBGsXsnmcndCWjE,20504
 data_processing/graph_utils.py,sha256=I9IFkU08SkXb8pfVASTvkm7T8BYt-92CaNj7TV6wJFE,8244
 data_processing/s3fs_utils.py,sha256=WoqqwxkHpv0Qq4I5f5-gUZBCFtVQ68ehXbdOjWRKTDQ,2752
-data_processing/subset.py,sha256=GbvfAaSJTfEvYOAZ6K0OgFA81xG_Y5UxiGDxukxO9gE,2558
+data_processing/subset.py,sha256=Dh_JK4u0tf99N-oV2PW6qm9pLtGY0rjAaKZ8F5Z6ggk,2623
 data_sources/cfe-nowpm-realization-template.json,sha256=8an6q1drWD8wU1ocvdPab-GvZDvlQ-0di_-NommH3QI,3528
 data_sources/cfe-template.ini,sha256=6e5-usqjWtm3MWVvtm8CTeZTJJMxO1ZswkOXq0L9mnc,2033
 data_sources/em-catchment-template.yml,sha256=M08ixazEUHYI2PNavtI0xPZeSzcQ9bg2g0XzNT-8_u4,292
@@ -36,9 +36,9 @@ ngiab_data_cli/__main__.py,sha256=V-g0dwa000e5Qye7PBMTtHTK7Cl7as3JS0UoAR0QrZ4,10
 ngiab_data_cli/arguments.py,sha256=7ptImy8tLM1XvjfDr13tZszkjGVtenXo0KqllJeE3Mw,4372
 ngiab_data_cli/custom_logging.py,sha256=iS2XozaxudcxQj17qAsrCgbVK9LJAYAPmarJuVWJo1k,1280
 ngiab_data_cli/forcing_cli.py,sha256=lkcqWDk5H8IPyGv0DwLIZMQldqTUXpfwSX0C_RIuIJ8,3890
-ngiab_data_preprocess-4.2.0.dist-info/licenses/LICENSE,sha256=6dMSprwwnsRzEm02mEDbKHD9dUbL8bPIt9Vhrhb0Ulk,1081
-ngiab_data_preprocess-4.2.0.dist-info/METADATA,sha256=Y2NVmd92S38QMwKXEkLvLKyWQ2IGy25okHV8sDy6c2c,10310
-ngiab_data_preprocess-4.2.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-ngiab_data_preprocess-4.2.0.dist-info/entry_points.txt,sha256=spwlhKEJ3ZnNETQsJGeTjD7Vwy8O_zGHb9GdX8ACCtw,128
-ngiab_data_preprocess-4.2.0.dist-info/top_level.txt,sha256=CjhYAUZrdveR2fOK6rxffU09VIN2IuPD7hk4V3l3pV0,52
-ngiab_data_preprocess-4.2.0.dist-info/RECORD,,
+ngiab_data_preprocess-4.2.1.dist-info/licenses/LICENSE,sha256=6dMSprwwnsRzEm02mEDbKHD9dUbL8bPIt9Vhrhb0Ulk,1081
+ngiab_data_preprocess-4.2.1.dist-info/METADATA,sha256=x6orDRcSZMvfbo_G8r9AhhgzFXOuQ8A4_lVyam5TYtg,10310
+ngiab_data_preprocess-4.2.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+ngiab_data_preprocess-4.2.1.dist-info/entry_points.txt,sha256=spwlhKEJ3ZnNETQsJGeTjD7Vwy8O_zGHb9GdX8ACCtw,128
+ngiab_data_preprocess-4.2.1.dist-info/top_level.txt,sha256=CjhYAUZrdveR2fOK6rxffU09VIN2IuPD7hk4V3l3pV0,52
+ngiab_data_preprocess-4.2.1.dist-info/RECORD,,