bruce-models 4.6.6 → 4.6.8

package/dist/bruce-models.es5.js

@@ -4580,8 +4580,9 @@ var Geometry;
                 // Converts polygons to GeoJSON coordinates.
                 // This will close the polygon if it's not already closed and remove consecutive duplicates.
                 const coordinates = closePolygonCoordinates(sortedPolygons.map(polygon => {
-                    return removeConsecutiveDuplicates(polygon.LinearRing.split(' ').map(coord => {
-                        const [lon, lat, alt] = coord.split(',').map(Number);
+                    const points = ParsePoints(polygon.LinearRing);
+                    return removeConsecutiveDuplicates(points.map(coord => {
+                        const { longitude: lon, latitude: lat, altitude: alt } = coord;
                         return (altitude != null ? [lon, lat, altitude] : [lon, lat, alt !== undefined ? alt : 0]);
                     }));
                 }));
@@ -4593,8 +4594,9 @@ var Geometry;
                 }
             }
             if (!jGeometry && geometry.LineString) {
-                const coordinates = removeConsecutiveDuplicates(geometry.LineString.split(' ').map(coord => {
-                    const [lon, lat, alt] = coord.split(',').map(Number);
+                const points = ParsePoints(geometry.LineString);
+                const coordinates = removeConsecutiveDuplicates(points.map(coord => {
+                    const { longitude: lon, latitude: lat, altitude: alt } = coord;
                     return (altitude != null ? [lon, lat, altitude] : [lon, lat, alt !== undefined ? alt : 0]);
                 }));
                 if (coordinates.length >= 2) {
@@ -4605,12 +4607,15 @@ var Geometry;
                 }
             }
             if (!jGeometry && geometry.Point) {
-                const [lon, lat, alt] = geometry.Point.split(',').map(Number);
-                const coordinates = altitude != null ? [lon, lat, altitude] : [lon, lat, alt !== undefined ? alt : 0];
-                jGeometry = {
-                    coordinates: coordinates,
-                    type: GeoJson.EType.Point
-                };
+                const points = ParsePoints(geometry.Point);
+                if (points.length) {
+                    const { longitude: lon, latitude: lat, altitude: alt } = points[0];
+                    const coordinates = altitude != null ? [lon, lat, altitude] : [lon, lat, alt !== undefined ? alt : 0];
+                    jGeometry = {
+                        coordinates: coordinates,
+                        type: GeoJson.EType.Point
+                    };
+                }
             }
             if (jGeometry) {
                 collection.push(jGeometry);
@@ -4671,15 +4676,11 @@ var Geometry;
         // This will append to the "full" object as it goes.
         const traverse = (feature) => {
             // Geometry collections don't have coords so we have to cast as any.
-            const { type, coordinates, properties } = feature.geometry;
+            const { type, coordinates, properties, geometries } = feature.geometry;
             // Unknown thing. Ignoring.
             if (!type) {
                 return;
             }
-            // No coordinates. Ignoring.
-            if (!coordinates) {
-                return;
-            }
             // Simple properties merge.
             // Doesn't handle nested properties very well.
             if (properties) {
@@ -4688,9 +4689,8 @@ var Geometry;
             // We'll first match cases of nested collections and handle them early.
             // Then we'll be left with simple geometry cases.
             if (type === GeoJson.EType.GeometryCollection) {
-                const collection = feature;
-                for (let i = 0; i < collection.geometries.length; i++) {
-                    const geo = collection.geometries[i];
+                for (let i = 0; i < geometries.length; i++) {
+                    const geo = geometries[i];
                     traverse({
                         type: GeoJson.EType.Feature,
                         geometry: geo,
@@ -4706,6 +4706,10 @@ var Geometry;
                 }
                 return;
             }
+            // No coordinates. Ignoring.
+            if (!coordinates) {
+                return;
+            }
             const geometry = {};
             switch (type) {
                 case GeoJson.EType.Polygon:
@@ -14021,7 +14025,7 @@ var DataSource;
 })(DataSource || (DataSource = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "4.6.6";
+const VERSION = "4.6.8";
 
 export { VERSION, AnnDocument, CustomForm, AbstractApi, Api, BruceApi, GlobalApi, GuardianApi, ApiGetters, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, LRUCache, GeoJson, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityCoords, EntityTypeVisualSettings, EntityAttribute, EntityHistoricData, EntityTableView, Comment, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, ProjectViewLegacy, ProjectViewLegacyBookmark, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, Account, AccountInvite, AccountFeatures, AccountLimits, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, ImportCad, ImportCsv, ImportJson, ImportKml, ImportedFile, Markup, Uploader, Plugin, ENVIRONMENT, DataSource };
 //# sourceMappingURL=bruce-models.es5.js.map