bruce-cesium 1.2.6 → 1.2.8

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, EntityRelationType, ObjectUtils, Tileset, EntityCoords, EntityFilterGetter, EntitySource, EntityRelation, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
-import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, Rectangle, KmlDataSource, CallbackProperty, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, OrthographicFrustum, JulianDate, Matrix4, Cesium3DTileset, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance } from 'cesium';
+import { Cartesian2, Cartographic, Math as Math$1, Cartesian3, Entity, Primitive, Cesium3DTileFeature, Color, Cesium3DTileColorBlendMode, HeadingPitchRange, HeightReference, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, createOsmBuildings, Cesium3DTileStyle, Rectangle, KmlDataSource, OrthographicFrustum, JulianDate, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CallbackProperty, Matrix4, Cesium3DTileset, IonResource, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, ColorMaterialProperty, Matrix3, EasingFunction, GeometryInstance } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1165,11 +1165,11 @@ function getRenderGroupId(zoomItem) {
 var EntityRenderEngine;
 (function (EntityRenderEngine) {
     function Render(params) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            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;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            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;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         groupRenderParams = {
                             apiGetter: params.apiGetter,
@@ -1179,6 +1179,14 @@ var EntityRenderEngine;
                             menuItemId: params.menuItemId,
                             visualRegister: params.visualRegister
                         };
+                        // Flatten multi-geometry if it's only got 1 piece.
+                        for (i = 0; i < params.entities.length; i++) {
+                            entity = params.entities[i];
+                            geometry = entity.geometry;
+                            if (((_a = geometry === null || geometry === void 0 ? void 0 : geometry.MultiGeometry) === null || _a === void 0 ? void 0 : _a.length) == 1) {
+                                entity.geometry = __assign(__assign({}, entity.geometry), geometry.MultiGeometry[0]);
+                            }
+                        }
                         cEntities = {};
                         models = [];
                         polygons = [];
@@ -1207,7 +1215,7 @@ var EntityRenderEngine;
                                     entityId: id,
                                     menuItemId: params.menuItemId
                                 });
-                                oldRenderId = (_a = existingRego === null || existingRego === void 0 ? void 0 : existingRego.visual) === null || _a === void 0 ? void 0 : _a._renderGroup;
+                                oldRenderId = (_b = existingRego === null || existingRego === void 0 ? void 0 : existingRego.visual) === null || _b === void 0 ? void 0 : _b._renderGroup;
                                 if (newRenderId == oldRenderId && !(existingRego === null || existingRego === void 0 ? void 0 : existingRego.stale)) {
                                     cEntities[id] = existingRego.visual;
                                 }
@@ -1229,7 +1237,7 @@ var EntityRenderEngine;
                         mParams = __assign(__assign({}, groupRenderParams), { entities: models });
                         return [4 /*yield*/, Model3d.RenderGroup(mParams)];
                     case 1:
-                        mEntities = _b.sent();
+                        mEntities = _c.sent();
                         for (i = 0; i < mParams.entities.length; i++) {
                             entity = mParams.entities[i];
                             id = entity.Bruce.ID;
@@ -1241,13 +1249,13 @@ var EntityRenderEngine;
                                 polygons.push(entity);
                             }
                         }
-                        _b.label = 2;
+                        _c.label = 2;
                     case 2:
                         if (!(polygons.length > 0)) return [3 /*break*/, 4];
                         pParams = __assign(__assign({}, groupRenderParams), { entities: polygons });
                         return [4 /*yield*/, Polygon.RenderGroup(pParams)];
                     case 3:
-                        pEntities = _b.sent();
+                        pEntities = _c.sent();
                         for (i = 0; i < pParams.entities.length; i++) {
                             entity = pParams.entities[i];
                             cEntity = pEntities[entity.Bruce.ID];
@@ -1258,13 +1266,13 @@ var EntityRenderEngine;
                                 polylines.push(entity);
                             }
                         }
