From 7c46dff021fa6508195c4fa5fe3323fe9726d2be Mon Sep 17 00:00:00 2001 From: Chloe Seeborg Date: Fri, 8 Nov 2024 16:30:23 -0700 Subject: [PATCH] RME IGO fixes, round 2 --- .../web/rs_metric_engine/AcresVB_Mile.json | 3 +- .../web/rs_metric_engine/Act_Chan_Ratio.json | 3 +- Symbology/web/rs_metric_engine/Ag_Conv.json | 3 +- Symbology/web/rs_metric_engine/Dev_Conv.json | 3 +- .../web/rs_metric_engine/Elevated_Ratio.json | 3 +- .../web/rs_metric_engine/Fldpln_Access.json | 3 +- .../rs_metric_engine/Floodplain_Ratio.json | 3 +- .../web/rs_metric_engine/HectaresVB_Km.json | 3 +- .../web/rs_metric_engine/IGO_Confinement.json | 22 ++++++------ .../rs_metric_engine/IGO_Constriction.json | 6 ++-- .../web/rs_metric_engine/IGO_Plan_Sin.json | 3 +- .../rs_metric_engine/Integrated_Width.json | 35 +++++++++---------- Symbology/web/rs_metric_engine/Land_Use.json | 3 +- .../web/rs_metric_engine/Low_Lying_Ratio.json | 3 +- Symbology/web/rs_metric_engine/Prop_Rip.json | 27 +++++++------- .../web/rs_metric_engine/RME_Capacity.json | 6 ++-- .../web/rs_metric_engine/RME_Drainage.json | 31 ++++++++-------- .../web/rs_metric_engine/RME_Opportunity.json | 4 +-- Symbology/web/rs_metric_engine/RME_Risk.json | 7 ++-- .../web/rs_metric_engine/Rail_Density.json | 3 +- .../web/rs_metric_engine/Rel_Flow_Length.json | 27 +++++++------- .../web/rs_metric_engine/Road_Density.json | 3 +- .../web/rs_metric_engine/Stream_Grad.json | 3 +- .../web/rs_metric_engine/Valley_Grad.json | 3 +- 24 files changed, 96 insertions(+), 114 deletions(-) diff --git a/Symbology/web/rs_metric_engine/AcresVB_Mile.json b/Symbology/web/rs_metric_engine/AcresVB_Mile.json index d14b74c9..3199340c 100644 --- a/Symbology/web/rs_metric_engine/AcresVB_Mile.json +++ b/Symbology/web/rs_metric_engine/AcresVB_Mile.json @@ -63,8 +63,7 @@ 500, "rgb(12, 118, 193)", 1000000, - "rgb(12, 118, 193)", - "hsla(0, 0%, 0%, 0)" + "rgb(12, 118, 193)" ], "circle-radius": 3 } diff --git a/Symbology/web/rs_metric_engine/Act_Chan_Ratio.json b/Symbology/web/rs_metric_engine/Act_Chan_Ratio.json index 81e743f8..3c7fa8cd 100644 --- a/Symbology/web/rs_metric_engine/Act_Chan_Ratio.json +++ b/Symbology/web/rs_metric_engine/Act_Chan_Ratio.json @@ -53,8 +53,7 @@ 0.75, "rgb(8, 48, 107)", 1.00, - "rgb(8, 48, 107)", - "hsla(0, 0%, 0%, 0)" + "rgb(8, 48, 107)" ], "circle-radius": 3 } diff --git a/Symbology/web/rs_metric_engine/Ag_Conv.json b/Symbology/web/rs_metric_engine/Ag_Conv.json index 15c725d2..6cbfd577 100644 --- a/Symbology/web/rs_metric_engine/Ag_Conv.json +++ b/Symbology/web/rs_metric_engine/Ag_Conv.json @@ -43,8 +43,7 @@ 0.6001, "rgb(255, 153, 0)", 1, - "rgb(255, 153, 0)", - "hsla(0, 0%, 0%, 0)" + "rgb(255, 153, 0)" ], "circle-radius": [ "interpolate", diff --git a/Symbology/web/rs_metric_engine/Dev_Conv.json b/Symbology/web/rs_metric_engine/Dev_Conv.json index 589ff041..3abec300 100644 --- a/Symbology/web/rs_metric_engine/Dev_Conv.json +++ b/Symbology/web/rs_metric_engine/Dev_Conv.json @@ -43,8 +43,7 @@ 0.6001, "rgb(107, 0, 0)", 1, - "rgb(107, 0, 0)", - "hsla(0, 0%, 0%, 0)" + "rgb(107, 0, 0)" ], "circle-radius": [ "interpolate", diff --git a/Symbology/web/rs_metric_engine/Elevated_Ratio.json b/Symbology/web/rs_metric_engine/Elevated_Ratio.json index ab348779..32397bc2 100644 --- a/Symbology/web/rs_metric_engine/Elevated_Ratio.json +++ b/Symbology/web/rs_metric_engine/Elevated_Ratio.json @@ -53,8 +53,7 @@ 0.75, "rgb(113, 111, 53)", 2, - "rgb(113, 111, 53)", - "hsla(0, 0%, 0%, 0)" + "rgb(113, 111, 53)" ], "circle-radius": 3 } diff --git a/Symbology/web/rs_metric_engine/Fldpln_Access.json b/Symbology/web/rs_metric_engine/Fldpln_Access.json index 00acda54..58fde561 100644 --- a/Symbology/web/rs_metric_engine/Fldpln_Access.json +++ b/Symbology/web/rs_metric_engine/Fldpln_Access.json @@ -38,8 +38,7 @@ 0.9501, "rgb(31, 147, 255)", 1, - "rgb(31, 147, 255)", - "hsla(0, 0%, 0%, 0)" + "rgb(31, 147, 255)" ], "circle-radius": 3 } diff --git a/Symbology/web/rs_metric_engine/Floodplain_Ratio.json b/Symbology/web/rs_metric_engine/Floodplain_Ratio.json index bfe9c6e7..051fe207 100644 --- a/Symbology/web/rs_metric_engine/Floodplain_Ratio.json +++ b/Symbology/web/rs_metric_engine/Floodplain_Ratio.json @@ -38,8 +38,7 @@ 0.9501, "rgb(0, 104, 55)", 1.00, - "rgb(0, 104, 55)", - "hsla(0, 0%, 0%, 0)" + "rgb(0, 104, 55)" ], "circle-radius": 3 } diff --git a/Symbology/web/rs_metric_engine/HectaresVB_Km.json b/Symbology/web/rs_metric_engine/HectaresVB_Km.json index 0e220835..ac4e672d 100644 --- a/Symbology/web/rs_metric_engine/HectaresVB_Km.json +++ b/Symbology/web/rs_metric_engine/HectaresVB_Km.json @@ -63,8 +63,7 @@ 125, "rgb(12, 118, 193)", 1000000, - "rgb(12, 118, 193)", - "hsla(0, 0%, 0%, 0)" + "rgb(12, 118, 193)" ], "circle-radius": 3 } diff --git a/Symbology/web/rs_metric_engine/IGO_Confinement.json b/Symbology/web/rs_metric_engine/IGO_Confinement.json index e6d9d1e4..b349f397 100644 --- a/Symbology/web/rs_metric_engine/IGO_Confinement.json +++ b/Symbology/web/rs_metric_engine/IGO_Confinement.json @@ -4,7 +4,8 @@ ["rgb(26, 150, 65)", "Unconfined (0 - 0.1)"], ["rgb(166, 217, 106)", "Partly Confined - Planform Controlled (0.1 - 0.5)"], ["rgb(253, 174, 97)", "Partly Confined - Bedrock Controlled (0.5 - 0.85)"], - ["rgb(215, 25, 28)", "Confined (0.85 - 1)"] + ["rgb(215, 25, 28)", "Confined (0.85 - 1)"], + ["rgb(0, 0, 0)", "Null"] ], "layerStyles": [ { @@ -19,21 +20,21 @@ ["linear"], ["get", "conf_igo_confinement_ratio"], 0, - 6.8, + 4.5, 0.1, - 6.8, + 4.5, 0.1001, - 6, + 4, 0.5, - 6, + 4, 0.5001, - 5.3, + 3.5, 0.85, - 5.3, + 3.5, 0.8501, - 4.5, + 3, 1, - 4.5 + 3 ], "circle-color": [ "interpolate", @@ -54,8 +55,7 @@ 0.8501, "rgb(215, 25, 28)", 1, - "rgb(215, 25, 28)", - "hsla(0, 0%, 0%, 0)" + "rgb(215, 25, 28)" ] } } diff --git a/Symbology/web/rs_metric_engine/IGO_Constriction.json b/Symbology/web/rs_metric_engine/IGO_Constriction.json index 057ddfdd..cee7bef9 100644 --- a/Symbology/web/rs_metric_engine/IGO_Constriction.json +++ b/Symbology/web/rs_metric_engine/IGO_Constriction.json @@ -5,7 +5,8 @@ ["rgb(255, 191, 191)", "0.2 - 0.4"], ["rgb(255, 128, 128)", "0.4 - 0.6"], ["rgb(255, 64, 64)", "0.6 - 0.8"], - ["rgb(255, 0, 0)", "0.8 - 1"] + ["rgb(255, 0, 0)", "0.8 - 1"], + ["rgb(0, 0, 0)", "Null"] ], "layerStyles": [ { @@ -38,8 +39,7 @@ 0.8001, "rgb(255, 0, 0)", 1, - "rgb(255, 0, 0)", - "hsla(0, 0%, 0%, 0)" + "rgb(255, 0, 0)" ], "circle-radius": 3 } diff --git a/Symbology/web/rs_metric_engine/IGO_Plan_Sin.json b/Symbology/web/rs_metric_engine/IGO_Plan_Sin.json index 035fc7b1..96f63125 100644 --- a/Symbology/web/rs_metric_engine/IGO_Plan_Sin.json +++ b/Symbology/web/rs_metric_engine/IGO_Plan_Sin.json @@ -43,8 +43,7 @@ 5.0001, "rgb(152, 0, 67)", 50.00, - "rgb(152, 0, 67)", - "hsla(0, 0%, 0%, 0)" + "rgb(152, 0, 67)" ], "circle-radius": [ "interpolate", diff --git a/Symbology/web/rs_metric_engine/Integrated_Width.json b/Symbology/web/rs_metric_engine/Integrated_Width.json index a49c1ce7..6b00b397 100644 --- a/Symbology/web/rs_metric_engine/Integrated_Width.json +++ b/Symbology/web/rs_metric_engine/Integrated_Width.json @@ -53,45 +53,44 @@ 10000.0001, "rgb(253, 231, 37)", 100000, - "rgb(253, 231, 37)", - "hsla(0, 0%, 0%, 0)" + "rgb(253, 231, 37)" ], "circle-radius": [ "interpolate", ["linear"], ["get", "vbet_igo_integrated_width"], 0.00, - 3.8, + 3, 10, - 3.8, + 3, 10.0001, - 4.5, + 3.5, 25, - 4.5, + 3.5, 25.0001, - 5.3, + 4, 100, - 5.3, + 4, 100.0001, - 6, + 4.5, 250, - 6, + 4.5, 250.0001, - 6.8, + 5, 500, - 6.8, + 5, 500.0001, - 7.5, + 5.5, 1000, - 7.5, + 5.5, 1000.0001, - 8.3, + 6, 10000, - 8.3, + 6, 10000.0001, - 9, + 6.5, 100000, - 9 + 6.5 ] } } diff --git a/Symbology/web/rs_metric_engine/Land_Use.json b/Symbology/web/rs_metric_engine/Land_Use.json index c7abede3..d86c9047 100644 --- a/Symbology/web/rs_metric_engine/Land_Use.json +++ b/Symbology/web/rs_metric_engine/Land_Use.json @@ -33,8 +33,7 @@ 66.0001, "rgb(245, 0, 0)", 100, - "rgb(245, 0, 0)", - "hsla(0, 0%, 0%, 0)" + "rgb(245, 0, 0)" ], "circle-radius": 3 } diff --git a/Symbology/web/rs_metric_engine/Low_Lying_Ratio.json b/Symbology/web/rs_metric_engine/Low_Lying_Ratio.json index a97bd726..50d0bf0d 100644 --- a/Symbology/web/rs_metric_engine/Low_Lying_Ratio.json +++ b/Symbology/web/rs_metric_engine/Low_Lying_Ratio.json @@ -53,8 +53,7 @@ 0.75, "rgb(0, 68, 27)", 2, - "rgb(0, 68, 27)", - "hsla(0, 0%, 0%, 0)" + "rgb(0, 68, 27)" ], "circle-radius": 3 } diff --git a/Symbology/web/rs_metric_engine/Prop_Rip.json b/Symbology/web/rs_metric_engine/Prop_Rip.json index bbf36bb5..fa904c42 100644 --- a/Symbology/web/rs_metric_engine/Prop_Rip.json +++ b/Symbology/web/rs_metric_engine/Prop_Rip.json @@ -43,37 +43,36 @@ 0.6001, "rgb(9, 112, 0)", 1, - "rgb(9, 112, 0)", - "hsla(0, 0%, 0%, 0)" + "rgb(9, 112, 0)" ], "circle-radius": [ "interpolate", ["linear"], ["get", "rcat_igo_prop_riparian"], 0, - 3.8, + 3, 0.00001, - 3.8, + 3, 0.00002, - 4.5, + 3.5, 0.05, - 4.5, + 3.5, 0.0501, - 5.3, + 4, 0.15, - 5.3, + 4, 0.1501, - 6, + 4.5, 0.3, - 6, + 4.5, 0.3001, - 6.8, + 5, 0.6, - 6.8, + 5, 0.6001, - 7.5, + 5.5, 1, - 7.5 + 5.5 ] } } diff --git a/Symbology/web/rs_metric_engine/RME_Capacity.json b/Symbology/web/rs_metric_engine/RME_Capacity.json index 0a956aee..1285d668 100644 --- a/Symbology/web/rs_metric_engine/RME_Capacity.json +++ b/Symbology/web/rs_metric_engine/RME_Capacity.json @@ -6,7 +6,8 @@ ["rgb(245, 245, 0)", "Occasional: 1-5 dams/km (2-8 dams/mi)"], ["rgb(76, 230, 1)", "Frequent: 5-15 dams/km (8-24 dams/mi)"], ["rgb(0, 93, 230)", "Pervasive: 15-40 dams/km (24-64 dams/mi)"], - ["rgb(19, 26, 113)", "> 40 dams/km"] + ["rgb(19, 26, 113)", "> 40 dams/km"], + ["rgb(0, 0, 0)", "Null"] ], "layerStyles": [ { @@ -43,8 +44,7 @@ 40.0001, "rgb(19, 26, 113)", 100, - "rgb(19, 26, 113)", - "hsla(0, 0%, 0%, 0)" + "rgb(19, 26, 113)" ], "circle-radius": [ "interpolate", diff --git a/Symbology/web/rs_metric_engine/RME_Drainage.json b/Symbology/web/rs_metric_engine/RME_Drainage.json index 6f930b5e..0cc1a329 100644 --- a/Symbology/web/rs_metric_engine/RME_Drainage.json +++ b/Symbology/web/rs_metric_engine/RME_Drainage.json @@ -48,41 +48,40 @@ 250000.0001, "rgb(8, 22, 38)", 500000, - "rgb(8, 22, 38)", - "hsla(0, 0%, 0%, 0)" + "rgb(8, 22, 38)" ], "circle-radius": [ "interpolate", ["linear"], ["get", "rme_dgo_drainage_area"], 0, - 4.5, + 3, 10, - 4.5, + 3, 10.0001, - 5.3, + 3.5, 25, - 5.3, + 3.5, 25.0001, - 6, + 4, 100, - 6, + 4, 100.0001, - 6.8, + 4.5, 250, - 6.8, + 4.5, 250.0001, - 7.5, + 5, 50000, - 7.5, + 5, 50000.0001, - 8.3, + 5.5, 250000, - 8.3, + 5.5, 250000.0001, - 9, + 6, 500000, - 9 + 6 ] } } diff --git a/Symbology/web/rs_metric_engine/RME_Opportunity.json b/Symbology/web/rs_metric_engine/RME_Opportunity.json index b8db5a8b..616ec5ec 100644 --- a/Symbology/web/rs_metric_engine/RME_Opportunity.json +++ b/Symbology/web/rs_metric_engine/RME_Opportunity.json @@ -5,7 +5,7 @@ ["rgb(0, 197, 255)", "Straight Forward - Quick Return"], ["rgb(230, 204, 0)", "Strategic - Long-Term Investment"], ["rgb(185, 185, 185)", "None"], - ["rgb(0, 0, 0)", "NA"] + ["rgb(0, 0, 0)", "NA or Null"] ], "layerStyles": [ { @@ -28,7 +28,7 @@ "rgb(185, 185, 185)", ["NA"], "rgb(0, 0, 0)", - "hsla(0, 0%, 0%, 0)" + "rgb(0, 0, 0)" ], "circle-radius": 3 } diff --git a/Symbology/web/rs_metric_engine/RME_Risk.json b/Symbology/web/rs_metric_engine/RME_Risk.json index 85c48bef..d808d38b 100644 --- a/Symbology/web/rs_metric_engine/RME_Risk.json +++ b/Symbology/web/rs_metric_engine/RME_Risk.json @@ -5,7 +5,8 @@ ["rgb(255, 170, 0)", "Some Risk"], ["rgb(0, 197, 255)", "Minor Risk"], ["rgb(165, 165, 165)", "Negligible Risk"], - ["rgb(0, 0, 0)", "None"] + ["rgb(100, 100, 100)", "None"], + ["rgb(0, 0, 0)", "Null"] ], "layerStyles": [ { @@ -27,8 +28,8 @@ ["Negligible Risk"], "rgb(165, 165, 165)", ["None"], - "rgb(0, 0, 0)", - "hsla(0, 0%, 0%, 0)" + "rgb(100, 100, 100)", + "rgb(0, 0, 0)" ] } } diff --git a/Symbology/web/rs_metric_engine/Rail_Density.json b/Symbology/web/rs_metric_engine/Rail_Density.json index 8e3ade79..69bf4116 100644 --- a/Symbology/web/rs_metric_engine/Rail_Density.json +++ b/Symbology/web/rs_metric_engine/Rail_Density.json @@ -39,8 +39,7 @@ 1.0001, "rgb(255, 225, 60)", 1000000, - "rgb(255, 225, 60)", - "hsla(0, 0%, 0%, 0)" + "rgb(255, 225, 60)" ] } } diff --git a/Symbology/web/rs_metric_engine/Rel_Flow_Length.json b/Symbology/web/rs_metric_engine/Rel_Flow_Length.json index 15a58821..8cc3ad1d 100644 --- a/Symbology/web/rs_metric_engine/Rel_Flow_Length.json +++ b/Symbology/web/rs_metric_engine/Rel_Flow_Length.json @@ -43,37 +43,36 @@ 5.0001, "rgb(129, 15, 124)", 1000, - "rgb(129, 15, 124)", - "hsla(0, 0%, 0%, 0)" + "rgb(129, 15, 124)" ], "circle-radius": [ "interpolate", ["linear"], ["get", "rme_igo_rel_flow_length"], 0.00, - 3.8, + 3, 1, - 3.8, + 3, 1.0001, - 4.5, + 3.5, 1.2, - 4.5, + 3.5, 1.2001, - 5.3, + 4, 1.5, - 5.3, + 4, 1.5001, - 6, + 4.5, 2, - 6, + 4.5, 2.0001, - 6.8, 5, - 6.8, + 5, + 5, 5.0001, - 7.5, + 5.5, 1000, - 7.5 + 5.5 ] } } diff --git a/Symbology/web/rs_metric_engine/Road_Density.json b/Symbology/web/rs_metric_engine/Road_Density.json index b9e7fbc0..16e74d4d 100644 --- a/Symbology/web/rs_metric_engine/Road_Density.json +++ b/Symbology/web/rs_metric_engine/Road_Density.json @@ -39,8 +39,7 @@ 1.0001, "rgb(255, 104, 60)", 1000000, - "rgb(255, 104, 60)", - "hsla(0, 0%, 0%, 0)" + "rgb(255, 104, 60)" ] } } diff --git a/Symbology/web/rs_metric_engine/Stream_Grad.json b/Symbology/web/rs_metric_engine/Stream_Grad.json index 8d139d03..83908e29 100644 --- a/Symbology/web/rs_metric_engine/Stream_Grad.json +++ b/Symbology/web/rs_metric_engine/Stream_Grad.json @@ -43,8 +43,7 @@ 0.1001, "rgb(215, 48, 39)", 10, - "rgb(215, 48, 39)", - "hsla(0, 0%, 0%, 0)" + "rgb(215, 48, 39)" ], "circle-radius": 3 } diff --git a/Symbology/web/rs_metric_engine/Valley_Grad.json b/Symbology/web/rs_metric_engine/Valley_Grad.json index 2a6209d5..c66884d0 100644 --- a/Symbology/web/rs_metric_engine/Valley_Grad.json +++ b/Symbology/web/rs_metric_engine/Valley_Grad.json @@ -44,8 +44,7 @@ 0.1001, "rgb(215, 48, 39)", 10, - "rgb(215, 48, 39)", - "hsla(0, 0%, 0%, 0)" + "rgb(215, 48, 39)" ] } }