bruce-cesium 1.2.7 → 1.2.9

package/dist/bruce-cesium.es5.js

@@ -1,5 +1,5 @@
-import { BruceEvent, Cartes, Carto, Geometry, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, DelayQueue, Entity as Entity$1, BatchedDataGetter, EntityRelationType, ObjectUtils, Tileset, EntityCoords, EntityFilterGetter, EntitySource, EntityRelation, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, Rectangle, KmlDataSource, CallbackProperty, Matrix4, Cesium3DTileset, IonResource, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, OrthographicFrustum, JulianDate, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline } from 'cesium';
+import { BruceEvent, Cartes, Carto, Geometry, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, DelayQueue, Entity as Entity$1, BatchedDataGetter, EntityRelationType, Tileset, EntityCoords, EntityFilterGetter, EntitySource, EntityRelation, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
+import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, Rectangle, KmlDataSource, OrthographicFrustum, JulianDate, CallbackProperty, Matrix4, Cesium3DTileset, IonResource, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1120,6 +1120,13 @@ function getZIndex(style, entity, tags) {
     }
     return EnsureNumber(zIndex);
 }
+function getValue(viewer, obj) {
+    var _a;
+    if ((_a = obj) === null || _a === void 0 ? void 0 : _a.getValue) {
+        return obj.getValue(viewer.scene.lastRenderTime);
+    }
+    return obj;
+}
 function getStyle(api, entity, styleId) {
     return __awaiter(this, void 0, void 0, function () {
         var style, type;
@@ -1165,11 +1172,11 @@ function getRenderGroupId(zoomItem) {
 var EntityRenderEngine;
 (function (EntityRenderEngine) {
     function Render(params) {
-        var _a;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function () {
-            var groupRenderParams, cEntities, models, polygons, polylines, points, i, entity, id, zoomItem, displayType, newRenderId, existingRego, oldRenderId, mParams, mEntities, i, entity, id, cEntity, pParams, pEntities, i, entity, cEntity, pParams, pEntities, i, entity, cEntity, pParams, pEntities, i, entity, cEntity;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var groupRenderParams, i, entity, geometry, cEntities, models, multiGeometry, polygons, polylines, points, i, entity, id, zoomItem, displayType, newRenderId, existingRego, oldRenderId, mParams, mEntities, i, entity, id, cEntity, _loop_1, i, pParams, pEntities, i, entity, cEntity, pParams, pEntities, i, entity, cEntity, pParams, pEntities, i, entity, cEntity;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         groupRenderParams = {
                             apiGetter: params.apiGetter,
@@ -1179,8 +1186,17 @@ var EntityRenderEngine;
                             menuItemId: params.menuItemId,
                             visualRegister: params.visualRegister
                         };
+                        // Flatten multi-geometry if it's only got 1 piece.
+                        for (i = 0; i < params.entities.length; i++) {
+                            entity = params.entities[i];
+                            geometry = entity.geometry;
+                            if (((_a = geometry === null || geometry === void 0 ? void 0 : geometry.MultiGeometry) === null || _a === void 0 ? void 0 : _a.length) == 1) {
+                                entity.geometry = __assign(__assign(__assign({}, entity.geometry), geometry.MultiGeometry[0]), { MultiGeometry: [] });
+                            }
+                        }
                         cEntities = {};
                         models = [];
+                        multiGeometry = [];
                         polygons = [];
                         polylines = [];
                         points = [];
@@ -1207,7 +1223,7 @@ var EntityRenderEngine;
                                     entityId: id,
                                     menuItemId: params.menuItemId
                                 });
-                                oldRenderId = (_a = existingRego === null || existingRego === void 0 ? void 0 : existingRego.visual) === null || _a === void 0 ? void 0 : _a._renderGroup;
+                                oldRenderId = (_b = existingRego === null || existingRego === void 0 ? void 0 : existingRego.visual) === null || _b === void 0 ? void 0 : _b._renderGroup;
                                 if (newRenderId == oldRenderId && !(existingRego === null || existingRego === void 0 ? void 0 : existingRego.stale)) {
                                     cEntities[id] = existingRego.visual;
                                 }
@@ -1216,7 +1232,12 @@ var EntityRenderEngine;
                                         models.push(entity);
                                     }
                                     else if (displayType == ZoomControl.EDisplayType.Geometry) {
-                                        polygons.push(entity);
+                                        if ((_d = (_c = entity.geometry) === null || _c === void 0 ? void 0 : _c.MultiGeometry) === null || _d === void 0 ? void 0 : _d.length) {
+                                            multiGeometry.push(entity);
+                                        }
+                                        else {
+                                            polygons.push(entity);
+                                        }
                                     }
                                     else {
                                         points.push(entity);
@@ -1229,7 +1250,7 @@ var EntityRenderEngine;
                         mParams = __assign(__assign({}, groupRenderParams), { entities: models });
                         return [4 /*yield*/, Model3d.RenderGroup(mParams)];
                     case 1:
-                        mEntities = _b.sent();
+                        mEntities = _e.sent();
                         for (i = 0; i < mParams.entities.length; i++) {
                             entity = mParams.entities[i];
                             id = entity.Bruce.ID;
@@ -1238,16 +1259,84 @@ var EntityRenderEngine;
                                 cEntities[id] = cEntity;
                             }
                             else {
-                                polygons.push(entity);
+                                multiGeometry.push(entity);
                             }
                         }
-                        _b.label = 2;
+                        _e.label = 2;
                     case 2:
-                        if (!(polygons.length > 0)) return [3 /*break*/, 4];
+                        if (!(multiGeometry.length > 0)) return [3 /*break*/, 6];
+                        _loop_1 = function (i) {
+                            var entity, pParams, zoomItem, j, subEntity, cPoly, rendered, cLines, cPoints, rootEntity, firstEntity;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        entity = multiGeometry[i];
+                                        pParams = __assign(__assign({}, groupRenderParams), { entities: [] });
+                                        zoomItem = pParams.zoomItems[entity.Bruce.ID];
+                                        for (j = 0; j < entity.geometry.MultiGeometry.length; j++) {
+                                            subEntity = __assign(__assign({}, entity), { geometry: entity.geometry.MultiGeometry[j], Bruce: __assign(__assign({}, entity.Bruce), { ID: ObjectUtils.UId() }) });
+                                            pParams.zoomItems[subEntity.Bruce.ID] = zoomItem;
+                                            pParams.entities.push(subEntity);
+                                        }
+                                        return [4 /*yield*/, Polygon.RenderGroup(pParams)];
+                                    case 1:
+                                        cPoly = _a.sent();
+                                        Object.keys(cPoly).forEach(function (key) {
+                                            if (cPoly[key]) {
+                                                pParams.entities = pParams.entities.filter(function (e) { return e.Bruce.ID != key; });
+                                            }
+                                        });
+                                        rendered = Object.values(cPoly);
+                                        return [4 /*yield*/, Polyline.RenderGroup(pParams)];
+                                    case 2:
+                                        cLines = _a.sent();
+                                        Object.keys(cLines).forEach(function (key) {
+                                            if (cLines[key]) {
+                                                pParams.entities = pParams.entities.filter(function (e) { return e.Bruce.ID != key; });
+                                            }
+                                        });
+                                        rendered = rendered.concat(Object.values(cLines));
+                                        return [4 /*yield*/, Point.RenderGroup(pParams)];
+                                    case 3:
+                                        cPoints = _a.sent();
+                                        rendered = rendered.concat(Object.values(cPoints));
+                                        rendered = rendered.filter(function (x) { return x != null; });
+                                        if (rendered.length) {
+                                            rootEntity = new Entity({});
+                                            params.viewer.entities.add(rootEntity);
+                                            rootEntity._siblingGraphics = [];
+                                            rootEntity._renderGroup = getRenderGroupId(zoomItem);
+                                            rootEntity._siblingGraphics = rootEntity._siblingGraphics.concat(rendered);
+                                            cEntities[entity.Bruce.ID] = rootEntity;
+                                            firstEntity = rendered[0];
+                                            if (firstEntity) {
+                                                rootEntity.position = getValue(params.viewer, firstEntity.position.getValue);
+                                            }
+                                        }
+                                        else {
+                                            polygons.push(entity);
+                                        }
+                                        return [2 /*return*/];
+                                }
+                            });
+                        };
+                        i = 0;
+                        _e.label = 3;
+                    case 3:
+                        if (!(i < multiGeometry.length)) return [3 /*break*/, 6];
+                        return [5 /*yield**/, _loop_1(i)];
+                    case 4:
+                        _e.sent();
+                        _e.label = 5;
+                    case 5:
+                        i++;
+                        return [3 /*break*/, 3];
+                    case 6:
+                        if (!(polygons.length > 0)) return [3 /*break*/, 8];
                         pParams = __assign(__assign({}, groupRenderParams), { entities: polygons });
                         return [4 /*yield*/, Polygon.RenderGroup(pParams)];
-                    case 3:
-                        pEntities = _b.sent();
+                    case 7:
+                        pEntities = _e.sent();
                         for (i = 0; i < pParams.entities.length; i++) {
                             entity = pParams.entities[i];
                             cEntity = pEntities[entity.Bruce.ID];
@@ -1258,13 +1347,13 @@ var EntityRenderEngine;
                                 polylines.push(entity);
                             }
                         }
-                        _b.label = 4;
-                    case 4:
-                        if (!(polylines.length > 0)) return [3 /*break*/, 6];
+                        _e.label = 8;
+                    case 8:
+                        if (!(polylines.length > 0)) return [3 /*break*/, 10];
                         pParams = __assign(__assign({}, groupRenderParams), { entities: polylines });
                         return [4 /*yield*/, Polyline.RenderGroup(pParams)];
-                    case 5:
-                        pEntities = _b.sent();
+                    case 9:
+                        pEntities = _e.sent();
                         for (i = 0; i < pParams.entities.length; i++) {
                             entity = pParams.entities[i];
                             cEntity = pEntities[entity.Bruce.ID];
@@ -1275,13 +1364,13 @@ var EntityRenderEngine;
                                 points.push(entity);
                             }
                         }
