bruce-models 1.9.6 → 1.9.8

package/dist/bruce-models.umd.js

@@ -2190,7 +2190,7 @@
                         value = GetMappingValue(field.value, entity);
                         break;
                 }
-                if (value != "") {
+                if (value != "" && value != null && value != undefined) {
                     value = Number(value);
                 }
                 if (value || value == 0) {
@@ -2330,8 +2330,14 @@
                         str: value,
                         entity: entity
                     });
-                    const eval2 = eval; // https://rollupjs.org/guide/en/#avoiding-eval
-                    return eval2(value);
+                    // Check if it includes a math operation.
+                    const MATH_REGEX = /(\d+\.?\d*|\.\d+)([+\-*/])(\d+\.?\d*|\.\d+)/;
+                    if (MATH_REGEX.test(value)) {
+                        // https://rollupjs.org/guide/en/#avoiding-eval
+                        // This stops eval warning.
+                        const eval2 = eval;
+                        return eval2(value);
+                    }
                 }
                 catch (exception) {
                     const e = exception;
@@ -4025,7 +4031,7 @@
                             cell.Fetched = true;
                             return;
                         }
-
+
                         let [x2, y2] = max;
                         x2 = Math.max(x2, lon2);
                         y2 = Math.max(y2, lat2);