bruce-cesium 1.7.4 → 1.7.5

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, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartesian2, Cartographic, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, HeightReference, EllipsoidTerrainProvider, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, OrthographicFrustum, JulianDate, Cesium3DTileset, Matrix4, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance, createGooglePhotorealistic3DTileset } from 'cesium';
+import { Cartesian2, Cartographic, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, HeightReference, EllipsoidTerrainProvider, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, JulianDate, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Cesium3DTileset, Matrix4, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -5509,48 +5509,52 @@ var TilesetCadRenderManager;
             }
         };
         Manager.prototype.mapTilesetFeature = function (feature) {
-            var _a, _b, _c, _d, _e, _f, _g;
-            var version = (_c = (_b = (_a = feature === null || feature === void 0 ? void 0 : feature.tileset) === null || _a === void 0 ? void 0 : _a.extensions) === null || _b === void 0 ? void 0 : _b.modelTree) === null || _c === void 0 ? void 0 : _c.version;
-            if (!version) {
-                version = 1;
-            }
+            var _a, _b, _c, _d;
             var rego = {
                 entityId: null,
                 entityTypeId: null,
                 menuItemId: this.item.id,
                 priority: 0,
                 visual: feature,
-                accountId: (_e = (_d = this.item.tileset) === null || _d === void 0 ? void 0 : _d.ClientAccountID) !== null && _e !== void 0 ? _e : this.apiGetter.accountId,
-                tilesetId: (_f = this.item.tileset) === null || _f === void 0 ? void 0 : _f.TilesetID
+                accountId: (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.apiGetter.accountId,
+                tilesetId: (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID
             };
-            if (version == 1) {
-                var pathStr = feature.getProperty("BrucePath");
-                if (pathStr != undefined) {
-                    var path = pathStr.split("|");
-                    var entityTypeId = this.getEntityTypeByPath(path);
-                    rego.entityTypeId = entityTypeId;
-                    rego.entityId = path[path.length - 1];
+            var propertyNames = feature.getPropertyNames();
+            for (var i = 0; i < propertyNames.length; i++) {
+                var prop = propertyNames[i];
+                var name_1 = String(prop).toLocaleLowerCase();
+                if (name_1 == "bruceid") {
+                    rego.entityId = feature.getProperty(prop);
+                    break;
                 }
-            }
-            else if (version == 2) {
-                var geomId = +feature.getProperty("GeomId");
-                if (geomId != null && (!!geomId || geomId == 0)) {
-                    var meta = this.getMetaByGeomId(geomId, feature.tileset);
-                    if (meta) {
-                        rego.entityId = meta.id;
-                        rego.entityTypeId = meta.typeId;
+                else if (name_1 == "brucepath") {
+                    var pathStr = feature.getProperty(prop);
+                    if (pathStr != undefined) {
+                        var path = pathStr.split("|");
+                        var entityTypeId = this.getEntityTypeByPath(path);
+                        rego.entityTypeId = entityTypeId;
+                        rego.entityId = path[path.length - 1];
+                        break;
+                    }
+                }
+                else if (name_1 == "geomid") {
+                    var geomId = +feature.getProperty(prop);
+                    if (geomId != null && (!!geomId || geomId == 0)) {
+                        var meta = this.getMetaByGeomId(geomId, feature.tileset);
+                        if (meta) {
+                            rego.entityId = meta.id;
+                            rego.entityTypeId = meta.typeId;
+                            break;
+                        }
                     }
                 }
-            }
-            else {
-                console.log("Unhandled tileset tree version = " + version);
             }
             if (!rego.entityId) {
                 return null;
             }
             // Optional menu item restriction.
             // Allows only showing certain entities from a tileset.
-            var onlyIds = (_g = this.item.BruceEntity) === null || _g === void 0 ? void 0 : _g.EntityIds;
+            var onlyIds = (_d = this.item.BruceEntity) === null || _d === void 0 ? void 0 : _d.EntityIds;
             if ((onlyIds === null || onlyIds === void 0 ? void 0 : onlyIds.length) && !onlyIds.includes(rego.entityId)) {
                 if (this.item.BruceEntity.Ghosts) {
                     feature.color = Color.WHITE.clone().withAlpha(0.5);
@@ -6919,15 +6923,18 @@ var TilesetGooglePhotosRenderManager;
             }
         };
         Manager.prototype.Init = function () {
+            var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
-                var _a;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                var _c;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
-                            _a = this;
-                            return [4 /*yield*/, createGooglePhotorealistic3DTileset()];
+                            // Using as any to be OK with older versions.
+                            _c = this;
+                            return [4 /*yield*/, ((_b = (_a = Cesium).createGooglePhotorealistic3DTileset) === null || _b === void 0 ? void 0 : _b.call(_a))];
                         case 1:
-                            _a.cTileset = _b.sent();
+                            // Using as any to be OK with older versions.
+                            _c.cTileset = _d.sent();
                             if (this.disposed) {
                                 return [2 /*return*/];
                             }