-                        _b.label = 4;
+                        _c.label = 4;
                     case 4:
                         if (!(polylines.length > 0)) return [3 /*break*/, 6];
                         pParams = __assign(__assign({}, groupRenderParams), { entities: polylines });
                         return [4 /*yield*/, Polyline.RenderGroup(pParams)];
                     case 5:
-                        pEntities = _b.sent();
+                        pEntities = _c.sent();
                         for (i = 0; i < pParams.entities.length; i++) {
                             entity = pParams.entities[i];
                             cEntity = pEntities[entity.Bruce.ID];
@@ -1275,13 +1283,13 @@ var EntityRenderEngine;
                                 points.push(entity);
                             }
                         }
-                        _b.label = 6;
+                        _c.label = 6;
                     case 6:
                         if (!(points.length > 0)) return [3 /*break*/, 8];
                         pParams = __assign(__assign({}, groupRenderParams), { entities: points });
                         return [4 /*yield*/, Point.RenderGroup(pParams)];
                     case 7:
-                        pEntities = _b.sent();
+                        pEntities = _c.sent();
                         for (i = 0; i < pParams.entities.length; i++) {
                             entity = pParams.entities[i];
                             cEntity = pEntities[entity.Bruce.ID];
@@ -1289,7 +1297,7 @@ var EntityRenderEngine;
                                 cEntities[entity.Bruce.ID] = cEntity;
                             }
                         }
-                        _b.label = 8;
+                        _c.label = 8;
                     case 8: return [2 /*return*/, cEntities];
                 }
             });
@@ -6881,11 +6889,12 @@ function renderDefaultMapTile(apiGetter, id) {
                         case ProjectViewTile.EDefaultImagery.EsriWorldStreetMap: return [3 /*break*/, 14];
                         case ProjectViewTile.EDefaultImagery.EsriNationalGeographic: return [3 /*break*/, 15];
                         case ProjectViewTile.EDefaultImagery.OpenStreetMap: return [3 /*break*/, 16];
-                        case ProjectViewTile.EDefaultImagery.StamenWaterColor: return [3 /*break*/, 17];
-                        case ProjectViewTile.EDefaultImagery.StamenToner: return [3 /*break*/, 18];
-                        case ProjectViewTile.EDefaultImagery.Grid: return [3 /*break*/, 19];
+                        case ProjectViewTile.EDefaultImagery.LINZ: return [3 /*break*/, 17];
+                        case ProjectViewTile.EDefaultImagery.StamenWaterColor: return [3 /*break*/, 18];
+                        case ProjectViewTile.EDefaultImagery.StamenToner: return [3 /*break*/, 19];
+                        case ProjectViewTile.EDefaultImagery.Grid: return [3 /*break*/, 20];
                     }
