BUGFIX: parameter 'initialTime' was not working correctly in some sit…

…uations
TitouanRobert · Jul 7, 2017 · d80ce0a · d80ce0a
1 parent fd1c17d
commit d80ce0a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/R/add_minicharts.R b/R/add_minicharts.R
@@ -187,7 +187,9 @@ updateMinicharts <- function(map, layerId, chartdata = NULL, time = NULL, maxVal
                              legend = TRUE, legendPosition = NULL,
                              timeFormat = NULL, initialTime = NULL, onChange = NULL) {
 
-  type <- match.arg(type, c("auto", "bar", "pie", "polar-area", "polar-radius"))
+  if (!is.null(type)) {
+    type <- match.arg(type, c("auto", "bar", "pie", "polar-area", "polar-radius"))
+  }
   if (is.null(time)) time <- 1
   if (!is.null(chartdata) & !is.null(popup) & is.null(popup$labels)) popup$labels <- colnames(chartdata)
 
@@ -218,7 +220,6 @@ updateMinicharts <- function(map, layerId, chartdata = NULL, time = NULL, maxVal
   # Update time slider only if data is updated
   if(is.null(chartdata)) {
     args$timeLabels <- NULL
-    args$initialTime <- NULL
   }
 
   # Update legend if required

diff --git a/R/prepare_js_args.R b/R/prepare_js_args.R
@@ -151,6 +151,7 @@
     }
   }
   timeLabels <- as.character(timeLabels)
+  if (!is.null(initialTime)) initialTime <- as.character(initialTime)
 
   list(
     options = options,

diff --git a/inst/leaflet.minicharts.min.js b/inst/leaflet.minicharts.min.js
diff --git a/javascript/timeslider.js b/javascript/timeslider.js
@@ -92,6 +92,7 @@
     },
 
     setTimeLabels: function(timeLabels) {
+      if (timeLabels === null) return;
       var self = this;
 
       if (typeof timeLabels == "undefined") {

diff --git a/tests/testthat/test-prepare_js_args.R b/tests/testthat/test-prepare_js_args.R
@@ -193,4 +193,11 @@ describe(".prepareJSArgs", {
     expect_equal(jsArgs$timeLabels, I(expectedLabels))
     expect_equal(jsArgs$initialTime, expectedLabels[1])
   })
+
+  it ("returns timeLabels and initialTimes in character format", {
+    jsArgs <- .prepareJSArgs(myOptions, mydata,
+                             initialTime = min(myOptions$options$time))
+    expect_equal(mode(jsArgs$timeLabels), "character")
+    expect_is(jsArgs$initialTime, "character")
+  })
 })
-Original file line number
+Diff line change
@@ Expand Up / @@ -151,6 +151,7 @@ @@
         }
       }
       timeLabels <- as.character(timeLabels)
+      if (!is.null(initialTime)) initialTime <- as.character(initialTime)
       list(
         options = options,
@@ Expand Down @@