Merge pull request #31 from yeedle/master

use math.js to evaluate user's arith expressions
r-spatial · Sep 25, 2020 · 92deeba · 92deeba
2 parents 37cdb63 + 71fe16a
commit 92deeba
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 1 deletion.
diff --git a/R/addGeoRaster.R b/R/addGeoRaster.R
@@ -361,6 +361,7 @@ leafletGeoRasterDependencies = function() {
         , "georaster-layer-for-leaflet.browserify.min.js"
         , "georaster-binding.js"
         , "georasterUtils.js"
+        , "mathjs.min.js"
       )
     )
   )
@@ -372,7 +373,8 @@ bandCalc = function(f) {
   idx_r = gregexpr("[0-9]+", band_calc)
   js_bands = as.numeric(unlist(regmatches(band_calc, idx_r)))
   js_bands = js_bands - min(js_bands)
-  js_bands = as.integer(rscl(js_bands, to = c(0, length(unique(js_bands)) - 1)))
+  js_bands = as.integer(rscl(js_bands, to = c(1, length(unique(js_bands)))))
+
 
   js_band_calc = gsub("[0-9]+", "%s", band_calc)
   js_band_calc = gsub(formalArgs(f), "values", js_band_calc)

diff --git a/inst/htmlwidgets/lib/georaster-for-leaflet/georasterUtils.js b/inst/htmlwidgets/lib/georaster-for-leaflet/georasterUtils.js
@@ -76,8 +76,13 @@ function evalDomain(arr, arith) {
   return [Math.min(...out), Math.max(...out)];
 }
 
+/*
 function evalMath(a, values) {
     return Function('values', 'with(Math) return ' + a)(values);
+} */
+
+function evalMath(rawExpression, values) {
+    return safeEval(rawExpression, {values});
 }