cesium 0.16.0 → 0.17.0

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

@@ -3,7 +3,6 @@ define([
         './DeveloperError',
         './destroyObject',
         './Cartesian2',
-        './JulianDate',
         './ScreenSpaceEventType',
         './KeyboardEventModifier',
         './defaultValue'
@@ -11,7 +10,6 @@ define([
         DeveloperError,
         destroyObject,
         Cartesian2,
-        JulianDate,
         ScreenSpaceEventType,
         KeyboardEventModifier,
         defaultValue) {
@@ -184,7 +182,7 @@ define([
         }
     };
 
-    function getModifier(screenSpaceEventHandler, event) {
+    function getModifier(event) {
         if (event.shiftKey) {
             return KeyboardEventModifier.SHIFT;
         } else if (event.ctrlKey) {
@@ -205,7 +203,7 @@ define([
             return;
         }
 
-        var modifier = getModifier(screenSpaceEventHandler, event);
+        var modifier = getModifier(event);
         var action;
 
         // IE_TODO:  On some versions of IE, the left-button is 1, and the right-button is 4.
@@ -232,7 +230,7 @@ define([
     }
 
     function handleMouseUp(screenSpaceEventHandler, event) {
-        var modifier = getModifier(screenSpaceEventHandler, event);
+        var modifier = getModifier(event);
         var action, clickAction;
         if (screenSpaceEventHandler._seenAnyTouchEvents) {
             return;
@@ -291,7 +289,7 @@ define([
             motion : new Cartesian2()
         };
 
-        var modifier = getModifier(screenSpaceEventHandler, event);
+        var modifier = getModifier(event);
         var action = screenSpaceEventHandler.getInputAction(ScreenSpaceEventType.MOUSE_MOVE, modifier);
         if (typeof action !== 'undefined') {
             action(movement);
@@ -308,7 +306,7 @@ define([
     function handleTouchStart(screenSpaceEventHandler, event) {
         var pos, pos2, numberOfTouches = event.touches.length;
         screenSpaceEventHandler._seenAnyTouchEvents = true;
-        var modifier = getModifier(screenSpaceEventHandler, event);
+        var modifier = getModifier(event);
         var action;
 
         pos = getPosition(screenSpaceEventHandler, event.touches[0]);
@@ -366,7 +364,7 @@ define([
     function handleTouchEnd(screenSpaceEventHandler, event) {
         var numberOfTouches = event.touches.length;
         var numberOfChangedTouches = event.changedTouches.length;
-        var modifier = getModifier(screenSpaceEventHandler, event);
+        var modifier = getModifier(event);
         var action, clickAction;
 
         if (screenSpaceEventHandler._leftMouseButtonDown) {
@@ -409,7 +407,7 @@ define([
     }
 
     function handleTouchMove(screenSpaceEventHandler, event) {
-        var modifier = getModifier(screenSpaceEventHandler, event);
+        var modifier = getModifier(event);
         var pos, pos2, action, movement;
 
         if (screenSpaceEventHandler._leftMouseButtonDown && (event.touches.length === 1)) {
@@ -488,7 +486,7 @@ define([
         // to the angle it was rotated in degrees.
         var delta = event.detail ? event.detail * -120 : event.wheelDelta;
 
-        var modifier = getModifier(screenSpaceEventHandler, event);
+        var modifier = getModifier(event);
         var type = ScreenSpaceEventType.WHEEL;
         var action = screenSpaceEventHandler.getInputAction(type, modifier);
 
@@ -499,7 +497,7 @@ define([
     }
 
     function handleMouseDblClick(screenSpaceEventHandler, event) {
-        var modifier = getModifier(screenSpaceEventHandler, event);
+        var modifier = getModifier(event);
         var action;
         var pos = getPosition(screenSpaceEventHandler, event);
 

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

@@ -3,7 +3,6 @@ define([
         './defaultValue',
         './DeveloperError',
         './Math',
-        './Cartesian2',
         './Cartesian3',
         './Quaternion',
         './Matrix3'
@@ -11,7 +10,6 @@ define([
         defaultValue,
         DeveloperError,
         CesiumMath,
-        Cartesian2,
         Cartesian3,
         Quaternion,
         Matrix3) {

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

@@ -5,18 +5,15 @@ define(['./Cartesian3',
         './Math',
         './Matrix3',
         './TimeConstants',
-        './TimeStandard',
-        './Transforms'
-    ],
-    function(
+        './TimeStandard'
+    ], function(
         Cartesian3,
         DeveloperError,
         JulianDate,
         CesiumMath,
         Matrix3,
         TimeConstants,
-        TimeStandard,
-        Transforms) {
+        TimeStandard) {
     "use strict";
 
     /**

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

@@ -73,13 +73,11 @@ define([
         };
 
         if (typeof require.toUrl !== 'undefined') {
-            var resolvedBootstrapperUrl = new Uri(buildModuleUrl('Workers/cesiumWorkerBootstrapper.js')).resolve(new Uri(document.location.href));
-            var baseUrl = new Uri('..').resolve(resolvedBootstrapperUrl).toString();
+            var baseUrl = new Uri('..').resolve(new Uri(buildModuleUrl('Workers/cesiumWorkerBootstrapper.js'))).toString();
             bootstrapMessage.loaderConfig.baseUrl = baseUrl;
         } else {
-            var workersUrl = new Uri(buildModuleUrl('Workers')).resolve(new Uri(document.location.href)).toString();
             bootstrapMessage.loaderConfig.paths = {
-                'Workers' : workersUrl
+                'Workers' : buildModuleUrl('Workers')
             };
         }
 

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

@@ -12,7 +12,6 @@ define([
         './Cartesian4',
         './TimeConstants',
         './Ellipsoid',
-        './JulianDate',
         './EarthOrientationParameters',
         './EarthOrientationParametersSample',
         '../ThirdParty/when'
@@ -30,7 +29,6 @@ define([
         Cartesian4,
         TimeConstants,
         Ellipsoid,
-        JulianDate,
         EarthOrientationParameters,
         EarthOrientationParametersSample,
         when) {

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

@@ -50,27 +50,35 @@ define([
     }
 
     var implementation;
+    var a;
 
     /**
-     * Given a non-relative moduleID, returns a URL to the file represented by that module ID,
+     * Given a non-relative moduleID, returns an absolute URL to the file represented by that module ID,
      * using, in order of preference, require.toUrl, the value of a global CESIUM_BASE_URL, or
      * the base URL of the Cesium.js script.
      *
      * @private
      */
     var buildModuleUrl = function(moduleID) {
-        if (typeof implementation !== 'undefined') {
-            return implementation(moduleID);
+        if (typeof implementation === 'undefined') {
+            //select implementation
+            if (typeof require.toUrl !== 'undefined') {
+                implementation = buildModuleUrlFromRequireToUrl;
+            } else {
+                implementation = buildModuleUrlFromBaseUrl;
+            }
         }
 
-        //select implementation
-        if (typeof require.toUrl !== 'undefined') {
-            implementation = buildModuleUrlFromRequireToUrl;
-        } else {
-            implementation = buildModuleUrlFromBaseUrl;
+        if (typeof a === 'undefined') {
+            a = document.createElement('a');
         }
 
-        return implementation(moduleID);
+        var url = implementation(moduleID);
+
+        a.href = url;
+        a.href = a.href; // IE only absolutizes href on get, not set
+
+        return a.href;
     };
 
     return buildModuleUrl;

data/app/assets/javascripts/DynamicScene/CompositeDynamicObjectCollection.js

@@ -6,7 +6,6 @@ define([
         '../Core/TimeInterval',
         '../Core/DeveloperError',
         './DynamicObject',
-        './DynamicObjectCollection',
         './CzmlDefaults'
     ], function(
         defaultValue,
@@ -15,7 +14,6 @@ define([
         TimeInterval,
         DeveloperError,
         DynamicObject,
-        DynamicObjectCollection,
         CzmlDefaults) {
     "use strict";
 
@@ -138,7 +136,7 @@ define([
             thisCollections = this._collections = collections;
 
             //Clear all existing objects and rebuild the collection.
-            this._clearObjects();
+            clearObjects(this);
             var thisMergeFunctions = this.mergeFunctions;
             for (iCollection = thisCollections.length - 1; iCollection > -1; iCollection--) {
                 collection = thisCollections[iCollection];
@@ -151,7 +149,7 @@ define([
                 var objects = collection.getObjects();
                 for ( var iObjects = objects.length - 1; iObjects > -1; iObjects--) {
                     var object = objects[iObjects];
-                    var compositeObject = this._getOrCreateObject(object.id);
+                    var compositeObject = getOrCreateObject(this, object.id);
                     for ( var iMergeFuncs = thisMergeFunctions.length - 1; iMergeFuncs > -1; iMergeFuncs--) {
                         var mergeFunc = thisMergeFunctions[iMergeFuncs];
                         mergeFunc(compositeObject, object);
@@ -195,24 +193,24 @@ define([
         this.setCollections([]);
     };
 
-    CompositeDynamicObjectCollection.prototype._getOrCreateObject = function(id) {
-        var obj = this._hash[id];
+    function getOrCreateObject(compositeDynamicObjectCollection, id) {
+        var obj = compositeDynamicObjectCollection._hash[id];
         if (!obj) {
             obj = new DynamicObject(id);
-            this._hash[id] = obj;
-            this._array.push(obj);
+            compositeDynamicObjectCollection._hash[id] = obj;
+            compositeDynamicObjectCollection._array.push(obj);
         }
         return obj;
-    };
+    }
 
-    CompositeDynamicObjectCollection.prototype._clearObjects = function() {
-        var removedObjects = this._array;
-        this._hash = {};
-        this._array = [];
+    function clearObjects(compositeDynamicObjectCollection) {
+        var removedObjects = compositeDynamicObjectCollection._array;
+        compositeDynamicObjectCollection._hash = {};
+        compositeDynamicObjectCollection._array = [];
         if (removedObjects.length > 0) {
-            this.objectsRemoved.raiseEvent(this, removedObjects);
+            compositeDynamicObjectCollection.objectsRemoved.raiseEvent(compositeDynamicObjectCollection, removedObjects);
         }
-    };
+    }
 
     CompositeDynamicObjectCollection.prototype._onObjectPropertiesChanged = function(dynamicObjectCollection, updatedObjects) {
         var thisMergeFunctions = this.mergeFunctions;
@@ -229,7 +227,7 @@ define([
                     deleteFunc(compositeObject);
                 }
             } else {
-                compositeObject = this._getOrCreateObject(updatedObject.id);
+                compositeObject = getOrCreateObject(this, updatedObject.id);
             }
 
             compositeObjects.push(compositeObject);

data/app/assets/javascripts/DynamicScene/CzmlDataSource.js

@@ -0,0 +1,197 @@
+/*global define*/
+define(['../Core/ClockRange',
+        '../Core/ClockStep',
+        '../Core/DeveloperError',
+        '../Core/Event',
+        '../Core/Iso8601',
+        '../Core/loadJson',
+        '../DynamicScene/DynamicClock',
+        '../DynamicScene/processCzml',
+        '../DynamicScene/DynamicObjectCollection'
+        ], function(
+                ClockRange,
+                ClockStep,
+                DeveloperError,
+                Event,
+                Iso8601,
+                loadJson,
+                DynamicClock,
+                processCzml,
+                DynamicObjectCollection) {
+    "use strict";
+
+    function loadCzml(dataSource, czml, sourceUri) {
+        var dynamicObjectCollection = dataSource._dynamicObjectCollection;
+        processCzml(czml, dynamicObjectCollection, sourceUri);
+        var availability = dynamicObjectCollection.computeAvailability();
+
+        var clock;
+        var documentObject = dynamicObjectCollection.getObject('document');
+        if (typeof documentObject !== 'undefined' && typeof documentObject.clock !== 'undefined') {
+            clock = new DynamicClock();
+            clock.startTime = documentObject.clock.startTime;
+            clock.stopTime = documentObject.clock.stopTime;
+            clock.clockRange = documentObject.clock.clockRange;
+            clock.clockStep = documentObject.clock.clockStep;
+            clock.multiplier = documentObject.clock.multiplier;
+            clock.currentTime = documentObject.clock.currentTime;
+        } else if (!availability.start.equals(Iso8601.MINIMUM_VALUE)) {
+            clock = new DynamicClock();
+            clock.startTime = availability.start;
+            clock.stopTime = availability.stop;
+            clock.clockRange = ClockRange.LOOP_STOP;
+            var totalSeconds = clock.startTime.getSecondsDifference(clock.stopTime);
+            var multiplier = Math.round(totalSeconds / 120.0);
+            clock.multiplier = multiplier;
+            clock.currentTime = clock.startTime;
+            clock.clockStep = ClockStep.SYSTEM_CLOCK_MULTIPLIER;
+        }
+        return clock;
+    }
+
+    /**
+     * A {@link DataSource} which processes CZML.
+     * @alias CzmlDataSource
+     * @constructor
+     */
+    var CzmlDataSource = function() {
+        this._changed = new Event();
+        this._error = new Event();
+        this._clock = undefined;
+        this._dynamicObjectCollection = new DynamicObjectCollection();
+        this._timeVarying = true;
+    };
+
+    /**
+     * Gets an event that will be raised when non-time-varying data changes
+     * or if the return value of getIsTimeVarying changes.
+     * @memberof DataSource
+     *
+     * @returns {Event} The event.
+     */
+    CzmlDataSource.prototype.getChangedEvent = function() {
+        return this._changed;
+    };
+
+    /**
+     * Gets an event that will be raised if an error is encountered during processing.
+     * @memberof CzmlDataSource
+     *
+     * @returns {Event} The event.
+     */
+    CzmlDataSource.prototype.getErrorEvent = function() {
+        return this._error;
+    };
+
+    /**
+     * Gets the top level clock defined in CZML or the availability of the
+     * underlying data if no clock is defined.  If the CZML document only contains
+     * infinite data, undefined will be returned.
+     * @memberof CzmlDataSource
+     *
+     * @returns {DynamicClock} The clock associated with the current CZML data, or undefined if none exists.
+     */
+    CzmlDataSource.prototype.getClock = function() {
+        return this._clock;
+    };
+
+    /**
+     * Gets the DynamicObjectCollection generated by this data source.
+     * @memberof DataSource
+     *
+     * @returns {DynamicObjectCollection} The collection of objects generated by this data source.
+     */
+    CzmlDataSource.prototype.getDynamicObjectCollection = function() {
+        return this._dynamicObjectCollection;
+    };
+
+    /**
+     * Gets a value indicating if the data varies with simulation time.  If the return value of
+     * this function changes, the changed event will be raised.
+     * @memberof DataSource
+     *
+     * @returns {Boolean} True if the data is varies with simulation time, false otherwise.
+     */
+    CzmlDataSource.prototype.getIsTimeVarying = function() {
+        return this._timeVarying;
+    };
+
+    /**
+     * Processes the provided CZML without clearing any existing data.
+     *
+     * @param {Object} czml The CZML to be processed.
+     * @param {String} source The source of the CZML.
+     *
+     * @exception {DeveloperError} czml is required.
+     */
+    CzmlDataSource.prototype.process = function(czml, source) {
+        if (typeof czml === 'undefined') {
+            throw new DeveloperError('czml is required.');
+        }
+
+        this._clock = loadCzml(this, czml, source);
+    };
+
+    /**
+     * Replaces any existing data with the provided CZML.
+     *
+     * @param {Object} czml The CZML to be processed.
+     * @param {String} source The source of the CZML.
+     *
+     * @exception {DeveloperError} czml is required.
+     */
+    CzmlDataSource.prototype.load = function(czml, source) {
+        if (typeof czml === 'undefined') {
+            throw new DeveloperError('czml is required.');
+        }
+
+        this._dynamicObjectCollection.clear();
+        this._clock = loadCzml(this, czml, source);
+    };
+
+    /**
+     * Asynchronously processes the CZML at the provided url without clearing any existing data.
+     *
+     * @param {Object} url The url to be processed.
+     *
+     * @returns {Promise} a promise that will resolve when the CZML is processed.
+     *
+     * @exception {DeveloperError} url is required.
+     */
+    CzmlDataSource.prototype.processUrl = function(url) {
+        if (typeof url === 'undefined') {
+            throw new DeveloperError('url is required.');
+        }
+
+        var dataSource = this;
+        return loadJson(url).then(function(czml) {
+            dataSource.process(czml, url);
+        }, function(error) {
+            this._error.raiseEvent(this, error);
+        });
+    };
+
+    /**
+     * Asynchronously loads the CZML at the provided url, replacing any existing data.
+     *
+     * @param {Object} url The url to be processed.
+     *
+     * @returns {Promise} a promise that will resolve when the CZML is processed.
+     *
+     * @exception {DeveloperError} url is required.
+     */
+    CzmlDataSource.prototype.loadUrl = function(url) {
+        if (typeof url === 'undefined') {
+            throw new DeveloperError('url is required.');
+        }
+
+        var dataSource = this;
+        return loadJson(url).then(function(czml) {
+            dataSource.load(czml, url);
+        }, function(error) {
+            this._error.raiseEvent(this, error);
+        });
+    };
+
+    return CzmlDataSource;
+});