bruce-cesium 2.3.8 → 2.4.0

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, DelayQueue, BatchedDataGetter, EntityRelationType, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ENVIRONMENT, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, Entity, Primitive, Cesium3DTileFeature, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, SceneMode, Cesium3DTileStyle, KmlDataSource, createOsmBuildings, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumInspector, defined, PolygonPipeline, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, EasingFunction, GeometryInstance, Ion, BoundingSphere } from 'cesium';
+import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, SceneMode, Entity, Primitive, Cesium3DTileFeature, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, Model, CesiumInspector, PolygonPipeline, ColorMaterialProperty, EasingFunction, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Ion, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1642,6 +1642,42 @@ function getValue(viewer, obj) {
     }
     return obj;
 }
+function getName(api, entity) {
+    return __awaiter(this, void 0, void 0, function () {
+        var typeId, type, name_1, e_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 3, , 4]);
+                    typeId = entity.Bruce["EntityType.ID"];
+                    type = null;
+                    if (!typeId) return [3 /*break*/, 2];
+                    return [4 /*yield*/, EntityType.Get({
+                            api: api,
+                            entityTypeId: typeId
+                        })];
+                case 1:
+                    type = (_a.sent()).entityType;
+                    _a.label = 2;
+                case 2:
+                    if (type) {
+                        name_1 = Entity$1.CalculateName({
+                            entity: entity,
+                            type: type,
+                            defaultToId: false
+                        });
+                        return [2 /*return*/, name_1 ? name_1 : "Unnamed entity"];
+                    }
+                    return [3 /*break*/, 4];
+                case 3:
+                    e_1 = _a.sent();
+                    console.error(e_1);
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/, "Unknown entity"];
+            }
+        });
+    });
+}
 function getStyle(api, entity, styleId) {
     return __awaiter(this, void 0, void 0, function () {
         var style, typeId, type;
@@ -1975,7 +2011,7 @@ var EntityRenderEngine;
     (function (Point) {
         function Render(params) {
             return __awaiter(this, void 0, void 0, function () {
-                var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl, res, e_1, iconScale, heightRef, radius, bFill, cFill, outline, cOutline, outlineWidth, outlineHeight, bOutline, fillHeight, exHeightRef, pos, bColor, cColor, size, heightRef;
+                var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl, res, e_2, iconScale, heightRef, radius, bFill, cFill, outline, cOutline, outlineWidth, outlineHeight, bOutline, fillHeight, exHeightRef, pos, bColor, cColor, size, heightRef;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -2028,7 +2064,7 @@ var EntityRenderEngine;
                             _a.label = 4;
                         case 4: return [3 /*break*/, 6];
                         case 5:
-                            e_1 = _a.sent();
+                            e_2 = _a.sent();
                             iconUrl = null;
                             return [3 /*break*/, 6];
                         case 6:
@@ -2173,7 +2209,7 @@ var EntityRenderEngine;
         function RenderGroup(params) {
             var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
-                var api, cEntities, i, entity, zoomItem, style, tagIds, tags, pStyle, cEntity;
+                var api, cEntities, i, entity, zoomItem, style, tagIds, tags, pStyle, cEntity, name_2;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -2182,7 +2218,7 @@ var EntityRenderEngine;
                             i = 0;
                             _d.label = 1;
                         case 1:
-                            if (!(i < params.entities.length)) return [3 /*break*/, 7];
+                            if (!(i < params.entities.length)) return [3 /*break*/, 9];
                             entity = params.entities[i];
                             zoomItem = params.zoomItems[entity.Bruce.ID];
                             return [4 /*yield*/, getStyle(api, entity, zoomItem.StyleID)];
@@ -2211,15 +2247,20 @@ var EntityRenderEngine;
                                 })];
                         case 5:
                             cEntity = _d.sent();
-                            if (cEntity) {
-                                cEntity._renderGroup = getRenderGroupId(zoomItem, (_c = params.viewer) === null || _c === void 0 ? void 0 : _c.terrainProvider);
-                            }
-                            cEntities[entity.Bruce.ID] = cEntity;
-                            _d.label = 6;
+                            if (!cEntity) return [3 /*break*/, 7];
+                            return [4 /*yield*/, getName(api, entity)];
                         case 6:
+                            name_2 = _d.sent();
+                            cEntity.name = name_2;
+                            cEntity._renderGroup = getRenderGroupId(zoomItem, (_c = params.viewer) === null || _c === void 0 ? void 0 : _c.terrainProvider);
+                            _d.label = 7;
+                        case 7:
+                            cEntities[entity.Bruce.ID] = cEntity;
+                            _d.label = 8;
+                        case 8:
                             i++;
                             return [3 /*break*/, 1];
-                        case 7: return [2 /*return*/, cEntities];
+                        case 9: return [2 /*return*/, cEntities];
                     }
                 });
             });
@@ -2316,7 +2357,7 @@ var EntityRenderEngine;
         function RenderGroup(params) {
             var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
-                var api, cEntities, i, entity, zoomItem, style, tagIds, tags, lStyle, cEntity;
+                var api, cEntities, i, entity, zoomItem, style, tagIds, tags, lStyle, cEntity, name_3;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -2325,7 +2366,7 @@ var EntityRenderEngine;
                             i = 0;
                             _d.label = 1;
                         case 1:
-                            if (!(i < params.entities.length)) return [3 /*break*/, 6];
+                            if (!(i < params.entities.length)) return [3 /*break*/, 7];
                             entity = params.entities[i];
                             zoomItem = params.zoomItems[entity.Bruce.ID];
                             return [4 /*yield*/, getStyle(api, entity, zoomItem.StyleID)];
@@ -2351,15 +2392,18 @@ var EntityRenderEngine;
                                 maxDistance: zoomItem.MaxZoom,
                                 minDistance: zoomItem.MinZoom
                             });
