Changes to confinement symbology.

Riverscapes · Jul 26, 2024 · a817ce0 · a817ce0
1 parent 3740d7a
commit a817ce0
Show file tree

Hide file tree

Showing 12 changed files with 1,036 additions and 1,127 deletions.
diff --git a/RaveBusinessLogic/V2/Confinement.xml b/RaveBusinessLogic/V2/Confinement.xml
@@ -51,7 +51,7 @@
         <Children collapsed="true">
           <Node xpathlabel="Name" xpath="Inputs/Geopackage/Layers/Vector[@lyrName='Flowlines']" type="line" symbology="flowlines" />
           <Node xpathlabel="Name" xpath="Inputs/Geopackage/Layers/Vector[@lyrName='flowlines']" type="line" symbology="flowlines" />
-          <Node label="Channel Area" xpath="Inputs/Geopackage/Layers/Vector[@lyrName='channel_area']" type="polygon" id="channel_area" symbology="channel_area" transparency="60"/>
+          <Node label="Channel Area" xpath="Inputs/Geopackage/Layers/Vector[@lyrName='channel_area']" type="polygon" id="channel_area" symbology="ChannelArea" transparency="60"/>
           <Node label="Valley Bottom Polygon" xpathlabel="Name" xpath="Inputs/Geopackage/Layers/Vector[@lyrName='ConfiningPolygon']" type="polygon" id="confining_poly" symbology="confining_poly" transparency="60"/>
           <Node label="Valley Bottom Polygon" xpathlabel="Name" xpath="Inputs/Geopackage/Layers/Vector[@lyrName='confining_polygon']" type="polygon" id="confining_poly" symbology="confining_poly" transparency="60"/>
           <Node label="Inputs Geopackage (SQLite Database)" xpath="Inputs/Geopackage" type="file" /> 

diff --git a/Symbology/qgis/Confinement/confinement_dgo.qml b/Symbology/qgis/Confinement/confinement_dgo.qml
diff --git a/Symbology/qgis/Confinement/confinement_igo.qml b/Symbology/qgis/Confinement/confinement_igo.qml
diff --git a/Symbology/qgis/Confinement/confinement_ratio.qml b/Symbology/qgis/Confinement/confinement_ratio.qml
diff --git a/Symbology/qgis/Confinement/constriction_ratio.qml b/Symbology/qgis/Confinement/constriction_ratio.qml
diff --git a/Symbology/web/Confinement/confinement_dgo.json b/Symbology/web/Confinement/confinement_dgo.json
@@ -1,16 +1,43 @@
 {
   "$schema": "https://xml.riverscapes.xyz/Symbology/web/vector.schema.json",
   "legend": [
-    ["hsl(0, 100%, 1%)", "Discrete Geographic Objects (DGOs)"]
+    ["hsl(84, 95%, 34%)", "0 - 0.1"],
+    ["hsl(63, 100%, 41%)", "0.1 - 0.5"],
+    ["hsl(42, 100%, 48%)", "0.5 - 0.85"],
+    ["hsl(0, 95%, 44%)", "0.85 - 1.0"]
   ],
   "layerStyles": [
     {
-        "id": "dgo-ajx9vb",
-        "type": "line",
-        "source": "composite",
-        "source-layer": "dgo-ajx9vb",
-        "layout": {},
-        "paint": {"line-color": "hsl(0, 100%, 1%)"}
-    }
+      "id": "sample-dgo-ccfyjo",
+      "type": "fill",
+      "source": "composite",
+      "source-layer": "sample_dgo-ccfyjo",
+      "layout": {},
+      "paint": {
+          "fill-color": [
+              "interpolate",
+              ["linear"],
+              ["get", "confinemen"],
+              0,
+              "hsl(84, 95%, 34%)",
+              0.1,
+              "hsl(84, 95%, 34%)",
+              0.10001,
+              "hsl(63, 100%, 41%)",
+              0.5,
+              "hsl(63, 100%, 41%)",
+              0.50001,
+              "hsl(42, 100%, 48%)",
+              0.85,
+              "hsl(42, 100%, 48%)",
+              0.85001,
+              "hsl(0, 95%, 44%)",
+              1,
+              "hsl(0, 95%, 44%)"
+          ],
+          "fill-outline-color": "rgb(0, 0, 0)",
+          "fill-opacity": 0.75
+      }
+  }
   ]
 }
