bruce-cesium 1.3.3 → 1.3.5

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, Geometry, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, DelayQueue, Entity as Entity$1, BatchedDataGetter, EntityRelationType, Tileset, EntityCoords, EntityFilterGetter, EntitySource, EntityRelation, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
2
- import { Cartesian2, Cartographic, Math as Math$1, Cartesian3, Entity, Primitive, Cesium3DTileFeature, Color, HeightReference, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, HeadingPitchRange, Cesium3DTileColorBlendMode, createOsmBuildings, Cesium3DTileStyle, Rectangle, KmlDataSource, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Cesium3DTileset, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance, CallbackProperty } from 'cesium';
2
+ import { Cartesian2, Cartographic, Math as Math$1, Entity, Primitive, Cesium3DTileFeature, Color, Cartesian3, HeightReference, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, KmlDataSource, createOsmBuildings, Cesium3DTileStyle, Rectangle, CallbackProperty, Matrix4, Cesium3DTileset, IonResource, OrthographicFrustum, JulianDate, EllipsoidGeodesic, EllipsoidTerrainProvider, sampleTerrainMostDetailed, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider } from 'cesium';
3
3
 
4
4
  var TIME_LAG = 300;
5
5
  var POSITION_CHECK_TIMER = 950;
@@ -1173,11 +1173,11 @@ function getRenderGroupId(zoomItem) {
1173
1173
  var EntityRenderEngine;
1174
1174
  (function (EntityRenderEngine) {
1175
1175
  function Render(params) {
1176
- var _a, _b, _c, _d;
1176
+ var _a, _b, _c, _d, _e, _f;
1177
1177
  return __awaiter(this, void 0, void 0, function () {
1178
1178
  var groupRenderParams, i, entity, geometry, cEntities, models, multiGeometry, polygons, polylines, points, i, entity, id, zoomItem, displayType, newRenderId, existingRego, oldRenderId, mParams, mEntities, i, entity, id, cEntity, _loop_1, i, pParams, pEntities, i, entity, cEntity, pParams, pEntities, i, entity, cEntity, pParams, pEntities, i, entity, cEntity;
1179
- return __generator(this, function (_e) {
1180
- switch (_e.label) {
1179
+ return __generator(this, function (_g) {
1180
+ switch (_g.label) {
1181
1181
  case 0:
1182
1182
  groupRenderParams = {
1183
1183
  apiGetter: params.apiGetter,
@@ -1218,8 +1218,6 @@ var EntityRenderEngine;
1218
1218
  else if (displayType == "polygon") {
1219
1219
  displayType = ZoomControl.EDisplayType.Geometry;
1220
1220
  }
1221
- displayType = ZoomControl.EDisplayType.Geometry;
1222
- // @ts-ignore
1223
1221
  if (displayType != ZoomControl.EDisplayType.Hidden) {
1224
1222
  newRenderId = getRenderGroupId(zoomItem);
1225
1223
  existingRego = params.visualRegister.GetRego({
@@ -1231,7 +1229,6 @@ var EntityRenderEngine;
1231
1229
  cEntities[id] = existingRego.visual;
1232
1230
  }
1233
1231
  else {
1234
- // @ts-ignore
1235
1232
  if (displayType == ZoomControl.EDisplayType.Model3D) {
1236
1233
  models.push(entity);
1237
1234
  }
@@ -1254,7 +1251,7 @@ var EntityRenderEngine;
1254
1251
  mParams = __assign(__assign({}, groupRenderParams), { entities: models });
1255
1252
  return [4 /*yield*/, Model3d.RenderGroup(mParams)];
1256
1253
  case 1:
1257
- mEntities = _e.sent();
1254
+ mEntities = _g.sent();
1258
1255
  for (i = 0; i < mParams.entities.length; i++) {
1259
1256
  entity = mParams.entities[i];
1260
1257
  id = entity.Bruce.ID;
@@ -1266,7 +1263,7 @@ var EntityRenderEngine;
1266
1263
  multiGeometry.push(entity);
1267
1264
  }
1268
1265
  }
1269
- _e.label = 2;
1266
+ _g.label = 2;
1270
1267
  case 2:
1271
1268
  if (!(multiGeometry.length > 0)) return [3 /*break*/, 6];
1272
1269
  _loop_1 = function (i) {
@@ -1275,6 +1272,10 @@ var EntityRenderEngine;
1275
1272
  switch (_a.label) {
1276
1273
  case 0:
1277
1274
  entity = multiGeometry[i];
1275
+ if (!((_f = (_e = entity.geometry) === null || _e === void 0 ? void 0 : _e.MultiGeometry) === null || _f === void 0 ? void 0 : _f.length)) {
1276
+ polygons.push(entity);
1277
+ return [2 /*return*/, "continue"];
1278
+ }
1278
1279
  pParams = __assign(__assign({}, groupRenderParams), { entities: [] });
1279
1280
  zoomItem = pParams.zoomItems[entity.Bruce.ID];
1280
1281
  for (j = 0; j < entity.geometry.MultiGeometry.length; j++) {
@@ -1328,13 +1329,13 @@ var EntityRenderEngine;
1328
1329
  });
1329
1330
  };
1330
1331
  i = 0;
1331
- _e.label = 3;
1332
+ _g.label = 3;
1332
1333
  case 3:
1333
1334
  if (!(i < multiGeometry.length)) return [3 /*break*/, 6];
1334
1335
  return [5 /*yield**/, _loop_1(i)];
1335
1336
  case 4:
1336
- _e.sent();
1337
- _e.label = 5;
1337
+ _g.sent();
1338
+ _g.label = 5;
1338
1339
  case 5:
1339
1340
  i++;
1340
1341
  return [3 /*break*/, 3];
@@ -1343,7 +1344,7 @@ var EntityRenderEngine;
1343
1344
  pParams = __assign(__assign({}, groupRenderParams), { entities: polygons });
1344
1345
  return [4 /*yield*/, Polygon.RenderGroup(pParams)];
1345
1346
  case 7:
1346
- pEntities = _e.sent();
1347
+ pEntities = _g.sent();
1347
1348
  for (i = 0; i < pParams.entities.length; i++) {
1348
1349
  entity = pParams.entities[i];
1349
1350
  cEntity = pEntities[entity.Bruce.ID];
@@ -1354,13 +1355,13 @@ var EntityRenderEngine;
1354
1355
  polylines.push(entity);
1355
1356
  }
1356
1357
  }
1357
- _e.label = 8;
1358
+ _g.label = 8;
1358
1359
  case 8:
1359
1360
  if (!(polylines.length > 0)) return [3 /*break*/, 10];
1360
1361
  pParams = __assign(__assign({}, groupRenderParams), { entities: polylines });
1361
1362
  return [4 /*yield*/, Polyline.RenderGroup(pParams)];
1362
1363
  case 9:
1363
- pEntities = _e.sent();
1364
+ pEntities = _g.sent();
1364
1365
  for (i = 0; i < pParams.entities.length; i++) {
1365
1366
  entity = pParams.entities[i];
1366
1367
  cEntity = pEntities[entity.Bruce.ID];
@@ -1371,13 +1372,13 @@ var EntityRenderEngine;
1371
1372
  points.push(entity);
1372
1373
  }
1373
1374
  }
1374
- _e.label = 10;
1375
+ _g.label = 10;
1375
1376
  case 10:
1376
1377
  if (!(points.length > 0)) return [3 /*break*/, 12];
1377
1378
  pParams = __assign(__assign({}, groupRenderParams), { entities: points });
1378
1379
  return [4 /*yield*/, Point.RenderGroup(pParams)];
1379
1380
  case 11:
1380
- pEntities = _e.sent();
1381
+ pEntities = _g.sent();
1381
1382
  for (i = 0; i < pParams.entities.length; i++) {
1382
1383
  entity = pParams.entities[i];
1383
1384
  cEntity = pEntities[entity.Bruce.ID];
@@ -1385,7 +1386,7 @@ var EntityRenderEngine;
1385
1386
  cEntities[entity.Bruce.ID] = cEntity;
1386
1387
  }
1387
1388
  }
1388
- _e.label = 12;
1389
+ _g.label = 12;
1389
1390
  case 12: return [2 /*return*/, cEntities];
1390
1391
  }
1391
1392
  });
@@ -2270,6 +2271,7 @@ var EntitiesRenderManager;
2270
2271
  if (typeId_1) {
2271
2272
  entities = entities.filter(function (x) { var _a; return ((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a["EntityType.ID"]) == typeId_1; });
2272
2273
  }
2274
+ console.log("render entities", entities);
2273
2275
  return [4 /*yield*/, EntityRenderEngine.Render({
2274
2276
  viewer: this.viewer,
2275
2277
  apiGetter: this.apiGetter,