From c1e2116a5f2471d94652af702ef51aa92dabf6f2 Mon Sep 17 00:00:00 2001 From: Joshua Gilbert Date: Tue, 17 Sep 2024 15:10:53 -0600 Subject: [PATCH] Minor fixes, mostly precision misspelled --- QRiS/metrics/active_channel_count.json | 2 +- QRiS/metrics/channel_head_count.json | 2 +- QRiS/metrics/channel_head_density.json | 2 +- QRiS/metrics/confluence_count.json | 2 +- QRiS/metrics/confluence_density.json | 2 +- QRiS/metrics/dam_count.json | 2 +- QRiS/metrics/dam_density.json | 2 +- QRiS/metrics/diffluence_count.json | 2 +- QRiS/metrics/diffluence_density.json | 2 +- QRiS/metrics/flow_length.json | 2 +- QRiS/metrics/jam_count.json | 11 ++++++++++- QRiS/metrics/jam_density.json | 2 +- QRiS/metrics/mid_channel_bar_area.json | 2 +- QRiS/metrics/mid_channel_bar_count.json | 2 +- QRiS/metrics/mid_channel_bar_density.json | 2 +- QRiS/metrics/percent_free_flowing.json | 2 +- QRiS/metrics/percent_ponded.json | 2 +- QRiS/metrics/pool_area.json | 2 +- QRiS/metrics/pool_count.json | 2 +- QRiS/metrics/pool_density.json | 2 +- QRiS/metrics/primary_channel_length.json | 3 ++- QRiS/metrics/relative_flow_length.json | 2 +- QRiS/metrics/riffle_area.json | 2 +- QRiS/metrics/riffle_count.json | 2 +- QRiS/metrics/riffle_density.json | 2 +- QRiS/metrics/riverscape_area.json | 23 ++++++++++++++++++++++ QRiS/metrics/riverscape_length.json | 23 ++++++++++++++++++++++ QRiS/metrics/secondary_channel_length.json | 5 +++-- 28 files changed, 84 insertions(+), 27 deletions(-) create mode 100644 QRiS/metrics/riverscape_area.json create mode 100644 QRiS/metrics/riverscape_length.json diff --git a/QRiS/metrics/active_channel_count.json b/QRiS/metrics/active_channel_count.json index aa4d4f0b..be178231 100644 --- a/QRiS/metrics/active_channel_count.json +++ b/QRiS/metrics/active_channel_count.json @@ -8,7 +8,7 @@ "description": "The total number of active channels (primary and non-primary) within the riverscape sample frame", "metadata": { "min_value": 0, - "precison": 2 + "precision": 1 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/channel_head_count.json b/QRiS/metrics/channel_head_count.json index a6de5a30..614e58d4 100644 --- a/QRiS/metrics/channel_head_count.json +++ b/QRiS/metrics/channel_head_count.json @@ -8,7 +8,7 @@ "description": "The number of channel heads in containing sample frame", "metadata": { "min_value": 0, - "precison": 2 + "precision": 1 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/channel_head_density.json b/QRiS/metrics/channel_head_density.json index e5b9678f..e0b92044 100644 --- a/QRiS/metrics/channel_head_density.json +++ b/QRiS/metrics/channel_head_density.json @@ -8,7 +8,7 @@ "description": "The number of channel heads per km of riverscape", "metadata": { "min_value": 0, - "precison": 2 + "precision": 3 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/confluence_count.json b/QRiS/metrics/confluence_count.json index ee3106b5..c041c9f4 100644 --- a/QRiS/metrics/confluence_count.json +++ b/QRiS/metrics/confluence_count.json @@ -8,7 +8,7 @@ "description": "The number of channel confluences in containing sample frame", "metadata": { "min_value": 0, - "precison": 2 + "precision": 1 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/confluence_density.json b/QRiS/metrics/confluence_density.json index 535418a2..7c20a7cc 100644 --- a/QRiS/metrics/confluence_density.json +++ b/QRiS/metrics/confluence_density.json @@ -8,7 +8,7 @@ "description": "The number of channel confluences per km of riverscape", "metadata": { "min_value": 0, - "precison": 2 + "precision": 3 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/dam_count.json b/QRiS/metrics/dam_count.json index 406af79d..6516a9fd 100644 --- a/QRiS/metrics/dam_count.json +++ b/QRiS/metrics/dam_count.json @@ -8,7 +8,7 @@ "description": "The number of dams in each sample frame", "metadata": { "min_value": 0, - "precision": 2 + "precision": 1 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/dam_density.json b/QRiS/metrics/dam_density.json index 1f479661..fac59ded 100644 --- a/QRiS/metrics/dam_density.json +++ b/QRiS/metrics/dam_density.json @@ -8,7 +8,7 @@ "description": "The number of beaver dams per km of riverscape ", "metadata": { "min_value": 0, - "precision": 2 + "precision": 3 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/diffluence_count.json b/QRiS/metrics/diffluence_count.json index d181b68a..11f2913e 100644 --- a/QRiS/metrics/diffluence_count.json +++ b/QRiS/metrics/diffluence_count.json @@ -8,7 +8,7 @@ "description": "The number of channel diffluences in the containing sample frame", "metadata": { "min_value": 0, - "precision": 2 + "precision": 1 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/diffluence_density.json b/QRiS/metrics/diffluence_density.json index c05eaf05..e9542643 100644 --- a/QRiS/metrics/diffluence_density.json +++ b/QRiS/metrics/diffluence_density.json @@ -8,7 +8,7 @@ "description": "The number of channel diffluences per km of riverscape", "metadata": { "min_value": 0, - "precision": 2 + "precision": 3 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/flow_length.json b/QRiS/metrics/flow_length.json index 8584fb24..264b73ce 100644 --- a/QRiS/metrics/flow_length.json +++ b/QRiS/metrics/flow_length.json @@ -8,7 +8,7 @@ "description": "The sum of all channel lengths in a sample frame", "metadata": { "min_value": 0, - "precison": 2 + "precision": 2 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/jam_count.json b/QRiS/metrics/jam_count.json index 7b8f476f..6006097a 100644 --- a/QRiS/metrics/jam_count.json +++ b/QRiS/metrics/jam_count.json @@ -8,7 +8,7 @@ "description": "The number of jams in each sample frame", "metadata": { "min_value": 0, - "precision": 2 + "precision": 1 }, "metric_params": { "layers": [ @@ -22,6 +22,15 @@ "Jam Complex" ] } + }, + { + "layer_name": "structural_elements_areas", + "attribute_filter": { + "field_name": "Type", + "values": [ + "Jam" + ] + } } ] } diff --git a/QRiS/metrics/jam_density.json b/QRiS/metrics/jam_density.json index bedd333c..2eda5741 100644 --- a/QRiS/metrics/jam_density.json +++ b/QRiS/metrics/jam_density.json @@ -8,7 +8,7 @@ "description": "The number of jams per km of riverscape", "metadata": { "min_value": 0, - "precision": 2 + "precision": 3 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/mid_channel_bar_area.json b/QRiS/metrics/mid_channel_bar_area.json index 57087cc4..5f12fd5c 100644 --- a/QRiS/metrics/mid_channel_bar_area.json +++ b/QRiS/metrics/mid_channel_bar_area.json @@ -8,7 +8,7 @@ "description": "The area of of mid channel bars in containing sample frame", "metadata": { "min_value": 0, - "precison": 2 + "precision": 2 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/mid_channel_bar_count.json b/QRiS/metrics/mid_channel_bar_count.json index f95434d3..97ff9ffa 100644 --- a/QRiS/metrics/mid_channel_bar_count.json +++ b/QRiS/metrics/mid_channel_bar_count.json @@ -8,7 +8,7 @@ "description": "The number of mid channel bars in containing sample frame", "metadata": { "min_value": 0, - "precison": 2 + "precision": 1 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/mid_channel_bar_density.json b/QRiS/metrics/mid_channel_bar_density.json index 9d10ce65..6204c542 100644 --- a/QRiS/metrics/mid_channel_bar_density.json +++ b/QRiS/metrics/mid_channel_bar_density.json @@ -8,7 +8,7 @@ "description": "The number of mid channel bars per km of riverscape", "metadata": { "min_value": 0, - "precison": 2 + "precision": 3 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/percent_free_flowing.json b/QRiS/metrics/percent_free_flowing.json index 8a2358ce..f6cff18b 100644 --- a/QRiS/metrics/percent_free_flowing.json +++ b/QRiS/metrics/percent_free_flowing.json @@ -8,7 +8,7 @@ "description": "The percent of the inundation extents that is free flowing", "metadata": { "min_value": 0, - "precison": 2 + "precision": 2 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/percent_ponded.json b/QRiS/metrics/percent_ponded.json index 6f889f5a..d5638161 100644 --- a/QRiS/metrics/percent_ponded.json +++ b/QRiS/metrics/percent_ponded.json @@ -8,7 +8,7 @@ "description": "The percent of the inundation extents that is backwater/ponded", "metadata": { "min_value": 0, - "precison": 2 + "precision": 2 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/pool_area.json b/QRiS/metrics/pool_area.json index a5e22b4e..3d4b1119 100644 --- a/QRiS/metrics/pool_area.json +++ b/QRiS/metrics/pool_area.json @@ -8,7 +8,7 @@ "description": "The area of pools in containing sample frame", "metadata": { "min_value": 0, - "precison": 2 + "precision": 2 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/pool_count.json b/QRiS/metrics/pool_count.json index 603d110b..fc389383 100644 --- a/QRiS/metrics/pool_count.json +++ b/QRiS/metrics/pool_count.json @@ -8,7 +8,7 @@ "description": "The number of pools in containing sample frame", "metadata": { "min_value": 0, - "precison": 2 + "precision": 1 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/pool_density.json b/QRiS/metrics/pool_density.json index 0d62ad65..115cdfa3 100644 --- a/QRiS/metrics/pool_density.json +++ b/QRiS/metrics/pool_density.json @@ -8,7 +8,7 @@ "description": "The number of pools per km of riverscape", "metadata": { "min_value": 0, - "precison": 2 + "precision": 3 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/primary_channel_length.json b/QRiS/metrics/primary_channel_length.json index 0912c5e9..b066596d 100644 --- a/QRiS/metrics/primary_channel_length.json +++ b/QRiS/metrics/primary_channel_length.json @@ -7,7 +7,8 @@ "default_level": "Metric", "description": "Length of the primary channel within the riverscape sample frame", "metadata": { - "min_value": 0 + "min_value": 0, + "precison": 2 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/relative_flow_length.json b/QRiS/metrics/relative_flow_length.json index be213313..984c5a3e 100644 --- a/QRiS/metrics/relative_flow_length.json +++ b/QRiS/metrics/relative_flow_length.json @@ -8,7 +8,7 @@ "description": "The sum of all channel lengths per km of riverscape", "metadata": { "min_value": 0, - "precison": 2 + "precision": 2 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/riffle_area.json b/QRiS/metrics/riffle_area.json index 32311db1..9941aeae 100644 --- a/QRiS/metrics/riffle_area.json +++ b/QRiS/metrics/riffle_area.json @@ -8,7 +8,7 @@ "description": "The area of riffles in containing sample frame", "metadata": { "min_value": 0, - "precison": 2 + "precision": 2 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/riffle_count.json b/QRiS/metrics/riffle_count.json index b2455832..2ddcbfee 100644 --- a/QRiS/metrics/riffle_count.json +++ b/QRiS/metrics/riffle_count.json @@ -8,7 +8,7 @@ "description": "The number of riffles in containing sample frame", "metadata": { "min_value": 0, - "precison": 2 + "precision": 1 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/riffle_density.json b/QRiS/metrics/riffle_density.json index 77df347f..aec85b24 100644 --- a/QRiS/metrics/riffle_density.json +++ b/QRiS/metrics/riffle_density.json @@ -8,7 +8,7 @@ "description": "The number of riffles per km of riverscape", "metadata": { "min_value": 0, - "precison": 2 + "precision": 3 }, "metric_params": { "layers": [ diff --git a/QRiS/metrics/riverscape_area.json b/QRiS/metrics/riverscape_area.json new file mode 100644 index 00000000..f4e85102 --- /dev/null +++ b/QRiS/metrics/riverscape_area.json @@ -0,0 +1,23 @@ +{ + "$schema": "../qris_metrics.schema.json", + "calculation_name": "area", + "default_level": "Metric", + "description": "Area of the Riverscape Valley Bottom within the sample frame", + "machine_name": "riverscape_area", + "definition_url": "none", + "units":"", + "metadata": { + "min_value": 0, + "precision": 3 + }, + "metric_params": { + "layers": [ + { + "layer_name": "valley_bottom", + "layer_source": "inputs" + } + ] + }, + "name": "Riverscape Area", + "version": 1 +} \ No newline at end of file diff --git a/QRiS/metrics/riverscape_length.json b/QRiS/metrics/riverscape_length.json new file mode 100644 index 00000000..91505dab --- /dev/null +++ b/QRiS/metrics/riverscape_length.json @@ -0,0 +1,23 @@ +{ + "$schema": "../qris_metrics.schema.json", + "calculation_name": "length", + "default_level": "Metric", + "description": "Length of the riverscape centerline within the sample frame", + "machine_name": "riverscape_length", + "definition_url": "none", + "units": "", + "metadata": { + "min_value": 0, + "precision": 3 + }, + "metric_params": { + "layers": [ + { + "layer_name": "centerline", + "layer_source": "inputs" + } + ] + }, + "name": "Riverscape Length", + "version": 1 +} \ No newline at end of file diff --git a/QRiS/metrics/secondary_channel_length.json b/QRiS/metrics/secondary_channel_length.json index 9bbaf0ed..8bd2d082 100644 --- a/QRiS/metrics/secondary_channel_length.json +++ b/QRiS/metrics/secondary_channel_length.json @@ -1,13 +1,14 @@ { "$schema": "../qris_metrics.schema.json", - "name": "Primary Channel Length", + "name": "Secondary Channel Length", "machine_name": "secondary_channel_length", "version": 1, "calculation_name": "length", "default_level": "Metric", "description": "Length of the secondary channels within the riverscape sample frame", "metadata": { - "min_value": 0 + "min_value": 0, + "precison": 2 }, "metric_params": { "layers": [