diff --git a/Symbology/qgis/Confinement/confinement_dgo.qml b/Symbology/qgis/Confinement/confinement_dgo.qml
new file mode 100644
index 00000000..e654ec16
--- /dev/null
+++ b/Symbology/qgis/Confinement/confinement_dgo.qml
@@ -0,0 +1,595 @@
+
+
+
+ 1
+ 1
+ 1
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+ 0
+ generatedlayout
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ "fid"
+
+ 2
+
diff --git a/Symbology/qgis/Confinement/confinement_igo.qml b/Symbology/qgis/Confinement/confinement_igo.qml
new file mode 100644
index 00000000..48b320a3
--- /dev/null
+++ b/Symbology/qgis/Confinement/confinement_igo.qml
@@ -0,0 +1,868 @@
+
+
+
+ 1
+ 1
+ 1
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+ 0
+ generatedlayout
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ "fid"
+
+ 0
+
diff --git a/Symbology/qgis/Confinement/confinement_ratio.qml b/Symbology/qgis/Confinement/confinement_ratio.qml
new file mode 100644
index 00000000..97364fee
--- /dev/null
+++ b/Symbology/qgis/Confinement/confinement_ratio.qml
@@ -0,0 +1,668 @@
+
+
+
+ 1
+ 1
+ 1
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+ 0
+ generatedlayout
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ "level_path"
+
+ 1
+
diff --git a/Symbology/qgis/Confinement/confinement_type.qml b/Symbology/qgis/Confinement/confinement_type.qml
new file mode 100644
index 00000000..836e357a
--- /dev/null
+++ b/Symbology/qgis/Confinement/confinement_type.qml
@@ -0,0 +1,627 @@
+
+
+
+ 1
+ 1
+ 1
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+ 0
+ generatedlayout
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ "NHDPlusID"
+
+ 1
+
diff --git a/Symbology/qgis/Confinement/confining_poly.qml b/Symbology/qgis/Confinement/confining_poly.qml
index fd1f00de..20a079ce 100644
--- a/Symbology/qgis/Confinement/confining_poly.qml
+++ b/Symbology/qgis/Confinement/confining_poly.qml
@@ -1,57 +1,178 @@
-
+
1
1
1
0
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -61,76 +182,73 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
0
0
- 1
-
-
-
-
+ 0.4
+
+
+
+
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -138,26 +256,26 @@
-
+
+
-
+
-
+
-
-
-
+
+
+
-
+
@@ -167,27 +285,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
-
+
-
-
+
+
+
+
@@ -219,14 +366,23 @@ def my_form_open(dialog, layer, feature):
0
generatedlayout
-
+
+
+
+
+
+
+
+
+
+
"fid"
-
+
2
diff --git a/Symbology/qgis/Confinement/constriction_ratio.qml b/Symbology/qgis/Confinement/constriction_ratio.qml
index 1b1746ac..1782268c 100644
--- a/Symbology/qgis/Confinement/constriction_ratio.qml
+++ b/Symbology/qgis/Confinement/constriction_ratio.qml
@@ -1,928 +1,772 @@
-
+
1
1
1
0
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
0
0
1
-
-
-
-
+
+
+
+
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -930,20 +774,20 @@
-
+
+
-
+
-
+
-
+
@@ -953,42 +797,42 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -997,55 +841,64 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -1077,13 +930,19 @@ def my_form_open(dialog, layer, feature):
0
generatedlayout
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1092,11 +951,26 @@ def my_form_open(dialog, layer, feature):
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
"NHDPlusID"
-
+
1
diff --git a/Symbology/qgis/Confinement/error_polygons.qml b/Symbology/qgis/Confinement/error_polygons.qml
index 2a91ec1b..8556d1cf 100644
--- a/Symbology/qgis/Confinement/error_polygons.qml
+++ b/Symbology/qgis/Confinement/error_polygons.qml
@@ -1,176 +1,267 @@
-
+
1
1
1
0
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -180,75 +271,73 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
0
0
1
-
-
-
+
+
+
+
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -256,26 +345,26 @@
-
+
+
-
+
-
+
-
-
-
+
+
+
-
+
@@ -285,6 +374,13 @@
+
+
+
+
+
+
+
@@ -301,34 +397,45 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
+
-
+
-
-
-
+
+
+
+
@@ -361,18 +468,26 @@ def my_form_open(dialog, layer, feature):
0
generatedlayout
-
-
-
+
+
+
+
+
+
+
+
+
+
+
"ErrorProcess"
-
+
2
diff --git a/Symbology/web/Confinement/confinement_dgo.json b/Symbology/web/Confinement/confinement_dgo.json
new file mode 100644
index 00000000..1275f5be
--- /dev/null
+++ b/Symbology/web/Confinement/confinement_dgo.json
@@ -0,0 +1,16 @@
+{
+ "$schema": "https://xml.riverscapes.xyz/Symbology/web/vector.schema.json",
+ "legend": [
+ ["hsl(0, 100%, 1%)", "Discrete Geographic Objects (DGOs)"]
+ ],
+ "layerStyles": [
+ {
+ "id": "dgo-ajx9vb",
+ "type": "line",
+ "source": "composite",
+ "source-layer": "dgo-ajx9vb",
+ "layout": {},
+ "paint": {"line-color": "hsl(0, 100%, 1%)"}
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Symbology/web/Confinement/confinement_igo.json b/Symbology/web/Confinement/confinement_igo.json
new file mode 100644
index 00000000..9b166bd6
--- /dev/null
+++ b/Symbology/web/Confinement/confinement_igo.json
@@ -0,0 +1,20 @@
+{
+ "$schema": "https://xml.riverscapes.xyz/Symbology/web/vector.schema.json",
+ "legend": [
+ ["hsl(57, 76%, 49%)", "Integrated Geographic Objects (IGOs)"]
+ ],
+ "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
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Symbology/web/Confinement/confinement_ratio.json b/Symbology/web/Confinement/confinement_ratio.json
index d0d7a186..432be3ce 100644
--- a/Symbology/web/Confinement/confinement_ratio.json
+++ b/Symbology/web/Confinement/confinement_ratio.json
@@ -1,29 +1,41 @@
{
- "$schema": "https://xml.riverscapes.net/Symbology/web/vector.schema.json",
+ "$schema": "https://xml.riverscapes.xyz/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(84, 95%, 34%)", "0.1"],
+ ["hsl(63, 100%, 41%)", "0.5"],
+ ["hsl(42, 100%, 48%)", "0.85"],
+ ["hsl(0, 95%, 44%)", "1.0"]
],
"layerStyles": [
{
- "id": "confinement-ratio-3oldrq",
+ "id": "confinement-ratio-aw7vzk",
"type": "line",
"source": "composite",
- "source-layer": "confinement_ratio-3oldrq",
+ "source-layer": "confinement_ratio-aw7vzk",
"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%)"
- ]
+ "line-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%)",
+ 2,
+ "hsl(0, 95%, 44%)"
+ ]
}
- }
+ }
]
}
\ No newline at end of file
diff --git a/Symbology/web/Confinement/confinement_raw.json b/Symbology/web/Confinement/confinement_raw.json
index fc4bb878..f1dcf001 100644
--- a/Symbology/web/Confinement/confinement_raw.json
+++ b/Symbology/web/Confinement/confinement_raw.json
@@ -1,29 +1,32 @@
{
- "$schema": "https://xml.riverscapes.net/Symbology/web/vector.schema.json",
+ "$schema": "https://xml.riverscapes.xyz/Symbology/web/vector.schema.json",
"legend": [
- ["hsl(8, 100%, 50%)", "Both"],
- ["hsl(235, 86%, 55%)", "Left"],
- ["hsl(313, 71%, 39%)", "Right"],
- [ "hsl(178, 64%, 34%)", "None"]
+ ["hsl(8, 100%, 50%)", "Both"],
+ ["hsl(235, 87%, 56%)", "Left"],
+ ["hsl(314, 71%, 39%)", "Right"],
+ ["hsl(178, 64%, 35%)", "None"]
],
"layerStyles": [
{
- "id": "confinement-raw-0utorb",
+ "id": "confinement-type-9thrft",
"type": "line",
"source": "composite",
- "source-layer": "confinement_raw-0utorb",
+ "source-layer": "confinement_type-9thrft",
"layout": {},
"paint": {
- "line-color": [
- "match",
- [ "get", "Confinement_Type"],
- ["Both"],"hsl(8, 100%, 50%)",
- ["Left"],"hsl(235, 86%, 55%)",
- ["Right"],"hsl(313, 71%, 39%)",
- ["None"], "hsl(178, 64%, 34%)",
- "#000000"
- ]
+ "line-color": [
+ "match",
+ ["get", "confinement_type"],
+ ["Right"],
+ "hsl(314, 71%, 39%)",
+ ["None"],
+ "hsl(178, 64%, 35%)",
+ ["Left"],
+ "hsl(235, 87%, 56%)",
+ ["Both"],
+ "hsl(8, 100%, 50%)"
+ ]
}
- }
+ }
]
}
\ No newline at end of file
diff --git a/Symbology/web/Confinement/confining_poly.json b/Symbology/web/Confinement/confining_poly.json
index 3068cb74..c666d409 100644
--- a/Symbology/web/Confinement/confining_poly.json
+++ b/Symbology/web/Confinement/confining_poly.json
@@ -1,19 +1,16 @@
{
- "$schema": "https://xml.riverscapes.net/Symbology/web/vector.schema.json",
- "legend": [
- ["hsl(60, 36%, 59%)", "Confining Polygon"]
- ],
- "layerStyles": [
- {
- "id": "confining-poly-3a679s",
- "type": "fill",
- "source": "composite",
- "source-layer": "confining_poly-3a679s",
- "layout": {},
- "paint": {
- "fill-color": "hsl(60, 36%, 59%)",
- "fill-outline-color": "hsla(0, 0%, 0%, 0)"
- }
- }
- ]
+ "$schema": "https://xml.riverscapes.xyz/Symbology/web/vector.schema.json",
+ "legend": [
+ ["hsla(128, 67%, 34%, 0.4)", ""]
+ ],
+ "layerStyles": [
+ {
+ "id": "valley-bottom-polygon-6di8ff",
+ "type": "fill",
+ "source": "composite",
+ "source-layer": "valley_bottom_polygon-6di8ff",
+ "layout": {},
+ "paint": {"fill-color": "hsla(128, 67%, 34%, 0.4)"}
+ }
+ ]
}
\ No newline at end of file
diff --git a/Symbology/web/Confinement/constriction_ratio.json b/Symbology/web/Confinement/constriction_ratio.json
index 1155754f..0ed8fc9a 100644
--- a/Symbology/web/Confinement/constriction_ratio.json
+++ b/Symbology/web/Confinement/constriction_ratio.json
@@ -1,23 +1,71 @@
{
- "$schema": "https://xml.riverscapes.net/Symbology/web/vector.schema.json",
+ "$schema": "https://xml.riverscapes.xyz/Symbology/web/vector.schema.json",
"legend": [
- [ "hsl(200, 51%, 77%)", "Constriction Ratio" ]
+ ["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"]
],
"layerStyles": [
{
- "id": "constriction-ratio-bxinm7",
+ "id": "constriction-proportion-bgs33e",
"type": "line",
"source": "composite",
- "source-layer": "constriction_ratio-bxinm7",
+ "source-layer": "constriction_proportion-bgs33e",
"layout": {},
"paint": {
- "line-color": [
- "step",
- [ "get", "Constriction_Ratio" ],
- "hsl(200, 51%, 77%)", 1,
- "hsl(0, 100%, 50%)"
- ]
+ "line-color": [
+ "interpolate",
+ ["linear"],
+ ["get", "constriction_ratio"],
+ 0,
+ "hsla(0, 0%, 100%, 0)",
+ 0.1,
+ "hsla(0, 0%, 100%, 0)",
+ 0.10001,
+ "hsl(0, 100%, 95%)",
+ 0.2,
+ "hsl(0, 100%, 95%)",
+ 0.20001,
+ "hsl(0, 100%, 89%)",
+ 0.3,
+ "hsl(0, 100%, 89%)",
+ 0.30001,
+ "hsl(0, 100%, 83%)",
+ 0.4,
+ "hsl(0, 100%, 83%)",
+ 0.40001,
+ "hsl(0, 100%, 78%)",
+ 0.5,
+ "hsl(0, 100%, 78%)",
+ 0.50001,
+ "hsl(0, 100%, 72%)",
+ 0.6,
+ "hsl(0, 100%, 72%)",
+ 0.60001,
+ "hsl(0, 100%, 67%)",
+ 0.7,
+ "hsl(0, 100%, 67%)",
+ 0.70001,
+ "hsl(0, 100%, 61%)",
+ 0.8,
+ "hsl(0, 100%, 61%)",
+ 0.80001,
+ "hsl(0, 100%, 55%)",
+ 0.9,
+ "hsl(0, 100%, 55%)",
+ 0.90001,
+ "hsl(0, 100%, 50%)",
+ 1.0,
+ "hsl(0, 100%, 50%)"
+ ]
}
- }
+ }
]
}
\ No newline at end of file