bruce-cesium 3.0.0 → 3.0.2

package/dist/bruce-cesium.umd.js

@@ -548,6 +548,9 @@
         function EnsurePosHeight(params) {
             var pos3d = params.pos3d, viewer = params.viewer, desiredHeightRef = params.desiredHeightRef, heightRef = params.heightRef;
             var carto = bruceModels.Cartes.ValidateCartes3(pos3d) ? Cesium.Cartographic.fromCartesian(pos3d) : null;
+            if (!(carto === null || carto === void 0 ? void 0 : carto.latitude)) {
+                return pos3d;
+            }
             if (heightRef == null) {
                 heightRef = Cesium.HeightReference.CLAMP_TO_GROUND;
             }
@@ -5019,36 +5022,50 @@
         }
         return obj;
     }
+    function isFlatTerrain(viewer) {
+        var _a;
+        if (!viewer) {
+            return false;
+        }
+        return ((_a = exports.ViewUtils.GatherTerrainTile({
+            viewer: viewer
+        }).terrain) === null || _a === void 0 ? void 0 : _a.tilesetId) == bruceModels.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 ? Cesium.HeightReference.NONE : Cesium.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);
@@ -5060,23 +5077,36 @@
                 var point = new Cesium.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 == Cesium.HeightReference.CLAMP_TO_GROUND && isFlatTerrain(viewer)) {
+            for (var i = 0; i < positions.length; i++) {
+                var pos = positions[i];
+                var carto = Cesium.Cartographic.fromCartesian(pos);
+                carto.height = 0;
+                positions[i] = Cesium.Cartographic.toCartesian(carto);
+            }
+        }
+        return positions;
     }
     function computeBoundingSphereFromPositions(positions) {
         return Cesium.BoundingSphere.fromPoints(positions);
@@ -5325,8 +5355,8 @@
             }
         }
     }
-    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.
@@ -5334,12 +5364,12 @@
             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);
             }
         }
         /**
@@ -5353,12 +5383,12 @@
             viewer.entities.add(visual);
         }
     }
-    function updateEntityShow(viewer, visual, show) {
+    function updateEntityShow(viewer, isRelationship, visual, show) {
         if (visual instanceof Cesium.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)) {
@@ -5408,7 +5438,7 @@
             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
@@ -13883,7 +13913,7 @@
                                     return [4 /*yield*/, renderDefaultMapTile(apiGetter, defaultImg.id)];
                                 case 1:
                                     provider = _d.sent();
-                                    return [3 /*break*/, 18];
+                                    return [3 /*break*/, 19];
                                 case 2:
                                     api = apiGetter.getApi(meta.accountId);
                                     // Ensure regional url is loaded.
@@ -13928,9 +13958,9 @@
                                         maximumLevel: hasLevels ? maxLevel : undefined,
                                         minimumLevel: hasLevels ? minLevel : undefined,
                                     });
-                                    return [3 /*break*/, 18];
+                                    return [3 /*break*/, 19];
                                 case 5:
-                                    if (!(tileset.type === bruceModels.Tileset.EType.ExternalGeoMap)) return [3 /*break*/, 17];
+                                    if (!(tileset.type === bruceModels.Tileset.EType.ExternalGeoMap)) return [3 /*break*/, 18];
                                     settings_1 = tileset.settings;
                                     _a = settings_1.mapType;
                                     switch (_a) {
@@ -13938,8 +13968,9 @@
                                         case bruceModels.Tileset.Settings.EExternalMapType.MapBoxImagery: return [3 /*break*/, 10];
                                         case bruceModels.Tileset.Settings.EExternalMapType.OpenStreetMapImagery: return [3 /*break*/, 14];
                                         case bruceModels.Tileset.Settings.EExternalMapType.TileMapImagery: return [3 /*break*/, 15];
+                                        case bruceModels.Tileset.Settings.EExternalMapType.CustomTemplate: return [3 /*break*/, 16];
                                     }
-                                    return [3 /*break*/, 16];
+                                    return [3 /*break*/, 17];
                                 case 6:
                                     if (!settings_1.key) return [3 /*break*/, 7];
                                     _b = settings_1.key;
@@ -13954,7 +13985,7 @@
                                         assetId: Number(settings_1.externalId),
                                         accessToken: cesiumIonKey
                                     });
-                                    return [3 /*break*/, 16];
+                                    return [3 /*break*/, 17];
                                 case 10:
                                     if (!settings_1.key) return [3 /*break*/, 11];
                                     _c = settings_1.key;
@@ -13971,7 +14002,7 @@
                                             "/tiles/256/{z}/{x}/{y}?access_token="
                                             + mapboxKey
                                     });
-                                    return [3 /*break*/, 16];
+                                    return [3 /*break*/, 17];
                                 case 14:
                                     provider = new Cesium.OpenStreetMapImageryProvider({
                                         url: settings_1.url,
@@ -13981,7 +14012,7 @@
                                         // maximumLevel: hasLevels ? maxLevel : undefined,
                                         // minimumLevel: hasLevels ? minLevel : undefined,
                                     });
-                                    return [3 /*break*/, 16];
+                                    return [3 /*break*/, 17];
                                 case 15:
                                     provider = new Cesium.TileMapServiceImageryProvider({
                                         url: settings_1.url,
@@ -13991,9 +14022,14 @@
                                         // maximumLevel: hasLevels ? maxLevel : undefined,
                                         // minimumLevel: hasLevels ? minLevel : undefined,
                                     });
-                                    return [3 /*break*/, 16];
-                                case 16: return [3 /*break*/, 18];
-                                case 17:
+                                    return [3 /*break*/, 17];
+                                case 16:
+                                    provider = new Cesium.UrlTemplateImageryProvider({
+                                        url: settings_1.url
+                                    });
+                                    return [3 /*break*/, 17];
+                                case 17: return [3 /*break*/, 19];
+                                case 18:
                                     if (tileset.type === bruceModels.Tileset.EType.EntitiesMap) {
                                         provider = new Cesium.UrlTemplateImageryProvider({
                                             url: bruceModels.Tileset.GetPublicFileUrl({
@@ -14011,8 +14047,8 @@
                                             // maximumLevel: hasLevels ? maxLevel : undefined,
                                         });
                                     }
-                                    _d.label = 18;
-                                case 18:
+                                    _d.label = 19;
+                                case 19:
                                     if (provider) {
                                         layer = viewer.imageryLayers.addImageryProvider(provider);
                                         layer._bMeta = meta;
@@ -18116,7 +18152,7 @@
         ViewerUtils.CreateWidgets = CreateWidgets;
     })(exports.ViewerUtils || (exports.ViewerUtils = {}));
 
-    var VERSION$1 = "3.0.0";
+    var VERSION$1 = "3.0.2";
 
     exports.VERSION = VERSION$1;
     exports.CesiumParabola = CesiumParabola;