Merge pull request #4155 from AnalyticalGraphicsInc/generateArcFix

Allow PolylinePipeline.generateArc to accept an array of heights for one position

CHANGES.md

@@ -12,6 +12,7 @@ Change Log
 * Pack funcions now return the result array  [#4156](https://github.com/AnalyticalGraphicsInc/cesium/pull/4156)
 * Added optional `rangeMax` parameter to `Math.toSNorm` and `Math.fromSNorm`. [#4121](https://github.com/AnalyticalGraphicsInc/cesium/pull/4121)
 * Removed `MapQuest OpenStreetMap` from the list of demo base layers since direct tile access has been discontinued.  See the [MapQuest Developer Blog](http://devblog.mapquest.com/2016/06/15/modernization-of-mapquest-results-in-changes-to-open-tile-access/) for details.
+* Fixed PolylinePipeline.generateArc to accept an array of heights when there's only one position [#4155](https://github.com/AnalyticalGraphicsInc/cesium/pull/4155)
 
 ### 1.23 - 2016-07-01
 

Source/Core/PolylinePipeline.js

@@ -233,11 +233,13 @@ define([
         var length = positions.length;
         var ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.WGS84);
         var height = defaultValue(options.height, 0);
+        var hasHeightArray = isArray(height);
 
         if (length < 1) {
             return [];
         } else if (length === 1) {
             var p = ellipsoid.scaleToGeodeticSurface(positions[0], scaleFirst);
+            height = hasHeightArray ? height[0] : height;
             if (height !== 0) {
                 var n = ellipsoid.geodeticSurfaceNormal(p, cartesian);
                 Cartesian3.multiplyByScalar(n, height, n);
@@ -263,7 +265,6 @@ define([
         var arrayLength = (numPoints + 1) * 3;
         var newPositions = new Array(arrayLength);
         var offset = 0;
-        var hasHeightArray = isArray(height);
 
         for (i = 0; i < length - 1; i++) {
             var p0 = positions[i];

Specs/Core/PolylinePipelineSpec.js

@@ -57,6 +57,19 @@ defineSuite([
         }).toThrowDeveloperError();
     });
 
+    it('generateArc accepts a height array for single value', function() {
+        var positions = [Cartesian3.fromDegrees(0, 0)];
+        var height = [30];
+
+        var newPositions = PolylinePipeline.generateArc({
+            positions: positions,
+            height: height
+        });
+
+        expect(newPositions.length).toEqual(3);
+        expect(Cartesian3.fromArray(newPositions, 0)).toEqualEpsilon(Cartesian3.fromDegrees(0, 0, 30), CesiumMath.EPSILON6);
+    });
+
     it('generateArc subdivides in half', function() {
         var p1 = Cartesian3.fromDegrees(0, 0);
         var p2 = Cartesian3.fromDegrees(90, 0);