bruce-models 4.6.7 → 4.6.9

package/dist/bruce-models.umd.js

@@ -4468,7 +4468,7 @@
          * @returns returns GeoJSON or null if conversion failed or resulted in an empty object.
          */
         function ToGeoJsonFeature(params) {
-            const { geometry, properties, altitude } = params;
+            const { geometry, properties, altitude, noAltitude } = params;
             // Primary collection of geometries.
             // We will return a single feature that contains many geometries.
             // That way we can attach properties to the top-level.
@@ -4523,6 +4523,9 @@
                         const points = ParsePoints(polygon.LinearRing);
                         return removeConsecutiveDuplicates(points.map(coord => {
                             const { longitude: lon, latitude: lat, altitude: alt } = coord;
+                            if (noAltitude) {
+                                return [lon, lat];
+                            }
                             return (altitude != null ? [lon, lat, altitude] : [lon, lat, alt !== undefined ? alt : 0]);
                         }));
                     }));
@@ -4537,6 +4540,9 @@
                     const points = ParsePoints(geometry.LineString);
                     const coordinates = removeConsecutiveDuplicates(points.map(coord => {
                         const { longitude: lon, latitude: lat, altitude: alt } = coord;
+                        if (noAltitude) {
+                            return [lon, lat];
+                        }
                         return (altitude != null ? [lon, lat, altitude] : [lon, lat, alt !== undefined ? alt : 0]);
                     }));
                     if (coordinates.length >= 2) {
@@ -4550,7 +4556,13 @@
                     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];
+                        let coordinates;
+                        if (noAltitude) {
+                            coordinates = [lon, lat];
+                        }
+                        else {
+                            coordinates = altitude != null ? [lon, lat, altitude] : [lon, lat, alt !== undefined ? alt : 0];
+                        }
                         jGeometry = {
                             coordinates: coordinates,
                             type: exports.GeoJson.EType.Point
@@ -4616,15 +4628,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) {
@@ -4633,9 +4641,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,
@@ -4651,6 +4658,10 @@
                     }
                     return;
                 }
+                // No coordinates. Ignoring.
+                if (!coordinates) {
+                    return;
+                }
                 const geometry = {};
                 switch (type) {
                     case exports.GeoJson.EType.Polygon:
@@ -13751,7 +13762,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "4.6.7";
+    const VERSION = "4.6.9";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;