bruce-cesium 4.6.0 → 4.6.2

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
-import { BruceEvent, Cartes, Entity as Entity$1, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, ProjectViewTile, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, ProjectViewLegacyTile, Camera, EntityAttribute, EntityAttachment, EntityAttachmentType, AbstractApi, Session } from 'bruce-models';
+import { BruceEvent, Cartes, Entity as Entity$1, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, ProjectViewTile, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, EntityAttribute, EntityAttachment, EntityAttachmentType, Session, AbstractApi } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, ClassificationType, ArcType, CornerType, ShadowMode, ConstantProperty, ConstantPositionProperty, HorizontalOrigin, VerticalOrigin, ColorBlendMode, HeadingPitchRoll, Transforms, Model, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, Cesium3DTileset, CesiumInspector, ClockRange, Matrix4, Matrix3, IonResource, BoundingSphere, GeometryInstance, PolygonPipeline, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, ColorBlendMode, HeadingPitchRoll, Transforms, Model, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, KmlDataSource, OrthographicFrustum, EasingFunction, NearFarScalar, SceneTransforms, EllipsoidTerrainProvider, CesiumInspector, defined, ClockRange, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, ScreenSpaceEventHandler, ScreenSpaceEventType, Quaternion, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -16697,7 +16697,8 @@ var SharedGetters;
 })(SharedGetters || (SharedGetters = {}));
 
 var MAX_BATCHES = 2;
-var BATCH_SIZE$3 = 30;
+var BATCH_SIZE_OLD_API = 30;
+var BATCH_SIZE_NEW_API = 1000;
 var BATCH_DELAY = 200;
 var MAX_RANGE = 3000;
 var TilesetOsmRenderManager;
@@ -16714,6 +16715,8 @@ var TilesetOsmRenderManager;
             this.entityTypeId = null;
             this.queueCheckInterval = null;
             this.processingQueue = 0;
+            this._osmIdToBruceId = {};
+            this.batchSize = BATCH_SIZE_OLD_API;
             var viewer = params.viewer, visualsManager = params.register, apiGetter = params.getters, monitor = params.monitor, item = params.item;
             this.viewer = viewer;
             this.getters = apiGetter;
@@ -16772,7 +16775,7 @@ var TilesetOsmRenderManager;
             this.sourceId = EnsureNumber((_a = menuItem.BruceEntity) === null || _a === void 0 ? void 0 : _a.SourceId, 0);
             this.entityTypeId = (_b = menuItem.BruceEntity) === null || _b === void 0 ? void 0 : _b["EntityType.ID"];
             (function () { return __awaiter(_this, void 0, void 0, function () {
-                var validToken, CESIUM, cTileset;
+                var validToken, CESIUM, cTileset, api;
                 var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
@@ -16799,6 +16802,13 @@ var TilesetOsmRenderManager;
                             }
                             _a.label = 4;
                         case 4:
+                            api = this.getters.GetBruceApi();
+                            return [4 /*yield*/, api.Loading];
+                        case 5:
+                            _a.sent();
+                            if (api.IsVersionAtLeast("1.0.5244")) {
+                                this.batchSize = BATCH_SIZE_NEW_API;
+                            }
                             if (this.disposed) {
                                 if (this.cTileset && !this.cTileset.isDestroyed()) {
                                     this.cTileset.destroy();
@@ -16935,7 +16945,7 @@ var TilesetOsmRenderManager;
                                 var isClose = this.getIsVisualWithinRange(feature, MAX_RANGE);
                                 if (isClose) {
                                     batch.push(feature);
-                                    if (batch.length >= BATCH_SIZE$3) {
+                                    if (batch.length >= this.batchSize) {
                                         return batch;
                                     }
                                 }
@@ -16964,7 +16974,7 @@ var TilesetOsmRenderManager;
         };
         Manager.prototype.mapTileBatch = function (features) {
             return __awaiter(this, void 0, void 0, function () {
-                var featureIds, featureMap, _loop_1, this_1, i, api, bIds, i, osmId, bruceId, feature, rego, visual;
+                var featureIds, featureMap, _loop_1, this_1, i, toSearchFeatureIds, i, api, bIds, i, osmId, bId, i, osmId, bruceId, feature, rego, visual;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -16986,6 +16996,13 @@ var TilesetOsmRenderManager;
                             for (i = 0; i < features.length; i++) {
                                 _loop_1(i);
                             }
+                            toSearchFeatureIds = [];
+                            for (i = 0; i < featureIds.length; i++) {
+                                if (!this._osmIdToBruceId[featureIds[i]]) {
+                                    toSearchFeatureIds.push(featureIds[i]);
+                                }
+                            }
+                            if (!toSearchFeatureIds.length) return [3 /*break*/, 2];
                             api = this.getters.GetBruceApi();
                             return [4 /*yield*/, EntitySource.GetEntityIdsBySourceKeys({
                                     api: api,
@@ -16996,7 +17013,22 @@ var TilesetOsmRenderManager;
                             bIds = (_a.sent()).idMapping;
                             for (i = 0; i < featureIds.length; i++) {
                                 osmId = featureIds[i];
-                                bruceId = bIds[osmId];
+                                bId = bIds[osmId];
+                                if (!bId) {
+                                    bId = ObjectUtils.UId();
+                                }
+                                // Record so the same OSM ID will correlate to the same Nextspace ID.
+                                // This is important because we can have multiple pieces of the same building with the same OSM ID.
+                                // We need to ensure we don't generate a placeholder that is difference for each piece.
+                                this._osmIdToBruceId[osmId] = bId;
+                            }
+                            _a.label = 2;
+                        case 2:
+                            for (i = 0; i < featureIds.length; i++) {
+                                osmId = featureIds[i];
+                                bruceId = this._osmIdToBruceId[osmId];
+                                // Should not happen.
+                                // We cover unknowns earlier, this is just in case.
                                 if (!bruceId) {
                                     bruceId = ObjectUtils.UId();
                                 }
@@ -17075,7 +17107,7 @@ var TilesetOsmRenderManager;
                         delete this._loadedCesiumEntities[key];
                         this.totalLoaded -= 1;
                         removed += 1;
-                        if (removed >= BATCH_SIZE$3) {
+                        if (removed >= this.batchSize) {
                             return true;
                         }
                     }
@@ -27839,7 +27871,7 @@ var WidgetViewBar = /** @class */ (function (_super) {
     return WidgetViewBar;
 }(Widget.AWidget));
 
-var VERSION = "4.6.0";
+var VERSION = "4.6.2";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, MenuItemManager, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar, WidgetControlViewBar, WidgetControlViewBarSearch, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks };
 //# sourceMappingURL=bruce-cesium.es5.js.map