-                            if (cEntity) {
-                                cEntity._renderGroup = getRenderGroupId(zoomItem, (_c = params.viewer) === null || _c === void 0 ? void 0 : _c.terrainProvider);
-                                cEntities[entity.Bruce.ID] = cEntity;
-                            }
-                            _d.label = 5;
+                            if (!cEntity) return [3 /*break*/, 6];
+                            return [4 /*yield*/, getName(api, entity)];
                         case 5:
+                            name_3 = _d.sent();
+                            cEntity.name = name_3;
+                            cEntity._renderGroup = getRenderGroupId(zoomItem, (_c = params.viewer) === null || _c === void 0 ? void 0 : _c.terrainProvider);
+                            cEntities[entity.Bruce.ID] = cEntity;
+                            _d.label = 6;
+                        case 6:
                             i++;
                             return [3 /*break*/, 1];
-                        case 6: return [2 /*return*/, cEntities];
+                        case 7: return [2 /*return*/, cEntities];
                     }
                 });
             });
@@ -2483,7 +2527,7 @@ var EntityRenderEngine;
         function RenderGroup(params) {
             var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
-                var api, cEntities, i, entity, zoomItem, style, tagIds, tags, pStyle, cEntity;
+                var api, cEntities, i, entity, zoomItem, style, tagIds, tags, pStyle, cEntity, name_4;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -2492,7 +2536,7 @@ var EntityRenderEngine;
                             i = 0;
                             _d.label = 1;
                         case 1:
-                            if (!(i < params.entities.length)) return [3 /*break*/, 6];
+                            if (!(i < params.entities.length)) return [3 /*break*/, 7];
                             entity = params.entities[i];
                             zoomItem = params.zoomItems[entity.Bruce.ID];
                             return [4 /*yield*/, getStyle(api, entity, zoomItem.StyleID)];
@@ -2518,15 +2562,18 @@ var EntityRenderEngine;
                                 maxDistance: zoomItem.MaxZoom,
                                 minDistance: zoomItem.MinZoom
                             });
