merge second part of yeedle

Merge branch 'master' of https://github.com/yeedle/leafem into yeedle-master # Conflicts: # inst/htmlwidgets/lib/georaster-for-leaflet/georasterUtils.js # inst/htmlwidgets/lib/georaster-for-leaflet/mathjs.min.js
r-spatial · Oct 9, 2020 · 0bb9461 · 0bb9461
2 parents 2ed08eb + 1b92bda
commit 0bb9461
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/inst/htmlwidgets/lib/georaster-for-leaflet/georasterUtils.js b/inst/htmlwidgets/lib/georaster-for-leaflet/georasterUtils.js
@@ -81,8 +81,12 @@ function evalMath(a, values) {
     return Function('values', 'with(Math) return ' + a)(values);
 } */
 
+const compiledExpressions = {}
 function evalMath(rawExpression, values) {
-    return safeEval(rawExpression, {values});
+  if (!(rawExpression in compiledExpressions)) {
+    compiledExpressions[rawExpression] = safeCompile(rawExpression).evaluate;
+  }
+  return compiledExpressions[rawExpression]({values});
 }
 
 // helpers from https://stackoverflow.com/questions/5623838/rgb-to-hex-and-hex-to-rgb

diff --git a/inst/htmlwidgets/lib/georaster-for-leaflet/mathjs.min.js b/inst/htmlwidgets/lib/georaster-for-leaflet/mathjs.min.js