merge changes from main

Merge branch 'main' into beta

# Conflicts:
#	DESCRIPTION
#	NEWS.md
#	R/00-Namespace.R

.github/workflows/pkgdown.yaml

@@ -29,14 +29,14 @@ jobs:
       - uses: r-lib/actions/setup-r@v2
         with:
           use-public-rspm: true
+          extra-repositories: |
+            https://Pandora-IsoMemo.github.io/drat/
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
           extra-packages: |
             any::pkgdown
             local::.
-          extra-repositories: |
-            https://Pandora-IsoMemo.github.io/drat/
           needs: website
 
       - name: Build site

DESCRIPTION

@@ -1,15 +1,15 @@
 Package: MapR
 Title: Display temporal and temperature graphical files for Isomemo
-Version: 24.3.0
+Version: 24.3.0.1
 Authors@R: c(person("Lukas", "Fuchs", email = "[email protected]", role = c("aut", "cre")))
 Description: An App to display temporal and temperature graphical files for Isomemo.
 License: GPL (>= 3)
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 Imports: 
     colourpicker,
-    DataTools (>= 23.12.2),
+    DataTools (>= 24.04.1),
     DT,
     magrittr,
     pastclim,

NAMESPACE

@@ -7,6 +7,7 @@ export(startApplication)
 import(shiny)
 importFrom(DataTools,importDataServer)
 importFrom(DataTools,importDataUI)
+importFrom(DataTools,importOptions)
 importFrom(magrittr,"%>%")
 importFrom(rjson,fromJSON)
 importFrom(shinyTools,dataExportButton)

NEWS.md

@@ -13,6 +13,11 @@
 ## New Features
 - adds header with Pandora, IsoMemo and help links
 
+# MapR 24.1.2
+
+## Bug Fixes
+- apply most recent DataTools version to fix the broken path to the example zip files
+
 # MapR 24.1.1
 
 ## New Features

R/00-Namespace.R

@@ -14,7 +14,7 @@
 
 #' @rawNamespace import(shiny)
 #' @importFrom rjson fromJSON
-#' @importFrom DataTools importDataUI importDataServer
+#' @importFrom DataTools importDataUI importDataServer importOptions
 #' @importFrom shinyTools dataExportButton dataExportServer headerButtonsUI includeShinyToolsCSS
 #' @importFrom yaml read_yaml
 

R/01-mapPanelModule.R

@@ -69,8 +69,7 @@ mapPanelServer <- function(id) {
         defaultSource = config()[["defaultSource"]],
         ckanFileTypes = config()[["ckanFileTypes"]],
         fileExtension = config()[["fileExtension"]],
-        mainFolder = config()[["mainFolder"]],
-        rPackageName = config()[["rPackageName"]]
+        options = importOptions(rPackageName = config()[["rPackageName"]])
         # expectedFileInZip = config()[["expectedFileInZip"]] # currently image list is not required if a questionnaire.json is included
       )
 

inst/config.yaml

@@ -3,6 +3,5 @@ defaultSource: "file"           # for import of data
 ckanFileTypes:
   - "zipm"
   - "zip"
-mainFolder: "exampleZip"  # for import of models
-fileExtension: "zipm"
+fileExtension: "zipm"   # for import of models
 rPackageName: "MapR"