Changes due to new layer attributes

Riverscapes · Sep 6, 2024 · d775dfc · d775dfc
1 parent d77d908
commit d775dfc
Show file tree

Hide file tree

Showing 19 changed files with 111 additions and 100 deletions.
diff --git a/QRiS/metrics/bar_area.json → QRiS/metrics/mid_channel_bar_area.json b/QRiS/metrics/bar_area.json → 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 → QRiS/metrics/mid_channel_bar_count.json b/QRiS/metrics/bar_count.json → 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 → QRiS/metrics/mid_channel_bar_density.json b/QRiS/metrics/bar_density.json → 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"
+    }
 }
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
           ]
         }
       }