bruce-cesium 1.4.2 → 1.4.4

package/dist/bruce-cesium.es5.js

@@ -1,5 +1,5 @@
 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, Entity, Primitive, Cesium3DTileFeature, Color, Cartesian3, HeightReference, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, HeadingPitchRange, Cesium3DTileColorBlendMode, createOsmBuildings, Cesium3DTileStyle, Rectangle, CallbackProperty, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, OrthographicFrustum, JulianDate, Matrix4, Cesium3DTileset, IonResource, KmlDataSource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance } from 'cesium';
+import { Cartesian2, Cartographic, Math as Math$1, Cartesian3, Color, HeightReference, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, Rectangle, KmlDataSource, CallbackProperty, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, OrthographicFrustum, JulianDate, EllipsoidGeodesic, sampleTerrainMostDetailed, Matrix4, Cesium3DTileset, IonResource, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -4518,12 +4518,11 @@ var TilesetRenderEngine;
             }
         };
         CadStyler.prototype.processQueue = function () {
-            var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var MAX_BATCHES, BATCH_DELAY, batch, rerun, entities, i, record, feature;
+                var MAX_BATCHES, BATCH_DELAY, batch, rerun, entities, _loop_1, this_1, i;
                 var _this = this;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
                         case 0:
                             MAX_BATCHES = 2;
                             BATCH_DELAY = 200;
@@ -4536,9 +4535,9 @@ var TilesetRenderEngine;
                             this.runningQueues += 1;
                             batch = [];
                             rerun = false;
-                            _b.label = 1;
+                            _a.label = 1;
                         case 1:
-                            _b.trys.push([1, , 4, 5]);
+                            _a.trys.push([1, , 4, 5]);
                             batch = this.getEntityIdsForQueue();
                             if (!(batch.length > 0)) return [3 /*break*/, 3];
                             return [4 /*yield*/, Entity$1.GetListByIds({
@@ -4546,16 +4545,21 @@ var TilesetRenderEngine;
                                     entityIds: batch
                                 })];
                         case 2:
-                            entities = (_b.sent()).entities;
-                            for (i = 0; i < entities.length; i++) {
-                                record = entities[i];
-                                feature = this.getEntityRego((_a = record.Bruce) === null || _a === void 0 ? void 0 : _a.ID);
+                            entities = (_a.sent()).entities;
+                            _loop_1 = function (i) {
+                                var entityId = batch[i];
+                                var record = entities.find(function (e) { var _a; return ((_a = e.Bruce) === null || _a === void 0 ? void 0 : _a.ID) == entityId; });
+                                var feature = this_1.getEntityRego(entityId);
                                 if (feature) {
-                                    this.styleTilesetFeatureFullData(feature, record);
+                                    this_1.styleTilesetFeatureFullData(feature, record);
                                 }
+                            };
+                            this_1 = this;
+                            for (i = 0; i < batch.length; i++) {
+                                _loop_1(i);
                             }
                             rerun = batch.length > 0;
-                            _b.label = 3;
+                            _a.label = 3;
                         case 3: return [3 /*break*/, 5];
                         case 4:
                             setTimeout(function () {
@@ -4591,7 +4595,7 @@ var TilesetRenderEngine;
         CadStyler.prototype.loadStyles = function () {
             var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
-                var fallbackStyleId, data, e_1, styleMapping, modelTree, entityTypeIds, _loop_1, i, i, styleMap, styleId, entityType, e_2, data, e_3;
+                var fallbackStyleId, data, e_1, styleMapping, modelTree, entityTypeIds, _loop_2, i, i, styleMap, styleId, entityType, e_2, data, e_3;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -4625,7 +4629,7 @@ var TilesetRenderEngine;
                                     modelTree = (_b = (_a = this.cTileset) === null || _a === void 0 ? void 0 : _a.extensions) === null || _b === void 0 ? void 0 : _b.modelTree;
                                     if (modelTree) {
                                         entityTypeIds = this.getEntityTypeIdsFromModelTree(modelTree);
-                                        _loop_1 = function (i) {
+                                        _loop_2 = function (i) {
                                             var entityTypeId = entityTypeIds[i];
                                             if (styleMapping.findIndex(function (x) { return x.EntityTypeID == entityTypeId; }) <= -1) {
                                                 styleMapping.push({
@@ -4636,7 +4640,7 @@ var TilesetRenderEngine;
                                             }
                                         };
                                         for (i = 0; i < entityTypeIds.length; i++) {
-                                            _loop_1(i);
+                                            _loop_2(i);
                                         }
                                     }
                                 }
@@ -4767,7 +4771,7 @@ var TilesetRenderEngine;
                                             break;
                                         }
                                     }
-                                    var _loop_2 = function (i) {
+                                    var _loop_3 = function (i) {
                                         var hash = batch[i];
                                         var index = _this.recordCheckQueue.findIndex(function (x) { return x == hash; });
                                         if (index > -1) {
@@ -4775,7 +4779,7 @@ var TilesetRenderEngine;
                                         }
                                     };
                                     for (var i = 0; i < batch.length; i++) {
-                                        _loop_2(i);
+                                        _loop_3(i);
                                     }
                                 }
                                 if (batch.length) {