new nhd test fix

Riverscapes · Dec 19, 2024 · 8678ec0 · 8678ec0
1 parent 062ed3a
commit 8678ec0
Show file tree

Hide file tree

Showing 4 changed files with 130 additions and 35 deletions.
diff --git a/Symbology/web/Shared/flow_lines.json b/Symbology/web/Shared/flow_lines.json
@@ -19,15 +19,6 @@
       "paint": {
           "line-color": [
               "match",
-              ["get", "FCode"],
-              [46006],
-              "hsl(213, 100%, 33%)",
-              [33600],
-              "hsl(180, 75%, 79%)",
-              [33400],
-              "hsl(40, 100%, 50%)",
-              [55800],
-              "hsl(351, 55%, 58%)",
               ["get", "fcode"],
               [46006],
               "hsl(213, 100%, 33%)",
@@ -50,11 +41,6 @@
       "paint": {
           "line-color": [
               "match",
-              ["get", "FCode"],
-              [46003],
-              "hsl(80, 100%, 50%)",
-              [46007],
-              "hsl(40, 100%, 45%)",
               ["get", "fcode"],
               [46003],
               "hsl(80, 100%, 50%)",
@@ -75,9 +61,6 @@
           "line-dasharray": [2, 2],
           "line-color": [
               "match",
-              ["get", "FCode"],
-              [42800, 42801, 42802, 42807, 42813],
-              "#000000",
               ["get", "fcode"],
               [42800, 42801, 42802, 42807, 42813],
               "#000000",
@@ -95,9 +78,6 @@
       "paint": {
           "line-color": [
               "match",
-              ["get", "FCode"],
-              [42800, 42801, 42802, 42807, 42813],
-              "#000000",
               ["get", "fcode"],
               [42800, 42801, 42802, 42807, 42813],
               "#000000",
@@ -106,6 +86,83 @@
           "line-width": 2,
           "line-gap-width": 2
       }
-  }
+  },
+  {
+    "id": "Full NHD HR - solid",
+    "type": "line",
+    "source": "composite",
+    "source-layer": "NHD_flowline-6tver9",
+    "layout": {},
+    "paint": {
+        "line-color": [
+            "match",
+            ["get", "FCode"],
+            [46006],
+            "hsl(213, 100%, 33%)",
+            [33600],
+            "hsl(180, 75%, 79%)",
+            [33400],
+            "hsl(40, 100%, 50%)",
+            [55800],
+            "hsl(351, 55%, 58%)",
+            "hsla(0, 0%, 0%, 0)"
+        ]
+    }
+},
+{
+    "id": "Full NHD HR - dashed",
+    "type": "line",
+    "source": "composite",
+    "source-layer": "NHD_flowline-6tver9",
+    "layout": {},
+    "paint": {
+        "line-color": [
+            "match",
+            ["get", "FCode"],
+            [46003],
+            "hsl(80, 100%, 50%)",
+            [46007],
+            "hsl(40, 100%, 45%)",
+            "hsla(0, 0%, 0%, 0)"
+        ],
+        "line-dasharray": [1, 2]
+    }
+},
+{
+    "id": "Full NHD HR - pipes",
+    "type": "line",
+    "source": "composite",
+    "source-layer": "NHD_flowline-6tver9",
+    "layout": {},
+    "paint": {
+        "line-dasharray": [2, 2],
+        "line-color": [
+            "match",
+            ["get", "FCode"],
+            [42800, 42801, 42802, 42807, 42813],
+            "#000000",
+            "hsla(0, 0%, 0%, 0)"
+        ],
+        "line-width": 2
+    }
+},
+{
+    "id": "Full NHD HR - pipes gap",
+    "type": "line",
+    "source": "composite",
+    "source-layer": "NHD_flowline-6tver9",
+    "layout": {},
+    "paint": {
+        "line-color": [
+            "match",
+            ["get", "FCode"],
+            [42800, 42801, 42802, 42807, 42813],
+            "#000000",
+            "hsla(0, 0%, 0%, 0)"
+        ],
+        "line-width": 2,
+        "line-gap-width": 2
+    }
+}
   ]
 }
diff --git a/Symbology/web/Shared/nhdephemeral.json b/Symbology/web/Shared/nhdephemeral.json
@@ -9,12 +9,24 @@
         "type": "line",
         "source": "composite",
         "source-layer": "intermittent-126k30",
-        "filter": ["match", ["get", "FCode"], [46007], ["get", "fcode"], [46007], true, false],
+        "filter": ["match", ["get", "fcode"], [46007], true, false],
         "layout": {},
         "paint": {
             "line-dasharray": [3, 1, 1, 1, 1, 1],
             "line-color": "hsl(40, 100%, 45%)"
         }
-    }
+    },
+    {
+      "id": "46007 - Ephemeral",
+      "type": "line",
+      "source": "composite",
+      "source-layer": "intermittent-126k30",
+      "filter": ["match", ["get", "FCode"], [46007], ["get", "fcode"], [46007], true, false],
+      "layout": {},
+      "paint": {
+          "line-dasharray": [3, 1, 1, 1, 1, 1],
+          "line-color": "hsl(40, 100%, 45%)"
+      }
+  }
   ]
 }
