bruce-cesium 3.0.1 → 3.0.2

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, ProjectViewTile, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, EntityRelationType, DelayQueue, EntityCoords, Api, EntitySource, MenuItem, EntityRelation, ENVIRONMENT, ProjectView, ProjectViewBookmark, ProjectViewLegacyTile, ProgramKey, Camera, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, JulianDate, Entity, Primitive, Cesium3DTileFeature, SceneMode, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, SceneTransforms, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumInspector, OrthographicFrustum, defined, EasingFunction, Cesium3DTileset, Matrix4, Matrix3, IonResource, Ion, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, PolygonPipeline, ColorMaterialProperty, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, BoundingSphere, Intersect } from 'cesium';
+import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, JulianDate, SceneMode, Entity, Primitive, Cesium3DTileFeature, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, EasingFunction, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, SceneTransforms, CesiumInspector, defined, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, Model, Matrix4, Matrix3, IonResource, Ion, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, GeometryInstance, BoundingSphere, Intersect } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -549,6 +549,9 @@ var DrawingUtils;
     function EnsurePosHeight(params) {
         var pos3d = params.pos3d, viewer = params.viewer, desiredHeightRef = params.desiredHeightRef, heightRef = params.heightRef;
         var carto = Cartes.ValidateCartes3(pos3d) ? Cartographic.fromCartesian(pos3d) : null;
+        if (!(carto === null || carto === void 0 ? void 0 : carto.latitude)) {
+            return pos3d;
+        }
         if (heightRef == null) {
             heightRef = HeightReference.CLAMP_TO_GROUND;
         }
@@ -5028,36 +5031,50 @@ function getValue$2(viewer, obj) {
     }
     return obj;
 }