-                        _b.label = 6;
-                    case 6:
-                        if (!(points.length > 0)) return [3 /*break*/, 8];
+                        _e.label = 10;
+                    case 10:
+                        if (!(points.length > 0)) return [3 /*break*/, 12];
                         pParams = __assign(__assign({}, groupRenderParams), { entities: points });
                         return [4 /*yield*/, Point.RenderGroup(pParams)];
-                    case 7:
-                        pEntities = _b.sent();
+                    case 11:
+                        pEntities = _e.sent();
                         for (i = 0; i < pParams.entities.length; i++) {
                             entity = pParams.entities[i];
                             cEntity = pEntities[entity.Bruce.ID];
@@ -1289,8 +1378,8 @@ var EntityRenderEngine;
                                 cEntities[entity.Bruce.ID] = cEntity;
                             }
                         }
-                        _b.label = 8;
-                    case 8: return [2 /*return*/, cEntities];
+                        _e.label = 12;
+                    case 12: return [2 /*return*/, cEntities];
                 }
             });
         });
@@ -1785,7 +1874,7 @@ var EntityRenderEngine;
         function RenderGroup(params) {
             var _a, _b, _c, _d;
             return __awaiter(this, void 0, void 0, function () {
-                var api, cEntities, reqBody, i, entity, zoomItem, style, tagIds, tags, mStyle, group, level, catId, lodData, _loop_1, i;
+                var api, cEntities, reqBody, i, entity, zoomItem, style, tagIds, tags, mStyle, group, level, catId, lodData, _loop_2, i;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -1845,7 +1934,7 @@ var EntityRenderEngine;
                             })];
                         case 7:
                             lodData = (_e.sent()).lods;
-                            _loop_1 = function (i) {
+                            _loop_2 = function (i) {
                                 var entity, zoomItem, style, tagIds, tags, lod, mStyle, cEntity;
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
@@ -1894,7 +1983,7 @@ var EntityRenderEngine;
                             _e.label = 8;
                         case 8:
                             if (!(i < params.entities.length)) return [3 /*break*/, 11];
-                            return [5 /*yield**/, _loop_1(i)];
+                            return [5 /*yield**/, _loop_2(i)];
                         case 9:
                             _e.sent();
                             _e.label = 10;