-                            if (cEntity) {
-                                cEntity._renderGroup = getRenderGroupId(zoomItem, (_c = params.viewer) === null || _c === void 0 ? void 0 : _c.terrainProvider);
-                                cEntities[entity.Bruce.ID] = cEntity;
-                            }
-                            _d.label = 5;
+                            if (!cEntity) return [3 /*break*/, 6];
+                            return [4 /*yield*/, getName(api, entity)];
                         case 5:
+                            name_4 = _d.sent();
+                            cEntity.name = name_4;
+                            cEntity._renderGroup = getRenderGroupId(zoomItem, (_c = params.viewer) === null || _c === void 0 ? void 0 : _c.terrainProvider);
+                            cEntities[entity.Bruce.ID] = cEntity;
+                            _d.label = 6;
+                        case 6:
                             i++;
                             return [3 /*break*/, 1];
-                        case 6: return [2 /*return*/, cEntities];
+                        case 7: return [2 /*return*/, cEntities];
                     }
                 });
             });
@@ -2674,7 +2721,7 @@ var EntityRenderEngine;
                         case 7:
                             lodData = (_f.sent()).lods;
                             _loop_2 = function (i) {
-                                var entity, zoomItem, style, tagIds, tags, lod, mStyle, cEntity;
+                                var entity, zoomItem, style, tagIds, tags, lod, mStyle, cEntity, name_5;
                                 return __generator(this, function (_g) {
                                     switch (_g.label) {
                                         case 0:
@@ -2712,11 +2759,15 @@ var EntityRenderEngine;
                                                 maxDistance: zoomItem.MaxZoom,
                                                 minDistance: zoomItem.MinZoom
                                             });
-                                            if (cEntity) {
-                                                cEntity._renderGroup = getRenderGroupId(zoomItem, (_e = params.viewer) === null || _e === void 0 ? void 0 : _e.terrainProvider);
-                                                cEntities[entity.Bruce.ID] = cEntity;
-                                            }
-                                            return [2 /*return*/];
+                                            if (!cEntity) return [3 /*break*/, 5];
+                                            return [4 /*yield*/, getName(api, entity)];
+                                        case 4:
+                                            name_5 = _g.sent();
+                                            cEntity.name = name_5;
+                                            cEntity._renderGroup = getRenderGroupId(zoomItem, (_e = params.viewer) === null || _e === void 0 ? void 0 : _e.terrainProvider);
+                                            cEntities[entity.Bruce.ID] = cEntity;
+                                            _g.label = 5;
+                                        case 5: return [2 /*return*/];
                                     }
                                 });
                             };
@@ -3901,7 +3952,8 @@ var EntitiesRenderManager;
                                             entityTypeId: entity.Bruce["EntityType.ID"],
                                             accountId: this.apiGetter.accountId,
                                             tagIds: tagIds ? [].concat(tagIds) : [],
-                                            suppressShow: wasClustered
+                                            suppressShow: wasClustered,
+                                            name: cEntity.name
                                         };
                                         this.visualsManager.AddRego({
                                             rego: rego
@@ -4144,7 +4196,8 @@ var EntitiesLoadedRenderManager;
                                                 visual: cEntity,
                                                 priority: 0,
                                                 entityTypeId: entity.Bruce["EntityType.ID"],
-                                                accountId: this.apiGetter.accountId
+                                                accountId: this.apiGetter.accountId,
+                                                name: cEntity.name
                                             }
                                         });
                                     }
@@ -5719,7 +5772,8 @@ var EntitiesIdsRenderManager;
                                                 priority: 0,
                                                 entityTypeId: entity.Bruce["EntityType.ID"],
                                                 accountId: this.apiGetter.accountId,
-                                                suppressShow: clustered
+                                                suppressShow: clustered,
+                                                name: cEntity.name
                                             }
                                         });
                                     }
@@ -5907,7 +5961,8 @@ var EntityRenderManager;
                                             visual: cEntity,
                                             priority: 0,
                                             entityTypeId: entity.Bruce["EntityType.ID"],