+function isFlatTerrain(viewer) {
+    var _a;
+    if (!viewer) {
+        return false;
+    }
+    return ((_a = ViewUtils.GatherTerrainTile({
+        viewer: viewer
+    }).terrain) === null || _a === void 0 ? void 0 : _a.tilesetId) == ProjectViewTile.EDefaultTerrain.FlatTerrain;
+}
 var boundingSphereCache = {};
 function getPositionsFromEntity(viewer, entity) {
+    var positions = [];
+    var heightRef;
     if (entity.billboard) {
         var pos3d = getValue$2(viewer, entity.position);
         if (!(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
             return null;
         }
-        return [pos3d];
+        positions.push(pos3d);
+        heightRef = getValue$2(viewer, entity.billboard.heightReference);
     }
     else if (entity.polyline) {
-        return getValue$2(viewer, entity.polyline.positions);
+        positions = getValue$2(viewer, entity.polyline.positions);
+        heightRef = getValue$2(viewer, entity.polyline.clampToGround) == false ? HeightReference.NONE : HeightReference.CLAMP_TO_GROUND;
     }
     else if (entity.polygon) {
         var hierarchy = getValue$2(viewer, entity.polygon.hierarchy);
-        return hierarchy.positions;
+        positions = hierarchy.positions;
+        heightRef = getValue$2(viewer, entity.polygon.heightReference);
     }
     else if (entity.corridor) {
-        return getValue$2(viewer, entity.corridor.positions);
+        positions = getValue$2(viewer, entity.corridor.positions);
     }
     else if (entity.ellipse) {
         var position = getValue$2(viewer, entity.position);
         if (!(position === null || position === void 0 ? void 0 : position.x)) {
             return null;
         }
+        heightRef = getValue$2(viewer, entity.ellipse.heightReference);
         var semiMajorAxis = getValue$2(viewer, entity.ellipse.semiMajorAxis);
         var semiMinorAxis = getValue$2(viewer, entity.ellipse.semiMinorAxis);
         var rotation = getValue$2(viewer, entity.ellipse.rotation);
         // More subdivisions means a more accurate ellipse but worse performance.
         var numberOfSubdivisions = 5;
-        var positions = [];
         for (var i = 0; i < numberOfSubdivisions; i++) {
             var theta = i * (2 * Math.PI / numberOfSubdivisions);
             var x = semiMajorAxis * Math.cos(theta);
@@ -5069,23 +5086,36 @@ function getPositionsFromEntity(viewer, entity) {
             var point = new Cartesian3(position.x + rotatedX, position.y + rotatedY, position.z);
             positions.push(point);
         }
-        return positions;
     }
     else if (entity.model) {
         var pos3d = getValue$2(viewer, entity.position);
         if (!(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
             return null;
         }
-        return [pos3d];
+        positions.push(pos3d);
+        heightRef = getValue$2(viewer, entity.model.heightReference);
     }
     else if (entity.point) {
         var pos3d = getValue$2(viewer, entity.position);
         if (!(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
             return null;
         }
-        return [pos3d];
+        positions.push(pos3d);
+        heightRef = getValue$2(viewer, entity.point.heightReference);
     }
-    return null;
+    if (!(positions === null || positions === void 0 ? void 0 : positions.length)) {
+        return;
+    }
+    // We need to zero the heights.
+    if (heightRef == HeightReference.CLAMP_TO_GROUND && isFlatTerrain(viewer)) {
+        for (var i = 0; i < positions.length; i++) {
+            var pos = positions[i];
+            var carto = Cartographic.fromCartesian(pos);
+            carto.height = 0;
+            positions[i] = Cartographic.toCartesian(carto);
+        }
+    }
+    return positions;
 }
 function computeBoundingSphereFromPositions(positions) {
     return BoundingSphere.fromPoints(positions);
@@ -5334,8 +5364,8 @@ function removeEntity(viewer, visual) {
         }
     }
 }
-function updateCEntityShow(viewer, visual, show, ignoreParent) {
-    if (show) {
+function updateCEntityShow(viewer, isRelationship, visual, show, ignoreParent) {
+    if (show && !isRelationship) {
         // Culling is controlled by "visual-register-culler.ts".
         // When an object is unculled then the 'updateEntityShow' function is re-called to reveal it and related objects.
         // A sub-object can be culled while the siblings are not.
@@ -5343,12 +5373,12 @@ function updateCEntityShow(viewer, visual, show, ignoreParent) {
         show = !isCulled;
     }
     if (visual._parentEntity && !ignoreParent) {
-        updateCEntityShow(viewer, visual._parentEntity, show, false);
+        updateCEntityShow(viewer, isRelationship, visual._parentEntity, show, false);
     }
     if (visual._siblingGraphics) {
         for (var i = 0; i < visual._siblingGraphics.length; i++) {
             var sibling = visual._siblingGraphics[i];
-            updateCEntityShow(viewer, sibling, show, true);
+            updateCEntityShow(viewer, isRelationship, sibling, show, true);
         }
     }
     /**
@@ -5362,12 +5392,12 @@ function updateCEntityShow(viewer, visual, show, ignoreParent) {
         viewer.entities.add(visual);
     }
 }
-function updateEntityShow(viewer, visual, show) {
+function updateEntityShow(viewer, isRelationship, visual, show) {
     if (visual instanceof Entity) {
         if (!(viewer === null || viewer === void 0 ? void 0 : viewer.scene) || viewer.isDestroyed()) {
             return;
         }
-        updateCEntityShow(viewer, visual, show, false);
+        updateCEntityShow(viewer, isRelationship, visual, show, false);
         return;
     }
     if (!isAlive$1(viewer, visual)) {
@@ -5417,7 +5447,7 @@ function updateEntity(viewer, entityId, register) {
         var rego = regos[i];
         rego.best = rego === highestPriority;
         var visible = rego.suppressShow ? false : getShowState(rego);
-        updateEntityShow(viewer, rego.visual, visible);
+        updateEntityShow(viewer, rego.relation != null, rego.visual, visible);
         if (rego.best) {
             var isLabelled = register.GetIsLabelled({
                 entityId: entityId
@@ -18181,7 +18211,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "3.0.1";
+var VERSION$1 = "3.0.2";
 
 export { VERSION$1 as VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map