diff --git a/Symbology/web/Confinement/confinement_igo.json b/Symbology/web/Confinement/confinement_igo.json
@@ -1,20 +1,43 @@
 {
   "$schema": "https://xml.riverscapes.xyz/Symbology/web/vector.schema.json",
   "legend": [
-    ["hsl(57, 76%, 49%)", "Integrated Geographic Objects (IGOs)"]
+    ["hsl(84, 95%, 34%)", "0 - 0.1"],
+    ["hsl(63, 100%, 41%)", "0.1 - 0.5"],
+    ["hsl(42, 100%, 48%)", "0.5 - 0.85"],
+    ["hsl(0, 95%, 44%)", "0.85 - 1.0"]
   ],
   "layerStyles": [
     {
-        "id": "igo-dcto49",
-        "type": "circle",
-        "source": "composite",
-        "source-layer": "igo-dcto49",
-        "layout": {},
-        "paint": {
-            "circle-radius": 4,
-            "circle-color": "hsl(57, 76%, 49%)",
-            "circle-stroke-width": 0.4
-        }
-    }
+      "id": "sample-igo-1hlhoh",
+      "type": "circle",
+      "source": "composite",
+      "source-layer": "sample_igo-1hlhoh",
+      "layout": {},
+      "paint": {
+          "circle-radius": 4,
+          "circle-color": [
+              "interpolate",
+              ["linear"],
+              ["get", "confinement_ratio"],
+              0,
+              "hsl(84, 95%, 34%)",
+              0.1,
+              "hsl(84, 95%, 34%)",
+              0.10001,
+              "hsl(63, 100%, 41%)",
+              0.5,
+              "hsl(63, 100%, 41%)",
+              0.50001,
+              "hsl(42, 100%, 48%)",
+              0.85,
+              "hsl(42, 100%, 48%)",
+              0.85001,
+              "hsl(0, 95%, 44%)",
+              1,
+              "hsl(0, 95%, 44%)"
+          ],
+          "circle-stroke-color": "hsla(0, 0%, 0%, 0)"
+      }
+  }
   ]
 }
diff --git a/Symbology/web/Confinement/confinement_margins.json b/Symbology/web/Confinement/confinement_margins.json
@@ -1,29 +1,16 @@
 {
     "$schema": "https://xml.riverscapes.net/Symbology/web/vector.schema.json",
     "legend": [
-        ["hsl(116, 57%, 39%)", "0.1"],
-        ["hsl(108, 87%, 59%)", "0.5"],
-        ["hsl(29, 100%, 50%)", "0.85"],
-        ["hsl(8, 100%, 50%)", "1.0"]
+        ["hsl(325, 73%, 58%)", "Confining Margins"]
     ],
     "layerStyles": [
         {
-            "id": "confinement-ratio-3oldrq",
+            "id": "sample-confining-margin-42524p",
             "type": "line",
             "source": "composite",
-            "source-layer": "confinement_ratio-3oldrq",
+            "source-layer": "sample_confining_margin-42524p",
             "layout": {},
-            "paint": {
-                "line-color": [
-                    "step",
-                    ["get", "Confinement_Ratio"],
-                    "hsl(116, 57%, 39%)", 0.1,
-                    "hsl(108, 87%, 59%)", 0.5,
-                    "hsl(29, 100%, 50%)", 0.85,
-                    "hsl(8, 100%, 50%)", 1.0,
-                    "hsl(8, 100%, 50%)"
-                ]
-            }
+            "paint": {"line-color": "hsl(325, 73%, 58%)", "line-width": 0.75}
         }
     ]
 }

