bruce-models 4.6.8 → 4.7.0

package/dist/bruce-models.umd.js

@@ -3088,7 +3088,7 @@
          */
         function GetListByIds(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                let { api, entityIds, migrated, schemaId, req: reqParams, expandRelations, expandLocation, historicFrom, historicKey, historicTo, historicPoint, expandSources } = params;
+                let { api, entityIds, migrated, schemaId, req: reqParams, expandRelations, expandLocation, historicFrom, historicKey, historicTo, historicPoint, expandSources, expandImports } = params;
                 if (!entityIds.length) {
                     throw ("Entity IDs are required.");
                 }
@@ -3127,6 +3127,14 @@
                         reqData["Expand"] = "location";
                     }
                 }
+                if (expandImports) {
+                    if (reqData["Expand"]) {
+                        reqData["Expand"] += ",import";
+                    }
+                    else {
+                        reqData["Expand"] = "import";
+                    }
+                }
                 if (expandSources) {
                     reqData["ExpandSources"] = true;
                 }
@@ -3157,6 +3165,7 @@
                             entityId,
                             expandLocation,
                             expandRelations,
+                            expandImports,
                             expandSources,
                             entityTypeId: null,
                             historicFrom: historicFrom,
@@ -3552,7 +3561,7 @@
         function GetList(params) {
             var _a;
             return __awaiter(this, void 0, void 0, function* () {
-                let { api, filter, migrated, schemaId, req: reqParams, viaCdn, viaCdnCacheToken, analysis, expandRelations, historicFrom, historicKey, historicTo, historicPoint, expandLocation, expandSources } = params;
+                let { api, filter, migrated, schemaId, req: reqParams, viaCdn, viaCdnCacheToken, analysis, expandRelations, expandImports, historicFrom, historicKey, historicTo, historicPoint, expandLocation, expandSources } = params;
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
@@ -3595,7 +3604,7 @@
                     historicPoint: historicPoint,
                     ExpandSources: expandSources
                 };
-                if (expandLocation || expandRelations) {
+                if (expandLocation || expandRelations || expandImports) {
                     let expand = "";
                     if (expandLocation) {
                         expand += "location";
@@ -3606,12 +3615,19 @@
                         }
                         expand += "relation";
                     }
+                    if (expandImports) {
+                        if (expand) {
+                            expand += ",";
+                        }
+                        expand += "import";
+                    }
                     if (expand) {
                         body["Expand"] = expand;
                     }
                 }
                 let totalCount;
                 let entities = [];
+                let imports;
                 if (analysis || expandRelations || (viaCdn && api.GetCdnBaseUrl())) {
                     const urlParams = new URLSearchParams();
                     urlParams.set("cacheToken", String(viaCdnCacheToken ? viaCdnCacheToken : 0));
@@ -3642,6 +3658,9 @@
                     if (expandLocation) {
                         urlParams.append("$expand", "location");
                     }
+                    if (expandImports) {
+                        urlParams.append("$expand", "import");
+                    }
                     if (expandSources) {
                         urlParams.append("ExpandSources", "true");
                     }
@@ -3674,6 +3693,7 @@
                         entities = data.Items;
                     }
                     totalCount = data.TotalCount;
+                    imports = data.Imports;
                 }
                 else {
                     const urlParams = new URLSearchParams();
@@ -3683,6 +3703,9 @@
                     if (expandLocation) {
                         urlParams.append("$expand", "location");
                     }
+                    if (expandImports) {
+                        urlParams.append("$expand", "import");
+                    }
                     if (schemaId) {
                         urlParams.set("schema", schemaId);
                     }
@@ -3707,6 +3730,7 @@
                                     entityId: id,
                                     expandRelations,
                                     expandLocation,
+                                    expandImports,
                                     expandSources,
                                     entityTypeId: filter.entityTypeId,
                                     historicFrom: historicFrom,
@@ -3722,10 +3746,12 @@
                         }
                     }
                     totalCount = data.TotalCount;
+                    imports = data.Imports;
                 }
                 return {
                     entities,
-                    totalCount
+                    totalCount,
+                    imports
                 };
             });
         }
@@ -3769,7 +3795,7 @@
          * @returns
          */
         function GetCacheKey(params) {
-            let { entityId, entityTypeId, schemaId, expandLocation, expandRelations, expandSources, historicFrom, historicKey, historicTo, historicPoint } = params;
+            let { entityId, entityTypeId, schemaId, expandLocation, expandRelations, expandImports, expandSources, historicFrom, historicKey, historicTo, historicPoint } = params;
             if (!entityTypeId) {
                 entityTypeId = "";
             }
@@ -3789,7 +3815,7 @@
                 schemaId = "";
             }
             let key = `${exports.Api.ECacheKey.Entity}${exports.Api.ECacheKey.Id}${entityId}${String(entityTypeId)}${schemaId}`;
-            key += `${String(Boolean(expandLocation))}${String(Boolean(expandRelations))}${String(Boolean(expandSources))}`;
+            key += `${String(Boolean(expandLocation))}${String(Boolean(expandRelations))}${String(Boolean(expandSources))}${String(Boolean(expandImports))}`;
             key += `${exports.Api.ECacheKey.EntityHistoricData}${exports.Api.ECacheKey.Id}${historicKey}-${historicFrom}-${historicTo}-${historicPoint}`;
             return key;
         }
@@ -4468,7 +4494,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 +4549,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 +4566,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 +4582,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
@@ -13750,7 +13788,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "4.6.8";
+    const VERSION = "4.7.0";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;