fix delineation by gauge

modules/data_processing/gpkg_utils.py

@@ -292,7 +292,8 @@ def get_wb_from_gage_id(gage_id: str, gpkg: Path = file_paths.conus_hydrofabric(
         sql_query = f"SELECT id FROM hydrolocations WHERE hl_uri = 'Gages-{gage_id}'"
         nex_id = con.execute(sql_query).fetchone()[0]
         sql_query = f"SELECT id FROM network WHERE toid = '{nex_id}'"
-        wb_id = con.execute(sql_query).fetchone()[0]
+        wb_id = con.execute(sql_query).fetchall()
+        wb_ids = [str(x[0]) for x in wb_id]
     if nex_id is None:
         raise IndexError(f"No nexus found for gage ID {gage_id}")
-    return wb_id
+    return wb_ids

modules/map_app/static/js/main.js

@@ -293,7 +293,7 @@ function get_wbid_from_gage_id(gage_id) {
     })
         .then(response => response.json())
         .then(data => {
-            return data['wb_id'];
+            return data['wb_ids'];
         })
         .catch(error => {
             console.error('Error:', error);
@@ -304,9 +304,11 @@ function select_by_gage_id() {
     gage_ids = $('#gage_id_input').val();
     gage_ids = gage_ids.split(',');
     for (gage_id of gage_ids) {
-        wb_id = get_wbid_from_gage_id(gage_id);
-        wb_id.then(function (result) {
-            wb_id_dict[result] = [0, 0];
+        wb_ids = get_wbid_from_gage_id(gage_id);
+        wb_ids.then(function (result) {
+            for (result of result) {
+                wb_id_dict[result] = [0, 0];
+            }
             $('#selected-basins').text(Object.keys(wb_id_dict));
         });
     }

modules/map_app/views.py

@@ -354,5 +354,5 @@ def get_wbid_from_gage_id():
     gage_id = json.loads(request.data.decode("utf-8"))["gage_id"]
     result = get_wb_from_gage_id(gage_id)
     if result is not None:
-        return jsonify({"wb_id": result}), 200
+        return jsonify({"wb_ids": result}), 200
     return jsonify({"error": "No wbid found for gage id"}), 404

modules/ngiab_data_cli/__main__.py

@@ -290,7 +290,8 @@ def get_wb_ids_from_gage_ids(input_file: Path) -> List[str]:
     wb_ids = []
     for gage_id in gage_ids:
         wb_id = get_wb_from_gage_id(gage_id)
-        wb_ids.append(wb_id)
+        wb_ids.extend(wb_id)
+    logging.info(f"Converted {len(gage_ids)} gage IDs to {len(wb_ids)} waterbody IDs")
     return wb_ids