bruce-cesium 1.7.7 → 1.7.8

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, SceneMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, KmlDataSource, createOsmBuildings, Cesium3DTileStyle, Cesium3DTileset, Matrix4, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, OrthographicFrustum, JulianDate, NearFarScalar, PolygonPipeline, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance } 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, HeadingPitchRange, Cesium3DTileColorBlendMode, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, JulianDate, NearFarScalar, 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,7 +5509,7 @@ var TilesetCadRenderManager;
             }
         };
         Manager.prototype.mapTilesetFeature = function (feature) {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             var rego = {
                 entityId: null,
                 entityTypeId: null,
@@ -5520,33 +5520,38 @@ var TilesetCadRenderManager;
                 tilesetId: (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID
             };
             var featureAny = feature;
-            var propertyNames = featureAny.getPropertyNames ? featureAny.getPropertyNames() : featureAny.getPropertyIds();
-            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;
+            var propertyNames = featureAny.getPropertyNames ? featureAny.getPropertyNames() : (_d = featureAny.getPropertyIds) === null || _d === void 0 ? void 0 : _d.call(featureAny);
+            if (!propertyNames) {
+                return null;
+            }
+            // GeomId is higher priority than using entityId directly as we need entityTypeId as well.
+            var geomIdProp = propertyNames.find(function (x) { return String(x).toLowerCase() == "geomid"; });
+            if (geomIdProp) {
+                var geomId = +feature.getProperty(geomIdProp);
+                if (geomId != null && (!!geomId || geomId == 0)) {
+                    var meta = this.getMetaByGeomId(geomId, feature.tileset);
+                    if (meta) {
+                        rego.entityId = meta.id;
+                        rego.entityTypeId = meta.typeId;
+                    }
+                }
+            }
+            if (!rego.entityId) {
+                var bruceIdProp = propertyNames.find(function (x) { return String(x).toLowerCase() == "bruceid"; });
+                if (bruceIdProp) {
+                    rego.entityId = feature.getProperty(bruceIdProp);
                 }
-                else if (name_1 == "brucepath") {
-                    var pathStr = feature.getProperty(prop);
-                    if (pathStr != undefined) {
+            }
+            // Legacy.
+            if (!rego.entityId) {
+                var brucePathProp = propertyNames.find(function (x) { return String(x).toLowerCase() == "brucepath"; });
+                if (brucePathProp) {
+                    var pathStr = feature.getProperty(brucePathProp);
+                    if (pathStr) {
                         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;
-                        }
                     }
                 }
             }
@@ -5555,7 +5560,7 @@ var TilesetCadRenderManager;
             }
             // Optional menu item restriction.
             // Allows only showing certain entities from a tileset.
-            var onlyIds = (_d = this.item.BruceEntity) === null || _d === void 0 ? void 0 : _d.EntityIds;
+            var onlyIds = (_e = this.item.BruceEntity) === null || _e === void 0 ? void 0 : _e.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);
@@ -5573,9 +5578,13 @@ var TilesetCadRenderManager;
         Manager.prototype.getMetaByGeomId = function (geomId, tileset) {
             var _a;
             var modelTree = (_a = tileset === null || tileset === void 0 ? void 0 : tileset.extensions) === null || _a === void 0 ? void 0 : _a.modelTree;
-            return this.digMetaByGeomId(geomId, modelTree, []);
+            return this.digMetaByGeomId(geomId, modelTree, [], 0);
         };
-        Manager.prototype.digMetaByGeomId = function (geomId, branch, path) {
+        Manager.prototype.digMetaByGeomId = function (geomId, branch, path, depth) {
+            if (depth > 8) {
+                console.error("digMetaByGeomId: depth > 8");
+                return null;
+            }
             path = [].concat(path);
             path.push(branch.id);
             if (branch.geomId == geomId) {
@@ -5583,7 +5592,7 @@ var TilesetCadRenderManager;
             }
             else if (branch.children) {
                 for (var i = 0; i < branch.children.length; i++) {
-                    var meta = this.digMetaByGeomId(geomId, branch.children[i], path);
+                    var meta = this.digMetaByGeomId(geomId, branch.children[i], path, depth + 1);
                     if (meta) {
                         return meta;
                     }