Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixing and updating the rest of the nhd layers #776

Merged
merged 1 commit into from
Dec 19, 2024
Merged

fixing and updating the rest of the nhd layers #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RaveBusinessLogic/V2/ChannelArea.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</Node>
<Node label="Inputs" xpath="Inputs">
<Children collapsed="true">
<Node label="NHD Flowlines" xpath="Geopackage/Layers/Vector[@lyrName='flowlines']" type="line" id="flowlines" symbology="FLOWLINES" />
<Node label="NHD Flowlines" xpath="Geopackage/Layers/Vector[@lyrName='flowlines']" type="line" id="flowlines" symbology="flow_lines" />
<Node label="NHD Flow Areas" xpath="Geopackage/Layers/Vector[@lyrName='flowareas']" type="polygon" id="flowareas" symbology="FLOWAREAS" />
<Node label="NHD Waterbody Areas" xpath="Geopackage/Layers/Vector[@lyrName='waterbody']" type="polygon" id="waterbodies" symbology="WATER_BODIES" />
<Node label="Inputs Geopackage (SQLite Database)" xpath="Geopackage" type="file" />
Expand Down
4 changes: 2 additions & 2 deletions RaveBusinessLogic/V2/Confinement.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
</Node>
<Node label="Inputs">
<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 xpathlabel="Name" xpath="Inputs/Geopackage/Layers/Vector[@lyrName='Flowlines']" type="line" symbology="flow_lines" />
<Node xpathlabel="Name" xpath="Inputs/Geopackage/Layers/Vector[@lyrName='flowlines']" type="line" symbology="flow_lines" />
<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"/>
Expand Down
2 changes: 1 addition & 1 deletion RaveBusinessLogic/V2/RCAT.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<Children collapsed="true">
<Node label="Sampling Units">
<Children collapsed="true">
<Node label="Stream Reaches" xpath="Geopackage/Layers/Vector[@lyrName='reaches']" type="line" symbology="stream_reaches" />
<Node label="Stream Reaches" xpath="Geopackage/Layers/Vector[@lyrName='reaches']" type="line" symbology="flow_lines" />
<Node label="Integrated Geographic Objects (IGOs)" xpath="Geopackage/Layers/Vector[@lyrName='igo']" type="point" symbology="IGO" id="igo" />
<Node label="Discrete Geographic Objects (DGOs)" xpath="Geopackage/Layers/Vector[@lyrName='dgo']" type="polygon" symbology="DGO" id="dgo" />
</Children>
Expand Down
2 changes: 1 addition & 1 deletion RaveBusinessLogic/V2/hydro_context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</Node>
<Node label="Inputs" xpath="Inputs">
<Children collapsed="true">
<Node label="Segmented Flowlines" xpath="Geopackage/Layers/Vector[@lyrName='flowlines']" type="line" symbology="flowlines" />
<Node label="Segmented Flowlines" xpath="Geopackage/Layers/Vector[@lyrName='flowlines']" type="line" symbology="flow_lines" />
<Node label="Integrated Geographic Objects" xpath="Geopackage/Layers/Vector[@lyrName='igo']" type="point" symbology="IGO" />
<Node label="Discrete Geographic Objects" xpath="Geopackage/Layers/Vector[@lyrName='dgo']" type="point" symbology="DGO" />
<Node label="Digital Elevation Model" xpath="Raster[@id='DEM']" type="raster" id="dem" symbology="dem" transparency="40" />
Expand Down
24 changes: 24 additions & 0 deletions Symbology/web/ChannelArea/FILTERED_FLOWAREAS.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,30 @@
"#000000"
]
}
},
{
"id": "filteredflowareas-1xfmi5",
"type": "fill",
"source": "composite",
"source-layer": "filteredflowareas-1xfmi5",
"layout": {},
"paint": {
"fill-color": [
"match",
["get", "fcode"],
[46006],
"hsl(178, 64%, 35%)",
[48400],
"hsl(34, 97%, 71%)",
[34306],
"hsl(0, 0%, 0%)",
[53700],
"hsl(178, 223%, 138%)",
[43100],
"hsl(197, 24%, 240%)",
"#000000"
]
}
}
]
}
31 changes: 31 additions & 0 deletions Symbology/web/ChannelArea/FILTERED_WATERBODY.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,37 @@
],
"fill-opacity": ["match", ["get", "FCode"], [39001], 0.73, 1]
}
},
{
"id": "waterbodiesfiltered-73drf0",
"type": "fill",
"source": "composite",
"source-layer": "WaterbodiesFiltered-73drf0",
"layout": {},
"paint": {
"fill-color": [
"match",
["get", "fcode"],
[39004, 39009, 39011],
"hsl(196, 76%, 61%)",
[39001],
"hsl(196, 71%, 74%)",
[43601, 43604, 43610, 43612, 43613],
"hsl(64, 66%, 56%)",
[46600],
"hsl(131, 59%, 52%)",
[
"interpolate",
["linear"],
["get", "fcode"],
39001,
"#000000",
46600,
"#000000"
]
],
"fill-opacity": ["match", ["get", "fcode"], [39001], 0.73, 1]
}
}
]
}
32 changes: 31 additions & 1 deletion Symbology/web/ChannelArea/FLOWAREAS.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,40 @@
[45500],
"hsl(200, 48%, 87%)",
[33600],
"hsl(29, 43%, 62%))",
"hsl(29, 43%, 62%)",
"#000000"
]
}
},
{
"id": "nhdflowareasnovember-a4jlrn",
"type": "fill",
"source": "composite",
"source-layer": "nhdflowareasNOVEMBER-a4jlrn",
"layout": {},
"paint": {
"fill-color": [
"match",
["get", "fcode"],
[46006],
"hsl(178, 64%, 35%)",
[48400],
"hsl(34, 97%, 71%)",
[34306],
"hsl(0, 0%, 0%)",
[53700],
"hsl(178, 223%, 138%)",
[43100],
"hsl(197, 24%, 240%)",
[40307],
"hsl(91, 38%, 87%)",
[45500],
"hsl(200, 48%, 87%)",
[33600],
"hsl(29, 43%, 62%)",
"#000000"
]
}
}
]
}
43 changes: 39 additions & 4 deletions Symbology/web/ChannelArea/WATER_BODIES.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
["hsl(196, 71%, 74%)", "39001 - Lake/Pond (intermittent)"],
["hsl(64, 66%, 56%)", "43601, 43604, 43610, 43612, 43613 - Reservoir"],
["hsl(131, 59%, 52%)", "46600 - Swamp/Marsh"],
["hsl(19, 50%, 96%)", "36100 - Playa"],
["hsl(158, 25%, 100%)", "37800 - Ice Mass"]
["hsl(20, 86%, 72%)", "36100 - Playa"],
["hsl(159, 100%, 87%)", "37800 - Ice Mass"]
],
"layerStyles": [
{
Expand All @@ -28,9 +28,9 @@
[46600],
"hsl(131, 59%, 52%)",
[36100],
"hsl(19, 50%, 96%)",
"hsl(20, 86%, 72%)",
[37800],
"hsl(158, 25%, 100%)",
"hsl(159, 100%, 87%)",
[
"interpolate",
["linear"],
Expand All @@ -43,6 +43,41 @@
],
"fill-opacity": ["match", ["get", "FCode"], [39001], 0.73, 1]
}
},
{
"id": "waterbodiesnovember-8awwio",
"type": "fill",
"source": "composite",
"source-layer": "WaterbodiesNOVEMBER-8awwio",
"layout": {},
"paint": {
"fill-color": [
"match",
["get", "fcode"],
[39004, 39009, 39011],
"hsl(196, 76%, 61%)",
[39001],
"hsl(196, 71%, 74%)",
[43601, 43604, 43610, 43612, 43613],
"hsl(64, 66%, 56%)",
[46600],
"hsl(131, 59%, 52%)",
[36100],
"hsl(20, 86%, 72%)",
[37800],
"hsl(159, 100%, 87%)",
[
"interpolate",
["linear"],
["get", "fcode"],
39001,
"#000000",
46600,
"#000000"
]
],
"fill-opacity": ["match", ["get", "fcode"], [39001], 0.73, 1]
}
}
]
}
95 changes: 0 additions & 95 deletions Symbology/web/RCAT/stream_reaches.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Symbology/web/Shared/nhdephemeral.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"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],
Expand Down
6 changes: 3 additions & 3 deletions Symbology/web/Shared/nhdperrenial.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
"hsl(220, 100%, 23%)",
"hsla(0, 0%, 0%, 0)"
],
"line-width": ["match", ["get", "fcode"], [33400], 0.5, 1, 0]
"line-width": ["match", ["get", "fcode"], [33400], 0.5, 1]
}
},
{
"id": "perennial network",
"id": "perennial drainage network",
"type": "line",
"source": "composite",
"source-layer": "NHD_flowline-6tver9",
Expand All @@ -45,7 +45,7 @@
"hsl(220, 100%, 23%)",
"hsla(0, 0%, 0%, 0)"
],
"line-width": ["match", ["get", "FCode"], [33400], 0.5, 1, 0]
"line-width": ["match", ["get", "FCode"], [33400], 0.5, 1]
}
}
]
Expand Down
Loading