bruce-cesium 0.3.4 → 0.3.6

package/dist/bruce-cesium.es5.js

@@ -1,5 +1,5 @@
-import { BruceEvent, Cartes, Carto, Geometry, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, DelayQueue, Entity as Entity$1, BatchedDataGetter, ObjectUtils, Tileset, EntityFilterGetter, EntitySource, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTileSource, Camera, MathUtils } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Viewer, ArcGisMapServerImageryProvider, ScreenSpaceEventType, Primitive, Cesium3DTileFeature, HeadingPitchRange, OrthographicFrustum, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, createWorldTerrain, CesiumTerrainProvider, EllipsoidTerrainProvider, createOsmBuildings, Cesium3DTileStyle, Rectangle, Matrix4, Cesium3DTileset, EllipsoidGeodesic } from 'cesium';
+import { BruceEvent, Cartes, Carto, Geometry, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, DelayQueue, Entity as Entity$1, BatchedDataGetter, ObjectUtils, Tileset, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTileSource, Camera, MathUtils } from 'bruce-models';
+import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Viewer, ArcGisMapServerImageryProvider, ScreenSpaceEventType, Primitive, Cesium3DTileFeature, HeadingPitchRange, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, createWorldTerrain, CesiumTerrainProvider, EllipsoidTerrainProvider, OrthographicFrustum, EllipsoidGeodesic, createOsmBuildings, Cesium3DTileStyle, Rectangle, Matrix4, Cesium3DTileset } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1519,7 +1519,7 @@ var EntitiesRenderManager;
         Manager.prototype.onGetterUpdate = function (entities) {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var cEntities, i, id, cEntity, visual;
+                var cEntities, i, entity, id, cEntity, visual;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -1537,7 +1537,8 @@ var EntitiesRenderManager;
                         case 1:
                             cEntities = _b.sent();
                             for (i = 0; i < entities.length; i++) {
-                                id = entities[i].Bruce.ID;
+                                entity = entities[i];
+                                id = entity.Bruce.ID;
                                 cEntity = cEntities[id];
                                 this.renderedEntities[id] = !!cEntity;
                                 if (cEntity) {
@@ -1547,7 +1548,8 @@ var EntitiesRenderManager;
                                             entityId: id,
                                             menuItemId: this.item.id,
                                             visual: cEntity,
-                                            priority: 0
+                                            priority: 0,
+                                            entityTypeId: entity.Bruce["EntityType.ID"]
                                         });
                                     }
                                 }
@@ -1620,7 +1622,7 @@ var EntitiesLoadedRenderManager;
         Manager.prototype.onGetterUpdate = function (entities) {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var cEntities, i, id, cEntity, visual;
+                var cEntities, i, entity, id, cEntity, visual;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -1638,7 +1640,8 @@ var EntitiesLoadedRenderManager;
                         case 1:
                             cEntities = _b.sent();
                             for (i = 0; i < entities.length; i++) {
-                                id = entities[i].Bruce.ID;
+                                entity = entities[i];
+                                id = entity.Bruce.ID;
                                 cEntity = cEntities[id];
                                 this.renderedEntities[id] = !!cEntity;
                                 if (cEntity) {
@@ -1648,7 +1651,8 @@ var EntitiesLoadedRenderManager;
                                             entityId: id,
                                             menuItemId: this.item.id,
                                             visual: cEntity,
-                                            priority: 0
+                                            priority: 0,
+                                            entityTypeId: entity.Bruce["EntityType.ID"]
                                         });
                                     }
                                 }
@@ -2104,7 +2108,7 @@ var EntitiesIdsRenderManager;
         Manager.prototype.onGetterUpdate = function (entityIds) {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var api, entities, cEntities, i, id, cEntity, visual;
+                var api, entities, cEntities, i, entity, id, cEntity, visual;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -2126,7 +2130,8 @@ var EntitiesIdsRenderManager;
                         case 2:
                             cEntities = _b.sent();
                             for (i = 0; i < entities.length; i++) {
-                                id = entities[i].Bruce.ID;
+                                entity = entities[i];
+                                id = entity.Bruce.ID;
                                 cEntity = cEntities[id];
                                 this.renderedEntities[id] = !!cEntity;
                                 if (cEntity) {
@@ -2136,7 +2141,8 @@ var EntitiesIdsRenderManager;
                                             entityId: id,
                                             menuItemId: this.item.id,
                                             visual: cEntity,
-                                            priority: 0
+                                            priority: 0,
+                                            entityTypeId: entity.Bruce["EntityType.ID"]
                                         });
                                     }
                                 }
