bruce-models 4.6.3 → 4.6.5

package/dist/bruce-models.umd.js

@@ -3934,16 +3934,18 @@
                 // All properties.
                 if (includeUserData != false) {
                     properties = cloneObj(entity);
-                    // We exclude geometry since the geojson is supposed to represent that attribute.
-                    delete properties.geometry;
+                    // The GeoJSON is supposed to represent the geometry attribute.
+                    delete properties.Bruce.VectorGeometry;
+                    delete properties.Bruce.Boundaries;
                 }
                 // Only specific internal properties.
                 else {
+                    const bClone = cloneObj(entity.Bruce);
+                    // The GeoJSON is supposed to represent the geometry attribute.
+                    delete bClone.VectorGeometry;
+                    delete bClone.Boundaries;
                     properties = {
-                        Bruce: entity.Bruce ? cloneObj(entity.Bruce) : null,
-                        location: entity.location ? cloneObj(entity.location) : null,
-                        transform: entity.transform ? cloneObj(entity.transform) : null,
-                        boundaries: entity.boundaries ? cloneObj(entity.boundaries) : null,
+                        Bruce: bClone
                     };
                 }
                 feature.properties = properties;
@@ -4009,10 +4011,10 @@
                 if (!((_a = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _a === void 0 ? void 0 : _a.ID)) {
                     return;
                 }
-                let geometry = entity.geometry;
-                if (!geometry && (((_b = entity.location) === null || _b === void 0 ? void 0 : _b.longitude) && ((_c = entity.location) === null || _c === void 0 ? void 0 : _c.latitude))) {
+                let geometry = entity.Bruce.VectorGeometry;
+                if (!geometry && (((_b = entity.Bruce.Location) === null || _b === void 0 ? void 0 : _b.longitude) && ((_c = entity.Bruce.Location) === null || _c === void 0 ? void 0 : _c.latitude))) {
                     geometry = {
-                        Point: `${entity.location.longitude},${entity.location.latitude}` + (entity.location.altitude != null ? `,${entity.location.altitude}` : ""),
+                        Point: `${entity.Bruce.Location.longitude},${entity.Bruce.Location.latitude}` + (entity.Bruce.Location.altitude != null ? `,${entity.Bruce.Location.altitude}` : ""),
                     };
                 }
                 if (geometry) {
@@ -4159,12 +4161,12 @@
             path = path.replace("${", "");
             path = path.replace("}", "");
         }
+        // Split by backslashes.
+        paths.push(exports.PathUtils.Parse(path));
         // Split by dots.
         paths.push(exports.PathUtils.ParseLegacy(path));
         // Take string as is.
         paths.push([path]);
-        // Split by backslashes.
-        paths.push(exports.PathUtils.Parse(path));
         // Remove duplicates.
         const tmpPaths = [];
         for (let i = 0; i < paths.length; i++) {
@@ -4453,11 +4455,17 @@
                     entity: entity,
                     path: attrPath
                 });
-                const isValueNum = !isNaN(+eValue);
+                let isValueNum = !isNaN(+eValue);
+                if (eValue == null) {
+                    isValueNum = false;
+                }
                 for (let i = 0; i < value.values.length; i++) {
                     const option = value.values[i];
                     const mapValue = option.fieldValue;
-                    const isMapValueNum = !isNaN(+mapValue);
+                    let isMapValueNum = !isNaN(+mapValue);
+                    if (isMapValueNum == null) {
+                        isMapValueNum = false;
+                    }
                     if (isValueNum && (isMapValueNum || mapValue.includes("-"))) {
                         if (+mapValue == +eValue) {
                             return option.appliedValue;
@@ -13523,7 +13531,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "4.6.3";
+    const VERSION = "4.6.5";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;