-                    return [3 /*break*/, 20];
+                    return [3 /*break*/, 21];
                 case 1:
                     _c = (_b = BingMapsImageryProvider).bind;
                     _d = {
@@ -6896,7 +6905,7 @@ function renderDefaultMapTile(apiGetter, id) {
                 case 2:
                     provider = new (_c.apply(_b, [void 0, (_d.key = _v.sent(),
                             _d)]))();
-                    return [3 /*break*/, 20];
+                    return [3 /*break*/, 21];
                 case 3:
                     _f = (_e = BingMapsImageryProvider).bind;
                     _g = {
@@ -6907,7 +6916,7 @@ function renderDefaultMapTile(apiGetter, id) {
                 case 4:
                     provider = new (_f.apply(_e, [void 0, (_g.key = _v.sent(),
                             _g)]))();
-                    return [3 /*break*/, 20];
+                    return [3 /*break*/, 21];
                 case 5:
                     _j = (_h = BingMapsImageryProvider).bind;
                     _k = {
@@ -6918,7 +6927,7 @@ function renderDefaultMapTile(apiGetter, id) {
                 case 6:
                     provider = new (_j.apply(_h, [void 0, (_k.key = _v.sent(),
                             _k)]))();
-                    return [3 /*break*/, 20];
+                    return [3 /*break*/, 21];
                 case 7:
                     _m = (_l = MapboxImageryProvider).bind;
                     _o = {
@@ -6928,7 +6937,7 @@ function renderDefaultMapTile(apiGetter, id) {
                 case 8:
                     provider = new (_m.apply(_l, [void 0, (_o.accessToken = _v.sent(),
                             _o)]))();
-                    return [3 /*break*/, 20];
+                    return [3 /*break*/, 21];
                 case 9:
                     _q = (_p = MapboxStyleImageryProvider).bind;
                     _r = {
@@ -6938,7 +6947,7 @@ function renderDefaultMapTile(apiGetter, id) {
                 case 10:
                     provider = new (_q.apply(_p, [void 0, (_r.accessToken = _v.sent(),
                             _r)]))();
-                    return [3 /*break*/, 20];
+                    return [3 /*break*/, 21];
                 case 11:
                     _t = (_s = MapboxStyleImageryProvider).bind;
                     _u = {
@@ -6948,41 +6957,47 @@ function renderDefaultMapTile(apiGetter, id) {
                 case 12:
                     provider = new (_t.apply(_s, [void 0, (_u.accessToken = _v.sent(),
                             _u)]))();
-                    return [3 /*break*/, 20];
+                    return [3 /*break*/, 21];
                 case 13:
                     provider = new ArcGisMapServerImageryProvider({
                         url: "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer",
                         enablePickFeatures: false
                     });
-                    return [3 /*break*/, 20];
+                    return [3 /*break*/, 21];
                 case 14:
                     provider = new ArcGisMapServerImageryProvider({
                         url: "https://services.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer",
                         enablePickFeatures: false
                     });
-                    return [3 /*break*/, 20];
+                    return [3 /*break*/, 21];
                 case 15:
                     provider = new ArcGisMapServerImageryProvider({
                         url: "https://services.arcgisonline.com/ArcGIS/rest/services/NatGeo_World_Map/MapServer/",
                         enablePickFeatures: false
                     });
-                    return [3 /*break*/, 20];
+                    return [3 /*break*/, 21];
                 case 16:
                     provider = new OpenStreetMapImageryProvider({
                         url: "https://a.tile.openstreetmap.org/"
                     });
-                    return [3 /*break*/, 20];
+                    return [3 /*break*/, 21];
                 case 17:
                     provider = new OpenStreetMapImageryProvider({
-                        url: "https://stamen-tiles.a.ssl.fastly.net/watercolor/"
+                        url: "https://s3-ap-southeast-2.amazonaws.com/digitalnewzealand/PROD/Tilesets/nz-img",
+                        fileExtension: "jpg"
                     });
-                    return [3 /*break*/, 20];
+                    return [3 /*break*/, 21];
                 case 18:
                     provider = new OpenStreetMapImageryProvider({
-                        url: "https://stamen-tiles.a.ssl.fastly.net/toner/"
+                        url: "https://stamen-tiles.a.ssl.fastly.net/watercolor/"
                     });
-                    return [3 /*break*/, 20];
+                    return [3 /*break*/, 21];
                 case 19:
+                    provider = new OpenStreetMapImageryProvider({
+                        url: "https://stamen-tiles.a.ssl.fastly.net/toner/"
+                    });
+                    return [3 /*break*/, 21];
+                case 20:
                     provider = new GridImageryProvider({
                         tilingScheme: new GeographicTilingScheme(),
                         cells: 0,
@@ -6994,8 +7009,8 @@ function renderDefaultMapTile(apiGetter, id) {
                         tileHeight: 256,
                         canvasSize: 256
                     });
-                    return [3 /*break*/, 20];
-                case 20: return [2 /*return*/, provider];
+                    return [3 /*break*/, 21];
+                case 21: return [2 /*return*/, provider];
             }
         });
     });
@@ -7032,6 +7047,8 @@ function legacyMapIdToDefaultId(name) {
             return ProjectViewTile.EDefaultImagery.StamenWaterColor;
         case "stamentoner":
             return ProjectViewTile.EDefaultImagery.StamenToner;
+        case "linz":
+            return ProjectViewTile.EDefaultImagery.LINZ;
         case "grid":
             return ProjectViewTile.EDefaultImagery.Grid;
     }