From a9b2f9aa9fd9893ed1fc3bb9ecfb2b56054b67d2 Mon Sep 17 00:00:00 2001 From: hpinkos Date: Fri, 6 Nov 2015 11:42:58 -0500 Subject: [PATCH 1/2] Give PolylinePipeline.generateArc the correct ellipsoid --- Source/DataSources/PolylineGeometryUpdater.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Source/DataSources/PolylineGeometryUpdater.js b/Source/DataSources/PolylineGeometryUpdater.js index bbc6e779b713..17605390c1ad 100644 --- a/Source/DataSources/PolylineGeometryUpdater.js +++ b/Source/DataSources/PolylineGeometryUpdater.js @@ -427,6 +427,13 @@ define([ /** * @private */ + var generateCartesianArcOptions = { + positions : undefined, + granularity : undefined, + height : undefined, + ellipsoid : undefined + }; + var DynamicGeometryUpdater = function(primitives, geometryUpdater) { var sceneId = geometryUpdater._scene.id; @@ -446,12 +453,8 @@ define([ this._primitives = primitives; this._geometryUpdater = geometryUpdater; this._positions = []; - }; - var generateCartesianArcOptions = { - positions : undefined, - granularity : undefined, - height : undefined + generateCartesianArcOptions.ellipsoid = geometryUpdater._scene.globe.ellipsoid; }; DynamicGeometryUpdater.prototype.update = function(time) { From 84368a0fe628a81f04583cfa91cefb8fe6af5699 Mon Sep 17 00:00:00 2001 From: Matthew Amato Date: Mon, 9 Nov 2015 09:41:37 -0500 Subject: [PATCH 2/2] Update CHANGES --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index b3f8f3eff44a..c978331b1660 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,6 +12,7 @@ Change Log * Entities have a reference to their entity collection. * Entity collections have a reference to their owner (usually a data source, but can be a `CompositeEntityCollection`). * `GeoJsonDataSource.load` now takes an optional `describeProperty` function for generating feature description properties. [#3140](https://github.com/AnalyticalGraphicsInc/cesium/pull/3140) +* Fixed a bug which caused `Entity` polyline graphics to be incorrect when a scene's ellipsoid was not WGS84. [#3174](https://github.com/AnalyticalGraphicsInc/cesium/pull/3174) ### 1.15 - 2015-11-02