Same change in PolygonOutlineGeometry

CesiumGS · Apr 26, 2016 · b3daf58 · b3daf58
1 parent 1a1fe9a
commit b3daf58
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/Source/Core/PolygonOutlineGeometry.js b/Source/Core/PolygonOutlineGeometry.js
@@ -289,6 +289,9 @@ define([
         if (!defined(options) || !defined(options.polygonHierarchy)) {
             throw new DeveloperError('options.polygonHierarchy is required.');
         }
+        if (defined(options.perPositionHeight) && options.perPositionHeight && defined(options.height)) {
+            throw new DeveloperError('Cannot use both options.perPositionHeight and options.height');
+        }
         //>>includeEnd('debug');
 
         var polygonHierarchy = options.polygonHierarchy;

diff --git a/Specs/Core/PolygonOutlineGeometrySpec.js b/Specs/Core/PolygonOutlineGeometrySpec.js
@@ -21,6 +21,15 @@ defineSuite([
         }).toThrowDeveloperError();
     });
 
+    it('throws with height when perPositionHeight is true', function() {
+        expect(function() {
+            return new PolygonOutlineGeometry({
+                height: 30,
+                perPositionHeight: true
+            });
+        }).toThrowDeveloperError();
+    });
+
     it('throws without positions', function() {
         expect(function() {
             return PolygonOutlineGeometry.fromPositions();