bruce-cesium 2.3.5 → 2.3.6

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, SceneMode, HeadingPitchRange, Cesium3DTileColorBlendMode, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, Model, CesiumInspector, ColorMaterialProperty, EasingFunction, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, Ion, BoundingSphere } from 'cesium';
+import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, HeadingPitchRange, Cesium3DTileColorBlendMode, Cesium3DTileStyle, createOsmBuildings, 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;
@@ -8934,11 +8934,11 @@ var MenuItemCreator;
 (function (MenuItemCreator) {
     function RenderEntities(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var entityIds, apiGetter, manager, viewer, item, renderedId;
+            var entityIds, apiGetter, getters, manager, viewer, item, renderedId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        entityIds = params.entityIds, apiGetter = params.apiGetter, manager = params.manager, viewer = params.viewer;
+                        entityIds = params.entityIds, apiGetter = params.apiGetter, getters = params.getters, manager = params.manager, viewer = params.viewer;
                         if (!manager && viewer) {
                             manager = ViewerUtils.GetManager({
                                 viewer: viewer,
@@ -8969,6 +8969,7 @@ var MenuItemCreator;
                         };
                         return [4 /*yield*/, manager.RenderItem({
                                 apiGetter: apiGetter,
+                                getters: getters,
                                 item: item
                             })];
                     case 1:
@@ -8984,11 +8985,11 @@ var MenuItemCreator;
     MenuItemCreator.RenderEntities = RenderEntities;
     function RenderEntityTypes(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var typeIds, apiGetter, manager, viewer, renderedItemIds, menuItems, i, typeId, menuItem, itemId;
+            var typeIds, apiGetter, getters, manager, viewer, renderedItemIds, menuItems, i, typeId, menuItem, itemId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        typeIds = params.entityTypeIds, apiGetter = params.apiGetter, manager = params.manager, viewer = params.viewer;
+                        typeIds = params.entityTypeIds, apiGetter = params.apiGetter, getters = params.getters, manager = params.manager, viewer = params.viewer;
                         if (!manager && viewer) {
                             manager = ViewerUtils.GetManager({
                                 viewer: viewer,
@@ -9009,6 +9010,7 @@ var MenuItemCreator;
                         menuItems.push(menuItem);
                         return [4 /*yield*/, manager.RenderItem({
                                 apiGetter: apiGetter,
+                                getters: getters,
                                 item: menuItem
                             })];
                     case 2:
@@ -9029,11 +9031,11 @@ var MenuItemCreator;
     MenuItemCreator.RenderEntityTypes = RenderEntityTypes;
     function RenderEntityFilter(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var filter, apiGetter, manager, viewer, item, renderedIds;
+            var filter, apiGetter, getters, manager, viewer, item, renderedIds;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        filter = params.attrFilter, apiGetter = params.apiGetter, manager = params.manager, viewer = params.viewer;
+                        filter = params.attrFilter, apiGetter = params.apiGetter, getters = params.getters, manager = params.manager, viewer = params.viewer;
                         if (!manager && viewer) {
                             manager = ViewerUtils.GetManager({
                                 viewer: viewer,
@@ -9065,6 +9067,7 @@ var MenuItemCreator;
                         };
                         return [4 /*yield*/, manager.RenderItem({
                                 apiGetter: apiGetter,
+                                getters: getters,
                                 item: item
                             })];
                     case 1:
@@ -9080,11 +9083,11 @@ var MenuItemCreator;
     MenuItemCreator.RenderEntityFilter = RenderEntityFilter;
     function RenderMenuItems(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var menuItems, apiGetter, manager, viewer, renderedItemIds, i, menuItem, itemId;
+            var menuItems, apiGetter, getters, manager, viewer, renderedItemIds, i, menuItem, itemId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        menuItems = params.menuItems, apiGetter = params.apiGetter, manager = params.manager, viewer = params.viewer;
+                        menuItems = params.menuItems, apiGetter = params.apiGetter, getters = params.getters, manager = params.manager, viewer = params.viewer;
                         if (!manager && viewer) {
                             manager = ViewerUtils.GetManager({
                                 viewer: viewer,
@@ -9102,6 +9105,7 @@ var MenuItemCreator;
                         menuItem = menuItems[i];
                         return [4 /*yield*/, manager.RenderItem({
                                 apiGetter: apiGetter,
+                                getters: getters,
                                 item: menuItem
                             })];
                     case 2:
@@ -9121,12 +9125,18 @@ var MenuItemCreator;
     MenuItemCreator.RenderMenuItems = RenderMenuItems;
     function RenderTileset(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var tilesetId, apiGetter, viewer, manager, api, tileset, _a, menuItem, renderedIds;
+            var tilesetId, apiGetter, getters, viewer, manager, api, tileset, _a, menuItem, renderedIds;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        tilesetId = params.tilesetId, apiGetter = params.apiGetter, viewer = params.viewer, manager = params.manager;
-                        if (!apiGetter) {
+                        tilesetId = params.tilesetId, apiGetter = params.apiGetter, getters = params.getters, viewer = params.viewer, manager = params.manager;
+                        if (!getters) {
+                            getters = ENVIRONMENT.Api();
+                        }
+                        if (apiGetter && !getters) {
+                            console.warn("RenderTileset(): Please pass getters instead of apiGetter. This is now deprecated due to needing access to other kinds of apis.");
+                        }
+                        else if (!apiGetter) {
                             apiGetter = ENVIRONMENT.Api().GetBruceGetter();
                         }
                         if (!manager && viewer) {
@@ -9138,7 +9148,7 @@ var MenuItemCreator;
                         else if (manager && !viewer) {
                             viewer = manager.Viewer;
                         }
-                        api = apiGetter.getApi();
+                        api = getters.GetBruceApi();
                         if (!params.tileset) return [3 /*break*/, 1];
                         _a = params.tileset;
                         return [3 /*break*/, 3];
@@ -9206,7 +9216,8 @@ var MenuItemCreator;
                         if (!menuItem) return [3 /*break*/, 5];
                         return [4 /*yield*/, manager.RenderItem({
                                 item: menuItem,
-                                apiGetter: apiGetter
+                                apiGetter: apiGetter,
+                                getters: getters
                             })];
                     case 4:
                         renderedIds = _b.sent();
@@ -9226,13 +9237,19 @@ var MenuItemCreator;
     function RenderBookmarkItems(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var viewId, bookmarkId, apiGetter, manager, viewer, api, view, _b, bookmark, _c, enabledIds, menuItems, version, vSettings, bSettings, vSettings, bSettings, alternations, renderedItemIds, traverseItems_1, i;
+            var viewId, bookmarkId, apiGetter, getters, manager, viewer, api, view, _b, bookmark, _c, enabledIds, menuItems, version, vSettings, bSettings, vSettings, bSettings, alternations, renderedItemIds, traverseItems_1, i;
             var _this = this;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
-                        viewId = params.viewId, bookmarkId = params.bookmarkId, apiGetter = params.apiGetter, manager = params.manager, viewer = params.viewer;
-                        if (!apiGetter) {
+                        viewId = params.viewId, bookmarkId = params.bookmarkId, apiGetter = params.apiGetter, getters = params.getters, manager = params.manager, viewer = params.viewer;
+                        if (!getters) {
+                            getters = ENVIRONMENT.Api();
+                        }
+                        if (apiGetter && !getters) {
+                            console.warn("RenderBookmarkItems(): Please pass getters instead of apiGetter. This is now deprecated due to needing access to other kinds of apis.");
+                        }
+                        else if (!apiGetter) {
                             apiGetter = ENVIRONMENT.Api().GetBruceGetter();
                         }
                         if (!manager && viewer) {
@@ -9244,7 +9261,7 @@ var MenuItemCreator;
                         else if (manager && !viewer) {
                             viewer = manager.Viewer;
                         }
-                        api = apiGetter.getApi();
+                        api = getters.GetBruceApi();
                         if (!params.view) return [3 /*break*/, 1];
                         _b = params.view;
                         return [3 /*break*/, 3];
@@ -9316,7 +9333,8 @@ var MenuItemCreator;
                                         if (!enabledIds.includes(item.id)) return [3 /*break*/, 2];
                                         return [4 /*yield*/, manager.RenderItem({
                                                 item: item,
-                                                apiGetter: apiGetter
+                                                apiGetter: apiGetter,
+                                                getters: getters
                                             })];
                                     case 1:
                                         itemId = _b.sent();
@@ -11087,6 +11105,7 @@ function renderLegacyNavigator(params, bookmark, view) {
                     if (!bookmark) return [3 /*break*/, 4];
                     return [4 /*yield*/, MenuItemCreator.RenderBookmarkItems({
                             apiGetter: params.apiGetter,
+                            getters: params.getters,
                             manager: manager,
                             view: view,
                             bookmark: bookmark
@@ -11106,6 +11125,7 @@ function renderLegacyNavigator(params, bookmark, view) {
                     };
                     return [4 /*yield*/, params.manager.RenderItem({
                             apiGetter: params.apiGetter,
+                            getters: params.getters,
                             item: menuItem
                         })];
                 case 5:
@@ -11411,6 +11431,7 @@ function renderNavigator(params, bookmark, view) {
                     if (!bookmark) return [3 /*break*/, 5];
                     return [4 /*yield*/, MenuItemCreator.RenderBookmarkItems({
                             apiGetter: params.apiGetter,
+                            getters: params.getters,
                             manager: params.manager,
                             view: view,
                             bookmark: bookmark
@@ -11430,6 +11451,7 @@ function renderNavigator(params, bookmark, view) {
                     };
                     return [4 /*yield*/, params.manager.RenderItem({
                             apiGetter: params.apiGetter,
+                            getters: params.getters,
                             item: menuItem
                         })];
                 case 6:
@@ -11468,10 +11490,16 @@ var ViewRenderEngine;
                         else if (!params.viewer && params.manager) {
                             params.viewer = params.manager.Viewer;
                         }
-                        if (!params.apiGetter) {
+                        if (!params.getters) {
+                            params.getters = ENVIRONMENT.Api();
+                        }
+                        if (params.apiGetter && !params.getters) {
+                            console.warn("ViewRenderEngine.Render(): Please pass getters instead of apiGetter. This is now deprecated due to needing access to other kinds of apis.");
+                        }
+                        else if (!params.apiGetter) {
                             params.apiGetter = ENVIRONMENT.Api().GetBruceGetter();
                         }
-                        api = params.apiGetter.getApi();
+                        api = params.getters.GetBruceApi();
                         if (!params.view) return [3 /*break*/, 1];
                         _b = params.view;
                         return [3 /*break*/, 3];
@@ -14322,7 +14350,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.3.5";
+var VERSION$1 = "2.3.6";
 
 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