diff --git a/QRiS/metrics/bar_area.json b/QRiS/metrics/mid_channel_bar_area.json similarity index 65% rename from QRiS/metrics/bar_area.json rename to QRiS/metrics/mid_channel_bar_area.json index 20f713b1..57087cc4 100644 --- a/QRiS/metrics/bar_area.json +++ b/QRiS/metrics/mid_channel_bar_area.json @@ -1,11 +1,11 @@ { "$schema": "../qris_metrics.schema.json", - "name": "Bar Area", - "machine_name": "bar_area", + "name": "Mid Channel Bar Area", + "machine_name": "mid_channel_bar_area", "version": 1, "calculation_name": "area", "default_level": "Metric", - "description": "The area of bars in containing sample frame", + "description": "The area of of mid channel bars in containing sample frame", "metadata": { "min_value": 0, "precison": 2 @@ -15,9 +15,9 @@ { "layer_name": "geomorphic_unit_extents", "attribute_filter": { - "field_name": "Type 2 Tier", + "field_name": "Type", "values": [ - "Mound" + "Mid Channel Bar" ] } } diff --git a/QRiS/metrics/bar_count.json b/QRiS/metrics/mid_channel_bar_count.json similarity index 66% rename from QRiS/metrics/bar_count.json rename to QRiS/metrics/mid_channel_bar_count.json index c27d583c..f95434d3 100644 --- a/QRiS/metrics/bar_count.json +++ b/QRiS/metrics/mid_channel_bar_count.json @@ -1,11 +1,11 @@ { "$schema": "../qris_metrics.schema.json", - "name": "Bar Count", - "machine_name": "bar_count", + "name": "Mid Channel Bar Count", + "machine_name": "mid_channel_bar_count", "version": 1, "calculation_name": "count", "default_level": "Metric", - "description": "The number of bars in containing sample frame", + "description": "The number of mid channel bars in containing sample frame", "metadata": { "min_value": 0, "precison": 2 @@ -15,18 +15,18 @@ { "layer_name": "geomorphic_units", "attribute_filter": { - "field_name": "Type 2 Tier", + "field_name": "Type", "values": [ - "Mound" + "Mid Channel Bar" ] } }, { "layer_name": "geomorphic_unit_extents", "attribute_filter": { - "field_name": "Type 2 Tier", + "field_name": "Type", "values": [ - "Mound" + "Mid Channel Bar" ] } } diff --git a/QRiS/metrics/bar_density.json b/QRiS/metrics/mid_channel_bar_density.json similarity index 67% rename from QRiS/metrics/bar_density.json rename to QRiS/metrics/mid_channel_bar_density.json index 8f7ebf09..9d10ce65 100644 --- a/QRiS/metrics/bar_density.json +++ b/QRiS/metrics/mid_channel_bar_density.json @@ -1,36 +1,36 @@ -{ - "$schema": "../qris_metrics.schema.json", - "name": "Bar Density", - "machine_name": "bar_density", - "version": 1, - "calculation_name": "count", - "default_level": "Metric", - "description": "The number of pools per km of riverscape", - "metadata": { - "min_value": 0, - "precison": 2 - }, - "metric_params": { - "layers": [ - { - "layer_name": "geomorphic_units", - "attribute_filter": { - "field_name": "Type 2 Tier", - "values": [ - "Mound" - ] - } - }, - { - "layer_name": "geomorphic_unit_extents", - "attribute_filter": { - "field_name": "Type 2 Tier", - "values": [ - "Mound" - ] - } - } - ], - "normalization": "centerline" - } +{ + "$schema": "../qris_metrics.schema.json", + "name": "Mid Channel Bar Density", + "machine_name": "mid_channel_bar_density", + "version": 1, + "calculation_name": "count", + "default_level": "Metric", + "description": "The number of mid channel bars per km of riverscape", + "metadata": { + "min_value": 0, + "precison": 2 + }, + "metric_params": { + "layers": [ + { + "layer_name": "geomorphic_units", + "attribute_filter": { + "field_name": "Type", + "values": [ + "Mid Channel Bar" + ] + } + }, + { + "layer_name": "geomorphic_unit_extents", + "attribute_filter": { + "field_name": "Type", + "values": [ + "Mid Channel Bar" + ] + } + } + ], + "normalization": "centerline" + } } \ No newline at end of file diff --git a/QRiS/metrics/percent_riparian_vegetation.json b/QRiS/metrics/percent_riparian_vegetation.json index b10ce2d1..42cee926 100644 --- a/QRiS/metrics/percent_riparian_vegetation.json +++ b/QRiS/metrics/percent_riparian_vegetation.json @@ -14,6 +14,12 @@ "layers": [ { "layer_name": "vegetation_extents", + "attribute_filter": { + "field_name": "Type", + "values": [ + "Riparian" + ] + }, "usage": "numerator" } ] diff --git a/QRiS/metrics/pool_area.json b/QRiS/metrics/pool_area.json index 4cc82d32..a5e22b4e 100644 --- a/QRiS/metrics/pool_area.json +++ b/QRiS/metrics/pool_area.json @@ -15,10 +15,11 @@ { "layer_name": "geomorphic_unit_extents", "attribute_filter": { - "field_name": "Type 2 Tier", + "field_name": "Type", "values": [ - "Bowl", - "Trough" + "Pool", + "Pond", + "Chute" ] } } diff --git a/QRiS/metrics/pool_count.json b/QRiS/metrics/pool_count.json index 02f0f5b4..603d110b 100644 --- a/QRiS/metrics/pool_count.json +++ b/QRiS/metrics/pool_count.json @@ -15,20 +15,22 @@ { "layer_name": "geomorphic_units", "attribute_filter": { - "field_name": "Type 2 Tier", + "field_name": "Type", "values": [ - "Bowl", - "Trough" + "Pool", + "Pond", + "Chute" ] } }, { "layer_name": "geomorphic_unit_extents", "attribute_filter": { - "field_name": "Type 2 Tier", + "field_name": "Type", "values": [ - "Bowl", - "Trough" + "Pool", + "Pond", + "Chute" ] } } diff --git a/QRiS/metrics/pool_density.json b/QRiS/metrics/pool_density.json index 4f6d8148..0d62ad65 100644 --- a/QRiS/metrics/pool_density.json +++ b/QRiS/metrics/pool_density.json @@ -15,20 +15,22 @@ { "layer_name": "geomorphic_units", "attribute_filter": { - "field_name": "Type 2 Tier", + "field_name": "Type", "values": [ - "Bowl", - "Trough" + "Pool", + "Pond", + "Chute" ] } }, { "layer_name": "geomorphic_unit_extents", "attribute_filter": { - "field_name": "Type 2 Tier", + "field_name": "Type", "values": [ - "Bowl", - "Trough" + "Pool", + "Pond", + "Chute" ] } } diff --git a/QRiS/metrics/riffle_area.json b/QRiS/metrics/riffle_area.json index 81954216..32311db1 100644 --- a/QRiS/metrics/riffle_area.json +++ b/QRiS/metrics/riffle_area.json @@ -15,9 +15,9 @@ { "layer_name": "geomorphic_unit_extents", "attribute_filter": { - "field_name": "Type 2 Tier", + "field_name": "Type", "values": [ - "Saddle" + "Riffle" ] } } diff --git a/QRiS/metrics/riffle_count.json b/QRiS/metrics/riffle_count.json index 33e4b146..b2455832 100644 --- a/QRiS/metrics/riffle_count.json +++ b/QRiS/metrics/riffle_count.json @@ -15,18 +15,18 @@ { "layer_name": "geomorphic_units", "attribute_filter": { - "field_name": "Type 2 Tier", + "field_name": "Type", "values": [ - "Saddle" + "Riffle" ] } }, { "layer_name": "geomorphic_unit_extents", "attribute_filter": { - "field_name": "Type 2 Tier", + "field_name": "Type", "values": [ - "Saddle" + "Riffle" ] } } diff --git a/QRiS/metrics/riffle_density.json b/QRiS/metrics/riffle_density.json index 8ee868b4..77df347f 100644 --- a/QRiS/metrics/riffle_density.json +++ b/QRiS/metrics/riffle_density.json @@ -5,7 +5,7 @@ "version": 1, "calculation_name": "count", "default_level": "Metric", - "description": "The number of pools per km of riverscape", + "description": "The number of riffles per km of riverscape", "metadata": { "min_value": 0, "precison": 2 @@ -15,18 +15,18 @@ { "layer_name": "geomorphic_units", "attribute_filter": { - "field_name": "Type 2 Tier", + "field_name": "Type", "values": [ - "Saddle" + "Riffle" ] } }, { "layer_name": "geomorphic_unit_extents", "attribute_filter": { - "field_name": "Type 2 Tier", + "field_name": "Type", "values": [ - "Saddle" + "Riffle" ] } } diff --git a/QRiS/metrics/stage_0_area.json b/QRiS/metrics/stage_0_area.json index 07843928..88ad6f7e 100644 --- a/QRiS/metrics/stage_0_area.json +++ b/QRiS/metrics/stage_0_area.json @@ -1,6 +1,6 @@ { "$schema": "../qris_metrics.schema.json", - "name": "CEM Stage 0 Area", + "name": "SEM Stage 0 Area", "machine_name": "stage_0_area", "version": 1, "calculation_name": "area", @@ -15,9 +15,9 @@ { "layer_name": "cem_phases", "attribute_filter": { - "field_name": "CEM Stage", + "field_name": "SEM Stage", "values": [ - "0" + "0 Anastomosing" ] } } diff --git a/QRiS/metrics/stage_1_area.json b/QRiS/metrics/stage_1_area.json index aa7ad5ff..d94c1775 100644 --- a/QRiS/metrics/stage_1_area.json +++ b/QRiS/metrics/stage_1_area.json @@ -1,6 +1,6 @@ { "$schema": "../qris_metrics.schema.json", - "name": "CEM Stage 1 Area", + "name": "SEM Stage 1 Area", "machine_name": "stage_1_area", "version": 1, "calculation_name": "area", @@ -15,9 +15,9 @@ { "layer_name": "cem_phases", "attribute_filter": { - "field_name": "CEM Stage", + "field_name": "SEM Stage", "values": [ - "1" + "1 Sinuous Single Thread" ] } } diff --git a/QRiS/metrics/stage_2_area.json b/QRiS/metrics/stage_2_area.json index b6b13560..8efb5a9c 100644 --- a/QRiS/metrics/stage_2_area.json +++ b/QRiS/metrics/stage_2_area.json @@ -1,6 +1,6 @@ { "$schema": "../qris_metrics.schema.json", - "name": "CEM Stage 2 Area", + "name": "SEM Stage 2 Area", "machine_name": "stage_2_area", "version": 1, "calculation_name": "area", @@ -15,9 +15,9 @@ { "layer_name": "cem_phases", "attribute_filter": { - "field_name": "CEM Stage", + "field_name": "SEM Stage", "values": [ - "2" + "2 Channelized" ] } } diff --git a/QRiS/metrics/stage_3_area.json b/QRiS/metrics/stage_3_area.json index 19b4d7fb..1c6a1fa9 100644 --- a/QRiS/metrics/stage_3_area.json +++ b/QRiS/metrics/stage_3_area.json @@ -1,6 +1,6 @@ { "$schema": "../qris_metrics.schema.json", - "name": "CEM Stage 3 Area", + "name": "SEM Stage 3 Area", "machine_name": "stage_3_area", "version": 1, "calculation_name": "area", @@ -15,9 +15,9 @@ { "layer_name": "cem_phases", "attribute_filter": { - "field_name": "CEM Stage", + "field_name": "SEM Stage", "values": [ - "3" + "3 Degradation" ] } } diff --git a/QRiS/metrics/stage_4_area.json b/QRiS/metrics/stage_4_area.json index 567a495c..38e9d7dd 100644 --- a/QRiS/metrics/stage_4_area.json +++ b/QRiS/metrics/stage_4_area.json @@ -1,6 +1,6 @@ { "$schema": "../qris_metrics.schema.json", - "name": "CEM Stage 4 Area", + "name": "SEM Stage 4 Area", "machine_name": "stage_4_area", "version": 1, "calculation_name": "area", @@ -15,9 +15,9 @@ { "layer_name": "cem_phases", "attribute_filter": { - "field_name": "CEM Stage", + "field_name": "SEM Stage", "values": [ - "4" + "4 Degradation and Widening" ] } } diff --git a/QRiS/metrics/stage_5_area.json b/QRiS/metrics/stage_5_area.json index bd1cd338..9acc71f2 100644 --- a/QRiS/metrics/stage_5_area.json +++ b/QRiS/metrics/stage_5_area.json @@ -1,6 +1,6 @@ { "$schema": "../qris_metrics.schema.json", - "name": "CEM Stage 5 Area", + "name": "SEM Stage 5 Area", "machine_name": "stage_5_area", "version": 1, "calculation_name": "area", @@ -15,9 +15,9 @@ { "layer_name": "cem_phases", "attribute_filter": { - "field_name": "CEM Stage", + "field_name": "SEM Stage", "values": [ - "5" + "5 Aggradation and Widening" ] } } diff --git a/QRiS/metrics/stage_6_area.json b/QRiS/metrics/stage_6_area.json index 2366720f..698bc645 100644 --- a/QRiS/metrics/stage_6_area.json +++ b/QRiS/metrics/stage_6_area.json @@ -1,6 +1,6 @@ { "$schema": "../qris_metrics.schema.json", - "name": "CEM Stage 6 Area", + "name": "SEM Stage 6 Area", "machine_name": "stage_6_area", "version": 1, "calculation_name": "area", @@ -15,9 +15,9 @@ { "layer_name": "cem_phases", "attribute_filter": { - "field_name": "CEM Stage", + "field_name": "SEM Stage", "values": [ - "6" + "6 Quasi Equilibrium" ] } } diff --git a/QRiS/metrics/stage_7_area.json b/QRiS/metrics/stage_7_area.json index cfaee51c..c2202108 100644 --- a/QRiS/metrics/stage_7_area.json +++ b/QRiS/metrics/stage_7_area.json @@ -1,6 +1,6 @@ { "$schema": "../qris_metrics.schema.json", - "name": "CEM Stage 7 Area", + "name": "SEM Stage 7 Area", "machine_name": "stage_7_area", "version": 1, "calculation_name": "area", @@ -15,9 +15,9 @@ { "layer_name": "cem_phases", "attribute_filter": { - "field_name": "CEM Stage", + "field_name": "SEM Stage", "values": [ - "7" + "7 Laterally Active" ] } } diff --git a/QRiS/metrics/stage_8_area.json b/QRiS/metrics/stage_8_area.json index 9465c675..08d4719f 100644 --- a/QRiS/metrics/stage_8_area.json +++ b/QRiS/metrics/stage_8_area.json @@ -1,6 +1,6 @@ { "$schema": "../qris_metrics.schema.json", - "name": "CEM Stage 8 Area", + "name": "SEM Stage 8 Area", "machine_name": "stage_8_area", "version": 1, "calculation_name": "area", @@ -15,9 +15,9 @@ { "layer_name": "cem_phases", "attribute_filter": { - "field_name": "CEM Stage", + "field_name": "SEM Stage", "values": [ - "8" + "8 Anastomosing" ] } }