rme v 0.6.1

Riverscapes · Nov 13, 2023 · 974129d · 974129d
1 parent 41b22cc
commit 974129d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 26 deletions.
diff --git a/packages/rme/rme/__version__.py b/packages/rme/rme/__version__.py
@@ -1 +1 @@
-__version__ = "0.6.0"
+__version__ = "0.6.1"
diff --git a/packages/rme/rme/metric_engine.py b/packages/rme/rme/metric_engine.py
@@ -1345,29 +1345,20 @@ def metric_engine(huc: int, in_flowlines: Path, in_vaa_table: Path, in_ownership
     epsg = 4326
     with sqlite3.connect(outputs_gpkg) as conn:
         curs = conn.cursor()
-        # metrics_sql = ", ".join(
-        #     [f"{sql_name(metric['field_name'])} {metric['data_type']}" for metric in metrics.values()])
-        # sql = f'CREATE TABLE dgo_metrics_pivot (fid INTEGER PRIMARY KEY, {metrics_sql});'
-        # curs.execute(sql)
-        # sql2 = f'CREATE TABLE igo_metrics_pivot (fid INTEGER PRIMARY KEY, {metrics_sql});'
-        # curs.execute(sql2)
-        # conn.commit()
 
         # Insert Values into Pivot table
         number_metrics = {metric: val for metric, val in metrics.items(
         ) if val['data_type'] == 'INTEGER' or val['data_type'] == 'REAL'}
         text_metrics = {metric: val for metric,
                         val in metrics.items() if val['data_type'] == 'TEXT'}
-        # metric_names_sql = ", ".join(
-        #     [sql_name(metric["field_name"]) for metric in number_metrics.values()])
+
         num_metric_names_sql = ", ".join([sql_name(metric["field_name"]) for metric in number_metrics.values()])
         text_metric_names_sql = ", ".join([sql_name(metric["field_name"]) for metric in text_metrics.values()])
-        # metric_names_sql = f"{num_metric_names_sql}, {text_metric_names_sql}"
+
         metric_values_sql = ", ".join(
             [f"{sql_round(metric['data_type'], metric['metric_id'])} {sql_name(metric['field_name'])}" for metric in number_metrics.values()])
-        # text_metric_values_sql = ", ".join([f"{sql_text(metric['metric_id'])} {sql_name(metric['field_name'])}" for metric in text_metrics.values()])
-        # metric_values_sql = f"{num_metric_values_sql}, {text_metric_values_sql}"
-        sql = f'CREATE VIEW dgo_num_metrics (fid, {num_metric_names_sql}) SELECT M.dgo_id, {metric_values_sql} FROM dgo_metric_values M GROUP BY M.dgo_id;'
+
+        sql = f'CREATE VIEW dgo_num_metrics (fid, {num_metric_names_sql}) AS SELECT M.dgo_id, {metric_values_sql} FROM dgo_metric_values M GROUP BY M.dgo_id;'
         curs.execute(sql)
         sql2 = f"""CREATE VIEW igo_num_metrics (fid, {num_metric_names_sql}) AS SELECT M.igo_id, {metric_values_sql} FROM igo_metric_values M GROUP BY M.igo_id;"""
         curs.execute(sql2)
@@ -1440,15 +1431,6 @@ def metric_engine(huc: int, in_flowlines: Path, in_vaa_table: Path, in_ownership
 
     add_layer_descriptions(project, LYR_DESCRIPTIONS_JSON, LayerTypes)
 
-    ellapsed = time.time() - start_time
-    project.add_metadata([
-        RSMeta("ProcTimeS", "{:.2f}".format(ellapsed),
-               RSMetaTypes.HIDDEN, locked=True),
-        RSMeta("Processing Time", pretty_duration(ellapsed), locked=True)
-    ])
-
-    add_layer_descriptions(project, LYR_DESCRIPTIONS_JSON, LayerTypes)
-
     # Write a report
     report_path = os.path.join(
         project.project_dir, LayerTypes['REPORT'].rel_path)

diff --git a/packages/rme/rme/rme_rs.py b/packages/rme/rme/rme_rs.py
@@ -19,9 +19,9 @@
     'ecoregions': 'Ecoregions',
     'roads': 'Roads',
     'rail': 'Rail',
-    'vbet_dgos': 'vbet_dgos',
-    'vbet_igos': 'vbet_igos',
-    'vbet_centerlines': 'vbet_centerlines',
+    'dgos': 'vbet_dgos',
+    'igos': 'vbet_igos',
+    'valley_centerlines': 'vbet_centerlines',
     'confinement_dgo': 'confinement_dgos',
     'anthro_dgo': 'vwDgos',
     'rcat_dgo': 'vwDgos'