addresses #964 addresses #864 addresses #951 (prev commit)

Riverscapes · Jun 17, 2024 · e7b1048 · e7b1048
1 parent ff8229b
commit e7b1048
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/rme/.vscode/launch.json b/packages/rme/.vscode/launch.json
@@ -37,7 +37,7 @@
         //"{env:DATA_ROOT}/rs_context/${input:HUC}/transportation/railways.shp",
         //"{env:DATA_ROOT}/rs_context/${input:HUC}/ecoregions/ecoregions.shp",
         "{env:DATA_ROOT}/rme/${input:HUC}",
-        //"--confinement_dgos", "{env:DATA_ROOT}/confinement/${input:HUC}/outputs/confinement.gpkg/confinement_dgos",
+        "--confinement_dgos", "{env:DATA_ROOT}/confinement/${input:HUC}/outputs/confinement.gpkg/confinement_dgos",
         "--anthro_dgos", "{env:DATA_ROOT}/anthro/${input:HUC}/outputs/anthro.gpkg/vwDgos",
         "--rcat_dgos", "{env:DATA_ROOT}/rcat/${input:HUC}/outputs/rcat.gpkg/vwDgos",
         "--brat_network", "{env:DATA_ROOT}/brat/${input:HUC}/outputs/brat.gpkg/vwReaches",

diff --git a/packages/rme/rme/metric_engine.py b/packages/rme/rme/metric_engine.py
@@ -720,7 +720,7 @@ def metric_engine(huc: int, in_flowlines: Path, in_vaa_table: Path, in_counties:
                             metrics_output[metric['metric_id']] = str(road_density)
                         else:
                             road_density = None
-                        metrics_output[metric['metric_id']] = None
+                            metrics_output[metric['metric_id']] = None
 
                 if 'RAILDENS' in metrics and anthro_dgos:
                     metric = metrics['RAILDENS']
@@ -1578,7 +1578,7 @@ def metric_engine(huc: int, in_flowlines: Path, in_vaa_table: Path, in_counties:
             [f"M.{sql_name(metric['field_name'])} {sql_name(metric['field_name'])}" for metric in metrics.values()])
         sql = f'CREATE VIEW vw_igo_metrics AS SELECT G.fid, G.geom, G.level_path, G.seg_distance, G.stream_size, G.FCode, G.window_size, {metric_names_sql} FROM igos G INNER JOIN igo_metrics_pivot M ON M.fid = G.fid;'
         curs.execute(sql)
-        sql2 = f'CREATE VIEW vw_dgo_metrics AS SELECT G.fid, G.geom, G.level_path, G.seg_distance, G.FCode, {metric_names_sql} FROM dgos G INNER JOIN dgo_metrics_pivot M ON M.fid = G.fid;'
+        sql2 = f'CREATE VIEW vw_dgo_metrics AS SELECT G.fid, G.geom, G.level_path, G.seg_distance, G.FCode, G.segment_area, {metric_names_sql} FROM dgos G INNER JOIN dgo_metrics_pivot M ON M.fid = G.fid;'
         curs.execute(sql2)
         conn.commit()