bruce-cesium 1.2.6 → 1.2.8

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.
Files changed (9) hide show
  1. package/dist/bruce-cesium.es5.js +51 -34
  2. package/dist/bruce-cesium.es5.js.map +1 -1
  3. package/dist/bruce-cesium.umd.js +50 -33
  4. package/dist/bruce-cesium.umd.js.map +1 -1
  5. package/dist/lib/rendering/entity-render-engine.js +21 -13
  6. package/dist/lib/rendering/entity-render-engine.js.map +1 -1
  7. package/dist/lib/rendering/tile-render-engine.js +29 -20
  8. package/dist/lib/rendering/tile-render-engine.js.map +1 -1
  9. package/package.json +2 -2
package/dist/bruce-cesium.umd.js CHANGED
@@ -1162,11 +1162,11 @@
1162
1162
  }
1163
1163
  (function (EntityRenderEngine) {
1164
1164
  function Render(params) {
1165
- var _a;
1165
+ var _a, _b;
1166
1166
  return __awaiter(this, void 0, void 0, function () {
1167
- var groupRenderParams, cEntities, models, polygons, polylines, points, i, entity, id, zoomItem, displayType, newRenderId, existingRego, oldRenderId, mParams, mEntities, i, entity, id, cEntity, pParams, pEntities, i, entity, cEntity, pParams, pEntities, i, entity, cEntity, pParams, pEntities, i, entity, cEntity;
1168
- return __generator(this, function (_b) {
1169
- switch (_b.label) {
1167
+ var groupRenderParams, i, entity, geometry, cEntities, models, polygons, polylines, points, i, entity, id, zoomItem, displayType, newRenderId, existingRego, oldRenderId, mParams, mEntities, i, entity, id, cEntity, pParams, pEntities, i, entity, cEntity, pParams, pEntities, i, entity, cEntity, pParams, pEntities, i, entity, cEntity;
1168
+ return __generator(this, function (_c) {
1169
+ switch (_c.label) {
1170
1170
  case 0:
1171
1171
  groupRenderParams = {
1172
1172
  apiGetter: params.apiGetter,
@@ -1176,6 +1176,14 @@
1176
1176
  menuItemId: params.menuItemId,
1177
1177
  visualRegister: params.visualRegister
1178
1178
  };
1179
+ // Flatten multi-geometry if it's only got 1 piece.
1180
+ for (i = 0; i < params.entities.length; i++) {
1181
+ entity = params.entities[i];
1182
+ geometry = entity.geometry;
1183
+ if (((_a = geometry === null || geometry === void 0 ? void 0 : geometry.MultiGeometry) === null || _a === void 0 ? void 0 : _a.length) == 1) {
1184
+ entity.geometry = __assign(__assign({}, entity.geometry), geometry.MultiGeometry[0]);
1185
+ }
1186
+ }
1179
1187
  cEntities = {};
1180
1188
  models = [];
1181
1189
  polygons = [];
@@ -1204,7 +1212,7 @@
1204
1212
  entityId: id,
1205
1213
  menuItemId: params.menuItemId
1206
1214
  });
1207
- oldRenderId = (_a = existingRego === null || existingRego === void 0 ? void 0 : existingRego.visual) === null || _a === void 0 ? void 0 : _a._renderGroup;
1215
+ oldRenderId = (_b = existingRego === null || existingRego === void 0 ? void 0 : existingRego.visual) === null || _b === void 0 ? void 0 : _b._renderGroup;
1208
1216
  if (newRenderId == oldRenderId && !(existingRego === null || existingRego === void 0 ? void 0 : existingRego.stale)) {
1209
1217
  cEntities[id] = existingRego.visual;
1210
1218
  }
@@ -1226,7 +1234,7 @@
1226
1234
  mParams = __assign(__assign({}, groupRenderParams), { entities: models });
1227
1235
  return [4 /*yield*/, Model3d.RenderGroup(mParams)];
1228
1236
  case 1:
1229
- mEntities = _b.sent();
1237
+ mEntities = _c.sent();
1230
1238
  for (i = 0; i < mParams.entities.length; i++) {
1231
1239
  entity = mParams.entities[i];
1232
1240
  id = entity.Bruce.ID;
@@ -1238,13 +1246,13 @@
1238
1246
  polygons.push(entity);
1239
1247
  }
1240
1248
  }
1241
- _b.label = 2;
1249
+ _c.label = 2;
1242
1250
  case 2:
1243
1251
  if (!(polygons.length > 0)) return [3 /*break*/, 4];
1244
1252
  pParams = __assign(__assign({}, groupRenderParams), { entities: polygons });
1245
1253
  return [4 /*yield*/, Polygon.RenderGroup(pParams)];
1246
1254
  case 3:
1247
- pEntities = _b.sent();
1255
+ pEntities = _c.sent();
1248
1256
  for (i = 0; i < pParams.entities.length; i++) {
1249
1257
  entity = pParams.entities[i];
1250
1258
  cEntity = pEntities[entity.Bruce.ID];
@@ -1255,13 +1263,13 @@
1255
1263
  polylines.push(entity);
1256
1264
  }
1257
1265
  }
1258
- _b.label = 4;
1266
+ _c.label = 4;
1259
1267
  case 4:
1260
1268
  if (!(polylines.length > 0)) return [3 /*break*/, 6];
1261
1269
  pParams = __assign(__assign({}, groupRenderParams), { entities: polylines });
1262
1270
  return [4 /*yield*/, Polyline.RenderGroup(pParams)];
1263
1271
  case 5:
1264
- pEntities = _b.sent();
1272
+ pEntities = _c.sent();
1265
1273
  for (i = 0; i < pParams.entities.length; i++) {
1266
1274
  entity = pParams.entities[i];
1267
1275
  cEntity = pEntities[entity.Bruce.ID];
@@ -1272,13 +1280,13 @@
1272
1280
  points.push(entity);
1273
1281
  }
1274
1282
  }
1275
- _b.label = 6;
1283
+ _c.label = 6;
1276
1284
  case 6:
1277
1285
  if (!(points.length > 0)) return [3 /*break*/, 8];
1278
1286
  pParams = __assign(__assign({}, groupRenderParams), { entities: points });
1279
1287
  return [4 /*yield*/, Point.RenderGroup(pParams)];
1280
1288
  case 7:
1281
- pEntities = _b.sent();
1289
+ pEntities = _c.sent();
1282
1290
  for (i = 0; i < pParams.entities.length; i++) {
1283
1291
  entity = pParams.entities[i];
1284
1292
  cEntity = pEntities[entity.Bruce.ID];
@@ -1286,7 +1294,7 @@
1286
1294
  cEntities[entity.Bruce.ID] = cEntity;
1287
1295
  }
1288
1296
  }
1289
- _b.label = 8;
1297
+ _c.label = 8;
1290
1298
  case 8: return [2 /*return*/, cEntities];
1291
1299
  }
1292
1300
  });
@@ -6832,11 +6840,12 @@
6832
6840
  case bruceModels.ProjectViewTile.EDefaultImagery.EsriWorldStreetMap: return [3 /*break*/, 14];
6833
6841
  case bruceModels.ProjectViewTile.EDefaultImagery.EsriNationalGeographic: return [3 /*break*/, 15];
6834
6842
  case bruceModels.ProjectViewTile.EDefaultImagery.OpenStreetMap: return [3 /*break*/, 16];
6835
- case bruceModels.ProjectViewTile.EDefaultImagery.StamenWaterColor: return [3 /*break*/, 17];
6836
- case bruceModels.ProjectViewTile.EDefaultImagery.StamenToner: return [3 /*break*/, 18];
6837
- case bruceModels.ProjectViewTile.EDefaultImagery.Grid: return [3 /*break*/, 19];
6843
+ case bruceModels.ProjectViewTile.EDefaultImagery.LINZ: return [3 /*break*/, 17];
6844
+ case bruceModels.ProjectViewTile.EDefaultImagery.StamenWaterColor: return [3 /*break*/, 18];
6845
+ case bruceModels.ProjectViewTile.EDefaultImagery.StamenToner: return [3 /*break*/, 19];
6846
+ case bruceModels.ProjectViewTile.EDefaultImagery.Grid: return [3 /*break*/, 20];
6838
6847
  }
6839
- return [3 /*break*/, 20];
6848
+ return [3 /*break*/, 21];
6840
6849
  case 1:
6841
6850
  _c = (_b = Cesium.BingMapsImageryProvider).bind;
6842
6851
  _d = {
@@ -6847,7 +6856,7 @@
6847
6856
  case 2:
6848
6857
  provider = new (_c.apply(_b, [void 0, (_d.key = _v.sent(),
6849
6858
  _d)]))();
6850
- return [3 /*break*/, 20];
6859
+ return [3 /*break*/, 21];
6851
6860
  case 3:
6852
6861
  _f = (_e = Cesium.BingMapsImageryProvider).bind;
6853
6862
  _g = {
@@ -6858,7 +6867,7 @@
6858
6867
  case 4:
6859
6868
  provider = new (_f.apply(_e, [void 0, (_g.key = _v.sent(),
6860
6869
  _g)]))();
6861
- return [3 /*break*/, 20];
6870
+ return [3 /*break*/, 21];
6862
6871
  case 5:
6863
6872
  _j = (_h = Cesium.BingMapsImageryProvider).bind;
6864
6873
  _k = {
@@ -6869,7 +6878,7 @@
6869
6878
  case 6:
6870
6879
  provider = new (_j.apply(_h, [void 0, (_k.key = _v.sent(),
6871
6880
  _k)]))();
6872
- return [3 /*break*/, 20];
6881
+ return [3 /*break*/, 21];
6873
6882
  case 7:
6874
6883
  _m = (_l = Cesium.MapboxImageryProvider).bind;
6875
6884
  _o = {
@@ -6879,7 +6888,7 @@
6879
6888
  case 8:
6880
6889
  provider = new (_m.apply(_l, [void 0, (_o.accessToken = _v.sent(),
6881
6890
  _o)]))();
6882
- return [3 /*break*/, 20];
6891
+ return [3 /*break*/, 21];
6883
6892
  case 9:
6884
6893
  _q = (_p = Cesium.MapboxStyleImageryProvider).bind;
6885
6894
  _r = {
@@ -6889,7 +6898,7 @@
6889
6898
  case 10:
6890
6899
  provider = new (_q.apply(_p, [void 0, (_r.accessToken = _v.sent(),
6891
6900
  _r)]))();
6892
- return [3 /*break*/, 20];
6901
+ return [3 /*break*/, 21];
6893
6902
  case 11:
6894
6903
  _t = (_s = Cesium.MapboxStyleImageryProvider).bind;
6895
6904
  _u = {
@@ -6899,41 +6908,47 @@
6899
6908
  case 12:
6900
6909
  provider = new (_t.apply(_s, [void 0, (_u.accessToken = _v.sent(),
6901
6910
  _u)]))();
6902
- return [3 /*break*/, 20];
6911
+ return [3 /*break*/, 21];
6903
6912
  case 13:
6904
6913
  provider = new Cesium.ArcGisMapServerImageryProvider({
6905
6914
  url: "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer",
6906
6915
  enablePickFeatures: false
6907
6916
  });
6908
- return [3 /*break*/, 20];
6917
+ return [3 /*break*/, 21];
6909
6918
  case 14:
6910
6919
  provider = new Cesium.ArcGisMapServerImageryProvider({
6911
6920
  url: "https://services.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer",
6912
6921
  enablePickFeatures: false
6913
6922
  });
6914
- return [3 /*break*/, 20];
6923
+ return [3 /*break*/, 21];
6915
6924
  case 15:
6916
6925
  provider = new Cesium.ArcGisMapServerImageryProvider({
6917
6926
  url: "https://services.arcgisonline.com/ArcGIS/rest/services/NatGeo_World_Map/MapServer/",
6918
6927
  enablePickFeatures: false
6919
6928
  });
6920
- return [3 /*break*/, 20];
6929
+ return [3 /*break*/, 21];
6921
6930
  case 16:
6922
6931
  provider = new Cesium.OpenStreetMapImageryProvider({
6923
6932
  url: "https://a.tile.openstreetmap.org/"
6924
6933
  });
6925
- return [3 /*break*/, 20];
6934
+ return [3 /*break*/, 21];
6926
6935
  case 17:
6927
6936
  provider = new Cesium.OpenStreetMapImageryProvider({
6928
- url: "https://stamen-tiles.a.ssl.fastly.net/watercolor/"
6937
+ url: "https://s3-ap-southeast-2.amazonaws.com/digitalnewzealand/PROD/Tilesets/nz-img",
6938
+ fileExtension: "jpg"
6929
6939
  });
6930
- return [3 /*break*/, 20];
6940
+ return [3 /*break*/, 21];
6931
6941
  case 18:
6932
6942
  provider = new Cesium.OpenStreetMapImageryProvider({
6933
- url: "https://stamen-tiles.a.ssl.fastly.net/toner/"
6943
+ url: "https://stamen-tiles.a.ssl.fastly.net/watercolor/"
6934
6944
  });
6935
- return [3 /*break*/, 20];
6945
+ return [3 /*break*/, 21];
6936
6946
  case 19:
6947
+ provider = new Cesium.OpenStreetMapImageryProvider({
6948
+ url: "https://stamen-tiles.a.ssl.fastly.net/toner/"
6949
+ });
6950
+ return [3 /*break*/, 21];
6951
+ case 20:
6937
6952
  provider = new Cesium.GridImageryProvider({
6938
6953
  tilingScheme: new Cesium.GeographicTilingScheme(),
6939
6954
  cells: 0,
@@ -6945,8 +6960,8 @@
6945
6960
  tileHeight: 256,
6946
6961
  canvasSize: 256
6947
6962
  });
6948
- return [3 /*break*/, 20];
6949
- case 20: return [2 /*return*/, provider];
6963
+ return [3 /*break*/, 21];
6964
+ case 21: return [2 /*return*/, provider];
6950
6965
  }
6951
6966
  });
6952
6967
  });
@@ -6983,6 +6998,8 @@
6983
6998
  return bruceModels.ProjectViewTile.EDefaultImagery.StamenWaterColor;
6984
6999
  case "stamentoner":
6985
7000
  return bruceModels.ProjectViewTile.EDefaultImagery.StamenToner;
7001
+ case "linz":
7002
+ return bruceModels.ProjectViewTile.EDefaultImagery.LINZ;
6986
7003
  case "grid":
6987
7004
  return bruceModels.ProjectViewTile.EDefaultImagery.Grid;
6988
7005
  }