@@ -2235,7 +2241,8 @@ var EntityRenderManager;
                                         entityId: entity.Bruce.ID,
                                         menuItemId: this.item.id,
                                         visual: cEntity,
-                                        priority: 0
+                                        priority: 0,
+                                        entityTypeId: entity.Bruce["EntityType.ID"]
                                     });
                                 }
                             }
@@ -2257,31 +2264,46 @@ function colorToCColor$1(color) {
 }
 var TilesetRenderEngine;
 (function (TilesetRenderEngine) {
-    function ApplySettings(cTileset, tileset) {
+    function ApplyPosition(cTileset, tileset, coords) {
         if (tileset.type == Tileset.EType.Cad) {
             var settings = tileset.settings;
-            var root = cTileset.root;
-            var transform = settings.transform;
-            if (!transform) {
-                transform = {
-                    heading: 0,
-                    pitch: 0,
-                    roll: 0,
-                    scale: 1
-                };
-            }
-            var point = settings.location;
-            var pos = Cartesian3.fromDegrees(point.longitude, point.latitude, point.altitude);
+            var location_1;
+            var transform = void 0;
+            // Position using root entity + ucs.
+            if (coords === null || coords === void 0 ? void 0 : coords.ucs) {
+                location_1 = coords.ucs.location;
+                transform = coords.transform;
+            }
+            // Position using tileset.
+            else {
+                transform = settings.transform;
+                location_1 = settings.location;
+            }
+            if (!(location_1 === null || location_1 === void 0 ? void 0 : location_1.latitude)) {
+                return;
+            }
+            transform = __assign({ heading: 0, pitch: 0, roll: 0, scale: 1, x: 0, y: 0, z: 0 }, transform);
+            if (transform.scale <= 0) {
+                transform.scale = 0.000001;
+            }
+            var pos = Cartesian3.fromDegrees(location_1.longitude, location_1.latitude, location_1.altitude);
             var hpr = HeadingPitchRoll.fromDegrees(transform.heading, transform.pitch, transform.roll, new HeadingPitchRoll());
+            var root = cTileset.root;
             root.transform = Transforms.headingPitchRollToFixedFrame(pos, hpr);
-            var scale = +(transform === null || transform === void 0 ? void 0 : transform.scale);
-            if (!scale || scale <= 0) {
-                scale = 0.000001;
-            }
-            var scaleMatrix = Matrix4.fromScale(new Cartesian3(scale, scale, scale), new Matrix4());
+            var scaleMatrix = Matrix4.fromScale(new Cartesian3(transform.scale, transform.scale, transform.scale), new Matrix4());
             root.transform = Matrix4.multiply(root.transform, scaleMatrix, root.transform);
+            root.transform = Matrix4.multiplyByTranslation(root.transform, new Cartesian3(transform.x, transform.y, transform.z), root.transform);
             // Force matrix to update
             root.updateTransform();
+        }
+        else {
+            throw ("Not implemented.");
+        }
+    }
+    TilesetRenderEngine.ApplyPosition = ApplyPosition;
+    function ApplySettings(cTileset, tileset) {
+        if (tileset.type == Tileset.EType.Cad) {
+            var settings = tileset.settings;
             var maxScreenSpaceError = settings.maximumScreenSpaceError;
             if (maxScreenSpaceError || maxScreenSpaceError == 0) {
                 cTileset.maximumScreenSpaceError = maxScreenSpaceError;
@@ -2301,6 +2323,7 @@ var TilesetRenderEngine;
             params.viewer.scene.primitives.add(cTileset_1);
             cTileset_1.readyPromise.then(function () {
                 ApplySettings(cTileset_1, params.tileset);
+                ApplyPosition(cTileset_1, params.tileset, params.coords);
             });
             return cTileset_1;
         }
@@ -2710,7 +2733,7 @@ var TilesetCadRenderManager;
         Manager.prototype.Init = function () {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var tilesetId, api, tileset, cTileset;
+                var tilesetId, api, tileset, settings, rootId, coords, cTileset;
                 var _this = this;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -2726,10 +2749,16 @@ var TilesetCadRenderManager;
                             if (!tileset) {
                                 return [2 /*return*/];
                             }
+                            settings = tileset.settings;
+                            rootId = settings.rootEntityId;
+                            return [4 /*yield*/, EntityCoords.GetEntityCoords(api, rootId)];
+                        case 2:
+                            coords = _b.sent();
                             cTileset = this.cTileset = TilesetRenderEngine.Render({
                                 apiGetter: this.apiGetter,
                                 tileset: tileset,
-                                viewer: this.viewer
+                                viewer: this.viewer,
+                                coords: coords
                             });
                             cTileset.readyPromise.then(function () {
                                 _this.onCTilesetLoad();