bruce-models 3.4.4 → 3.4.5

package/dist/bruce-models.es5.js

@@ -2869,6 +2869,28 @@ var PathUtils;
     PathUtils.ParseLegacy = ParseLegacy;
 })(PathUtils || (PathUtils = {}));
 
+/**
+ * Describes an expectation on what should be rendered for a menu item-
+ * between a min-max distance of an entity to the camera.
+ */
+var ZoomControl;
+(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 = {}));
+})(ZoomControl || (ZoomControl = {}));
+
 /**
  * Describes the "Entity" concept within Nextspace.
  * An entity is a JSON blob containing both internal data and user-defined data.
@@ -3389,11 +3411,28 @@ var Entity;
     }
     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(ZoomControl.EDisplayType.Point);
+        const allowGeometry = allowedDisplayTypes == null || allowedDisplayTypes.includes(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.
@@ -3414,45 +3453,57 @@ var Entity;
             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 === 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(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 => {
@@ -3469,7 +3520,7 @@ var Entity;
             processGeometry(geometry, entity);
         });
         return {
-            type: 'FeatureCollection',
+            type: "FeatureCollection",
             features,
         };
     }
@@ -7076,28 +7127,6 @@ var ProgramKey;
     ProgramKey.Update = Update;
 })(ProgramKey || (ProgramKey = {}));
 
-/**
- * Describes an expectation on what should be rendered for a menu item-
- * between a min-max distance of an entity to the camera.
- */
-var ZoomControl;
-(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 = {}));
-})(ZoomControl || (ZoomControl = {}));
-
 /**
  * Describes the "Tileset" concept in Nextspace.
  *
@@ -10796,7 +10825,7 @@ var DataSource;
     DataSource.GetList = GetList;
 })(DataSource || (DataSource = {}));
 
-const VERSION = "3.4.4";
+const VERSION = "3.4.5";
 
 export { VERSION, AnnDocument, CustomForm, AbstractApi, Api, BruceApi, GlobalApi, GuardianApi, ApiGetters, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, LRUCache, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityCoords, EntityTypeVisualSettings, EntityAttribute, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, ProjectViewLegacy, ProjectViewLegacyBookmark, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, Account, AccountInvite, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, ImportCad, ImportCsv, ImportJson, ImportKml, ImportedFile, Markup, Uploader, Plugin, ENVIRONMENT, DataSource };
 //# sourceMappingURL=bruce-models.es5.js.map