From 1a61f206b630d60419302172f81ea2c6842d5bf5 Mon Sep 17 00:00:00 2001
From: Nicole Hill <nicole@poissonconsulting.ca>
Date: Mon, 10 Jun 2024 12:36:40 -0700
Subject: [PATCH 1/5] Bump version to 0.2.0

---
 DESCRIPTION |  2 +-
 NEWS.md     | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index bba7cb5..c91119f 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: runbisonpic
 Title: Shiny App for Modeling Wood Bison Camera Trap Data
-Version: 0.1.0
+Version: 0.2.0
 Authors@R: c(
     person("Ayla", "Pearson", , "ayla@poissonconsulting.ca", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0001-7388-1222")),
diff --git a/NEWS.md b/NEWS.md
index 15e9469..6fade58 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,36 @@
 <!-- NEWS.md is maintained by https://fledge.cynkra.com, contributors should not edit this file -->
 
+# runbisonpic 0.2.0
+
+- Merge branch 'main' of github.com:poissonconsulting/runbisonpic.
+
+- Merge pull request #25 from poissonconsulting/dev.
+
+  Add button to download an example dataset
+
+- Merge pull request #24 from poissonconsulting/reviewjoe.
+
+  partial review
+
+- Merge pull request #22 from poissonconsulting/update-default-thinning.
+
+  Update thinning description and step size
+
+- Merge branch 'main' of github.com:poissonconsulting/runbisonpic.
+
+- Merge pull request #17 from poissonconsulting/model-error-catch.
+
+  Pop-up box to catch model error
+
+- Merge pull request #15 from poissonconsulting/f-model.
+
+  Minor fixes that should have been part of previous pull request
+
+- Merge pull request #14 from poissonconsulting/f-model.
+
+  Adding model and working app parts
+
+
 # runbisonpic 0.1.0
 
 - Added a `NEWS.md` file to track changes to the package.

From cd10904ac75a3e6725cde837f314278854a992c4 Mon Sep 17 00:00:00 2001
From: Nicole Hill <nicole@poissonconsulting.ca>
Date: Mon, 10 Jun 2024 12:39:15 -0700
Subject: [PATCH 2/5] Update NEWS file

---
 NEWS.md | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 6fade58..4188de4 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,34 +2,7 @@
 
 # runbisonpic 0.2.0
 
-- Merge branch 'main' of github.com:poissonconsulting/runbisonpic.
-
-- Merge pull request #25 from poissonconsulting/dev.
-
-  Add button to download an example dataset
-
-- Merge pull request #24 from poissonconsulting/reviewjoe.
-
-  partial review
-
-- Merge pull request #22 from poissonconsulting/update-default-thinning.
-
-  Update thinning description and step size
-
-- Merge branch 'main' of github.com:poissonconsulting/runbisonpic.
-
-- Merge pull request #17 from poissonconsulting/model-error-catch.
-
-  Pop-up box to catch model error
-
-- Merge pull request #15 from poissonconsulting/f-model.
-
-  Minor fixes that should have been part of previous pull request
-
-- Merge pull request #14 from poissonconsulting/f-model.
-
-  Adding model and working app parts
-
+- Add button to download an example dataset
 
 # runbisonpic 0.1.0
 

From 700c763d1c64932c0986d50c5bf353774852592b Mon Sep 17 00:00:00 2001
From: Ayla Pearson <ayla@poissonconsulting.ca>
Date: Tue, 11 Jun 2024 14:51:35 -0700
Subject: [PATCH 3/5] fix model setting mode issue

---
 R/mod-model.R | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/R/mod-model.R b/R/mod-model.R
index 838d32f..4499b1b 100644
--- a/R/mod-model.R
+++ b/R/mod-model.R
@@ -105,6 +105,9 @@ mod_model_server <- function(id, upload) {
         silent = TRUE
       )
 
+      on.exit(embr::set_analysis_mode("reset"))
+      embr::set_analysis_mode(input$model_type)
+
       if (is_try_error(rv$analysis)) {
         w$hide()
         cat(rv$analysis[1])

From e4cac3d30de6f2477144f96a4f579e3752f7c4b4 Mon Sep 17 00:00:00 2001
From: Nicole Hill <nicole@poissonconsulting.ca>
Date: Fri, 28 Jun 2024 12:38:32 -0700
Subject: [PATCH 4/5] Get current analysis mode to reset to on exit

---
 R/mod-model.R | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/R/mod-model.R b/R/mod-model.R
index 4499b1b..b02dd9d 100644
--- a/R/mod-model.R
+++ b/R/mod-model.R
@@ -105,7 +105,8 @@ mod_model_server <- function(id, upload) {
         silent = TRUE
       )
 
-      on.exit(embr::set_analysis_mode("reset"))
+      current_analysis_mode <- embr::get_analysis_mode()
+      on.exit(options(current_analysis_mode))
       embr::set_analysis_mode(input$model_type)
 
       if (is_try_error(rv$analysis)) {

From b6a21c3f02c3ae792aa55a94cfbca0875b68a8e0 Mon Sep 17 00:00:00 2001
From: Ayla Pearson <ayla@poissonconsulting.ca>
Date: Fri, 12 Jul 2024 11:58:57 -0700
Subject: [PATCH 5/5] update roxygen version

---
 DESCRIPTION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index bba7cb5..6a5ac7b 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -43,4 +43,4 @@ Remotes:
 Config/testthat/edition: 3
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2