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.

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

Changes to confinement symbology for qgis and web. #722

Merged
merged 2 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
595 changes: 595 additions & 0 deletions Symbology/qgis/Confinement/confinement_dgo.qml

Large diffs are not rendered by default.

868 changes: 868 additions & 0 deletions Symbology/qgis/Confinement/confinement_igo.qml

Large diffs are not rendered by default.

668 changes: 668 additions & 0 deletions Symbology/qgis/Confinement/confinement_ratio.qml

Large diffs are not rendered by default.

767 changes: 418 additions & 349 deletions Symbology/qgis/Confinement/confinement_raw.qml

Large diffs are not rendered by default.

368 changes: 262 additions & 106 deletions Symbology/qgis/Confinement/confining_poly.qml

Large diffs are not rendered by default.

1,400 changes: 637 additions & 763 deletions Symbology/qgis/Confinement/constriction_ratio.qml

Large diffs are not rendered by default.

533 changes: 324 additions & 209 deletions Symbology/qgis/Confinement/error_polygons.qml

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions Symbology/web/Confinement/confinement_dgo.json
Original file line number Diff line number Diff line change
@@ -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%)"}
}
]
}
20 changes: 20 additions & 0 deletions Symbology/web/Confinement/confinement_igo.json
Original file line number Diff line number Diff line change
@@ -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
}
}
]
}
46 changes: 29 additions & 17 deletions Symbology/web/Confinement/confinement_ratio.json
Original file line number Diff line number Diff line change
@@ -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%)"
]
}
}
}
]
}
37 changes: 20 additions & 17 deletions Symbology/web/Confinement/confinement_raw.json
Original file line number Diff line number Diff line change
@@ -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%)"
]
}
}
}
]
}
31 changes: 14 additions & 17 deletions Symbology/web/Confinement/confining_poly.json
Original file line number Diff line number Diff line change
@@ -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)"}
}
]
}
70 changes: 59 additions & 11 deletions Symbology/web/Confinement/constriction_ratio.json
Original file line number Diff line number Diff line change
@@ -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%)"
]
}
}
}
]
}
Loading