diff --git a/Symbology/web/Shared/nhdintermittent.json b/Symbology/web/Shared/nhdintermittent.json
@@ -9,12 +9,24 @@
       "type": "line",
       "source": "composite",
       "source-layer": "intermittent-126k30",
-      "filter": ["match", ["get", "FCode"], [46003], ["get", "fcode"], [46003], true, false],
+      "filter": ["match", ["get", "fcode"], [46003], true, false],
       "layout": {},
       "paint": {
           "line-color": "hsl(194, 100%, 73%)",
           "line-dasharray": [4, 1, 1, 1, 1, 1]
       }
-  }
+  },
+  {
+    "id": "46003 - Intermittent",
+    "type": "line",
+    "source": "composite",
+    "source-layer": "intermittent-126k30",
+    "filter": ["match", ["get", "FCode"], [46003], true, false],
+    "layout": {},
+    "paint": {
+        "line-color": "hsl(194, 100%, 73%)",
+        "line-dasharray": [4, 1, 1, 1, 1, 1]
+    }
+}
   ]
 }
diff --git a/Symbology/web/Shared/nhdperrenial.json b/Symbology/web/Shared/nhdperrenial.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://xml.riverscapes.net/Symbology/web/vector.schema.json",
   "legend": [
-    ["hsl(213, 100%, 33%))", "Perennial"],
+    ["hsl(213, 100%, 33%)", "Perennial"],
     ["hsl(213, 100%, 33%)", "Connector (thin)"],
     ["hsl(220, 100%, 23%)","Artificial Path"]
   ],
@@ -15,13 +15,6 @@
       "paint": {
           "line-color": [
               "match",
-              ["get", "FCode"],
-              [46006],
-              "hsl(213, 100%, 33%)",
-              [33400],
-              "hsl(213, 100%, 33%)",
-              [55800],
-              "hsl(220, 100%, 23%)",
               ["get", "fcode"],
               [46006],
               "hsl(213, 100%, 33%)",
@@ -31,8 +24,29 @@
               "hsl(220, 100%, 23%)",
               "hsla(0, 0%, 0%, 0)"
           ],
-          "line-width": ["match", ["get", "FCode"], [33400], 0.5, 1, "match", ["get", "fcode"], [33400], 0.5, 1, 0]
+          "line-width": ["match", ["get", "fcode"], [33400], 0.5, 1, 0]
       }
-  }
+  },
+  {
+    "id": "perennial network",
+    "type": "line",
+    "source": "composite",
+    "source-layer": "NHD_flowline-6tver9",
+    "layout": {},
+    "paint": {
+        "line-color": [
+            "match",
+            ["get", "FCode"],
+            [46006],
+            "hsl(213, 100%, 33%)",
+            [33400],
+            "hsl(213, 100%, 33%)",
+            [55800],
+            "hsl(220, 100%, 23%)",
+            "hsla(0, 0%, 0%, 0)"
+        ],
+        "line-width": ["match", ["get", "FCode"], [33400], 0.5, 1, 0]
+    }
+}
   ]
 }