bruce-models 4.2.2 → 4.2.4

package/dist/bruce-models.umd.js

@@ -3514,6 +3514,7 @@
         Entity.Update = Update;
         /**
          * Util to remove a tag from an entity.
+         * @warning This does not save the entity record.
          * @param params
          */
         function RemoveTag(params) {
@@ -3529,6 +3530,7 @@
         Entity.RemoveTag = RemoveTag;
         /**
          * Util to add a tag to an entity.
+         * @warning This does not save the entity record.
          * @param params
          */
         function AddTag(params) {
@@ -3543,6 +3545,7 @@
         Entity.AddTag = AddTag;
         /**
          * Util to set a value on an entity.
+         * @warning This does not save the entity record.
          * @param params
          */
         function SetValue(params) {
@@ -3568,28 +3571,71 @@
          */
         function GetValue(params) {
             var _a;
-            const { entity: data, path } = params;
-            // Backwards compatibility.
-            if (path.length == 1 && path[0] == "ID") {
+            let { entity: data, path, handleLegacy: checkAgainstLegacy } = params;
+            if (checkAgainstLegacy == null) {
+                checkAgainstLegacy = true;
+            }
+            // Backwards compatibility for incredibly old data.
+            if (checkAgainstLegacy && path.length == 1 && path[0] == "ID") {
                 return (_a = data.Bruce) === null || _a === void 0 ? void 0 : _a.ID;
             }
-            let curData = data;
-            for (let i = 0; i < path.length; i++) {
-                const step = path[i];
-                if (!curData[step]) {
-                    return null;
+            const checkForValue = (path) => {
+                let curData = data;
+                for (let i = 0; i < path.length; i++) {
+                    const step = path[i];
+                    if (!curData[step]) {
+                        return null;
+                    }
+                    if (i >= path.length - 1) {
+                        return curData[step];
+                    }
+                    curData = curData[step];
                 }
-                if (i >= path.length - 1) {
-                    return curData[step];
+                return null;
+            };
+            // Check using the path provided.
+            let value = checkForValue(path);
+            // Check for the same path but in both top-level and internal data.
+            // This is done for specific paths we're migrating.
+            if (value == null && checkAgainstLegacy) {
+                // We're migrating 2D vector data into the internal data.
+                // So we'll check against both locations until migration is complete.
+                // First we'll check against properties that could be found inside the internal section.
+                if (path[0] == "location") {
+                    value = checkForValue(["Bruce"].concat(path));
+                }
+                else if (path[0] == "transform") {
+                    value = checkForValue(["Bruce"].concat(path));
+                }
+                else if (path[0] == "geometry") {
+                    value = checkForValue(["Bruce"].concat(path));
+                }
+                else if (path[0] == "boundaries") {
+                    value = checkForValue(["Bruce"].concat(path));
+                }
+                // Now we'll check against properties that could still be in the top-level and haven't been migrated yet.
+                if (path[0] == "Bruce" && path.length > 1) {
+                    if (path[1] == "location") {
+                        value = checkForValue(path.slice(1));
+                    }
+                    else if (path[1] == "transform") {
+                        value = checkForValue(path.slice(1));
+                    }
+                    else if (path[1] == "geometry") {
+                        value = checkForValue(path.slice(1));
+                    }
+                    else if (path[1] == "boundaries") {
+                        value = checkForValue(path.slice(1));
+                    }
                 }
-                curData = curData[step];
             }
-            return null;
+            return value;
         }
         Entity.GetValue = GetValue;
         /**
          * Removes a value from an entity.
          * This will mutate the entity record and run "delete" on the object property.
+         * @warning This does not save the entity record.
          * @param params
          */
         function RemoveValue(params) {
@@ -4554,22 +4600,39 @@
                 minLongitude: null
             };
             const points = [];
-            if (entity.location) {
-                points.push(entity.location);
+            const location = exports.Entity.GetValue({
+                entity: entity,
+                path: ["location"]
+            });
+            if (location) {
+                points.push(location);
             }
-            if (entity.geometry) {
-                if (entity.geometry.Point) {
-                    points.push(...exports.Geometry.ParsePoints(entity.geometry.Point));
+            const geometry = exports.Entity.GetValue({
+                entity: entity,
+                path: ["geometry"]
+            });
+            const processGeometry = (geometry, depth = 0) => {
+                if (!geometry || depth > 5) {
+                    return;
                 }
-                if (entity.geometry.LineString) {
-                    points.push(...exports.Geometry.ParsePoints(entity.geometry.LineString));
+                if (geometry.Point) {
+                    points.push(...exports.Geometry.ParsePoints(geometry.Point));
                 }
-                if (entity.geometry.Polygon) {
-                    for (const ring of entity.geometry.Polygon) {
+                if (geometry.LineString) {
+                    points.push(...exports.Geometry.ParsePoints(geometry.LineString));
+                }
+                if (geometry.Polygon) {
+                    for (const ring of geometry.Polygon) {
                         points.push(...exports.Geometry.ParsePoints(ring.LinearRing));
                     }
                 }
-            }
+                if (geometry.MultiGeometry) {
+                    for (const multiGeometry of geometry.MultiGeometry) {
+                        processGeometry(multiGeometry, depth + 1);
+                    }
+                }
+            };
+            processGeometry(geometry);
             for (const point of points) {
                 if (bounds.maxLatitude == null || point.latitude > bounds.maxLatitude) {
                     bounds.maxLatitude = point.latitude;
@@ -12913,7 +12976,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "4.2.2";
+    const VERSION = "4.2.4";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;