bruce-cesium 2.6.2 → 2.6.4

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, Bounds, EntityRelationType, DelayQueue, BatchedDataGetter, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ENVIRONMENT, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian3, SceneMode, Math as Math$1, Cartesian2, CallbackProperty, Color, Rectangle, JulianDate, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, OrthographicFrustum, ColorMaterialProperty, Matrix3, Matrix4, EasingFunction, GeometryInstance, Cesium3DTileset, IonResource, ScreenSpaceEventHandler, ScreenSpaceEventType, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, Model, CesiumInspector, Ion, BoundingSphere } from 'cesium';
+import { Cartographic, JulianDate, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, Entity, Primitive, Cesium3DTileFeature, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, EllipsoidTerrainProvider, CesiumInspector, defined, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, EasingFunction, GeometryInstance, Ion, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1031,42 +1031,63 @@ var EntityUtils;
      * @returns
      */
     function GetPosAsync(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         return __awaiter(this, void 0, void 0, function () {
-            var viewer, entityId, entity, tileset, tilesetId, visualRegister, returnHeightRef, recordHeightRef, api, e_1, pos3d, tSettings, alt, alt, heading, pitch, roll, matrix4, offset, m1, hpr, transform, transformedOffset;
-            return __generator(this, function (_l) {
-                switch (_l.label) {
+            var viewer, entityId, entity, tileset, tilesetId, visualRegister, returnHeightRef, recordHeightRef, api, lat, lon, e_1, e_2, pos3d, tSettings, alt, alt, heading, pitch, roll, matrix4, offset, m1, hpr, transform, transformedOffset;
+            return __generator(this, function (_o) {
+                switch (_o.label) {
                     case 0:
                         viewer = params.viewer, entityId = params.entityId, entity = params.entity, tileset = params.tileset, tilesetId = params.tilesetId, visualRegister = params.visualRegister, returnHeightRef = params.returnHeightRef, recordHeightRef = params.recordHeightRef, api = params.api;
-                        if (!!entity) return [3 /*break*/, 5];
-                        _l.label = 1;
+                        if (!!entity) return [3 /*break*/, 9];
+                        lat = 0;
+                        lon = 0;
+                        _o.label = 1;
                     case 1:
-                        _l.trys.push([1, 3, , 5]);
+                        _o.trys.push([1, 3, , 4]);
                         return [4 /*yield*/, Entity$1.Get({
                                 api: api,
                                 entityId: entityId,
-                                expandLocation: true
+                                expandLocation: false
                             })];
                     case 2:
-                        entity = (_l.sent()).entity;
-                        return [3 /*break*/, 5];
+                        entity = (_o.sent()).entity;
+                        lat = +((_a = entity === null || entity === void 0 ? void 0 : entity.location) === null || _a === void 0 ? void 0 : _a.latitude);
+                        lon = +((_b = entity === null || entity === void 0 ? void 0 : entity.location) === null || _b === void 0 ? void 0 : _b.longitude);
+                        return [3 /*break*/, 4];
                     case 3:
-                        e_1 = _l.sent();
-                        console.warn(e_1);
+                        e_1 = _o.sent();
+                        console.error(e_1);
+                        return [3 /*break*/, 4];
+                    case 4:
+                        if (!(entity && (isNaN(lat) || isNaN(lon) || (lat == 0 && lon == 0)))) return [3 /*break*/, 9];
+                        _o.label = 5;
+                    case 5:
+                        _o.trys.push([5, 7, , 9]);
+                        return [4 /*yield*/, Entity$1.Get({
+                                api: api,
+                                entityId: entityId,
+                                expandLocation: true
+                            })];
+                    case 6:
+                        entity = (_o.sent()).entity;
+                        return [3 /*break*/, 9];
+                    case 7:
+                        e_2 = _o.sent();
+                        console.warn(e_2);
                         return [4 /*yield*/, Entity$1.Get({
                                 api: api,
                                 entityId: entityId,
                                 expandLocation: false
                             })];
-                    case 4:
-                        entity = (_l.sent()).entity;
-                        return [3 /*break*/, 5];
-                    case 5:
+                    case 8:
+                        entity = (_o.sent()).entity;
+                        return [3 /*break*/, 9];
+                    case 9:
                         if (!entity) {
                             return [2 /*return*/, null];
                         }
                         if (!tilesetId) {
-                            tilesetId = ((_a = entity.tilesetID) === null || _a === void 0 ? void 0 : _a.length) ? entity.tilesetID[0] : tilesetId;
+                            tilesetId = ((_c = entity.tilesetID) === null || _c === void 0 ? void 0 : _c.length) ? entity.tilesetID[0] : tilesetId;
                         }
                         pos3d = tilesetId ? null : GetPos({
                             viewer: viewer,
@@ -1078,19 +1099,19 @@ var EntityUtils;
                         if (Cartes.ValidateCartes3(pos3d)) {
                             return [2 /*return*/, pos3d];
                         }
-                        if (!!tileset) return [3 /*break*/, 7];
-                        if (!tilesetId) return [3 /*break*/, 7];
+                        if (!!tileset) return [3 /*break*/, 11];
+                        if (!tilesetId) return [3 /*break*/, 11];
                         return [4 /*yield*/, Tileset.Get({
                                 api: api,
                                 tilesetId: tilesetId
                             })];
-                    case 6:
-                        tileset = (_l.sent()).tileset;
-                        _l.label = 7;
-                    case 7:
+                    case 10:
+                        tileset = (_o.sent()).tileset;
+                        _o.label = 11;
+                    case 11:
                         tSettings = tileset === null || tileset === void 0 ? void 0 : tileset.settings;
-                        if (((_b = entity.location) === null || _b === void 0 ? void 0 : _b.longitude) || ((_c = tSettings === null || tSettings === void 0 ? void 0 : tSettings.location) === null || _c === void 0 ? void 0 : _c.longitude)) {
-                            if ((_d = entity === null || entity === void 0 ? void 0 : entity.location) === null || _d === void 0 ? void 0 : _d.longitude) {
+                        if (((_d = entity.location) === null || _d === void 0 ? void 0 : _d.longitude) || ((_e = tSettings === null || tSettings === void 0 ? void 0 : tSettings.location) === null || _e === void 0 ? void 0 : _e.longitude)) {
+                            if ((_f = entity === null || entity === void 0 ? void 0 : entity.location) === null || _f === void 0 ? void 0 : _f.longitude) {
                                 alt = +entity.location.altitude;
                                 if (isNaN(alt)) {
                                     alt = 0;
@@ -1109,22 +1130,22 @@ var EntityUtils;
                                 heading = 0;
                                 pitch = 0;
                                 roll = 0;
-                                if ((_e = entity === null || entity === void 0 ? void 0 : entity.transform) === null || _e === void 0 ? void 0 : _e.heading) {
+                                if ((_g = entity === null || entity === void 0 ? void 0 : entity.transform) === null || _g === void 0 ? void 0 : _g.heading) {
                                     heading = entity.transform.heading;
                                 }
-                                else if ((_f = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _f === void 0 ? void 0 : _f.heading) {
+                                else if ((_h = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _h === void 0 ? void 0 : _h.heading) {
                                     heading = tSettings.transform.heading;
                                 }
-                                if ((_g = entity === null || entity === void 0 ? void 0 : entity.transform) === null || _g === void 0 ? void 0 : _g.pitch) {
+                                if ((_j = entity === null || entity === void 0 ? void 0 : entity.transform) === null || _j === void 0 ? void 0 : _j.pitch) {
                                     pitch = entity.transform.pitch;
                                 }
-                                else if ((_h = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _h === void 0 ? void 0 : _h.pitch) {
+                                else if ((_k = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _k === void 0 ? void 0 : _k.pitch) {
                                     pitch = tSettings.transform.pitch;
                                 }
-                                if ((_j = entity === null || entity === void 0 ? void 0 : entity.transform) === null || _j === void 0 ? void 0 : _j.roll) {
+                                if ((_l = entity === null || entity === void 0 ? void 0 : entity.transform) === null || _l === void 0 ? void 0 : _l.roll) {
                                     roll = entity.transform.roll;
                                 }
-                                else if ((_k = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _k === void 0 ? void 0 : _k.roll) {
+                                else if ((_m = tSettings === null || tSettings === void 0 ? void 0 : tSettings.transform) === null || _m === void 0 ? void 0 : _m.roll) {
                                     roll = tSettings.transform.roll;
                                 }
                                 heading = +heading;
@@ -1630,6 +1651,43 @@ function getPolygonExtrusion(entity, tags, ring, posses, heightRef, pStyle) {
     }
     return data;
 }
+function getCylinderStyleExtrusion(style, entity, tags, heightRef) {
+    var _a;
+    if (!style) {
+        return null;
+    }
+    try {
+        var extrusion = +Calculator.GetNumber(style, entity, tags);
+        if (!extrusion && extrusion != 0) {
+            return null;
+        }
+        /*
+            Cesium extrudes in strange way.
+            If you want something that is 50 meters above sea, and 5 meters tall,
+            You need to extrude by 55 meters, if you extrude by 5 it will extrude from sea and look flat.
+        */
+        var height = EnsureNumber((_a = entity.location) === null || _a === void 0 ? void 0 : _a.altitude, 0);
+        return heightRef != HeightReference.CLAMP_TO_GROUND ? extrusion + height : extrusion;
+    }
+    catch (e) {
+        console.error(e);
+    }
+    return 0;
+}
+function getCylinderExtrusion(entity, tags, heightRef, style) {
+    var data = {
+        value: undefined,
+        exHeightRef: heightRef == HeightReference.CLAMP_TO_GROUND ? HeightReference.RELATIVE_TO_GROUND : heightRef
+    };
+    var extrusion = getCylinderStyleExtrusion(style, entity, tags, heightRef);
+    if (extrusion) {
+        data.value = extrusion;
+    }
+    if (data.value != undefined) {
+        data.value = EnsureNumber(data.value);
+    }
+    return data;
+}
 function getHeightRef(style, defaultStyle) {
     var _a;
     var heightRef = defaultStyle == null ? HeightReference.CLAMP_TO_GROUND : defaultStyle;
@@ -1863,7 +1921,6 @@ var EntityRenderEngine;
             return __generator(this, function (_j) {
                 switch (_j.label) {
                     case 0:
-                        console.log("Rendering entities", params);
                         groupRenderParams = {
                             apiGetter: params.apiGetter,
                             viewer: params.viewer,
@@ -2115,7 +2172,7 @@ var EntityRenderEngine;
     (function (Point) {
         function Render(params) {
             return __awaiter(this, void 0, void 0, function () {
-                var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl, res, e_4, iconScale, disableDepthTest, heightRef, radius, bFill, cFill, outline, bOutline, cOutline, outlineWidth, outlineHeight, fillHeight, pos, cartographicPosition, bColor, cColor, size, heightRef;
+                var entity, style, type, cEntity, siblings, iconUrlRows, icon, iconUrl, res, e_4, iconScale, disableDepthTest, heightRef, radius, bFill, cFill, outline, cOutline, outlineWidth, bOutline, heightRef, pos3d, extrusion, outlineExtrusion, bColor, cColor, size, heightRef;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -2212,35 +2269,60 @@ var EntityRenderEngine;
                                 bFill = style.CylinderFillColor ? Calculator.GetColor(style.CylinderFillColor, entity, params.tags) : null;
                                 cFill = bFill ? colorToCColor(bFill) : Color.RED;
                                 outline = Boolean(style.CylinderBorderEnabled);
-                                bOutline = style.CylinderBorderColor ? Calculator.GetColor(style.CylinderBorderColor, entity, params.tags) : null;
-                                cOutline = bOutline ? colorToCColor(bOutline) : Color.BLACK;
-                                outlineWidth = EnsureNumber(Calculator.GetNumber(style.CylinderBorderWidth, entity, params.tags), 1);
-                                outlineHeight = EnsureNumber(Calculator.GetNumber(style.CylinderBorderExtrusion, entity, params.tags), 0);
-                                fillHeight = EnsureNumber(Calculator.GetNumber(style.CylinderFillExtrusion, entity, params.tags));
-                                pos = EntityUtils.GetPos({
+                                cOutline = null;
+                                outlineWidth = 1;
+                                if (outline) {
+                                    bOutline = style.CylinderBorderColor ? Calculator.GetColor(style.CylinderBorderColor, entity, params.tags) : null;
+                                    cOutline = bOutline ? colorToCColor(bOutline) : Color.BLACK;
+                                    outlineWidth = EnsureNumber(Calculator.GetNumber(style.CylinderBorderWidth, entity, params.tags), 1);
+                                }
+                                heightRef = getHeightRef(style);
+                                pos3d = EntityUtils.GetPos({
                                     viewer: params.viewer,
                                     entity: entity,
-                                    recordHeightRef: HeightReference.RELATIVE_TO_GROUND,
-                                    returnHeightRef: HeightReference.RELATIVE_TO_GROUND
+                                    recordHeightRef: heightRef,
+                                    returnHeightRef: heightRef
                                 });
-                                // Adjust the position to consider half the height of the cylinder
-                                if (pos) {
-                                    cartographicPosition = Cartographic.fromCartesian(pos);
-                                    cartographicPosition.height += fillHeight / 2;
-                                    pos = Cartographic.toCartesian(cartographicPosition);
-                                }
+                                extrusion = getCylinderExtrusion(entity, params.tags, heightRef, style.CylinderFillExtrusion);
                                 cEntity = new Entity({
-                                    position: pos,
-                                    cylinder: {
-                                        length: fillHeight,
-                                        topRadius: radius,
-                                        bottomRadius: radius,
+                                    ellipse: {
+                                        semiMajorAxis: radius,
+                                        semiMinorAxis: radius,
                                         material: cFill,
-                                        outline: outline,
-                                        outlineColor: cOutline,
-                                        outlineWidth: outlineWidth
-                                    }
+                                        outlineWidth: null,
+                                        extrudedHeight: extrusion.value,
+                                        heightReference: heightRef,
+                                        extrudedHeightReference: extrusion.exHeightRef,
+                                        height: Cartographic.fromCartesian(pos3d).height,
+                                        zIndex: 1,
+                                        distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
+                                    },
+                                    position: pos3d === null || pos3d === void 0 ? void 0 : pos3d.clone(),
+                                    show: true
                                 });
+                                if (outline && outlineWidth > 0) {
+                                    outlineExtrusion = getCylinderExtrusion(entity, params.tags, heightRef, style.CylinderBorderExtrusion);
+                                    // If this doesn't have its own extrusion, we must make it match the sibling.
+                                    // This way they render in a uniform way.
+                                    if (!outlineExtrusion.value && extrusion.value) {
+                                        outlineExtrusion.exHeightRef = extrusion.exHeightRef;
+                                    }
+                                    siblings.push(new Entity({
+                                        ellipse: {
+                                            semiMajorAxis: radius + outlineWidth,
+                                            semiMinorAxis: radius + outlineWidth,
+                                            material: cOutline,
+                                            outlineWidth: undefined,
+                                            extrudedHeight: outlineExtrusion.value,
+                                            heightReference: heightRef,
+                                            extrudedHeightReference: outlineExtrusion.exHeightRef,
+                                            height: Cartographic.fromCartesian(pos3d).height,
+                                            zIndex: 2,
+                                            distanceDisplayCondition: getDisplayCondition(params.minDistance, params.maxDistance)
+                                        },
+                                        position: pos3d === null || pos3d === void 0 ? void 0 : pos3d.clone()
+                                    }));
+                                }
                             }
                             if (!cEntity) {
                                 bColor = style.color ? Calculator.GetColor(style.color, entity, params.tags) : null;
@@ -2269,8 +2351,6 @@ var EntityRenderEngine;
                                     }),
                                     show: true
                                 });
-                                console.log("Created point", cEntity);
-                                debugger;
                             }
                             if (cEntity) {
                                 cEntity._siblingGraphics = siblings;
@@ -14996,7 +15076,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.5.9";
+var VERSION$1 = "2.6.4";
 
 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, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map