bruce-cesium 0.2.6 → 0.2.8

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, ObjectUtils, Tileset, EntityFilterGetter, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTileSource, Camera, MathUtils } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, Viewer, ArcGisMapServerImageryProvider, ScreenSpaceEventType, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, HeadingPitchRange, OrthographicFrustum, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, createWorldTerrain, CesiumTerrainProvider, EllipsoidTerrainProvider, Matrix4, Cesium3DTileset, EllipsoidGeodesic } from 'cesium';
+import { Cartesian2, Cartographic, Math as Math$1, Viewer, ArcGisMapServerImageryProvider, ScreenSpaceEventType, Cartesian3, Entity, Primitive, Cesium3DTileFeature, Color, HeightReference, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, HeadingPitchRange, OrthographicFrustum, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, createWorldTerrain, CesiumTerrainProvider, EllipsoidTerrainProvider, EllipsoidGeodesic, Matrix4, Cesium3DTileset } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1377,7 +1377,7 @@ var EntityRenderEngine;
 var EntitiesRenderManager;
 (function (EntitiesRenderManager) {
     var Manager = /** @class */ (function () {
-        function Manager(viewer, visualsManager, apiGetter, item, sharedGetters) {
+        function Manager(viewer, visualsManager, apiGetter, monitor, item, sharedGetters) {
             this.getter = null;
             this.getterSub = null;
             this.disposed = false;
@@ -1388,6 +1388,7 @@ var EntitiesRenderManager;
             this.viewMonitorRemoval = null;
             this.viewer = viewer;
             this.sharedGetters = sharedGetters;
+            this.monitor = monitor;
             this.apiGetter = apiGetter;
             this.item = item;
             this.visualsManager = visualsManager;
@@ -1413,14 +1414,15 @@ var EntitiesRenderManager;
                         api: api,
                         attrFilter: (_a = this.item.BruceEntity.Filter) !== null && _a !== void 0 ? _a : {},
                         batchSize: 500,
-                        typeId: this.item.BruceEntity["EntityType.ID"]
+                        typeId: this.item.BruceEntity["EntityType.ID"],
+                        monitor: this.monitor
                     });
                     minMax = RenderManager.Utils.GetZoomMinMax(this.item.CameraZoomSettings);
                     this.getter.IncludeMenuItem(this.item.id, [], minMax[0], minMax[1]);
                     this.getterSub = this.getter.OnUpdate.Subscribe(function (entities) {
                         _this.onGetterUpdate(entities);
                     });
-                    this.viewMonitorRemoval = new CesiumViewMonitor(this.viewer).Updated().Subscribe(function () {
+                    this.viewMonitorRemoval = this.monitor.Updated().Subscribe(function () {
                         _this.entityCheckQueue.Call();
                     });
                     this.entityCheckQueue = new DelayQueue(function () {
@@ -1596,6 +1598,7 @@ var EntitiesLoadedRenderManager;
                     this.getterSub = this.getter.OnUpdate.Subscribe(function (entities) {
                         _this.onGetterUpdate(entities);
                     });
+                    this.getter.Start();
                     return [2 /*return*/];
                 });
             });
@@ -2079,6 +2082,7 @@ var EntitiesIdsRenderManager;
                     this.getterSub = this.getter.OnUpdate.Subscribe(function (ids) {
                         _this.onGetterUpdate(ids);
                     });
+                    this.getter.Start();
                     return [2 /*return*/];
                 });
             });
@@ -2180,6 +2184,7 @@ var EntityRenderManager;
                     this.getterSub = this.getter.OnUpdate.Subscribe(function (ids) {
                         _this.onGetterUpdate(ids[0]);
                     });
+                    this.getter.Start();
                     return [2 /*return*/];
                 });
             });