-                                            accountId: this.apiGetter.accountId
+                                            accountId: this.apiGetter.accountId,
+                                            name: cEntity.name
                                         }
                                     });
                                 }
@@ -6139,21 +6194,18 @@ var TilesetRenderEngine;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        api = params.apiGetter.getApi(params.apiGetter.accountId);
+                        api = params.apiGetter.getApi(params.accountId);
                         // Ensure regional url is loaded.
                         return [4 /*yield*/, api.Loading];
                     case 1:
                         // Ensure regional url is loaded.
                         _a.sent();
                         loadUrl = params.tileset.loadUrl;
-                        // CDN url must match the api getter account id.
-                        if (!params.accountId || params.accountId == params.apiGetter.accountId) {
-                            // CDN enabled and tileset url template is available.
-                            if (params.viaCdn && api.TilesetCdnUrl) {
-                                loadUrl = api.TilesetCdnUrl.replace("<TILESETID>", params.tileset.id).replace("<FILEPATH>", "files/tileset.json");
-                                // First url param reserved for accountId. This is set within the API instance.
-                                loadUrl += "&generation=" + params.tileset.generateVersion;
-                            }
+                        // CDN enabled and tileset url template is available.
+                        if (params.viaCdn && api.TilesetCdnUrl) {
+                            loadUrl = api.TilesetCdnUrl.replace("<TILESETID>", params.tileset.id).replace("<FILEPATH>", "files/tileset.json");
+                            // First url param reserved for accountId. This is set within the API instance.
+                            loadUrl += "&generation=" + params.tileset.generateVersion;
                         }
                         if (!(params.tileset.type == Tileset.EType.Cad)) return [3 /*break*/, 3];
                         return [4 /*yield*/, createTileset(loadUrl ? loadUrl : Tileset.GetPublicFileUrl({
@@ -6990,6 +7042,7 @@ var TilesetCadRenderManager;
                         if (meta) {
                             rego.entityId = meta.id;
                             rego.entityTypeId = meta.typeId;
+                            rego.name = meta.name;
                         }
                     }
                 }
@@ -7055,7 +7108,7 @@ var TilesetCadRenderManager;
             path = [].concat(path);
             path.push(branch.id);
             if (branch.geomId == geomId) {
-                return { id: path[path.length - 1], typeId: branch.typeId };
+                return { id: path[path.length - 1], typeId: branch.typeId, name: branch.name };
             }
             else if (branch.children) {
                 for (var i = 0; i < branch.children.length; i++) {
@@ -7766,9 +7819,9 @@ var TilesetPointcloudRenderManager;
                         case 1:
                             _f.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, Tileset.Publish.IsAccessAllowed({
-                                    sourceAccountId: this.getters.GetAccountId(),
+                                    sourceAccountId: (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID,
                                     tilesetId: tilesetId,
-                                    forAccountId: (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID,
+                                    forAccountId: this.getters.GetAccountId(),
                                     api: this.getters.GetGlobalApi()
                                 })];
                         case 2:
@@ -8085,9 +8138,9 @@ var TilesetArbRenderManager;
                         case 1:
                             _o.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, Tileset.Publish.IsAccessAllowed({
-                                    sourceAccountId: this.getters.GetAccountId(),
+                                    sourceAccountId: (_f = this.item.tileset) === null || _f === void 0 ? void 0 : _f.ClientAccountID,
                                     tilesetId: tilesetId,
-                                    forAccountId: (_f = this.item.tileset) === null || _f === void 0 ? void 0 : _f.ClientAccountID,
+                                    forAccountId: this.getters.GetAccountId(),
                                     api: this.getters.GetGlobalApi()
                                 })];
                         case 2:
@@ -14346,7 +14399,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.3.8";
+var VERSION$1 = "2.4.0";
 
 export { VERSION$1 as VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, RelationsRenderManager, SharedGetters, CesiumParabola, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map