v2.0.0.9102

* refactor: Leaflet map Fuzzy Thermal changes + Create multiple TIEs for legend so don't count as NA - TIE_A_B same as TIE_B_A + Remove Continuous_Thermal as a required field - Was used for size but size no longer being used
leppott · Oct 17, 2023 · d9bed1c · d9bed1c
1 parent d609f98
commit d9bed1c
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 7 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: BCGcalc
 Type: Package
 Title: Biological Condition Gradient, calculator
-Version: 2.0.0.9101
+Version: 2.0.0.9102
 Authors@R: c(
   person("Erik W.", "Leppo", email="[email protected]", role=c("aut","cre")), 
   person("Jen", "Stamp", email="[email protected]", role="ctb"),

diff --git a/NEWS b/NEWS
@@ -1,11 +1,19 @@
 BCGcalc-NEWS
 ================
 <[email protected]>
-2023-10-03 11:20:44.059906
+2023-10-17 10:57:42.763533
 
 <!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->
 
-    #> Last Update: 2023-10-03 11:20:44.123572
+    #> Last Update: 2023-10-17 10:57:42.785233
+
+# BCGcalc 2.0.0.9102 (2023-10-17)
+
+- refactor: Leaflet map Fuzzy Thermal changes
+  - Create multiple TIEs for legend so don’t count as NA
+    - TIE_A_B same as TIE_B_A
+  - Remove Continuous_Thermal as a required field
+    - Was used for size but size no longer being used
 
 # BCGcalc 2.0.0.9101 (2023-10-03)
 

diff --git a/NEWS.md b/NEWS.md
@@ -1,11 +1,19 @@
 BCGcalc-NEWS
 ================
 <[email protected]>
-2023-10-03 11:20:44.059906
+2023-10-17 10:57:42.763533
 
 <!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->
 
-    #> Last Update: 2023-10-03 11:20:44.123572
+    #> Last Update: 2023-10-17 10:57:42.785233
+
+# BCGcalc 2.0.0.9102 (2023-10-17)
+
+- refactor: Leaflet map Fuzzy Thermal changes
+  - Create multiple TIEs for legend so don’t count as NA
+    - TIE_A_B same as TIE_B_A
+  - Remove Continuous_Thermal as a required field
+    - Was used for size but size no longer being used
 
 # BCGcalc 2.0.0.9101 (2023-10-03)
 

diff --git a/NEWS.rmd b/NEWS.rmd
@@ -21,6 +21,14 @@ knitr::opts_chunk$set(
 cat(paste0("Last Update: ",Sys.time()))
 ```
 
+# BCGcalc 2.0.0.9102 (2023-10-17)
+
+* refactor: Leaflet map Fuzzy Thermal changes
+    + Create multiple TIEs for legend so don't count as NA
+        - TIE_A_B same as TIE_B_A
+    + Remove Continuous_Thermal as a required field
+        - Was used for size but size no longer being used
+
 # BCGcalc 2.0.0.9101 (2023-10-03)
 
 * refactor: For leaflet map change to addCircleMarkers

diff --git a/inst/shiny-examples/BCGcalc/global.R b/inst/shiny-examples/BCGcalc/global.R
@@ -1,7 +1,7 @@
 # Shiny Global File
 
 # Version ----
-pkg_version <- "2.0.0.9101"
+pkg_version <- "2.0.0.9102"
 
 # Packages----
 # nolint start

diff --git a/inst/shiny-examples/BCGcalc/server.R b/inst/shiny-examples/BCGcalc/server.R
@@ -3833,7 +3833,7 @@ shinyServer(function(input, output) {
       sel_map_col_mapval <- "BCG_Status"
       sel_map_col_mapnar <- "BCG_Status2"
     } else if (sel_map_datatype == "Fuzzy Temp Model") {
-      sel_map_col_mapval <- "Continuous_Therm"
+      sel_map_col_mapval <- "Therm_Class" #"Continuous_Therm"
       sel_map_col_mapnar <- "Therm_Class"
     } else if (sel_map_datatype == "MTTI") {
       sel_map_col_mapval <- "MTTI"
@@ -4106,28 +4106,34 @@ shinyServer(function(input, output) {
       leg_col <- c("#140AE6"
                    , "#0066FF"
                    , "#7B9BF5"
+                   , "#7B9BF5"
                    , "#0AE1EC"
                    , "#9AF3FC"
                    , "#BEFEFB"
                    , "#DDFBFF"
+                   , "#DDFBFF"
                    , "#C6FFB9"
                    , "#34FB25"
                    , "#FFFF66"
                    , "#FFFFE5"
+                   , "#FFFFE5"
                    , "#E4DFEC"
                    , "#FFC000"
                    , "#808080"
       )
       leg_nar <- c("VeryCold"
                    , "VCold_Cold"
                    , "TIE_VCold_Cold"
+                   , "TIE_Cold_VCold"
                    , "Cold_VCold"
                    , "Cold"
                    , "Cold_Cool"
                    , "TIE_Cold_Cool"
+                   , "TIE_Cool_Cold"
                    , "Cool_Cold"
                    , "Cool"
                    , "Cool_Warm"
+                   , "TIE_Cool_Warm"
                    , "TIE_Warm_Cool"
                    , "Warm_Cool"
                    , "Warm"