Merge pull request #53 from agrobioinfoservices/devel

fix-map-path
AgrDataSci · Dec 13, 2020 · a15ef8d · a15ef8d
2 parents 3ec25fd + 04fd1c2
commit a15ef8d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/ClimMob.R b/ClimMob.R
@@ -430,8 +430,8 @@ org_lonlat <- tryCatch({
                             map_provider = "OpenStreetMap.Mapnik")
 
       mapshot(trial_map, 
-              url = paste0(outputpath, projname, "_trial_map.html"),
-              file = paste0(outputpath, projname, "_trial_map.png"))
+              url = paste0(outputpath, "/", projname, "_trial_map.html"),
+              file = paste0(outputpath, "/", projname, "_trial_map.png"))
 
     }
 

diff --git a/NEWS.md b/NEWS.md
@@ -4,6 +4,7 @@ ClimMob-analysis v1.1-2 (2020-12-13)
 ### Improvements 
 
 * Enable the production of reports when registration and data collection are performed at the same time (*e.g.* market tasting)
+* Variables from multichoice questions in ODK are now decoded and displayed as factors.
 
 ### Changes in behaviour
 

diff --git a/report/en/mainreport.Rmd b/report/en/mainreport.Rmd
@@ -81,7 +81,7 @@ if (isTRUE(geoTRUE)) {
   if (extension == "html") {
     trial_map
   }else{
-    knitr::include_graphics(paste0(outputpath, projname, "_trial_map.png"))
+    knitr::include_graphics(paste0(outputpath, "/", projname, "_trial_map.png"))
   }
 }
 ```