cesium 0.15.0 → 0.16.0

data/app/assets/javascripts/Core/Spherical.js

@@ -1,5 +1,10 @@
 /*global define*/
-define(function() {
+define([
+        './DeveloperError',
+        './defaultValue'
+    ], function(
+        DeveloperError,
+        defaultValue) {
     "use strict";
 
     /**
@@ -13,9 +18,9 @@ define(function() {
      * @param {Number} [magnitude=1.0] The linear coordinate measured from the origin.
      */
     var Spherical = function(clock, cone, magnitude) {
-        this.clock = typeof clock === 'undefined' ? 0.0 : clock;
-        this.cone = typeof cone === 'undefined' ? 0.0 : cone;
-        this.magnitude = typeof magnitude === 'undefined' ? 1.0 : magnitude;
+        this.clock = defaultValue(clock, 0.0);
+        this.cone = defaultValue(cone, 0.0);
+        this.magnitude = defaultValue(magnitude, 1.0);
     };
 
     /**
@@ -26,15 +31,23 @@ define(function() {
      * @param {Spherical} [spherical] The object in which the result will be stored, if undefined a new instance will be created.
      *
      * @returns The modified result parameter, or a new instance if one was not provided.
+     *
+     * @exception {DeveloperError} cartesian3 is required.
      */
     Spherical.fromCartesian3 = function(cartesian3, result) {
-        if (typeof result === 'undefined') {
-            result = new Spherical();
+        if (typeof cartesian3 === 'undefined') {
+            throw new DeveloperError('cartesian3 is required');
         }
+
         var x = cartesian3.x;
         var y = cartesian3.y;
         var z = cartesian3.z;
         var radialSquared = x * x + y * y;
+
+        if (typeof result === 'undefined') {
+            result = new Spherical();
+        }
+
         result.clock = Math.atan2(y, x);
         result.cone = Math.atan2(Math.sqrt(radialSquared), z);
         result.magnitude = Math.sqrt(radialSquared + z * z);
@@ -49,11 +62,18 @@ define(function() {
      * @param {Spherical} [result] The object to store the result into, if undefined a new instance will be created.
      *
      * @return The modified result parameter or a new instance if result was undefined.
+     *
+     * @exception {DeveloperError} spherical is required.
      */
     Spherical.clone = function(spherical, result) {
+        if (typeof spherical === 'undefined') {
+            throw new DeveloperError('spherical is required');
+        }
+
         if (typeof result === 'undefined') {
-            result = new Spherical();
+            return new Spherical(spherical.clock, spherical.cone, spherical.magnitude);
         }
+
         result.clock = spherical.clock;
         result.cone = spherical.cone;
         result.magnitude = spherical.magnitude;
@@ -68,11 +88,18 @@ define(function() {
      * @param {Spherical} [result] The object to store the result into, if undefined a new instance will be created.
      *
      * @return The modified result parameter or a new instance if result was undefined.
+     *
+     * @exception {DeveloperError} spherical is required.
      */
     Spherical.normalize = function(spherical, result) {
+        if (typeof spherical === 'undefined') {
+            throw new DeveloperError('spherical is required');
+        }
+
         if (typeof result === 'undefined') {
-            result = new Spherical();
+            return new Spherical(spherical.clock, spherical.cone, 1.0);
         }
+
         result.clock = spherical.clock;
         result.cone = spherical.cone;
         result.magnitude = 1.0;
@@ -108,7 +135,7 @@ define(function() {
      * @return true if the first spherical is within the provided epsilon of the second spherical, false otherwise.
      */
     Spherical.equalsEpsilon = function(left, right, epsilon) {
-        epsilon = typeof epsilon === 'undefined' ? 0.0 : epsilon;
+        epsilon = defaultValue(epsilon, 0.0);
         return (left === right) ||
                ((typeof left !== 'undefined') &&
                 (typeof right !== 'undefined') &&

data/app/assets/javascripts/Core/TaskProcessor.js

@@ -3,12 +3,16 @@ define([
         'require',
         './buildModuleUrl',
         './defaultValue',
-        '../ThirdParty/when'
+        './isCrossOriginUrl',
+        '../ThirdParty/when',
+        '../ThirdParty/Uri'
     ], function(
         require,
         buildModuleUrl,
         defaultValue,
-        when) {
+        isCrossOriginUrl,
+        when,
+        Uri) {
     "use strict";
 
     function completeTask(processor, event) {
@@ -26,9 +30,39 @@ define([
         delete deferreds[id];
     }
 
-    var bootstrapperUrl = buildModuleUrl('Workers/cesiumWorkerBootstrapper.js');
+    var _bootstrapperUrl;
+    function getBootstrapperUrl() {
+        if (typeof _bootstrapperUrl !== 'undefined') {
+            return _bootstrapperUrl;
+        }
+
+        _bootstrapperUrl = buildModuleUrl('Workers/cesiumWorkerBootstrapper.js');
+
+        if (isCrossOriginUrl(_bootstrapperUrl)) {
+            //to load cross-origin, create a shim worker from a blob URL
+            var script = 'importScripts("' + _bootstrapperUrl + '");';
+
+            var blob;
+            try {
+                blob = new Blob([script], {
+                    type : 'application/javascript'
+                });
+            } catch (e) {
+                var BlobBuilder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder || window.MSBlobBuilder;
+                var blobBuilder = new BlobBuilder();
+                blobBuilder.append(script);
+                blob = blobBuilder.getBlob('application/javascript');
+            }
+
+            var URL = window.URL || window.webkitURL;
+            _bootstrapperUrl = URL.createObjectURL(blob);
+        }
+
+        return _bootstrapperUrl;
+    }
 
     function createWorker(processor) {
+        var bootstrapperUrl = getBootstrapperUrl();
         var worker = new Worker(bootstrapperUrl);
         worker.postMessage = defaultValue(worker.webkitPostMessage, worker.postMessage);
 
@@ -39,10 +73,13 @@ define([
         };
 
         if (typeof require.toUrl !== 'undefined') {
-            bootstrapMessage.loaderConfig.baseUrl = '..';
+            var resolvedBootstrapperUrl = new Uri(buildModuleUrl('Workers/cesiumWorkerBootstrapper.js')).resolve(new Uri(document.location.href));
+            var baseUrl = new Uri('..').resolve(resolvedBootstrapperUrl).toString();
+            bootstrapMessage.loaderConfig.baseUrl = baseUrl;
         } else {
+            var workersUrl = new Uri(buildModuleUrl('Workers')).resolve(new Uri(document.location.href)).toString();
             bootstrapMessage.loaderConfig.paths = {
-                'Workers' : '.'
+                'Workers' : workersUrl
             };
         }
 

data/app/assets/javascripts/Core/TimeIntervalCollection.js

@@ -468,7 +468,7 @@ define([
         if (typeof timeIntervalCollection === 'undefined') {
             throw new DeveloperError('timeIntervalCollection is required.');
         }
-        return this._intersectInternal(timeIntervalCollection, equalsCallback, mergeCallback);
+        return intersectInternal(this, timeIntervalCollection, equalsCallback, mergeCallback);
     };
 
     /**
@@ -495,14 +495,14 @@ define([
         }
         var intervals = new TimeIntervalCollection();
         intervals.addInterval(interval);
-        return this._intersectInternal(intervals, equalsCallback, mergeCallback);
+        return intersectInternal(this, intervals, equalsCallback, mergeCallback);
     };
 
-    TimeIntervalCollection.prototype._intersectInternal = function(intervals, equalsCallback, mergeCallback) {
+    function intersectInternal(timeIntervalCollection, intervals, equalsCallback, mergeCallback) {
         var left = 0;
         var right = 0;
         var result = new TimeIntervalCollection();
-        var thisIntervals = this._intervals;
+        var thisIntervals = timeIntervalCollection._intervals;
         var otherIntervals = intervals._intervals;
 
         while (left < thisIntervals.length && right < otherIntervals.length) {
@@ -537,7 +537,7 @@ define([
             }
         }
         return result;
-    };
+    }
 
     return TimeIntervalCollection;
 });

data/app/assets/javascripts/Core/Tipsify.js

@@ -1,5 +1,10 @@
 /*global define*/
-define(['./DeveloperError'], function(DeveloperError) {
+define([
+    './DeveloperError',
+    './defaultValue'
+    ], function(
+        DeveloperError,
+        defaultValue) {
     "use strict";
 
     /**
@@ -35,21 +40,21 @@ define(['./DeveloperError'], function(DeveloperError) {
      * var indices = [0, 1, 2, 3, 4, 5];
      * var maxIndex = 5;
      * var cacheSize = 3;
-     * var acmr = Tipsify.calculateACMR(indices, maxIndex, cacheSize);
+     * var acmr = Tipsify.calculateACMR({indices : indices, maxIndex : maxIndex, cacheSize : cacheSize});
      */
     Tipsify.calculateACMR = function(description) {
-        description = description || {};
+        description = defaultValue(description, defaultValue.EMPTY_OBJECT);
         var indices = description.indices;
         var maximumIndex = description.maximumIndex;
-        var cacheSize = description.cacheSize || 24;
+        var cacheSize = defaultValue(description.cacheSize, 24);
 
-        if (!indices) {
+        if (typeof indices === 'undefined') {
             throw new DeveloperError('indices is required.');
         }
 
         var numIndices = indices.length;
 
-        if ((numIndices < 3) || (numIndices % 3 !== 0)) {
+        if (numIndices < 3 || numIndices % 3 !== 0) {
             throw new DeveloperError('indices length must be a multiple of three.');
         }
         if (maximumIndex <= 0) {
@@ -60,7 +65,7 @@ define(['./DeveloperError'], function(DeveloperError) {
         }
 
         // Compute the maximumIndex if not given
-        if(!maximumIndex) {
+        if (typeof maximumIndex === 'undefined') {
             maximumIndex = 0;
             var currentIndex = 0;
             var intoIndices = indices[currentIndex];
@@ -110,13 +115,13 @@ define(['./DeveloperError'], function(DeveloperError) {
      * var indices = [0, 1, 2, 3, 4, 5];
      * var maxIndex = 5;
      * var cacheSize = 3;
-     * var reorderedIndices = Tipsify.tipsify(indices, maxIndex, cacheSize);
+     * var reorderedIndices = Tipsify.tipsify({indices : indices, maxIndex : maxIndex, cacheSize : cacheSize});
      */
     Tipsify.tipsify = function(description) {
-        description = description || {};
+        description = defaultValue(description, defaultValue.EMPTY_OBJECT);
         var indices = description.indices;
         var maximumIndex = description.maximumIndex;
-        var cacheSize = description.cacheSize || 24;
+        var cacheSize = defaultValue(description.cacheSize, 24);
 
         var cursor;
 
@@ -166,12 +171,12 @@ define(['./DeveloperError'], function(DeveloperError) {
             return n;
         }
 
-        if (!indices) {
+        if (typeof indices === 'undefined') {
             throw new DeveloperError('indices is required.');
         }
         var numIndices = indices.length;
 
-        if ((numIndices < 3) || (numIndices % 3 !== 0)) {
+        if (numIndices < 3 || numIndices % 3 !== 0) {
             throw new DeveloperError('indices length must be a multiple of three.');
         }
         if (maximumIndex <= 0) {
@@ -186,7 +191,7 @@ define(['./DeveloperError'], function(DeveloperError) {
         var currentIndex = 0;
         var intoIndices = indices[currentIndex];
         var endIndex = numIndices;
-        if (maximumIndex) {
+        if (typeof maximumIndex !== 'undefined') {
             maximumIndexPlusOne = maximumIndex + 1;
         } else {
             while (currentIndex < endIndex) {
@@ -214,11 +219,11 @@ define(['./DeveloperError'], function(DeveloperError) {
         currentIndex = 0;
         var triangle = 0;
         while (currentIndex < endIndex) {
-            (vertices[indices[currentIndex]]).vertexTriangles.push(triangle);
+            vertices[indices[currentIndex]].vertexTriangles.push(triangle);
             ++(vertices[indices[currentIndex]]).numLiveTriangles;
-            (vertices[indices[currentIndex + 1]]).vertexTriangles.push(triangle);
+            vertices[indices[currentIndex + 1]].vertexTriangles.push(triangle);
             ++(vertices[indices[currentIndex + 1]]).numLiveTriangles;
-            (vertices[indices[currentIndex + 2]]).vertexTriangles.push(triangle);
+            vertices[indices[currentIndex + 2]].vertexTriangles.push(triangle);
             ++(vertices[indices[currentIndex + 2]]).numLiveTriangles;
             ++triangle;
             currentIndex += 3;

data/app/assets/javascripts/Core/Transforms.js

@@ -38,7 +38,7 @@ define([
 
     /**
      * Contains functions for transforming positions to various reference frames.
-     * @alias Transforms
+     * @exports Transforms
      */
     var Transforms = {};
 
@@ -275,7 +275,7 @@ define([
      * function updateAndRender() {
      *     var now = new JulianDate();
      *     scene.initializeFrame();
-     *     scene.setSunPosition(computeSunPosition(now));
+     *     scene.setSunPosition(Simon1994PlanetaryPositions.ComputeSunPositionInEarthInertialFrame(now));
      *     scene.getCamera().transform = Matrix4.fromRotationTranslation(Transforms.computeTemeToPseudoFixedMatrix(now), Cartesian3.ZERO);
      *     scene.render();
      *     requestAnimationFrame(updateAndRender);
@@ -335,8 +335,8 @@ define([
      *
      * @memberof Transforms
      *
-     * @see Transforms#computeIcrfToFixedMatrix
-     * @see Transforms#computeFixedToIcrfMatrix
+     * @see Transforms.computeIcrfToFixedMatrix
+     * @see Transforms.computeFixedToIcrfMatrix
      */
     Transforms.iau2006XysData = new Iau2006XysData();
 
@@ -348,8 +348,8 @@ define([
      *
      * @memberof Transforms
      *
-     * @see Transforms#computeIcrfToFixedMatrix
-     * @see Transforms#computeFixedToIcrfMatrix
+     * @see Transforms.computeIcrfToFixedMatrix
+     * @see Transforms.computeFixedToIcrfMatrix
      */
     Transforms.earthOrientationParameters = EarthOrientationParameters.NONE;
 
@@ -368,8 +368,8 @@ define([
      *          and evaluation of the transformation between the fixed and ICRF axes will
      *          no longer return undefined for a time inside the interval.
      *
-     * @see Transforms#computeIcrfToFixedMatrix
-     * @see Transforms#computeFixedToIcrfMatrix
+     * @see Transforms.computeIcrfToFixedMatrix
+     * @see Transforms.computeFixedToIcrfMatrix
      * @see when
      *
      * @example
@@ -406,14 +406,14 @@ define([
      *
      * @exception {DeveloperError} date is required.
      *
-     * @see Transforms#preloadIcrfFixed
+     * @see Transforms.preloadIcrfFixed
      *
      * @example
      * //Set the view to the inertial frame.
      * function updateAndRender() {
      *     var now = new JulianDate();
      *     scene.initializeFrame();
-     *     scene.setSunPosition(computeSunPosition(now));
+     *     scene.setSunPosition(Simon1994PlanetaryPositions.ComputeSunPositionInEarthInertialFrame(now));
      *     var icrfToFixed = Transforms.computeIcrfToFixedMatrix(now);
      *     if (typeof icrfToFixed !== 'undefined') {
      *         scene.getCamera().transform = Matrix4.fromRotationTranslation(icrfToFixed, Cartesian3.ZERO);
@@ -457,7 +457,7 @@ define([
      *
      * @exception {DeveloperError} date is required.
      *
-     * @see Transforms#preloadIcrfFixed
+     * @see Transforms.preloadIcrfFixed
      *
      * @example
      * // Transform a point from the ICRF axes to the Fixed axes.

data/app/assets/javascripts/Core/TridiagonalSystemSolver.js

@@ -45,19 +45,19 @@ define(['./DeveloperError'], function(DeveloperError) {
      * var solution = TridiagonalSystemSolver.solve(lowerDiagonal, diagonal, upperDiagonal, rightHandSide);
      */
     TridiagonalSystemSolver.solve = function(lower, diagonal, upper, right) {
-        if (!lower || !(lower instanceof Array)) {
+        if (typeof lower === 'undefined' || !(lower instanceof Array)) {
             throw new DeveloperError('The array lower is required.');
         }
 
-        if (!diagonal || !(diagonal instanceof Array)) {
+        if (typeof diagonal === 'undefined' || !(diagonal instanceof Array)) {
             throw new DeveloperError('The array diagonal is required.');
         }
 
-        if (!upper || !(upper instanceof Array)) {
+        if (typeof upper === 'undefined' || !(upper instanceof Array)) {
             throw new DeveloperError('The array upper is required.');
         }
 
-        if (!right || !(right instanceof Array)) {
+        if (typeof right === 'undefined' || !(right instanceof Array)) {
             throw new DeveloperError('The array right is required.');
         }
 

data/app/assets/javascripts/Core/clone.js

@@ -1,21 +1,38 @@
 /*global define*/
-define(function() {
+define([
+        './defaultValue'
+    ], function(
+        defaultValue) {
     "use strict";
 
-    function clone(object) {
+    /**
+     * Clones an object, returning a new object containing the same properties.
+     *
+     * @exports clone
+     *
+     * @param {Object} object The object to clone.
+     * @param {Boolean} [deep=false] If true, all properties will be deep cloned recursively.
+     */
+    var clone = function(object, deep) {
         if (object === null || typeof object !== 'object') {
             return object;
         }
 
-        var temp = new object.constructor();
-        for ( var key in object) {
-            if (object.hasOwnProperty(key)) {
-                temp[key] = clone(object[key]);
+        deep = defaultValue(deep, false);
+
+        var result = new object.constructor();
+        for ( var propertyName in object) {
+            if (object.hasOwnProperty(propertyName)) {
+                var value = object[propertyName];
+                if (deep) {
+                    value = clone(value, deep);
+                }
+                result[propertyName] = value;
             }
         }
 
-        return temp;
-    }
+        return result;
+    };
 
     return clone;
 });