bruce-cesium 1.6.2 → 1.6.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,5 @@
1
1
  import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, 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';
2
- import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, EllipsoidTerrainProvider, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, Rectangle, SceneMode, OrthographicFrustum, JulianDate, CallbackProperty, KmlDataSource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ColorMaterialProperty, Matrix3, Matrix4, EasingFunction, GeometryInstance, Cesium3DTileset, IonResource, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider } from 'cesium';
2
+ import { Cartesian2, Cartographic, Math as Math$1, SceneMode, Cartesian3, Entity, Primitive, Cesium3DTileFeature, Color, HeightReference, EllipsoidTerrainProvider, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, KmlDataSource, createOsmBuildings, Cesium3DTileStyle, Rectangle, CallbackProperty, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, PolygonPipeline, Cesium3DTileset, Matrix4, IonResource, OrthographicFrustum, JulianDate, EllipsoidGeodesic, sampleTerrainMostDetailed, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance } from 'cesium';
3
3
 
4
4
  var TIME_LAG = 300;
5
5
  var POSITION_CHECK_TIMER = 950;
@@ -766,7 +766,12 @@ var EntityUtils;
766
766
  function evaluateRecord() {
767
767
  if (entity.location && Carto.ValidateCarto(entity.location)) {
768
768
  var location_1 = entity.location;
769
- return Cartesian3.fromDegrees(EnsureNumber(location_1.longitude), EnsureNumber(location_1.latitude), EnsureNumber(location_1.altitude));
769
+ var latitude = EnsureNumber(location_1.latitude);
770
+ var longitude = EnsureNumber(location_1.longitude);
771
+ // Disallowing exact 0.
772
+ if (latitude || longitude) {
773
+ return Cartesian3.fromDegrees(longitude, latitude, EnsureNumber(location_1.altitude));
774
+ }
770
775
  }
771
776
  if (entity.geometry && typeof entity.geometry == "object") {
772
777
  var pointStr = entity.geometry.Point;
@@ -818,8 +823,11 @@ var EntityUtils;
818
823
  longitude: (EnsureNumber(entity.boundaries.minLongitude) + EnsureNumber(entity.boundaries.maxLongitude)) / 2,
819
824
  altitude: 0
820
825
  };
821
- if (point && Carto.ValidateCarto(point)) {
822
- return Cartesian3.fromDegrees(point.longitude, point.latitude, point.altitude);
826
+ // Disallowing exact 0.
827
+ if (point.latitude || point.longitude) {
828
+ if (Carto.ValidateCarto(point)) {
829
+ return Cartesian3.fromDegrees(point.longitude, point.latitude, point.altitude);
830
+ }
823
831
  }
824
832
  }
825
833
  }
@@ -845,21 +853,11 @@ var EntityUtils;
845
853
  function GetPosAsync(params) {
846
854
  var _a, _b, _c, _d, _e, _f;
847
855
  return __awaiter(this, void 0, void 0, function () {
848
- var viewer, entityId, entity, tileset, tilesetId, visualRegister, returnHeightRef, recordHeightRef, api, pos3d, e_1, tSettings, ALT_INCREASE, alt, alt, heading, matrix4, offset, m1, hpr, transform, transformedOffset;
856
+ var viewer, entityId, entity, tileset, tilesetId, visualRegister, returnHeightRef, recordHeightRef, api, e_1, pos3d, tSettings, ALT_INCREASE, alt, alt, heading, matrix4, offset, m1, hpr, transform, transformedOffset;
849
857
  return __generator(this, function (_g) {
850
858
  switch (_g.label) {
851
859
  case 0:
852
860
  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;
853
- pos3d = GetPos({
854
- viewer: viewer,
855
- entity: entity,
856
- visualRegister: visualRegister,
857
- returnHeightRef: returnHeightRef,
858
- recordHeightRef: recordHeightRef
859
- });
860
- if (Cartes.ValidateCartes3(pos3d)) {
861
- return [2 /*return*/, pos3d];
862
- }
863
861
  if (!!entity) return [3 /*break*/, 5];
864
862
  _g.label = 1;
865
863
  case 1:
@@ -884,6 +882,19 @@ var EntityUtils;
884
882
  entity = (_g.sent()).entity;
885
883
  return [3 /*break*/, 5];
886
884
  case 5:
885
+ if (!entity) {
886
+ return [2 /*return*/, null];
887
+ }
888
+ pos3d = GetPos({
889
+ viewer: viewer,
890
+ entity: entity,
891
+ visualRegister: visualRegister,
892
+ returnHeightRef: returnHeightRef,
893
+ recordHeightRef: recordHeightRef
894
+ });
895
+ if (Cartes.ValidateCartes3(pos3d)) {
896
+ return [2 /*return*/, pos3d];
897
+ }
887
898
  if (!!tileset) return [3 /*break*/, 7];
888
899
  if (!tilesetId) {
889
900
  tilesetId = ((_a = entity.tilesetID) === null || _a === void 0 ? void 0 : _a.length) ? entity.tilesetID[0] : tilesetId;