diff --git a/Symbology/web/Confinement/confinement_ratio.json b/Symbology/web/Confinement/confinement_ratio.json
@@ -1,10 +1,10 @@
 {
   "$schema": "https://xml.riverscapes.xyz/Symbology/web/vector.schema.json",
   "legend": [
-    ["hsl(84, 95%, 34%)", "0.1"],
-    ["hsl(63, 100%, 41%)", "0.5"],
-    ["hsl(42, 100%, 48%)", "0.85"],
-    ["hsl(0, 95%, 44%)", "1.0"]
+    ["hsl(84, 95%, 34%)", "0 - 0.1"],
+    ["hsl(63, 100%, 41%)", "0.1 - 0.5"],
+    ["hsl(42, 100%, 48%)", "0.5 - 0.85"],
+    ["hsl(0, 95%, 44%)", "0.85 - 1.0"]
   ],
   "layerStyles": [
     {

diff --git a/Symbology/web/Confinement/confinement_raw.json b/Symbology/web/Confinement/confinement_raw.json
@@ -24,7 +24,8 @@
               ["Left"],
               "hsl(235, 87%, 56%)",
               ["Both"],
-              "hsl(8, 100%, 50%)"
+              "hsl(8, 100%, 50%)",
+              "#000000"
           ]
       }
   }

diff --git a/Symbology/web/Confinement/constriction_ratio.json b/Symbology/web/Confinement/constriction_ratio.json
@@ -1,16 +1,11 @@
 {
   "$schema": "https://xml.riverscapes.xyz/Symbology/web/vector.schema.json",
   "legend": [
-    ["hsla(0, 0%, 100%, 0)", "0"],
-    ["hsl(0, 100%, 95%)", ""],
-    ["hsl(0, 100%, 89%)", ""],
-    ["hsl(0, 100%, 83%)", ""],
-    ["hsl(0, 100%, 78%)", ""],
-    ["hsl(0, 100%, 72%)", ""],
-    ["hsl(0, 100%, 67%)", ""],
-    ["hsl(0, 100%, 61%)", ""],
-    ["hsl(0, 100%, 55%)", ""],
-    ["hsl(0, 100%, 50%)", "1"]
+    ["hsla(0, 0%, 100%, 0)", "0 - 0.2"],
+    ["hsl(0, 100%, 87%)", "0.2 - 0.4"],
+    ["hsl(0, 100%, 75%)", "0.4 - 0.6"],
+    ["hsl(0, 100%, 63%)", "0.6 - 0.8"],
+    ["hsl(0, 100%, 50%)", "0.8 - 0.1"]
   ],
   "layerStyles": [
     {
@@ -25,42 +20,22 @@
               ["linear"],
               ["get", "constriction_ratio"],
               0,
-              "hsla(0, 0%, 100%, 0)",
-              0.1,
-              "hsla(0, 0%, 100%, 0)",
-              0.10001,
-              "hsl(0, 100%, 95%)",
+              "hsl(0, 0%, 100%)",
               0.2,
-              "hsl(0, 100%, 95%)",
+              "hsl(0, 0%, 100%)",
               0.20001,
-              "hsl(0, 100%, 89%)",
-              0.3,
-              "hsl(0, 100%, 89%)",
-              0.30001,
-              "hsl(0, 100%, 83%)",
+              "hsl(0, 100%, 87%)",
               0.4,
-              "hsl(0, 100%, 83%)",
+              "hsl(0, 100%, 87%)",
               0.40001,
-              "hsl(0, 100%, 78%)",
-              0.5,
-              "hsl(0, 100%, 78%)",
-              0.50001,
-              "hsl(0, 100%, 72%)",
+              "hsl(0, 100%, 75%)",
               0.6,
-              "hsl(0, 100%, 72%)",
+              "hsl(0, 100%, 75%)",
               0.60001,
-              "hsl(0, 100%, 67%)",
-              0.7,
-              "hsl(0, 100%, 67%)",
-              0.70001,
-              "hsl(0, 100%, 61%)",
+              "hsl(0, 100%, 63%)",
               0.8,
-              "hsl(0, 100%, 61%)",
+              "hsl(0, 100%, 63%)",
               0.80001,
-              "hsl(0, 100%, 55%)",
-              0.9,
-              "hsl(0, 100%, 55%)",
-              0.90001,
               "hsl(0, 100%, 50%)",
               1.0,
               "hsl(0, 100%, 50%)"

diff --git a/Symbology/web/Confinement/flowlines.json b/Symbology/web/Confinement/flowlines.json