@@ -2875,15 +2880,14 @@ function createFilterGetterCacheKey(params) {
 var SharedGetters;
 (function (SharedGetters) {
     var Cache = /** @class */ (function () {
-        function Cache(viewer) {
+        function Cache() {
             this.data = {};
-            this.viewer = viewer;
         }
         Cache.prototype.GetOrCreateFilterGetter = function (params) {
             var cacheKey = createFilterGetterCacheKey(params);
             var getter = this.data[cacheKey];
             if (!getter) {
-                getter = new EntityFilterGetter.Getter(params.api, new CesiumViewMonitor(this.viewer), params.typeId, params.batchSize, params.attrFilter);
+                getter = new EntityFilterGetter.Getter(params.api, params.monitor, params.typeId, params.batchSize, params.attrFilter);
                 this.data[cacheKey] = getter;
             }
             return getter;
@@ -2893,6 +2897,195 @@ var SharedGetters;
     SharedGetters.Cache = Cache;
 })(SharedGetters || (SharedGetters = {}));
 
+/**
+ * Utility to keep track of enabled menu items within a Cesium viewer.
+ */
+var MenuItemManager;
+(function (MenuItemManager) {
+    var Manager = /** @class */ (function () {
+        function Manager(viewer, visualsRegister) {
+            this.items = [];
+            this.onUpdate = null;
+            this.viewer = viewer;
+            if (!visualsRegister) {
+                visualsRegister = new VisualsRegister.Register(viewer);
+            }
+            this.visualsRegister = visualsRegister;
+            this.sharedGetters = new SharedGetters.Cache();
+            this.sharedMonitor = new CesiumViewMonitor(this.viewer);
+        }
+        Object.defineProperty(Manager.prototype, "Viewer", {
+            get: function () {
+                return this.viewer;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(Manager.prototype, "VisualsRegister", {
+            get: function () {
+                return this.visualsRegister;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(Manager.prototype, "OnUpdate", {
+            get: function () {
+                if (!this.onUpdate) {
+                    this.onUpdate = new BruceEvent();
+                }
+                return this.onUpdate;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        /**
+         * Renders a given menu item and all ids children.
+         * Will return the enabled item id.
+         * @param params
+         * @returns
+         */
+        Manager.prototype.RenderItem = function (params) {
+            var _a, _b;
+            return __awaiter(this, void 0, void 0, function () {
+                var rItem, i, childId;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            if (this.items.find(function (x) { return x.id == params.item.id; })) {
+                                return [2 /*return*/, params.item.id];
+                            }
+                            rItem = {
+                                id: (_a = params.item.id) !== null && _a !== void 0 ? _a : ObjectUtils.UId(),
+                                childIds: [],
+                                item: params.item,
+                                renderManager: null,
+                                type: params.item.Type
+                            };
+                            switch (params.item.Type) {
+                                case MenuItem.EType.Entities:
+                                    rItem.renderManager = new EntitiesRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, this.sharedMonitor, params.item, this.sharedGetters);
+                                    break;
+                                case MenuItem.EType.EntitiesLoaded:
+                                    rItem.renderManager = new EntitiesLoadedRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, this.sharedMonitor, params.item);
+                                    break;
+                                case MenuItem.EType.EntitiesIds:
+                                    rItem.renderManager = new EntitiesIdsRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, this.sharedMonitor, params.item);
+                                    break;
+                                case MenuItem.EType.Entity:
+                                    rItem.renderManager = new EntityRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, this.sharedMonitor, params.item);
+                                    break;
+                                case MenuItem.EType.CadTileset:
+                                    rItem.renderManager = new TilesetCadRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, params.item);
+                                    break;
+                                case MenuItem.EType.Osm:
+                                    // TODO;
+                                    break;
+                                case MenuItem.EType.PointCloud:
+                                    // TODO;
+                                    break;
+                                case MenuItem.EType.EntityTileset:
+                                    // TODO;
+                                    break;
+                                case MenuItem.EType.Kml:
+                                    // TODO;
+                                    break;
+                                // Any "none" type can be ignored. These are just containers for other items.
+                                case MenuItem.EType.None:
+                                    break;
+                                default:
+                                    console.error("Menu item type is not implemented.", params.item.Type);
+                            }
+                            if (!rItem.renderManager) return [3 /*break*/, 2];
+                            return [4 /*yield*/, rItem.renderManager.Init()];
+                        case 1:
+                            _c.sent();
+                            _c.label = 2;
+                        case 2:
+                            this.items.push(rItem);
+                            if (!params.item.Children) return [3 /*break*/, 6];
+                            i = 0;
+                            _c.label = 3;
+                        case 3:
+                            if (!(i < params.item.Children.length)) return [3 /*break*/, 6];
+                            return [4 /*yield*/, this.RenderItem(__assign(__assign({}, params), { item: params.item.Children[i] }))];
+                        case 4:
+                            childId = _c.sent();
+                            rItem.childIds.push(childId);
+                            _c.label = 5;
+                        case 5:
+                            i++;
+                            return [3 /*break*/, 3];
+                        case 6:
+                            (_b = this.onUpdate) === null || _b === void 0 ? void 0 : _b.Trigger({ isEnabling: true, itemId: rItem.id });
+                            return [2 /*return*/, rItem.id];
+                    }
+                });
+            });
+        };
+        /**
+         * Disables a menu item by ids id.
+         * This will disable all children as well.
+         * @param id
+         */
+        Manager.prototype.RemoveItemById = function (id) {
+            var _a, _b;
+            return __awaiter(this, void 0, void 0, function () {
+                var item, _loop_1, this_1, i;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            item = this.items.find(function (x) { return x.id === id; });
+                            if (!item) return [3 /*break*/, 5];
+                            _loop_1 = function (i) {
+                                var child;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            child = this_1.items.find(function (x) { return x.id === item.childIds[i]; });
+                                            if (!child) return [3 /*break*/, 2];
+                                            return [4 /*yield*/, this_1.RemoveItemById(child.id)];
+                                        case 1:
+                                            _a.sent();
+                                            _a.label = 2;
+                                        case 2: return [2 /*return*/];
+                                    }
+                                });
+                            };
+                            this_1 = this;
+                            i = 0;
+                            _c.label = 1;
+                        case 1:
+                            if (!(i < item.childIds.length)) return [3 /*break*/, 4];
+                            return [5 /*yield**/, _loop_1(i)];
+                        case 2:
+                            _c.sent();
+                            _c.label = 3;
+                        case 3:
+                            i++;
+                            return [3 /*break*/, 1];
+                        case 4:
+                            try {
+                                (_a = item.renderManager) === null || _a === void 0 ? void 0 : _a.Dispose();
+                            }
+                            catch (e) {
+                                console.error(e);
+                            }
+                            this.items = this.items.filter(function (x) { return x.id !== id; });
+                            (_b = this.onUpdate) === null || _b === void 0 ? void 0 : _b.Trigger({ isEnabling: false, itemId: item.id });
+                            _c.label = 5;
+                        case 5: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        Manager.prototype.GetEnabledItemIds = function () {
+            return this.items.map(function (x) { return x.id; });
+        };
+        return Manager;
+    }());
+    MenuItemManager.Manager = Manager;
+})(MenuItemManager || (MenuItemManager = {}));
+
 /**
  * Utility to help generate menu items for rendering various data.
  */
@@ -3247,10 +3440,6 @@ var TileRenderEngine;
     TileRenderEngine.CompareLegacyNames = CompareLegacyNames;
     var Map;
     (function (Map) {
-        function MarkProvider(provider, id) {
-            provider._bId = id;
-        }
-        Map.MarkProvider = MarkProvider;
         function Render(params) {
             throw ("Not implemented");
         }
@@ -3420,6 +3609,7 @@ var TileRenderEngine;
             }
             if (layer) {
                 layer._bId = bId;
+                layer._bName = tile.Name;
                 if (!params.viewer.imageryLayers.contains(layer)) {
                     params.viewer.imageryLayers.add(layer);
                 }
@@ -3543,6 +3733,7 @@ var TileRenderEngine;
         }
         Terrain.Render = Render;
         function RenderLegacy(params) {
+            var _a;
             var bId = createTerrainBId(params.data);
             var curProvider = params.viewer.terrainProvider;
             if (curProvider._bId && curProvider._bId === bId) {
@@ -3577,6 +3768,7 @@ var TileRenderEngine;
             }
             if (provider) {
                 provider._bId = bId;
+                provider._bName = (_a = params.data) === null || _a === void 0 ? void 0 : _a.Name;
                 params.viewer.terrainProvider = provider;
             }
         }
@@ -3875,194 +4067,5 @@ var MeasureAddon = /** @class */ (function () {
     return MeasureAddon;
 }());
 
-/**
- * Utility to keep track of enabled menu items within a Cesium viewer.
- */
-var MenuItemManager;
-(function (MenuItemManager$$1) {
-    var Manager = /** @class */ (function () {
-        function Manager(viewer, visualsRegister) {
-            this.items = [];
-            this.onUpdate = null;
-            this.viewer = viewer;
-            if (!visualsRegister) {
-                visualsRegister = new VisualsRegister.Register(viewer);
-            }
-            this.visualsRegister = visualsRegister;
-            this.sharedGetters = new SharedGetters.Cache(this.viewer);
-            this.sharedMonitor = new CesiumViewMonitor(this.viewer);
-        }
-        Object.defineProperty(Manager.prototype, "Viewer", {
-            get: function () {
-                return this.viewer;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(Manager.prototype, "VisualsRegister", {
-            get: function () {
-                return this.visualsRegister;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(Manager.prototype, "OnUpdate", {
-            get: function () {
-                if (!this.onUpdate) {
-                    this.onUpdate = new BruceEvent();
-                }
-                return this.onUpdate;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        /**
-         * Renders a given menu item and all ids children.
-         * Will return the enabled item id.
-         * @param params
-         * @returns
-         */
-        Manager.prototype.RenderItem = function (params) {
-            var _a, _b;
-            return __awaiter(this, void 0, void 0, function () {
-                var rItem, i, childId;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
-                        case 0:
-                            if (this.items.find(function (x) { return x.id == params.item.id; })) {
-                                return [2 /*return*/, params.item.id];
-                            }
-                            rItem = {
-                                id: (_a = params.item.id) !== null && _a !== void 0 ? _a : ObjectUtils.UId(),
-                                childIds: [],
-                                item: params.item,
-                                renderManager: null,
-                                type: params.item.Type
-                            };
-                            switch (params.item.Type) {
-                                case MenuItem.EType.Entities:
-                                    rItem.renderManager = new EntitiesRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, params.item, this.sharedGetters);
-                                    break;
-                                case MenuItem.EType.EntitiesLoaded:
-                                    rItem.renderManager = new EntitiesLoadedRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, this.sharedMonitor, params.item);
-                                    break;
-                                case MenuItem.EType.EntitiesIds:
-                                    rItem.renderManager = new EntitiesIdsRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, this.sharedMonitor, params.item);
-                                    break;
-                                case MenuItem.EType.Entity:
-                                    rItem.renderManager = new EntityRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, this.sharedMonitor, params.item);
-                                    break;
-                                case MenuItem.EType.CadTileset:
-                                    rItem.renderManager = new TilesetCadRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, params.item);
-                                    break;
-                                case MenuItem.EType.Osm:
-                                    // TODO;
-                                    break;
-                                case MenuItem.EType.PointCloud:
-                                    // TODO;
-                                    break;
-                                case MenuItem.EType.EntityTileset:
-                                    // TODO;
-                                    break;
-                                case MenuItem.EType.Kml:
-                                    // TODO;
-                                    break;
-                                // Any "none" type can be ignored. These are just containers for other items.
-                                case MenuItem.EType.None:
-                                    break;
-                                default:
-                                    console.error("Menu item type is not implemented.", params.item.Type);
-                            }
-                            if (!rItem.renderManager) return [3 /*break*/, 2];
-                            return [4 /*yield*/, rItem.renderManager.Init()];
-                        case 1:
-                            _c.sent();
-                            _c.label = 2;
-                        case 2:
-                            this.items.push(rItem);
-                            if (!params.item.Children) return [3 /*break*/, 6];
-                            i = 0;
-                            _c.label = 3;
-                        case 3:
-                            if (!(i < params.item.Children.length)) return [3 /*break*/, 6];
-                            return [4 /*yield*/, this.RenderItem(__assign(__assign({}, params), { item: params.item.Children[i] }))];
-                        case 4:
-                            childId = _c.sent();
-                            rItem.childIds.push(childId);
-                            _c.label = 5;
-                        case 5:
-                            i++;
-                            return [3 /*break*/, 3];
-                        case 6:
-                            (_b = this.onUpdate) === null || _b === void 0 ? void 0 : _b.Trigger({ isEnabling: true, itemId: rItem.id });
-                            return [2 /*return*/, rItem.id];
-                    }
-                });
-            });
-        };
-        /**
-         * Disables a menu item by ids id.
-         * This will disable all children as well.
-         * @param id
-         */
-        Manager.prototype.RemoveItemById = function (id) {
-            var _a, _b;
-            return __awaiter(this, void 0, void 0, function () {
-                var item, _loop_1, this_1, i;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
-                        case 0:
-                            item = this.items.find(function (x) { return x.id === id; });
-                            if (!item) return [3 /*break*/, 5];
-                            _loop_1 = function (i) {
-                                var child;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0:
-                                            child = this_1.items.find(function (x) { return x.id === item.childIds[i]; });
-                                            if (!child) return [3 /*break*/, 2];
-                                            return [4 /*yield*/, this_1.RemoveItemById(child.id)];
-                                        case 1:
-                                            _a.sent();
-                                            _a.label = 2;
-                                        case 2: return [2 /*return*/];
-                                    }
-                                });
-                            };
-                            this_1 = this;
-                            i = 0;
-                            _c.label = 1;
-                        case 1:
-                            if (!(i < item.childIds.length)) return [3 /*break*/, 4];
-                            return [5 /*yield**/, _loop_1(i)];
-                        case 2:
-                            _c.sent();
-                            _c.label = 3;
-                        case 3:
-                            i++;
-                            return [3 /*break*/, 1];
-                        case 4:
-                            try {
-                                (_a = item.renderManager) === null || _a === void 0 ? void 0 : _a.Dispose();
-                            }
-                            catch (e) {
-                                console.error(e);
-                            }
-                            this.items = this.items.filter(function (x) { return x.id !== id; });
-                            (_b = this.onUpdate) === null || _b === void 0 ? void 0 : _b.Trigger({ isEnabling: false, itemId: item.id });
-                            _c.label = 5;
-                        case 5: return [2 /*return*/];
-                    }
-                });
-            });
-        };
-        Manager.prototype.GetEnabledItemIds = function () {
-            return this.items.map(function (x) { return x.id; });
-        };
-        return Manager;
-    }());
-    MenuItemManager$$1.Manager = Manager;
-})(MenuItemManager || (MenuItemManager = {}));
-
 export { CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, RenderHelper, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, ViewRenderEngine, TileRenderEngine, MeasureAddon, SharedGetters };
 //# sourceMappingURL=bruce-cesium.es5.js.map