From 168dfe43e672b24d925d2f4693042ca4c1fc9676 Mon Sep 17 00:00:00 2001 From: Jordan Gilbert Date: Mon, 5 Feb 2024 16:24:34 -0700 Subject: [PATCH 1/3] some anthro and rcat bl --- RaveBusinessLogic/V2/Anthro.xml | 8 ++++---- RaveBusinessLogic/V2/RCAT.xml | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/RaveBusinessLogic/V2/Anthro.xml b/RaveBusinessLogic/V2/Anthro.xml index 8b876391..2fa0bc71 100644 --- a/RaveBusinessLogic/V2/Anthro.xml +++ b/RaveBusinessLogic/V2/Anthro.xml @@ -8,7 +8,7 @@ - + @@ -23,8 +23,8 @@ - - + + @@ -44,7 +44,7 @@ - + diff --git a/RaveBusinessLogic/V2/RCAT.xml b/RaveBusinessLogic/V2/RCAT.xml index 8189205f..1d88896f 100644 --- a/RaveBusinessLogic/V2/RCAT.xml +++ b/RaveBusinessLogic/V2/RCAT.xml @@ -43,7 +43,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -90,8 +90,7 @@ This view is the riparian condition ouptut from RCAT - - + From 7075c76a7da199b09d08e0093b70118fbb879028 Mon Sep 17 00:00:00 2001 From: Jordan Gilbert Date: Mon, 12 Feb 2024 12:24:27 -0700 Subject: [PATCH 2/3] anthro and rcat updates for workshop --- RaveBusinessLogic/V2/Anthro.xml | 2 +- RaveBusinessLogic/V2/RCAT.xml | 22 +- Symbology/qgis/Anthro/DivPts_ct.qml | 1142 +++++---- Symbology/qgis/Anthro/DivPts_dens.qml | 1024 ++++---- Symbology/qgis/Anthro/road_valleybottom.qml | 405 +++ Symbology/qgis/Anthro/roadcross_count.qml | 1024 ++++---- Symbology/qgis/Anthro/roadcross_density.qml | 906 +++---- Symbology/qgis/Shared/ownership.qml | 1914 ++++++-------- Symbology/qgis/Shared/reach_ownership.qml | 2194 +++++++++++++++++ Symbology/web/Anthro/DivPts_ct.json | 26 +- Symbology/web/Anthro/DivPts_dens.json | 26 +- .../Anthro/{LUIRaster.clr => LUIRaster.txt} | 0 Symbology/web/Anthro/reach_ownership.json | 110 + Symbology/web/Anthro/road_valleybottom.json | 16 + Symbology/web/Anthro/roadcross_count.json | 26 +- Symbology/web/Anthro/roadcross_density.json | 18 +- Symbology/web/Shared/ownership.json | 20 +- 17 files changed, 5806 insertions(+), 3069 deletions(-) create mode 100755 Symbology/qgis/Anthro/road_valleybottom.qml create mode 100755 Symbology/qgis/Shared/reach_ownership.qml rename Symbology/web/Anthro/{LUIRaster.clr => LUIRaster.txt} (100%) create mode 100644 Symbology/web/Anthro/reach_ownership.json create mode 100644 Symbology/web/Anthro/road_valleybottom.json diff --git a/RaveBusinessLogic/V2/Anthro.xml b/RaveBusinessLogic/V2/Anthro.xml index 2fa0bc71..7131da75 100644 --- a/RaveBusinessLogic/V2/Anthro.xml +++ b/RaveBusinessLogic/V2/Anthro.xml @@ -92,7 +92,7 @@ - + This view displayis the sampling units (IGOs and DGOs) diff --git a/RaveBusinessLogic/V2/RCAT.xml b/RaveBusinessLogic/V2/RCAT.xml index 1d88896f..5d3380e4 100644 --- a/RaveBusinessLogic/V2/RCAT.xml +++ b/RaveBusinessLogic/V2/RCAT.xml @@ -42,8 +42,8 @@ - - + + @@ -93,7 +93,7 @@ - + This view shows the IGOs and DGOs @@ -109,5 +109,21 @@ + + This view shows the riparian vegetation conversion type output overlayed on the conversion raster + + + + + + + + This view shows the floodplain accessibility output overlayed on the floodplain accessibility raster + + + + + + \ No newline at end of file diff --git a/Symbology/qgis/Anthro/DivPts_ct.qml b/Symbology/qgis/Anthro/DivPts_ct.qml index d813635e..ad226c6e 100644 --- a/Symbology/qgis/Anthro/DivPts_ct.qml +++ b/Symbology/qgis/Anthro/DivPts_ct.qml @@ -1,540 +1,540 @@ - + 1 1 1 0 - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - - - - - + - + - - - - - + - + - - - - - + - + - - - - - + - + - - - - - + - + - - - - - + - + @@ -545,10 +545,10 @@ - @@ -557,53 +557,53 @@ 0 1 - - - + + + - + - + @@ -611,121 +611,170 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + + @@ -800,29 +871,42 @@ + + + + + + - + - @@ -854,55 +938,79 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Symbology/qgis/Anthro/DivPts_dens.qml b/Symbology/qgis/Anthro/DivPts_dens.qml index daeba51f..92aa89f7 100644 --- a/Symbology/qgis/Anthro/DivPts_dens.qml +++ b/Symbology/qgis/Anthro/DivPts_dens.qml @@ -1,522 +1,522 @@ - + 1 1 1 0 - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - - - - - + - + - - - - - + - + - - - - - + - + - - - - - + - + - - - - - + - + - - - - @@ -524,17 +524,17 @@ - - + + @@ -546,9 +546,9 @@ - @@ -556,54 +556,54 @@ 0 0 1 - - - - + + + + - + - + @@ -611,12 +611,12 @@ - + @@ -624,108 +624,157 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -858,6 +942,7 @@ def my_form_open(dialog, layer, feature): + @@ -865,8 +950,15 @@ def my_form_open(dialog, layer, feature): + + + + + + + @@ -875,6 +967,7 @@ def my_form_open(dialog, layer, feature): + @@ -882,8 +975,15 @@ def my_form_open(dialog, layer, feature): + + + + + + + @@ -892,6 +992,7 @@ def my_form_open(dialog, layer, feature): + @@ -899,8 +1000,15 @@ def my_form_open(dialog, layer, feature): + + + + + + + diff --git a/Symbology/qgis/Anthro/road_valleybottom.qml b/Symbology/qgis/Anthro/road_valleybottom.qml new file mode 100755 index 00000000..09d87dd6 --- /dev/null +++ b/Symbology/qgis/Anthro/road_valleybottom.qml @@ -0,0 +1,405 @@ + + + + 1 + 1 + 1 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + + 0 + generatedlayout + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "PERMANENT_" + + 1 + diff --git a/Symbology/qgis/Anthro/roadcross_count.qml b/Symbology/qgis/Anthro/roadcross_count.qml index 80b49e8b..94fd416b 100644 --- a/Symbology/qgis/Anthro/roadcross_count.qml +++ b/Symbology/qgis/Anthro/roadcross_count.qml @@ -1,522 +1,522 @@ - + 1 1 1 0 - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - - - - - + - + - - - - - + - + - - - - - + - + - - - - - + - + - - - - - + - + - - - - @@ -524,17 +524,17 @@ - - + + @@ -546,9 +546,9 @@ - @@ -556,54 +556,54 @@ 0 0 1 - - - - + + + + - + - + @@ -611,12 +611,12 @@ - + @@ -624,108 +624,157 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + - + - @@ -858,6 +942,7 @@ def my_form_open(dialog, layer, feature): + @@ -865,8 +950,15 @@ def my_form_open(dialog, layer, feature): + + + + + + + @@ -875,6 +967,7 @@ def my_form_open(dialog, layer, feature): + @@ -882,8 +975,15 @@ def my_form_open(dialog, layer, feature): + + + + + + + @@ -892,6 +992,7 @@ def my_form_open(dialog, layer, feature): + @@ -899,8 +1000,15 @@ def my_form_open(dialog, layer, feature): + + + + + + + diff --git a/Symbology/qgis/Anthro/roadcross_density.qml b/Symbology/qgis/Anthro/roadcross_density.qml index 0456ee66..fc58925b 100644 --- a/Symbology/qgis/Anthro/roadcross_density.qml +++ b/Symbology/qgis/Anthro/roadcross_density.qml @@ -1,522 +1,522 @@ - + 1 1 1 0 - + +<<<<<<< HEAD - + - + - - + - + - + - + - + - - - - - + + + + + - + - + - - - - - + - + - - - - - + - + - - - - - + - + - - - - - + - + - - - - - + - + - - - - @@ -524,17 +524,17 @@ - - - + + + @@ -548,7 +548,7 @@ - @@ -557,53 +557,53 @@ 0 1 - - - + + + - + - + @@ -611,12 +611,12 @@ - + @@ -624,7 +624,7 @@ - + @@ -783,28 +783,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -831,82 +831,82 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - +