bruce-cesium 4.1.9 → 4.2.1

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ProjectViewTile, DelayQueue, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, Api, EntityRelationType, ENVIRONMENT, EntityHistoricData, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, AbstractApi, ProjectViewBookmark, EntityAttachment, EntityAttachmentType, EntityAttribute, ProjectView, ProjectViewLegacyTile, Camera } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, NearFarScalar, Model, ColorMaterialProperty, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorBlendMode, HeadingPitchRoll, Transforms, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Quaternion, Intersect } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, DistanceDisplayCondition, NearFarScalar, Model, ColorMaterialProperty, Entity, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorBlendMode, HeadingPitchRoll, Transforms, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, HeadingPitchRange, Ion, Cesium3DTileStyle, Cesium3DTileColorBlendMode, KmlDataSource, OrthographicFrustum, EasingFunction, SceneTransforms, Cesium3DTileset, Matrix4, Matrix3, IonResource, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Quaternion, Intersect } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4654,14 +4654,19 @@ var SimplifyGeometry;
     /**
      * Returns the total number of points in the geometry.
      * @param geometry
+     * @param limit number to count up to before returning.
      * @returns
      */
-    function CountPoints(geometry) {
+    function CountPoints(geometry, limit) {
         var count = 0;
         var traverse = function (geometry) {
             if (geometry.MultiGeometry) {
                 for (var i = 0; i < geometry.MultiGeometry.length; i++) {
                     traverse(geometry.MultiGeometry[i]);
+                    // Reached the limit, return.
+                    if (limit && count >= limit) {
+                        return;
+                    }
                 }
             }
             else if (geometry.Polygon) {
@@ -4686,193 +4691,278 @@ var SimplifyGeometry;
      * This will turn it into GeoJSON, run it through turf, then back to Bruce geometry.
      * @param geometry
      */
-    function Simplify(geometry, tolerance) {
-        if (!geometry || tolerance <= 0 || !turf || !turf.simplify) {
+    function Simplify(entityId, geometry, tolerance) {
+        var _a;
+        if (!geometry || !turf || !turf.simplify) {
             return geometry;
         }
-        var geoJson = toGeoJson(geometry);
-        // Union overlapping shapes
-        var combinedFeatures = [];
-        geoJson.features.forEach(function (feature) {
-            var unioned = false;
-            for (var i = 0; i < combinedFeatures.length; i++) {
-                try {
-                    var unionResult = turf.union(combinedFeatures[i], feature);
-                    if (unionResult) {
-                        combinedFeatures[i] = unionResult;
-                        unioned = true;
-                        break;
-                    }
-                }
-                catch (error) {
-                    // Ignore the error if union fails, and continue
-                }
-            }
-            if (!unioned) {
-                combinedFeatures.push(feature);
-            }
+        // Convert to geojson so that we can interact with turf.
+        var gFeature = Geometry.ToGeoJsonFeature({
+            geometry: geometry
         });
-        geoJson = {
-            type: "FeatureCollection",
-            features: combinedFeatures,
-        };
-        // Simplify the combined result.
-        var simplified = turf.simplify(geoJson, { tolerance: tolerance, highQuality: true, mutate: true });
-        return fromGeoJson(simplified);
+        // Unkink the geometry.
+        // This removes overlapping polygons before we start merging and simplifying.
+        // Commented out because it has crashes and doesn't handle holes.
+        untangleFeature(gFeature);
+        // Union the geometry.
+        // This merges overlapping polygons.
+        unionFeature(gFeature);
+        // Simplify the geometry.
+        if (tolerance > 0) {
+            gFeature.geometry = turf.simplify(gFeature.geometry, {
+                tolerance: tolerance,
+                highQuality: true,
+                mutate: true
+            });
+        }
+        // Converting back to Bruce geometry.
+        geometry = (_a = Geometry.FromGeoJson({
+            geoJson: gFeature
+        })) === null || _a === void 0 ? void 0 : _a.geometry;
+        return geometry;
     }
     SimplifyGeometry.Simplify = Simplify;
 })(SimplifyGeometry || (SimplifyGeometry = {}));
 /**
- * Converts Bruce geometry to GeoJSON.
- * @param geometry
- * @returns
+ * Runs through all found polygons and runs unkink through turf on them.
+ * @param feature
  */
-function toGeoJson(geometry) {
-    var features = [];
-    var excludeAltitude = false;
-    var areCoordinatesEqual = function (coord1, coord2) {
-        return coord1[0] === coord2[0] && coord1[1] === coord2[1] && (coord1[2] === coord2[2] || (coord1.length < 3 && coord2.length < 3));
-    };
-    var removeConsecutiveDuplicates = function (coordinates) {
-        return coordinates.filter(function (coord, index, array) {
-            return index === 0 || !areCoordinatesEqual(coord, array[index - 1]);
-        });
+function untangleFeature(feature) {
+    // Collection to add to because the result might be multiple from an unkink.
+    var collection = {
+        geometries: [],
+        type: "GeometryCollection"
     };
-    var closePolygonCoordinates = function (coordinates) {
-        if (coordinates.length > 0 && !areCoordinatesEqual(coordinates[0], coordinates[coordinates.length - 1])) {
-            var firstPointCopy = [].concat(coordinates[0]);
-            coordinates.push(firstPointCopy);
+    // Runs a dedupe and unkink on the coordinates.
+    // Returns if the coordinates were added to the collection.
+    var processCoordinates = function (coords) {
+        try {
+            // Dedupe the coordinates to avoid issues with unkink.
+            coords = dedupeCoordinates(coords);
+            var outer = [];
+            var inner = [];
+            // We'll unkink each ring separately as this is killing the holes when it is done as a whole.
+            // So we'll do it separate then recombine.
+            for (var i = 0; i < coords.length; i++) {
+                var ring = coords[i];
+                var unkink = turf.unkinkPolygon({
+                    type: "Polygon",
+                    coordinates: [ring]
+                });
+                if (unkink.type == "FeatureCollection") {
+                    var target = i == 0 ? outer : inner;
+                    for (var j = 0; j < unkink.features.length; j++) {
+                        var unkinked = unkink.features[j].geometry.coordinates;
+                        if (unkinked.length > 0) {
+                            target.push(unkinked[0]);
+                        }
+                    }
+                }
+                else {
+                    console.error("Unexpected unkink result.", unkink);
+                }
+            }
+            // Recreate the rings and reapply to the collection.
+            if (outer.length > 0) {
+                var combinedCoords = [outer[0]];
+                for (var i = 0; i < inner.length; i++) {
+                    combinedCoords.push(inner[i]);
+                }
+                // Add the combined coordinates to the collection
+                var polygon = {
+                    type: "Polygon",
+                    coordinates: combinedCoords
+                };
+                // Ensure right-hand rule is followed.
+                ensureRightHandRule(polygon);
+                // Add to the collection.
+                collection.geometries.push(polygon);
+                return true;
+            }
         }
-        return coordinates;
+        catch (e) {
+            // console.error("Failed to unkink polygon.", e);
+        }
+        return false;
     };
     var processGeometry = function (geometry) {
-        var _a, _b;
-        var feature = {
-            type: "Feature",
-            properties: {},
-            geometry: null
-        };
-        if ((_a = geometry.MultiGeometry) === null || _a === void 0 ? void 0 : _a.length) {
-            geometry.MultiGeometry.forEach(function (geo) { return processGeometry(geo); });
-            return;
+        var added = false;
+        if (geometry.type == "Polygon") {
+            added = processCoordinates(geometry.coordinates);
         }
-        else if ((_b = geometry.Polygon) === null || _b === void 0 ? void 0 : _b.length) {
-            var sortedPolygons = geometry.Polygon.sort(function (a, b) {
-                return a.Facing === Geometry.EPolygonRingType.Boundaries ? -1 : 1;
-            });
-            var coordinates = sortedPolygons.map(function (polygonRing) {
-                return closePolygonCoordinates(removeConsecutiveDuplicates(polygonRing.LinearRing.split(' ').map(function (coord) {
-                    var _a = coord.split(',').map(Number), lon = _a[0], lat = _a[1], alt = _a[2];
-                    return [lon, lat, alt !== undefined ? alt : 0];
-                })));
-            });
-            // Check if the polygon has at least 4 points.
-            var isValidPolygon = coordinates.every(function (polygon) { return polygon.length >= 4; });
-            if (!isValidPolygon) {
-                // Perhaps try other geometry instead of returning?
-                return;
+        else if (geometry.type == "MultiPolygon") {
+            for (var i = 0; i < geometry.coordinates.length; i++) {
+                added = processCoordinates(geometry.coordinates[i]) || added;
             }
-            feature.geometry = {
-                type: "Polygon",
-                coordinates: coordinates,
-            };
-        }
-        else if (geometry.LineString) {
-            var coordinates = removeConsecutiveDuplicates(geometry.LineString.split(' ').map(function (coord) {
-                var _a = coord.split(',').map(Number), lon = _a[0], lat = _a[1], alt = _a[2];
-                return [lon, lat, alt !== undefined ? alt : 0];
-            }));
-            // Check if the polyline has at least 2 points.
-            if (coordinates.length < 2) {
-                // Perhaps try other geometry instead of returning?
-                return;
-            }
-            feature.geometry = {
-                type: "LineString",
-                coordinates: coordinates,
-            };
-        }
-        else if (geometry.Point) {
-            var _c = geometry.Point.split(',').map(Number), lon = _c[0], lat = _c[1], alt = _c[2];
-            var coordinates = excludeAltitude ? [lon, lat] : [lon, lat, alt !== undefined ? alt : 0];
-            feature.geometry = {
-                type: "Point",
-                coordinates: coordinates,
-            };
         }
-        if (feature.geometry) {
-            features.push(feature);
+        if (!added) {
+            // Adding original since we can't unkink it.
+            collection.geometries.push(geometry);
         }
     };
-    try {
-        processGeometry(geometry);
+    if (feature.geometry.type == "GeometryCollection") {
+        feature.geometry.geometries.forEach(function (geometry) {
+            processGeometry(geometry);
+        });
     }
-    catch (e) {
-        console.error(e);
-        return null;
+    else {
+        processGeometry(feature.geometry);
+    }
+    // Re-assign the geometry.
+    if (collection.geometries.length == 1) {
+        feature.geometry = collection.geometries[0];
+    }
+    else {
+        feature.geometry = collection;
     }
-    var geoJson = {
-        type: "FeatureCollection",
-        features: features,
-    };
-    return geoJson;
 }
 /**
- * Converts GeoJSON to Bruce geometry.
- * @param geoJson
- * @returns
+ * Runs through all found polygons and unions them using turf.
+ * Failed unions are ignored and the original is kept.
+ * @param feature
  */
-function fromGeoJson(geoJson) {
-    if (geoJson.features.length === 0) {
-        return {};
-    }
-    var geometry = {
-        Polygon: [],
-        MultiGeometry: []
+function unionFeature(feature) {
+    // Collection to add to because the result might be multiple from an unkink.
+    var collection = {
+        geometries: [],
+        type: "GeometryCollection"
     };
-    if (geoJson.features.length > 1) {
-        geoJson.features.forEach(function (feature) {
-            var featureGeometry = fromGeoJson({
-                type: "FeatureCollection",
-                features: [feature]
-            });
-            geometry.MultiGeometry.push(featureGeometry);
+    // We'll turn each geometry into a feature and union them.
+    var tmpCollection = {
+        features: [],
+        type: "FeatureCollection"
+    };
+    if (feature.geometry.type == "GeometryCollection") {
+        feature.geometry.geometries.forEach(function (geometry) {
+            if (geometry.type == "Polygon") {
+                tmpCollection.features.push({
+                    type: "Feature",
+                    geometry: geometry,
+                    properties: {}
+                });
+            }
+            else if (geometry.type == "MultiPolygon") {
+                for (var i = 0; i < geometry.coordinates.length; i++) {
+                    tmpCollection.features.push({
+                        type: "Feature",
+                        geometry: {
+                            type: "Polygon",
+                            coordinates: geometry.coordinates[i]
+                        },
+                        properties: {}
+                    });
+                }
+            }
+            // Only focusing on polygons.
+            else {
+                collection.geometries.push(geometry);
+            }
         });
-        return geometry;
     }
-    var feature = geoJson.features[0];
-    var _a = feature.geometry, type = _a.type, coordinates = _a.coordinates;
-    switch (type) {
-        case "Polygon":
-            coordinates.forEach(function (polygon, index) {
-                var linearRing = polygon.map(function (coord) { return coord.join(','); }).join(' ');
-                geometry.Polygon.push({
-                    LinearRing: linearRing,
-                    Facing: index === 0 ? Geometry.EPolygonRingType.Boundaries : Geometry.EPolygonRingType.Hole
-                });
+    else if (feature.geometry.type == "Polygon") {
+        tmpCollection.features.push({
+            type: "Feature",
+            geometry: feature.geometry,
+            properties: {}
+        });
+    }
+    else if (feature.geometry.type == "MultiPolygon") {
+        for (var i = 0; i < feature.geometry.coordinates.length; i++) {
+            tmpCollection.features.push({
+                type: "Feature",
+                geometry: {
+                    type: "Polygon",
+                    coordinates: feature.geometry.coordinates[i]
+                },
+                properties: {}
             });
-            break;
-        case "LineString":
-            geometry.LineString = coordinates.map(function (coord) { return coord.join(','); }).join(' ');
-            break;
-        case "Point":
-            geometry.Point = coordinates.join(',');
-            break;
-        case "MultiPolygon":
-            coordinates.forEach(function (multiPolygon) {
-                var multiPolygonGeometry = { Polygon: [] };
-                multiPolygon.forEach(function (polygon, index) {
-                    var linearRing = polygon.map(function (coord) { return coord.join(','); }).join(' ');
-                    multiPolygonGeometry.Polygon.push({
-                        LinearRing: linearRing,
-                        Facing: index === 0 ? Geometry.EPolygonRingType.Boundaries : Geometry.EPolygonRingType.Hole
-                    });
+        }
+    }
+    // No polygons to union.
+    // Need at least 2 to union.
+    if (tmpCollection.features.length < 2) {
+        return;
+    }
+    // Now we'll union them.
+    try {
+        var union = turf.union(tmpCollection);
+        if (union.geometry.type == "Polygon") {
+            collection.geometries.push(union.geometry);
+        }
+        else if (union.geometry.type == "MultiPolygon") {
+            for (var i = 0; i < union.geometry.coordinates.length; i++) {
+                collection.geometries.push({
+                    type: "Polygon",
+                    coordinates: union.geometry.coordinates[i]
                 });
-                geometry.MultiGeometry.push(multiPolygonGeometry);
-            });
-            break;
+            }
+        }
+        else {
+            // Returning early because the result is unexpected.
+            return;
+        }
+    }
+    catch (e) {
+        // console.error("Failed to union polygons.", e);
+        return;
     }
-    return geometry;
+    // Re-assign the geometry.
+    if (collection.geometries.length == 1) {
+        feature.geometry = collection.geometries[0];
+    }
+    else {
+        feature.geometry = collection;
+    }
+}
+function dedupeCoordinates(inputCoords) {
+    return inputCoords.map(function (ring) {
+        if (ring.length < 2) {
+            return ring;
+        }
+        var dedupeCoords = [];
+        var uniqueCoords = new Set();
+        // Dedupe the points.
+        ring.forEach(function (coord) {
+            var key = coord.join(',');
+            if (!uniqueCoords.has(key)) {
+                uniqueCoords.add(key);
+                dedupeCoords.push(coord);
+            }
+        });
+        // Make sure the last point matches the first.
+        if (dedupeCoords.length > 1) {
+            if (dedupeCoords[0][0] != dedupeCoords[dedupeCoords.length - 1][0] ||
+                dedupeCoords[0][1] != dedupeCoords[dedupeCoords.length - 1][1]) {
+                dedupeCoords.push(dedupeCoords[0]);
+            }
+        }
+        return dedupeCoords;
+    });
+}
+function ensureRightHandRule(polygon) {
+    // Ensure the outer ring follows the right-hand rule
+    if (polygon.coordinates.length > 0) {
+        var outerRing = polygon.coordinates[0];
+        if (isClockwise(outerRing)) {
+            polygon.coordinates[0] = outerRing.reverse();
+        }
+    }
+    // Ensure any inner rings (holes) follow the right-hand rule
+    for (var i = 1; i < polygon.coordinates.length; i++) {
+        var innerRing = polygon.coordinates[i];
+        if (!isClockwise(innerRing)) {
+            polygon.coordinates[i] = innerRing.reverse();
+        }
+    }
+}
+function isClockwise(ring) {
+    var sum = 0;
+    for (var i = 0; i < ring.length - 1; i++) {
+        var p1 = ring[i];
+        var p2 = ring[i + 1];
+        sum += (p2[0] - p1[0]) * (p2[1] + p1[1]);
+    }
+    return sum > 0;
 }
 
 function colorToCColor(color) {
@@ -5548,11 +5638,11 @@ function compareColorMaterials(viewer, a, b) {
 var EntityRenderEngine;
 (function (EntityRenderEngine) {
     function Render(params) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function () {
-            var groupRenderParams, i, entity, geometry, optimized, updated, cEntities, models, multiGeometry, polygons, polylines, points, i, entity, id, zoomItem, displayType, existingRego, newRenderId, oldRenderId, geometry, mParams, mEntities, i, entity, id, cEntity, _loop_1, i, pParams, pEntities, i, entity, cEntity, pParams, pEntities, i, entity, cEntity, pParams, pEntities, i, entity, cEntity;
-            return __generator(this, function (_h) {
-                switch (_h.label) {
+            var groupRenderParams, updated, cEntities, models, multiGeometry, polygons, polylines, points, prepareGeometry, i, entity, id, zoomItem, displayType, existingRego, newRenderId, oldRenderId, geometry, mParams, mEntities, i, entity, id, cEntity, _loop_1, i, pParams, pEntities, i, entity, cEntity, pParams, pEntities, i, entity, cEntity, pParams, pEntities, i, entity, cEntity;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
                     case 0:
                         groupRenderParams = {
                             apiGetter: params.apiGetter,
@@ -5562,10 +5652,16 @@ 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$1.GetValue({
+                        updated = new Map();
+                        cEntities = new Map();
+                        models = [];
+                        multiGeometry = [];
+                        polygons = [];
+                        polylines = [];
+                        points = [];
+                        prepareGeometry = function (entity) {
+                            var _a;
+                            var geometry = Entity$1.GetValue({
                                 entity: entity,
                                 path: ["Bruce", "VectorGeometry"]
                             });
@@ -5574,20 +5670,19 @@ var EntityRenderEngine;
                             // Note that this modifies the Entity object.
                             if (params.optimizeGeometry) {
                                 if (params.optimizeMinPoints == null) {
-                                    params.optimizeMinPoints = 1000;
+                                    params.optimizeMinPoints = 500;
                                 }
-                                if (geometry && SimplifyGeometry.CountPoints(geometry) >= params.optimizeMinPoints) {
+                                if (geometry && SimplifyGeometry.CountPoints(geometry, params.optimizeMinPoints) >= params.optimizeMinPoints) {
                                     if (params.optimizeTolerance == null) {
-                                        params.optimizeTolerance = 0.0005;
+                                        params.optimizeTolerance = 0.00001;
                                     }
-                                    optimized = SimplifyGeometry.Simplify(geometry, params.optimizeTolerance);
+                                    var optimized = SimplifyGeometry.Simplify(entity.Bruce.ID, geometry, params.optimizeTolerance);
                                     if (optimized) {
                                         // Continue on with the rendering using the optimized geometry.
                                         geometry = optimized;
                                         // Dereference the Entity object now that we have done a destructive operation.
                                         entity = Object.assign({}, entity);
                                         entity.Bruce = Object.assign({}, entity.Bruce);
-                                        params.entities[i] = entity;
                                     }
                                 }
                             }
@@ -5600,14 +5695,8 @@ var EntityRenderEngine;
                             else {
                                 entity.Bruce.VectorGeometry = geometry;
                             }
-                        }
-                        updated = new Map();
-                        cEntities = new Map();
-                        models = [];
-                        multiGeometry = [];
-                        polygons = [];
-                        polylines = [];
-                        points = [];
+                            return entity;
+                        };
                         // Initial sorting.
                         for (i = 0; i < params.entities.length; i++) {
                             entity = params.entities[i];
@@ -5631,12 +5720,12 @@ var EntityRenderEngine;
                                     menuItemId: params.menuItemId
                                 });
                                 newRenderId = getRenderGroupId(zoomItem);
-                                oldRenderId = (_b = existingRego === null || existingRego === void 0 ? void 0 : existingRego.visual) === null || _b === void 0 ? void 0 : _b._renderGroup;
+                                oldRenderId = (_a = existingRego === null || existingRego === void 0 ? void 0 : existingRego.visual) === null || _a === void 0 ? void 0 : _a._renderGroup;
                                 if (!params.force &&
                                     newRenderId == oldRenderId &&
                                     !(existingRego === null || existingRego === void 0 ? void 0 : existingRego.stale) &&
                                     // If historic metadata is different then it's also stale.
-                                    ((existingRego === null || existingRego === void 0 ? void 0 : existingRego.historicDateTime) == ((_c = entity.Bruce) === null || _c === void 0 ? void 0 : _c.HistoricDateTime))) {
+                                    ((existingRego === null || existingRego === void 0 ? void 0 : existingRego.historicDateTime) == ((_b = entity.Bruce) === null || _b === void 0 ? void 0 : _b.HistoricDateTime))) {
                                     // No sorting category needed. Already rendered the way we want.
                                     cEntities.set(id, existingRego.visual);
                                 }
@@ -5647,20 +5736,22 @@ var EntityRenderEngine;
                                         // Flag as no longer stale as we're unlikely to recreate the rego if we're reusing the graphic.
                                         existingRego.stale = false;
                                         // Update metadata for the same reason.
-                                        existingRego.historicDateTime = (_d = entity.Bruce) === null || _d === void 0 ? void 0 : _d.HistoricDateTime;
-                                        existingRego.historicAttrKey = (_e = entity.Bruce) === null || _e === void 0 ? void 0 : _e.HistoricAttrKey;
+                                        existingRego.historicDateTime = (_c = entity.Bruce) === null || _c === void 0 ? void 0 : _c.HistoricDateTime;
+                                        existingRego.historicAttrKey = (_d = entity.Bruce) === null || _d === void 0 ? void 0 : _d.HistoricAttrKey;
                                         existingRego.entityTypeId = entity.Bruce["EntityType.ID"];
                                         updated.set(id, true);
                                     }
                                     if (displayType == ZoomControl.EDisplayType.Model3D) {
+                                        entity = params.entities[i] = prepareGeometry(entity);
                                         models.push(entity);
                                     }
                                     else if (displayType == ZoomControl.EDisplayType.Geometry) {
+                                        entity = params.entities[i] = prepareGeometry(entity);
                                         geometry = Entity$1.GetValue({
                                             entity: entity,
                                             path: ["Bruce", "VectorGeometry"]
                                         });
-                                        if ((_f = geometry === null || geometry === void 0 ? void 0 : geometry.MultiGeometry) === null || _f === void 0 ? void 0 : _f.length) {
+                                        if ((_e = geometry === null || geometry === void 0 ? void 0 : geometry.MultiGeometry) === null || _e === void 0 ? void 0 : _e.length) {
                                             multiGeometry.push(entity);
                                         }
                                         else {
@@ -5678,7 +5769,7 @@ var EntityRenderEngine;
                         mParams = __assign(__assign({}, groupRenderParams), { rendered: cEntities, entities: models, entitiesHistoric: params.entitiesHistoric });
                         return [4 /*yield*/, Model3d.RenderGroup(mParams)];
                     case 1:
-                        mEntities = _h.sent();
+                        mEntities = _g.sent();
                         for (i = 0; i < mParams.entities.length; i++) {
                             entity = mParams.entities[i];
                             id = entity.Bruce.ID;
@@ -5690,20 +5781,20 @@ var EntityRenderEngine;
                                 multiGeometry.push(entity);
                             }
                         }
-                        _h.label = 2;
+                        _g.label = 2;
                     case 2:
                         if (!(multiGeometry.length > 0)) return [3 /*break*/, 6];
                         _loop_1 = function (i) {
                             var entity, geometry, pParams, zoomItem, j, subEntity, cPoly, rendered, cLines, cPoints, rootEntity_1, firstEntity;
-                            return __generator(this, function (_j) {
-                                switch (_j.label) {
+                            return __generator(this, function (_h) {
+                                switch (_h.label) {
                                     case 0:
                                         entity = multiGeometry[i];
                                         geometry = Entity$1.GetValue({
                                             entity: entity,
                                             path: ["Bruce", "VectorGeometry"]
                                         });
-                                        if (!((_g = geometry === null || geometry === void 0 ? void 0 : geometry.MultiGeometry) === null || _g === void 0 ? void 0 : _g.length)) {
+                                        if (!((_f = geometry === null || geometry === void 0 ? void 0 : geometry.MultiGeometry) === null || _f === void 0 ? void 0 : _f.length)) {
                                             polygons.push(entity);
                                             return [2 /*return*/, "continue"];
                                         }
@@ -5717,7 +5808,7 @@ var EntityRenderEngine;
                                         }
                                         return [4 /*yield*/, Polygon.RenderGroup(pParams)];
                                     case 1:
-                                        cPoly = _j.sent();
+                                        cPoly = _h.sent();
                                         Array.from(cPoly.keys()).forEach(function (key) {
                                             if (cPoly.get(key)) {
                                                 pParams.entities = pParams.entities.filter(function (e) { return e.Bruce.ID != key; });
@@ -5726,7 +5817,7 @@ var EntityRenderEngine;
                                         rendered = Array.from(cPoly.values());
                                         return [4 /*yield*/, Polyline.RenderGroup(pParams)];
                                     case 2:
-                                        cLines = _j.sent();
+                                        cLines = _h.sent();
                                         Array.from(cLines.keys()).forEach(function (key) {
                                             if (cLines.get(key)) {
                                                 pParams.entities = pParams.entities.filter(function (e) { return e.Bruce.ID != key; });
@@ -5736,9 +5827,9 @@ var EntityRenderEngine;
                                         if (!!rendered.length) return [3 /*break*/, 4];
                                         return [4 /*yield*/, Point.RenderGroup(pParams)];
                                     case 3:
-                                        cPoints = _j.sent();
+                                        cPoints = _h.sent();
                                         rendered = rendered.concat(Array.from(cPoints.values()));
-                                        _j.label = 4;
+                                        _h.label = 4;
                                     case 4:
                                         rendered = rendered.filter(function (x) { return x != null; });
                                         if (rendered.length) {
@@ -5765,13 +5856,13 @@ var EntityRenderEngine;
                             });
                         };
                         i = 0;
-                        _h.label = 3;
+                        _g.label = 3;
                     case 3:
                         if (!(i < multiGeometry.length)) return [3 /*break*/, 6];
                         return [5 /*yield**/, _loop_1(i)];
                     case 4:
-                        _h.sent();
-                        _h.label = 5;
+                        _g.sent();
+                        _g.label = 5;
                     case 5:
                         i++;
                         return [3 /*break*/, 3];
@@ -5780,7 +5871,7 @@ var EntityRenderEngine;
                         pParams = __assign(__assign({}, groupRenderParams), { entities: polygons, rendered: cEntities });
                         return [4 /*yield*/, Polygon.RenderGroup(pParams)];
                     case 7:
-                        pEntities = _h.sent();
+                        pEntities = _g.sent();
                         for (i = 0; i < pParams.entities.length; i++) {
                             entity = pParams.entities[i];
                             cEntity = pEntities.get(entity.Bruce.ID);
@@ -5791,13 +5882,13 @@ var EntityRenderEngine;
                                 polylines.push(entity);
                             }
                         }
-                        _h.label = 8;
+                        _g.label = 8;
                     case 8:
                         if (!(polylines.length > 0)) return [3 /*break*/, 10];
                         pParams = __assign(__assign({}, groupRenderParams), { entities: polylines, rendered: cEntities });
                         return [4 /*yield*/, Polyline.RenderGroup(pParams)];
                     case 9:
-                        pEntities = _h.sent();
+                        pEntities = _g.sent();
                         for (i = 0; i < pParams.entities.length; i++) {
                             entity = pParams.entities[i];
                             cEntity = pEntities.get(entity.Bruce.ID);
@@ -5808,13 +5899,13 @@ var EntityRenderEngine;
                                 points.push(entity);
                             }
                         }
-                        _h.label = 10;
+                        _g.label = 10;
                     case 10:
                         if (!(points.length > 0)) return [3 /*break*/, 12];
                         pParams = __assign(__assign({}, groupRenderParams), { entities: points, rendered: cEntities, entitiesHistoric: params.entitiesHistoric });
                         return [4 /*yield*/, Point.RenderGroup(pParams)];
                     case 11:
-                        pEntities = _h.sent();
+                        pEntities = _g.sent();
                         for (i = 0; i < pParams.entities.length; i++) {
                             entity = pParams.entities[i];
                             cEntity = pEntities.get(entity.Bruce.ID);
@@ -5822,7 +5913,7 @@ var EntityRenderEngine;
                                 cEntities.set(entity.Bruce.ID, cEntity);
                             }
                         }
-                        _h.label = 12;
+                        _g.label = 12;
                     case 12: return [2 /*return*/, {
                             entities: cEntities,
                             updated: updated
@@ -6736,6 +6827,7 @@ var EntityRenderEngine;
                 var points = Geometry.ParsePoints(x.LinearRing);
                 var holePosses = points.map(function (x) { return Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(x.altitude)); });
                 holePosses = cullDuplicatePoints(holePosses);
+                Cartes.CloseRing3(holePosses);
                 return holePosses;
             }).filter(function (x) { return x.length >= 4; });
             var zIndex = getZIndex(style, entity, params.tags);
@@ -11249,12 +11341,12 @@ var EntitiesRenderManager;
          * @param force TODO: This should re-render entities that are already rendered.
          */
         Manager.prototype.renderAsGeojson = function (entities, force) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
             return __awaiter(this, void 0, void 0, function () {
-                var zoomItem, lods, withLods_1, individuals, style, e_4, entityTypeId, entityType, e_5, pStyle, lStyle, polygonsClamped, bFillColor, cFillColor, bLineColor, cLineColor, lineWidthPx, i, entity, geometry, optimized, geojson, notRendered, source, groups, applyStyle, toForceUpdate, register, sEntities, i, cEntity;
+                var zoomItem, lods, withLods_1, individuals_1, style, e_4, entityTypeId, entityType, e_5, pStyle, lStyle, polygonsClamped, bFillColor, cFillColor, bLineColor, cLineColor, lineWidthPx, i, entity, geometry, optimized, collection, i, entity, feature, individuals, source, groups, applyStyle, toForceUpdate, register, sEntities, i, cEntity;
                 var _this = this;
-                return __generator(this, function (_o) {
-                    switch (_o.label) {
+                return __generator(this, function (_l) {
+                    switch (_l.label) {
                         case 0:
                             entities = entities.filter(function (entity) {
                                 var _a;
@@ -11284,43 +11376,43 @@ var EntitiesRenderManager;
                                     }
                                 })];
                         case 1:
-                            lods = (_o.sent()).lods;
+                            lods = (_l.sent()).lods;
                             if (this.disposed) {
                                 this.doDispose();
                                 return [2 /*return*/];
                             }
                             withLods_1 = lods.filter(function (x) { return x.entityId && !!x.clientFileId; }).map(function (x) { return x.entityId; });
-                            individuals = entities.filter(function (entity) {
+                            individuals_1 = entities.filter(function (entity) {
                                 var _a;
                                 return withLods_1.includes((_a = entity.Bruce) === null || _a === void 0 ? void 0 : _a.ID);
                             });
-                            if (individuals.length) {
-                                this.renderAsIndividuals(individuals, force);
+                            if (individuals_1.length) {
+                                this.renderAsIndividuals(individuals_1, force);
                             }
                             // Now we proceed with what is left.
                             entities = entities.filter(function (entity) {
                                 var _a;
                                 return !withLods_1.includes((_a = entity.Bruce) === null || _a === void 0 ? void 0 : _a.ID);
                             });
-                            _o.label = 2;
+                            _l.label = 2;
                         case 2:
                             if (!entities.length) {
                                 return [2 /*return*/];
                             }
                             style = null;
                             if (!((zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID) && (zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID) > -1)) return [3 /*break*/, 6];
-                            _o.label = 3;
+                            _l.label = 3;
                         case 3:
-                            _o.trys.push([3, 5, , 6]);
+                            _l.trys.push([3, 5, , 6]);
                             return [4 /*yield*/, Style.Get({
                                     api: this.apiGetter.getApi(),
                                     styleId: zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID
                                 })];
                         case 4:
-                            style = (_a = (_o.sent()).style) === null || _a === void 0 ? void 0 : _a.Settings;
+                            style = (_a = (_l.sent()).style) === null || _a === void 0 ? void 0 : _a.Settings;
                             return [3 /*break*/, 6];
                         case 5:
-                            e_4 = _o.sent();
+                            e_4 = _l.sent();
                             console.error(e_4);
                             return [3 /*break*/, 6];
                         case 6:
@@ -11329,15 +11421,15 @@ var EntitiesRenderManager;
                                 entityTypeId = (_d = (_c = entities.find(function (x) { var _a; return !!((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a["EntityType.ID"]); })) === null || _c === void 0 ? void 0 : _c.Bruce) === null || _d === void 0 ? void 0 : _d["EntityType.ID"];
                             }
                             if (!entityTypeId) return [3 /*break*/, 12];
-                            _o.label = 7;
+                            _l.label = 7;
                         case 7:
-                            _o.trys.push([7, 11, , 12]);
+                            _l.trys.push([7, 11, , 12]);
                             return [4 /*yield*/, EntityType.Get({
                                     entityTypeId: entityTypeId,
                                     api: this.apiGetter.getApi()
                                 })];
                         case 8:
-                            entityType = (_e = (_o.sent())) === null || _e === void 0 ? void 0 : _e.entityType;
+                            entityType = (_e = (_l.sent())) === null || _e === void 0 ? void 0 : _e.entityType;
                             if (!(!style && entityType)) return [3 /*break*/, 10];
                             if (!(entityType["DisplaySetting.ID"] && entityType["DisplaySetting.ID"] > 0)) return [3 /*break*/, 10];
                             return [4 /*yield*/, Style.Get({
@@ -11345,11 +11437,11 @@ var EntitiesRenderManager;
                                     styleId: entityType["DisplaySetting.ID"]
                                 })];
                         case 9:
-                            style = (_f = (_o.sent()).style) === null || _f === void 0 ? void 0 : _f.Settings;
-                            _o.label = 10;
+                            style = (_f = (_l.sent()).style) === null || _f === void 0 ? void 0 : _f.Settings;
+                            _l.label = 10;
                         case 10: return [3 /*break*/, 12];
                         case 11:
-                            e_5 = _o.sent();
+                            e_5 = _l.sent();
                             console.error(e_5);
                             return [3 /*break*/, 12];
                         case 12:
@@ -11379,13 +11471,13 @@ var EntitiesRenderManager;
                                     });
                                     if (geometry) {
                                         if (this.item.optimizeMinPoints == null) {
-                                            this.item.optimizeMinPoints = 1000;
+                                            this.item.optimizeMinPoints = 500;
                                         }
-                                        if (SimplifyGeometry.CountPoints(geometry) > this.item.optimizeMinPoints) {
+                                        if (SimplifyGeometry.CountPoints(geometry, this.item.optimizeMinPoints) >= this.item.optimizeMinPoints) {
                                             if (this.item.optimizeTolerance == null) {
-                                                this.item.optimizeTolerance = 0.0005;
+                                                this.item.optimizeTolerance = 0.00001;
                                             }
-                                            optimized = SimplifyGeometry.Simplify(geometry, this.item.optimizeTolerance);
+                                            optimized = SimplifyGeometry.Simplify(entity.Bruce.ID, geometry, this.item.optimizeTolerance);
                                             if (optimized) {
                                                 // Dereference the Entity object now that we have done a destructive operation.
                                                 entity = Object.assign({}, entity);
@@ -11402,34 +11494,51 @@ var EntitiesRenderManager;
                                     entity.Bruce.VectorGeometry = geometry;
                                 }
                             }
-                            geojson = Entity$1.ToGeoJson({
-                                entities: entities,
-                                includeUserData: false,
-                                excludeAltitude: polygonsClamped && lineWidthPx <= 0,
-                                altitude: lineWidthPx > 0 && polygonsClamped ? 1 : null,
-                                // No points.
-                                allowedDisplayTypes: [ZoomControl.EDisplayType.Geometry]
-                            });
-                            notRendered = !((_l = geojson === null || geojson === void 0 ? void 0 : geojson.features) === null || _l === void 0 ? void 0 : _l.length) ? entities : entities.filter(function (entity) {
-                                return !geojson.features.some(function (feature) {
-                                    var _a, _b, _c;
-                                    return ((_b = (_a = feature.properties) === null || _a === void 0 ? void 0 : _a.Bruce) === null || _b === void 0 ? void 0 : _b.ID) == ((_c = entity.Bruce) === null || _c === void 0 ? void 0 : _c.ID);
+                            collection = {
+                                features: [],
+                                type: "FeatureCollection"
+                            };
+                            for (i = 0; i < entities.length; i++) {
+                                entity = entities[i];
+                                feature = Geometry.ToGeoJsonFeature({
+                                    geometry: entity.Bruce.VectorGeometry,
+                                    noAltitude: polygonsClamped && lineWidthPx <= 0,
+                                    altitude: lineWidthPx > 0 && polygonsClamped ? 1 : null,
+                                    properties: __assign(__assign({}, entity), { Bruce: __assign(__assign({}, entity.Bruce), { 
+                                            // Exclude as we just converted it to geojson.
+                                            VectorGeometry: null }) })
                                 });
+                                if (feature) {
+                                    collection.features.push(feature);
+                                }
+                            }
+                            individuals = entities.filter(function (entity) {
+                                var feature = collection.features.find(function (x) { var _a, _b; return ((_b = (_a = x.properties) === null || _a === void 0 ? void 0 : _a.Bruce) === null || _b === void 0 ? void 0 : _b.ID) == entity.Bruce.ID; });
+                                if (!feature) {
+                                    return true;
+                                }
+                                if (feature.geometry.type == "Point") {
+                                    return true;
+                                }
+                                return false;
                             });
-                            if (notRendered.length) {
-                                this.renderAsIndividuals(notRendered, force);
+                            if (individuals.length) {
+                                this.renderAsIndividuals(individuals, force);
                             }
-                            if (!((_m = geojson === null || geojson === void 0 ? void 0 : geojson.features) === null || _m === void 0 ? void 0 : _m.length)) {
+                            // Filter out points (the ones we just rendered as individuals).
+                            collection.features = collection.features.filter(function (x) { return x.geometry.type != "Point"; });
+                            // If there is nothing to render now, return.
+                            if (!collection.features.length) {
                                 return [2 /*return*/];
                             }
-                            return [4 /*yield*/, GeoJsonDataSource.load(geojson, {
+                            return [4 /*yield*/, GeoJsonDataSource.load(collection, {
                                     stroke: cLineColor,
                                     fill: cFillColor,
                                     strokeWidth: lineWidthPx,
                                     clampToGround: lineWidthPx <= 0 && polygonsClamped
                                 })];
                         case 13:
-                            source = _o.sent();
+                            source = _l.sent();
                             this.viewer.dataSources.add(source);
                             this.sources.push(source);
                             if (this.disposed) {
@@ -12161,12 +12270,12 @@ var EntitiesLoadedRenderManager;
          * @param force TODO: This should re-render entities that are already rendered.
          */
         Manager.prototype.renderAsGeojson = function (entities, force) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
             return __awaiter(this, void 0, void 0, function () {
-                var zoomItem, lods, withLods_1, individuals, style, e_3, entityTypeId, entityType, e_4, pStyle, lStyle, polygonsClamped, bFillColor, cFillColor, bLineColor, cLineColor, lineWidthPx, geojson, notRendered, source, groups, applyStyle, toForceUpdate, register, sEntities, i, cEntity;
+                var zoomItem, lods, withLods_1, individuals_1, style, e_3, entityTypeId, entityType, e_4, pStyle, lStyle, polygonsClamped, bFillColor, cFillColor, bLineColor, cLineColor, lineWidthPx, collection, i, entity, feature, individuals, source, groups, applyStyle, toForceUpdate, register, sEntities, i, cEntity;
                 var _this = this;
-                return __generator(this, function (_o) {
-                    switch (_o.label) {
+                return __generator(this, function (_l) {
+                    switch (_l.label) {
                         case 0:
                             entities = entities.filter(function (entity) {
                                 var _a;
@@ -12196,43 +12305,43 @@ var EntitiesLoadedRenderManager;
                                     }
                                 })];
                         case 1:
-                            lods = (_o.sent()).lods;
+                            lods = (_l.sent()).lods;
                             if (this.disposed) {
                                 this.doDispose();
                                 return [2 /*return*/];
                             }
                             withLods_1 = lods.filter(function (x) { return x.entityId && !!x.clientFileId; }).map(function (x) { return x.entityId; });
-                            individuals = entities.filter(function (entity) {
+                            individuals_1 = entities.filter(function (entity) {
                                 var _a;
                                 return withLods_1.includes((_a = entity.Bruce) === null || _a === void 0 ? void 0 : _a.ID);
                             });
-                            if (individuals.length) {
-                                this.renderAsIndividuals(individuals, force);
+                            if (individuals_1.length) {
+                                this.renderAsIndividuals(individuals_1, force);
                             }
                             // Now we proceed with what is left.
                             entities = entities.filter(function (entity) {
                                 var _a;
                                 return !withLods_1.includes((_a = entity.Bruce) === null || _a === void 0 ? void 0 : _a.ID);
                             });
-                            _o.label = 2;
+                            _l.label = 2;
                         case 2:
                             if (!entities.length) {
                                 return [2 /*return*/];
                             }
                             style = null;
                             if (!((zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID) && (zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID) > -1)) return [3 /*break*/, 6];
-                            _o.label = 3;
+                            _l.label = 3;
                         case 3:
-                            _o.trys.push([3, 5, , 6]);
+                            _l.trys.push([3, 5, , 6]);
                             return [4 /*yield*/, Style.Get({
                                     api: this.apiGetter.getApi(),
                                     styleId: zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID
                                 })];
                         case 4:
-                            style = (_a = (_o.sent()).style) === null || _a === void 0 ? void 0 : _a.Settings;
+                            style = (_a = (_l.sent()).style) === null || _a === void 0 ? void 0 : _a.Settings;
                             return [3 /*break*/, 6];
                         case 5:
-                            e_3 = _o.sent();
+                            e_3 = _l.sent();
                             console.error(e_3);
                             return [3 /*break*/, 6];
                         case 6:
@@ -12241,15 +12350,15 @@ var EntitiesLoadedRenderManager;
                                 entityTypeId = (_d = (_c = entities.find(function (x) { var _a; return !!((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a["EntityType.ID"]); })) === null || _c === void 0 ? void 0 : _c.Bruce) === null || _d === void 0 ? void 0 : _d["EntityType.ID"];
                             }
                             if (!entityTypeId) return [3 /*break*/, 12];
-                            _o.label = 7;
+                            _l.label = 7;
                         case 7:
-                            _o.trys.push([7, 11, , 12]);
+                            _l.trys.push([7, 11, , 12]);
                             return [4 /*yield*/, EntityType.Get({
                                     entityTypeId: entityTypeId,
                                     api: this.apiGetter.getApi()
                                 })];
                         case 8:
-                            entityType = (_e = (_o.sent())) === null || _e === void 0 ? void 0 : _e.entityType;
+                            entityType = (_e = (_l.sent())) === null || _e === void 0 ? void 0 : _e.entityType;
                             if (!(!style && entityType)) return [3 /*break*/, 10];
                             if (!(entityType["DisplaySetting.ID"] && entityType["DisplaySetting.ID"] > 0)) return [3 /*break*/, 10];
                             return [4 /*yield*/, Style.Get({
@@ -12257,11 +12366,11 @@ var EntitiesLoadedRenderManager;
                                     styleId: entityType["DisplaySetting.ID"]
                                 })];
                         case 9:
-                            style = (_f = (_o.sent()).style) === null || _f === void 0 ? void 0 : _f.Settings;
-                            _o.label = 10;
+                            style = (_f = (_l.sent()).style) === null || _f === void 0 ? void 0 : _f.Settings;
+                            _l.label = 10;
                         case 10: return [3 /*break*/, 12];
                         case 11:
-                            e_4 = _o.sent();
+                            e_4 = _l.sent();
                             console.error(e_4);
                             return [3 /*break*/, 12];
                         case 12:
@@ -12281,34 +12390,51 @@ var EntitiesLoadedRenderManager;
                                 lineWidthPx = 0;
                             }
                             lineWidthPx = Math.round(lineWidthPx);
-                            geojson = Entity$1.ToGeoJson({
-                                entities: entities,
-                                includeUserData: false,
-                                excludeAltitude: polygonsClamped && lineWidthPx <= 0,
-                                altitude: lineWidthPx > 0 && polygonsClamped ? 1 : null,
-                                // No points.
-                                allowedDisplayTypes: [ZoomControl.EDisplayType.Geometry]
-                            });
-                            notRendered = !((_l = geojson === null || geojson === void 0 ? void 0 : geojson.features) === null || _l === void 0 ? void 0 : _l.length) ? entities : entities.filter(function (entity) {
-                                return !geojson.features.some(function (feature) {
-                                    var _a, _b, _c;
-                                    return ((_b = (_a = feature.properties) === null || _a === void 0 ? void 0 : _a.Bruce) === null || _b === void 0 ? void 0 : _b.ID) == ((_c = entity.Bruce) === null || _c === void 0 ? void 0 : _c.ID);
+                            collection = {
+                                features: [],
+                                type: "FeatureCollection"
+                            };
+                            for (i = 0; i < entities.length; i++) {
+                                entity = entities[i];
+                                feature = Geometry.ToGeoJsonFeature({
+                                    geometry: entity.Bruce.VectorGeometry,
+                                    noAltitude: polygonsClamped && lineWidthPx <= 0,
+                                    altitude: lineWidthPx > 0 && polygonsClamped ? 1 : null,
+                                    properties: __assign(__assign({}, entity), { Bruce: __assign(__assign({}, entity.Bruce), { 
+                                            // Exclude as we just converted it to geojson.
+                                            VectorGeometry: null }) })
                                 });
+                                if (feature) {
+                                    collection.features.push(feature);
+                                }
+                            }
+                            individuals = entities.filter(function (entity) {
+                                var feature = collection.features.find(function (x) { var _a, _b; return ((_b = (_a = x.properties) === null || _a === void 0 ? void 0 : _a.Bruce) === null || _b === void 0 ? void 0 : _b.ID) == entity.Bruce.ID; });
+                                if (!feature) {
+                                    return true;
+                                }
+                                if (feature.geometry.type == "Point") {
+                                    return true;
+                                }
+                                return false;
                             });
-                            if (notRendered.length) {
-                                this.renderAsIndividuals(notRendered, force);
+                            if (individuals.length) {
+                                this.renderAsIndividuals(individuals, force);
                             }
-                            if (!((_m = geojson === null || geojson === void 0 ? void 0 : geojson.features) === null || _m === void 0 ? void 0 : _m.length)) {
+                            // Filter out points (the ones we just rendered as individuals).
+                            collection.features = collection.features.filter(function (x) { return x.geometry.type != "Point"; });
+                            // If there is nothing to render now, return.
+                            if (!collection.features.length) {
                                 return [2 /*return*/];
                             }
-                            return [4 /*yield*/, GeoJsonDataSource.load(geojson, {
+                            return [4 /*yield*/, GeoJsonDataSource.load(collection, {
                                     stroke: cLineColor,
                                     fill: cFillColor,
                                     strokeWidth: lineWidthPx,
                                     clampToGround: lineWidthPx <= 0 && polygonsClamped
                                 })];
                         case 13:
-                            source = _o.sent();
+                            source = _l.sent();
                             this.viewer.dataSources.add(source);
                             this.sources.push(source);
                             if (this.disposed) {
@@ -12784,12 +12910,12 @@ var EntitiesIdsRenderManager;
          * @param force TODO: This should re-render entities that are already rendered.
          */
         Manager.prototype.renderAsGeojson = function (entities, force) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
             return __awaiter(this, void 0, void 0, function () {
-                var zoomItem, lods, withLods_1, individuals, style, e_3, entityTypeId, entityType, e_4, pStyle, lStyle, polygonsClamped, bFillColor, cFillColor, bLineColor, cLineColor, lineWidthPx, geojson, notRendered, source, groups, applyStyle, toForceUpdate, register, sEntities, i, cEntity;
+                var zoomItem, lods, withLods_1, individuals_1, style, e_3, entityTypeId, entityType, e_4, pStyle, lStyle, polygonsClamped, bFillColor, cFillColor, bLineColor, cLineColor, lineWidthPx, collection, i, entity, feature, individuals, source, groups, applyStyle, toForceUpdate, register, sEntities, i, cEntity;
                 var _this = this;
-                return __generator(this, function (_o) {
-                    switch (_o.label) {
+                return __generator(this, function (_l) {
+                    switch (_l.label) {
                         case 0:
                             entities = entities.filter(function (entity) {
                                 var _a;
@@ -12819,43 +12945,43 @@ var EntitiesIdsRenderManager;
                                     }
                                 })];
                         case 1:
-                            lods = (_o.sent()).lods;
+                            lods = (_l.sent()).lods;
                             if (this.disposed) {
                                 this.doDispose();
                                 return [2 /*return*/];
                             }
                             withLods_1 = lods.filter(function (x) { return x.entityId && !!x.clientFileId; }).map(function (x) { return x.entityId; });
-                            individuals = entities.filter(function (entity) {
+                            individuals_1 = entities.filter(function (entity) {
                                 var _a;
                                 return withLods_1.includes((_a = entity.Bruce) === null || _a === void 0 ? void 0 : _a.ID);
                             });
-                            if (individuals.length) {
-                                this.renderAsIndividuals(individuals, force);
+                            if (individuals_1.length) {
+                                this.renderAsIndividuals(individuals_1, force);
                             }
                             // Now we proceed with what is left.
                             entities = entities.filter(function (entity) {
                                 var _a;
                                 return !withLods_1.includes((_a = entity.Bruce) === null || _a === void 0 ? void 0 : _a.ID);
                             });
-                            _o.label = 2;
+                            _l.label = 2;
                         case 2:
                             if (!entities.length) {
                                 return [2 /*return*/];
                             }
                             style = null;
                             if (!((zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID) && (zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID) > -1)) return [3 /*break*/, 6];
-                            _o.label = 3;
+                            _l.label = 3;
                         case 3:
-                            _o.trys.push([3, 5, , 6]);
+                            _l.trys.push([3, 5, , 6]);
                             return [4 /*yield*/, Style.Get({
                                     api: this.apiGetter.getApi(),
                                     styleId: zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID
                                 })];
                         case 4:
-                            style = (_a = (_o.sent()).style) === null || _a === void 0 ? void 0 : _a.Settings;
+                            style = (_a = (_l.sent()).style) === null || _a === void 0 ? void 0 : _a.Settings;
                             return [3 /*break*/, 6];
                         case 5:
-                            e_3 = _o.sent();
+                            e_3 = _l.sent();
                             console.error(e_3);
                             return [3 /*break*/, 6];
                         case 6:
@@ -12864,15 +12990,15 @@ var EntitiesIdsRenderManager;
                                 entityTypeId = (_d = (_c = entities.find(function (x) { var _a; return !!((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a["EntityType.ID"]); })) === null || _c === void 0 ? void 0 : _c.Bruce) === null || _d === void 0 ? void 0 : _d["EntityType.ID"];
                             }
                             if (!entityTypeId) return [3 /*break*/, 12];
-                            _o.label = 7;
+                            _l.label = 7;
                         case 7:
-                            _o.trys.push([7, 11, , 12]);
+                            _l.trys.push([7, 11, , 12]);
                             return [4 /*yield*/, EntityType.Get({
                                     entityTypeId: entityTypeId,
                                     api: this.apiGetter.getApi()
                                 })];
                         case 8:
-                            entityType = (_e = (_o.sent())) === null || _e === void 0 ? void 0 : _e.entityType;
+                            entityType = (_e = (_l.sent())) === null || _e === void 0 ? void 0 : _e.entityType;
                             if (!(!style && entityType)) return [3 /*break*/, 10];
                             if (!(entityType["DisplaySetting.ID"] && entityType["DisplaySetting.ID"] > 0)) return [3 /*break*/, 10];
                             return [4 /*yield*/, Style.Get({
@@ -12880,11 +13006,11 @@ var EntitiesIdsRenderManager;
                                     styleId: entityType["DisplaySetting.ID"]
                                 })];
                         case 9:
-                            style = (_f = (_o.sent()).style) === null || _f === void 0 ? void 0 : _f.Settings;
-                            _o.label = 10;
+                            style = (_f = (_l.sent()).style) === null || _f === void 0 ? void 0 : _f.Settings;
+                            _l.label = 10;
                         case 10: return [3 /*break*/, 12];
                         case 11:
-                            e_4 = _o.sent();
+                            e_4 = _l.sent();
                             console.error(e_4);
                             return [3 /*break*/, 12];
                         case 12:
@@ -12904,34 +13030,51 @@ var EntitiesIdsRenderManager;
                                 lineWidthPx = 0;
                             }
                             lineWidthPx = Math.round(lineWidthPx);
-                            geojson = Entity$1.ToGeoJson({
-                                entities: entities,
-                                includeUserData: false,
-                                excludeAltitude: polygonsClamped && lineWidthPx <= 0,
-                                altitude: lineWidthPx > 0 && polygonsClamped ? 1 : null,
-                                // No points.
-                                allowedDisplayTypes: [ZoomControl.EDisplayType.Geometry]
-                            });
-                            notRendered = !((_l = geojson === null || geojson === void 0 ? void 0 : geojson.features) === null || _l === void 0 ? void 0 : _l.length) ? entities : entities.filter(function (entity) {
-                                return !geojson.features.some(function (feature) {
-                                    var _a, _b, _c;
-                                    return ((_b = (_a = feature.properties) === null || _a === void 0 ? void 0 : _a.Bruce) === null || _b === void 0 ? void 0 : _b.ID) == ((_c = entity.Bruce) === null || _c === void 0 ? void 0 : _c.ID);
+                            collection = {
+                                features: [],
+                                type: "FeatureCollection"
+                            };
+                            for (i = 0; i < entities.length; i++) {
+                                entity = entities[i];
+                                feature = Geometry.ToGeoJsonFeature({
+                                    geometry: entity.Bruce.VectorGeometry,
+                                    noAltitude: polygonsClamped && lineWidthPx <= 0,
+                                    altitude: lineWidthPx > 0 && polygonsClamped ? 1 : null,
+                                    properties: __assign(__assign({}, entity), { Bruce: __assign(__assign({}, entity.Bruce), { 
+                                            // Exclude as we just converted it to geojson.
+                                            VectorGeometry: null }) })
                                 });
+                                if (feature) {
+                                    collection.features.push(feature);
+                                }
+                            }
+                            individuals = entities.filter(function (entity) {
+                                var feature = collection.features.find(function (x) { var _a, _b; return ((_b = (_a = x.properties) === null || _a === void 0 ? void 0 : _a.Bruce) === null || _b === void 0 ? void 0 : _b.ID) == entity.Bruce.ID; });
+                                if (!feature) {
+                                    return true;
+                                }
+                                if (feature.geometry.type == "Point") {
+                                    return true;
+                                }
+                                return false;
                             });
-                            if (notRendered.length) {
-                                this.renderAsIndividuals(notRendered, force);
+                            if (individuals.length) {
+                                this.renderAsIndividuals(individuals, force);
                             }
-                            if (!((_m = geojson === null || geojson === void 0 ? void 0 : geojson.features) === null || _m === void 0 ? void 0 : _m.length)) {
+                            // Filter out points (the ones we just rendered as individuals).
+                            collection.features = collection.features.filter(function (x) { return x.geometry.type != "Point"; });
+                            // If there is nothing to render now, return.
+                            if (!collection.features.length) {
                                 return [2 /*return*/];
                             }
-                            return [4 /*yield*/, GeoJsonDataSource.load(geojson, {
+                            return [4 /*yield*/, GeoJsonDataSource.load(collection, {
                                     stroke: cLineColor,
                                     fill: cFillColor,
                                     strokeWidth: lineWidthPx,
                                     clampToGround: lineWidthPx <= 0 && polygonsClamped
                                 })];
                         case 13:
-                            source = _o.sent();
+                            source = _l.sent();
                             this.viewer.dataSources.add(source);
                             this.sources.push(source);
                             if (this.disposed) {
@@ -25609,7 +25752,7 @@ var ViewRenderEngine;
     ViewRenderEngine.Render = Render;
 })(ViewRenderEngine || (ViewRenderEngine = {}));
 
-var VERSION = "4.1.9";
+var VERSION = "4.2.1";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map