bruce-models 3.4.4 → 3.4.5

package/dist/bruce-models.umd.js

@@ -2823,6 +2823,27 @@
         PathUtils.ParseLegacy = ParseLegacy;
     })(exports.PathUtils || (exports.PathUtils = {}));
 
+    /**
+     * Describes an expectation on what should be rendered for a menu item-
+     * between a min-max distance of an entity to the camera.
+     */
+    (function (ZoomControl) {
+        /**
+         * Available display types for a menu item.
+         */
+        let EDisplayType;
+        (function (EDisplayType) {
+            // Hidden means it will not be rendered.
+            EDisplayType["Hidden"] = "hidden";
+            // Point will try render a point based on any available Entity data.
+            EDisplayType["Point"] = "point";
+            // Geometry means it will try render multi-geometry, polygon, polyline, or point in order of priority.
+            EDisplayType["Geometry"] = "geometry";
+            // 3D means it will try render 3D model, multi-geometry, polygon, polyline, or point in order of priority.
+            EDisplayType["Model3D"] = "3d";
+        })(EDisplayType = ZoomControl.EDisplayType || (ZoomControl.EDisplayType = {}));
+    })(exports.ZoomControl || (exports.ZoomControl = {}));
+
     (function (Entity) {
         /**
          * Returns cache identifier for an entity record.
@@ -3337,11 +3358,28 @@
         }
         Entity.GetList = GetList;
         function ToGeoJson(params) {
-            const { entities, excludeAltitude, altitude, includeUserData } = params;
+            const { entities, excludeAltitude, altitude, includeUserData, allowedDisplayTypes } = params;
             const features = [];
+            const allowPoint = allowedDisplayTypes == null || allowedDisplayTypes.includes(exports.ZoomControl.EDisplayType.Point);
+            const allowGeometry = allowedDisplayTypes == null || allowedDisplayTypes.includes(exports.ZoomControl.EDisplayType.Geometry);
             const cloneObj = (obj) => {
                 return JSON.parse(JSON.stringify(obj));
             };
+            const areCoordinatesEqual = (coord1, coord2) => {
+                return coord1[0] === coord2[0] && coord1[1] === coord2[1] && (coord1[2] === coord2[2] || (coord1.length < 3 && coord2.length < 3));
+            };
+            const removeConsecutiveDuplicates = (coordinates) => {
+                return coordinates.filter((coord, index, array) => {
+                    return index === 0 || !areCoordinatesEqual(coord, array[index - 1]);
+                });
+            };
+            const closePolygonCoordinates = (coordinates) => {
+                if (coordinates.length > 0 && !areCoordinatesEqual(coordinates[0], coordinates[coordinates.length - 1])) {
+                    const firstPointCopy = [...coordinates[0]];
+                    coordinates.push(firstPointCopy);
+                }
+                return coordinates;
+            };
             const populateProperties = (feature, entity) => {
                 let properties = null;
                 // All properties.
@@ -3362,45 +3400,57 @@
                 feature.properties = properties;
             };
             const processGeometry = (geometry, entity) => {
+                var _a, _b;
                 const feature = {
-                    type: 'Feature',
+                    type: "Feature",
                     properties: {},
                     geometry: null
                 };
                 populateProperties(feature, entity);
-                if (geometry.Polygon) {
+                if (((_a = geometry.MultiGeometry) === null || _a === void 0 ? void 0 : _a.length) && allowGeometry) {
+                    geometry.MultiGeometry.forEach(geo => processGeometry(geo, entity));
+                    return;
+                }
+                else if (((_b = geometry.Polygon) === null || _b === void 0 ? void 0 : _b.length) && allowGeometry) {
                     const sortedPolygons = geometry.Polygon.sort((a, b) => a.Facing === exports.Geometry.EPolygonRingType.Boundaries ? -1 : 1);
-                    const coordinates = sortedPolygons.map(polygonRing => polygonRing.LinearRing.split(' ').map(coord => {
+                    const coordinates = sortedPolygons.map(polygonRing => closePolygonCoordinates(removeConsecutiveDuplicates(polygonRing.LinearRing.split(' ').map(coord => {
                         const [lon, lat, alt] = coord.split(',').map(Number);
                         return excludeAltitude ? [lon, lat] : [lon, lat, altitude !== undefined ? altitude : (alt !== undefined ? alt : [])];
-                    }));
+                    }))));
+                    // Check if the polygon has at least 4 points.
+                    const isValidPolygon = coordinates.every(polygon => polygon.length >= 4);
+                    if (!isValidPolygon) {
+                        // Perhaps try other geometry instead of returning?
+                        return;
+                    }
                     feature.geometry = {
-                        type: 'Polygon',
+                        type: "Polygon",
                         coordinates: coordinates,
                     };
                 }
-                if (geometry.Point) {
-                    const [lon, lat, alt] = geometry.Point.split(',').map(Number);
-                    const coordinates = excludeAltitude ? [lon, lat] : [lon, lat, altitude !== undefined ? altitude : (alt !== undefined ? alt : [])];
+                else if (geometry.LineString && (allowedDisplayTypes == null || allowedDisplayTypes.includes(exports.ZoomControl.EDisplayType.Geometry))) {
+                    const coordinates = removeConsecutiveDuplicates(geometry.LineString.split(' ').map(coord => {
+                        const [lon, lat, alt] = coord.split(',').map(Number);
+                        return excludeAltitude ? [lon, lat] : [lon, lat, altitude !== undefined ? altitude : (alt !== undefined ? alt : [])];
+                    }));
+                    // Check if the polyline has at least 2 points.
+                    if (coordinates.length < 2) {
+                        // Perhaps try other geometry instead of returning?
+                        return;
+                    }
                     feature.geometry = {
-                        type: 'Point',
+                        type: "LineString",
                         coordinates,
                     };
                 }
-                if (geometry.LineString) {
-                    const coordinates = geometry.LineString.split(' ').map(coord => {
-                        const [lon, lat, alt] = coord.split(',').map(Number);
-                        return excludeAltitude ? [lon, lat] : [lon, lat, altitude !== undefined ? altitude : (alt !== undefined ? alt : [])];
-                    });
+                else if (geometry.Point && allowPoint) {
+                    const [lon, lat, alt] = geometry.Point.split(',').map(Number);
+                    const coordinates = excludeAltitude ? [lon, lat] : [lon, lat, altitude !== undefined ? altitude : (alt !== undefined ? alt : [])];
                     feature.geometry = {
-                        type: 'LineString',
+                        type: "Point",
                         coordinates,
                     };
                 }
-                if (geometry.MultiGeometry) {
-                    geometry.MultiGeometry.forEach(geo => processGeometry(geo, entity));
-                    return;
-                }
                 features.push(feature);
             };
             entities.forEach(entity => {
@@ -3417,7 +3467,7 @@
                 processGeometry(geometry, entity);
             });
             return {
-                type: 'FeatureCollection',
+                type: "FeatureCollection",
                 features,
             };
         }
@@ -6926,27 +6976,6 @@
         ProgramKey.Update = Update;
     })(exports.ProgramKey || (exports.ProgramKey = {}));
 
-    /**
-     * Describes an expectation on what should be rendered for a menu item-
-     * between a min-max distance of an entity to the camera.
-     */
-    (function (ZoomControl) {
-        /**
-         * Available display types for a menu item.
-         */
-        let EDisplayType;
-        (function (EDisplayType) {
-            // Hidden means it will not be rendered.
-            EDisplayType["Hidden"] = "hidden";
-            // Point will try render a point based on any available Entity data.
-            EDisplayType["Point"] = "point";
-            // Geometry means it will try render multi-geometry, polygon, polyline, or point in order of priority.
-            EDisplayType["Geometry"] = "geometry";
-            // 3D means it will try render 3D model, multi-geometry, polygon, polyline, or point in order of priority.
-            EDisplayType["Model3D"] = "3d";
-        })(EDisplayType = ZoomControl.EDisplayType || (ZoomControl.EDisplayType = {}));
-    })(exports.ZoomControl || (exports.ZoomControl = {}));
-
     (function (Tileset) {
         /**
          * Returns cache identifier for a tileset.
@@ -10543,7 +10572,7 @@
         DataSource.GetList = GetList;
     })(exports.DataSource || (exports.DataSource = {}));
 
-    const VERSION = "3.4.4";
+    const VERSION = "3.4.5";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;