Merge pull request #2923 from AnalyticalGraphicsInc/polyGeo-perPosHeight

Fix PolygonGeometry per position height extrusion
CesiumGS · Aug 6, 2015 · f230501 · f230501
2 parents b7e4e26 + 446cfcd
commit f230501
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,15 @@
 Change Log
 ==========
 
+### 1.13 - 2015-09-01
+
+* Breaking changes
+  *
+* Deprecated
+  *
+* Fix issue where extruded `PolygonGeometry` was always extruding to the ellipsoid surface instead of specified height.
+
+
 ### 1.12 - 2015-08-03
 
 * Breaking changes

diff --git a/Source/Core/PolygonGeometry.js b/Source/Core/PolygonGeometry.js
@@ -619,8 +619,8 @@ define([
         var perPositionHeight = defaultValue(options.perPositionHeight, false);
 
         var extrudedHeight = options.extrudedHeight;
-        var extrude = (defined(extrudedHeight) && (!CesiumMath.equalsEpsilon(height, extrudedHeight, CesiumMath.EPSILON6) || perPositionHeight));
-        if (extrude) {
+        var extrude = defined(extrudedHeight);
+        if (extrude && !perPositionHeight) {
             var h = extrudedHeight;
             extrudedHeight = Math.min(h, height);
             height = Math.max(h, height);

diff --git a/Source/Core/PolygonOutlineGeometry.js b/Source/Core/PolygonOutlineGeometry.js
@@ -296,8 +296,8 @@ define([
         var perPositionHeight = defaultValue(options.perPositionHeight, false);
 
         var extrudedHeight = options.extrudedHeight;
-        var extrude = (defined(extrudedHeight) && (!CesiumMath.equalsEpsilon(height, extrudedHeight, CesiumMath.EPSILON6) || perPositionHeight));
-        if (extrude) {
+        var extrude = defined(extrudedHeight);
+        if (extrude && !perPositionHeight) {
             var h = extrudedHeight;
             extrudedHeight = Math.min(h, height);
             height = Math.max(h, height);