bruce-models 4.6.6 → 4.6.8

package/dist/bruce-models.umd.js

@@ -4520,8 +4520,9 @@
                     // 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]);
                         }));
                     }));
@@ -4533,8 +4534,9 @@
                     }
                 }
                 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) {
@@ -4545,12 +4547,15 @@
                     }
                 }
                 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: exports.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: exports.GeoJson.EType.Point
+                        };
+                    }
                 }
                 if (jGeometry) {
                     collection.push(jGeometry);
@@ -4611,15 +4616,11 @@
             // 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) {
@@ -4628,9 +4629,8 @@
                 // We'll first match cases of nested collections and handle them early.
                 // Then we'll be left with simple geometry cases.
                 if (type === exports.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: exports.GeoJson.EType.Feature,
                             geometry: geo,
@@ -4646,6 +4646,10 @@
                     }
                     return;
                 }
+                // No coordinates. Ignoring.
+                if (!coordinates) {
+                    return;
+                }
                 const geometry = {};
                 switch (type) {
                     case exports.GeoJson.EType.Polygon:
@@ -13746,7 +13750,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "4.6.6";
+    const VERSION = "4.6.8";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;