cesium 0.24.1 → 0.25.0

data/app/assets/javascripts/Widgets/Animation/Animation.js

@@ -323,19 +323,18 @@ define(['Core/defined', 'Core/defineProperties', 'Core/destroyObject', 'Core/Dev
      * Cesium.requestAnimationFrame(tick);
      */
     var Animation = function(container, viewModel) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(container)) {
             throw new DeveloperError('container is required.');
         }
-
         if (!defined(viewModel)) {
             throw new DeveloperError('viewModel is required.');
         }
+        //>>includeEnd('debug');
 
         container = getElement(container);
-
         this._viewModel = viewModel;
         this._container = container;
-
         this._centerX = 0;
         this._centerY = 0;
         this._defsElement = undefined;

data/app/assets/javascripts/Widgets/Animation/AnimationViewModel.js

@@ -97,16 +97,15 @@ define(['Core/binarySearch', 'Core/ClockStep', 'Core/ClockRange', 'Core/defined'
      * @see Animation
      */
     var AnimationViewModel = function(clockViewModel) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(clockViewModel)) {
             throw new DeveloperError('clockViewModel is required.');
         }
+        //>>includeEnd('debug');
 
         var that = this;
-
         this._clockViewModel = clockViewModel;
-
         this._allShuttleRingTicks = [];
-
         this._dateFormatter = AnimationViewModel.defaultDateFormatter;
         this._timeFormatter = AnimationViewModel.defaultTimeFormatter;
 
@@ -416,9 +415,11 @@ define(['Core/binarySearch', 'Core/ClockStep', 'Core/ClockRange', 'Core/defined'
      * @exception {DeveloperError} positiveTicks is required.
      */
     AnimationViewModel.prototype.setShuttleRingTicks = function(positiveTicks) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(positiveTicks)) {
             throw new DeveloperError('positiveTicks is required.');
         }
+        //>>includeEnd('debug');
 
         var i;
         var len;
@@ -546,9 +547,12 @@ define(['Core/binarySearch', 'Core/ClockStep', 'Core/ClockRange', 'Core/defined'
                 return this._dateFormatter;
             },
             set : function(dateFormatter) {
+                //>>includeStart('debug', pragmas.debug);
                 if (typeof dateFormatter !== 'function') {
                     throw new DeveloperError('dateFormatter must be a function');
                 }
+                //>>includeEnd('debug');
+
                 this._dateFormatter = dateFormatter;
             }
         },
@@ -567,9 +571,12 @@ define(['Core/binarySearch', 'Core/ClockStep', 'Core/ClockRange', 'Core/defined'
                 return this._timeFormatter;
             },
             set : function(timeFormatter) {
+                //>>includeStart('debug', pragmas.debug);
                 if (typeof timeFormatter !== 'function') {
                     throw new DeveloperError('timeFormatter must be a function');
                 }
+                //>>includeEnd('debug');
+
                 this._timeFormatter = timeFormatter;
             }
         }

data/app/assets/javascripts/Widgets/BaseLayerPicker/BaseLayerPicker.js

@@ -92,13 +92,14 @@ define(['Core/defined', 'Core/defineProperties', 'Core/destroyObject', 'Core/Dev
      * baseLayerPicker.viewModel.selectedItem = providerViewModels[0];
      */
     var BaseLayerPicker = function(container, imageryLayers, imageryProviderViewModels) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(container)) {
             throw new DeveloperError('container is required.');
         }
-
         if (!defined(imageryLayers)) {
             throw new DeveloperError('imageryLayers is required.');
         }
+        //>>includeEnd('debug');
 
         container = getElement(container);
 

data/app/assets/javascripts/Widgets/BaseLayerPicker/BaseLayerPickerViewModel.js

@@ -21,9 +21,11 @@ define(['Core/defined', 'Core/defineProperties', 'Core/DeveloperError', 'Widgets
      * @see ImageryProviderViewModel
      */
     var BaseLayerPickerViewModel = function(imageryLayers, imageryProviderViewModels) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(imageryLayers)) {
             throw new DeveloperError('imageryLayers is required');
         }
+        //>>includeEnd('debug');
 
         if (!defined(imageryProviderViewModels)) {
             imageryProviderViewModels = [];

data/app/assets/javascripts/Widgets/BaseLayerPicker/ImageryProviderViewModel.js

@@ -14,9 +14,9 @@ define(['Core/defineProperties', 'Core/defined', 'Core/DeveloperError', 'Widgets
      * @constructor
      *
      * @param {Object} description The object containing all parameters.
-     * @param {String|Observable} description.name The name of the layer.
-     * @param {String|Observable} description.tooltip The tooltip to show when the item is moused over.
-     * @param {String|Observable} description.iconUrl An icon representing the layer.
+     * @param {String} description.name The name of the layer.
+     * @param {String} description.tooltip The tooltip to show when the item is moused over.
+     * @param {String} description.iconUrl An icon representing the layer.
      * @param {Function|Command} description.creationFunction A function or Command which creates the ImageryProvider or array of ImageryProviders to be added to the layers collection.
      *
      * @exception {DeveloperError} description.name is required.
@@ -28,21 +28,20 @@ define(['Core/defineProperties', 'Core/defined', 'Core/DeveloperError', 'Widgets
      * @see ImageryProvider
      */
     var ImageryProviderViewModel = function(description) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(description.name)) {
             throw new DeveloperError('description.name is required.');
         }
-
         if (!defined(description.tooltip)) {
             throw new DeveloperError('description.tooltip is required.');
         }
-
         if (!defined(description.iconUrl)) {
             throw new DeveloperError('description.iconUrl is required.');
         }
-
         if (typeof description.creationFunction !== 'function') {
             throw new DeveloperError('description.creationFunction is required.');
         }
+        //>>includeEnd('debug');
 
         var creationCommand = description.creationFunction;
         if (!defined(creationCommand.canExecute)) {

data/app/assets/javascripts/Widgets/CesiumWidget/CesiumWidget.js

@@ -111,9 +111,11 @@ define(['Core/buildModuleUrl', 'Core/Cartesian3', 'Core/Clock', 'Core/DefaultPro
      * });
      */
     var CesiumWidget = function(container, options) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(container)) {
             throw new DeveloperError('container is required.');
         }
+        //>>includeEnd('debug');
 
         container = getElement(container);
 

data/app/assets/javascripts/Widgets/FullscreenButton/FullscreenButton.js

@@ -27,9 +27,12 @@ define(['Core/defined', 'Core/defineProperties', 'Core/DeveloperError', 'Core/de
      * @see Fullscreen
      */
     var FullscreenButton = function(container, fullscreenElement) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(container)) {
             throw new DeveloperError('container is required.');
         }
+        //>>includeEnd('debug');
+
 
         container = getElement(container);
 

data/app/assets/javascripts/Widgets/FullscreenButton/FullscreenButtonViewModel.js

@@ -93,9 +93,12 @@ define(['Core/defaultValue', 'Core/defineProperties', 'Core/destroyObject', 'Cor
                 return this._fullscreenElement;
             },
             set : function(value) {
+                //>>includeStart('debug', pragmas.debug);
                 if (!(value instanceof Element)) {
                     throw new DeveloperError('value must be a valid Element.');
                 }
+                //>>includeEnd('debug');
+
                 this._fullscreenElement = value;
             }
         },

data/app/assets/javascripts/Widgets/Geocoder/Geocoder.js

@@ -36,15 +36,16 @@ define(['Core/defined', 'Core/defineProperties', 'Core/destroyObject', 'Core/Dev
      * @exception {DeveloperError} description.scene is required.
      */
     var Geocoder = function(description) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(description) || !defined(description.container)) {
             throw new DeveloperError('description.container is required.');
         }
         if (!defined(description.scene)) {
             throw new DeveloperError('description.scene is required.');
         }
+        //>>includeEnd('debug');
 
         var container = getElement(description.container);
-
         var viewModel = new GeocoderViewModel(description);
 
         viewModel._startSearchPath = startSearchPath;

data/app/assets/javascripts/Widgets/Geocoder/GeocoderViewModel.js

@@ -1,5 +1,5 @@
 /*global define*/
-define(['Core/BingMapsApi', 'Core/Cartesian3', 'Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/DeveloperError', 'Core/Ellipsoid', 'Core/Extent', 'Core/jsonp', 'Core/Matrix3', 'Core/Matrix4', 'Scene/CameraFlightPath', 'Scene/SceneMode', 'Widgets/createCommand', 'ThirdParty/knockout', 'ThirdParty/when'], function(
+define(['Core/BingMapsApi', 'Core/Cartesian3', 'Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/DeveloperError', 'Core/Ellipsoid', 'Core/Extent', 'Core/jsonp', 'Core/Matrix3', 'Core/Matrix4', 'Scene/CameraColumbusViewMode', 'Scene/CameraFlightPath', 'Scene/SceneMode', 'Widgets/createCommand', 'ThirdParty/knockout', 'ThirdParty/when'], function(
         BingMapsApi,
         Cartesian3,
         defaultValue,
@@ -11,6 +11,7 @@ define(['Core/BingMapsApi', 'Core/Cartesian3', 'Core/defaultValue', 'Core/define
         jsonp,
         Matrix3,
         Matrix4,
+        CameraColumbusViewMode,
         CameraFlightPath,
         SceneMode,
         createCommand,
@@ -38,9 +39,11 @@ define(['Core/BingMapsApi', 'Core/Cartesian3', 'Core/defaultValue', 'Core/define
      * @exception {DeveloperError} scene is required.
      */
     var GeocoderViewModel = function(description) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(description) || !defined(description.scene)) {
             throw new DeveloperError('description.scene is required.');
         }
+        //>>includeEnd('debug');
 
         this._url = defaultValue(description.url, 'http://dev.virtualearth.net/');
         if (this._url.length > 0 && this._url[this._url.length - 1] !== '/') {
@@ -92,9 +95,12 @@ define(['Core/BingMapsApi', 'Core/Cartesian3', 'Core/defaultValue', 'Core/define
                 return this._searchText;
             },
             set : function(value) {
+                //>>includeStart('debug', pragmas.debug);
                 if (typeof value !== 'string') {
                     throw new DeveloperError('value must be a valid string.');
                 }
+                //>>includeEnd('debug');
+
                 this._searchText = value;
             }
         });
@@ -112,9 +118,12 @@ define(['Core/BingMapsApi', 'Core/Cartesian3', 'Core/defaultValue', 'Core/define
                 return this._flightDuration;
             },
             set : function(value) {
+                //>>includeStart('debug', pragmas.debug);
                 if (value < 0) {
                     throw new DeveloperError('value must be positive.');
                 }
+                //>>includeEnd('debug');
+
                 this._flightDuration = value;
             }
         });
@@ -182,6 +191,13 @@ define(['Core/BingMapsApi', 'Core/Cartesian3', 'Core/defaultValue', 'Core/define
         }
     });
 
+    var transform2D = new Matrix4(0.0, 0.0, 1.0, 0.0,
+            1.0, 0.0, 0.0, 0.0,
+            0.0, 1.0, 0.0, 0.0,
+            0.0, 0.0, 0.0, 1.0);
+    var inverseTransform2D = Matrix4.inverseTransformation(transform2D);
+    var scratchTransform = new Matrix4();
+
     function geocode(viewModel) {
         var query = viewModel.searchText;
 
@@ -228,41 +244,39 @@ define(['Core/BingMapsApi', 'Core/Cartesian3', 'Core/defaultValue', 'Core/define
             var east = bbox[3];
             var extent = Extent.fromDegrees(west, south, east, north);
 
-            var position = viewModel._scene.getCamera().controller.getExtentCameraCoordinates(extent);
+            var camera = viewModel._scene.getCamera();
+            var position = camera.controller.getExtentCameraCoordinates(extent);
             if (!defined(position)) {
                 // This can happen during a scene mode transition.
                 return;
             }
 
-            var up;
-            var direction;
-            if (viewModel._scene.mode === SceneMode.SCENE3D) {
-                up = Cartesian3.UNIT_Z;
-                direction = Cartesian3.negate(viewModel._ellipsoid.geodeticSurfaceNormal(position));
-            } else {
-                up = Cartesian3.UNIT_Y;
-                direction = Cartesian3.negate(Cartesian3.UNIT_Z);
-            }
-
             var description = {
                 destination : position,
                 duration : viewModel._flightDuration,
-                up : up,
-                direction : direction
+                onComplete : function() {
+                    var screenSpaceCameraController = viewModel._scene.getScreenSpaceCameraController();
+                    screenSpaceCameraController.setEllipsoid(viewModel._ellipsoid);
+                    screenSpaceCameraController.columbusViewMode = CameraColumbusViewMode.FREE;
+                }
             };
 
-            var camera = viewModel._scene.getCamera();
             if (!Matrix4.equals(camera.transform, Matrix4.IDENTITY)) {
-                var transform = Matrix4.inverseTransformation(camera.transform);
-                Matrix4.multiplyByPoint(camera.transform, camera.position, camera.position);
+                var transform = Matrix4.clone(camera.transform, scratchTransform);
+
+                if (viewModel._scene.mode !== SceneMode.SCENE3D) {
+                    Matrix4.clone(transform2D, camera.transform);
+                    Matrix4.multiply(inverseTransform2D, transform, transform);
+                } else {
+                    Matrix4.clone(Matrix4.IDENTITY, camera.transform);
+                }
+
+                Matrix4.multiplyByPoint(transform, camera.position, camera.position);
 
-                var rotation = Matrix4.getRotation(camera.transform);
+                var rotation = Matrix4.getRotation(transform);
                 Matrix3.multiplyByVector(rotation, camera.direction, camera.direction);
                 Matrix3.multiplyByVector(rotation, camera.up, camera.up);
                 Cartesian3.cross(camera.direction, camera.up, camera.right);
-
-                camera.transform = Matrix4.IDENTITY;
-                viewModel._scene.getScreenSpaceCameraController().setEllipsoid(viewModel._ellipsoid);
             }
 
             var flight = CameraFlightPath.createAnimation(viewModel._scene, description);

data/app/assets/javascripts/Widgets/HomeButton/HomeButton.js

@@ -24,9 +24,11 @@ define(['Core/defined', 'Core/defineProperties', 'Core/destroyObject', 'Core/Dev
      * @exception {DeveloperError} scene is required.
      */
     var HomeButton = function(container, scene, transitioner, ellipsoid, flightDuration) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(container)) {
             throw new DeveloperError('container is required.');
         }
+        //>>includeEnd('debug');
 
         container = getElement(container);
 

data/app/assets/javascripts/Widgets/HomeButton/HomeButtonViewModel.js

@@ -98,9 +98,11 @@ define(['Core/Cartesian3', 'Core/Matrix3', 'Core/defaultValue', 'Core/defined',
      * @exception {DeveloperError} scene is required.
      */
     var HomeButtonViewModel = function(scene, transitioner, ellipsoid, flightDuration) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(scene)) {
             throw new DeveloperError('scene is required.');
         }
+        //>>includeEnd('debug');
 
         ellipsoid = defaultValue(ellipsoid, Ellipsoid.WGS84);
         flightDuration = defaultValue(flightDuration, 1500);
@@ -189,9 +191,12 @@ define(['Core/Cartesian3', 'Core/Matrix3', 'Core/defaultValue', 'Core/defined',
                 return this._flightDuration;
             },
             set : function(value) {
+                //>>includeStart('debug', pragmas.debug);
                 if (value < 0) {
                     throw new DeveloperError('value must be positive.');
                 }
+                //>>includeEnd('debug');
+
                 this._flightDuration = value;
             }
         }

data/app/assets/javascripts/Widgets/SceneModePicker/SceneModePicker.js

@@ -47,12 +47,14 @@ define(['Core/defineProperties', 'Core/defined', 'Core/destroyObject', 'Core/Dev
      * var sceneModePicker = new Cesium.SceneModePicker('sceneModePickerContainer', transitioner);
      */
     var SceneModePicker = function(container, transitioner) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(container)) {
             throw new DeveloperError('container is required.');
         }
         if (!defined(transitioner)) {
             throw new DeveloperError('transitioner is required.');
         }
+        //>>includeEnd('debug');
 
         container = getElement(container);
 

data/app/assets/javascripts/Widgets/SceneModePicker/SceneModePickerViewModel.js

@@ -20,9 +20,11 @@ define(['Core/defineProperties', 'Core/defined', 'Core/destroyObject', 'Core/Dev
      * @exception {DeveloperError} transitioner is required.
      */
     var SceneModePickerViewModel = function(transitioner) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(transitioner)) {
             throw new DeveloperError('transitioner is required.');
         }
+        //>>includeEnd('debug');
 
         this._transitioner = transitioner;
 

data/app/assets/javascripts/Widgets/Timeline/Timeline.js

@@ -65,13 +65,14 @@ define(['Core/DeveloperError', 'Core/ClockRange', 'Core/defined', 'Core/destroyO
     var timelineMonthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
 
     function Timeline(container, clock) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(container)) {
             throw new DeveloperError('container is required.');
         }
-
         if (!defined(clock)) {
             throw new DeveloperError('clock is required.');
         }
+        //>>includeEnd('debug');
 
         container = getElement(container);
 
@@ -195,9 +196,13 @@ define(['Core/DeveloperError', 'Core/ClockRange', 'Core/defined', 'Core/destroyO
 
     Timeline.prototype.zoomTo = function(startJulianDate, endJulianDate) {
         this._timeBarSecondsSpan = startJulianDate.getSecondsDifference(endJulianDate);
+
+        //>>includeStart('debug', pragmas.debug);
         if (this._timeBarSecondsSpan <= 0) {
             throw new DeveloperError('Start time must come before end time.');
         }
+        //>>includeEnd('debug');
+
         this._startJulian = startJulianDate;
         this._endJulian = endJulianDate;
 

data/app/assets/javascripts/Widgets/ToggleButtonViewModel.js

@@ -14,13 +14,15 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
      *
      * @param {Command} command The command which will be executed when the button is toggled.
      * @param {Object} [options] Options defining the button's properties.
-     * @param {Boolean|Observable} [options.toggled=false] A boolean, or observable, indicating whether the button should be initially toggled.
-     * @param {String|Observable} [options.tooltip=''] A string, or observable, containing the button's tooltip.
+     * @param {Boolean} [options.toggled=false] A boolean indicating whether the button should be initially toggled.
+     * @param {String} [options.tooltip=''] A string containing the button's tooltip.
      */
     var ToggleButtonViewModel = function(command, options) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(command)) {
             throw new DeveloperError('command is required.');
         }
+        //>>includeEnd('debug');
 
         this._command = command;
 

data/app/assets/javascripts/Widgets/Viewer/Viewer.js

@@ -83,9 +83,10 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/define
      * @param {ImageryProvider} [options.imageryProvider=new BingMapsImageryProvider()] The imagery provider to use.  This value is only valid if options.baseLayerPicker is set to false.
      * @param {TerrainProvider} [options.terrainProvider=new EllipsoidTerrainProvider()] The terrain provider to use
      * @param {SkyBox} [options.skyBox] The skybox used to render the stars.  When <code>undefined</code>, the default stars are used.
-     * @param {Element} [options.fullscreenElement=container] The element to make full screen when the full screen button is pressed.
+     * @param {Element} [options.fullscreenElement=document.body] The element to make full screen when the full screen button is pressed.
      * @param {Boolean} [options.useDefaultRenderLoop=true] True if this widget should control the render loop, false otherwise.
      * @param {Boolean} [options.showRenderLoopErrors=true] If true, this widget will automatically display an HTML panel to the user containing the error, if a render loop error occurs.
+     * @param {Boolean} [options.automaticallyTrackFirstDataSourceClock=true] If true, this widget will automatically track the clock settings of the first DataSource that is added, updating if the DataSource's clock changes.  Set this to false if you want to configure the clock independently.
      * @param {Object} [options.contextOptions=undefined] Context and WebGL creation properties corresponding to {@link Context#options}.
      * @param {SceneMode} [options.sceneMode=SceneMode.SCENE3D] The initial scene mode.
      *
@@ -146,15 +147,19 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/define
      * });
      */
     var Viewer = function(container, options) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(container)) {
             throw new DeveloperError('container is required.');
         }
+        //>>includeEnd('debug');
 
         container = getElement(container);
         options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
         var createBaseLayerPicker = !defined(options.baseLayerPicker) || options.baseLayerPicker !== false;
 
+        //>>includeStart('debug', pragmas.debug);
+
         //If using BaseLayerPicker, imageryProvider is an invalid option
         if (createBaseLayerPicker && defined(options.imageryProvider)) {
             throw new DeveloperError('options.imageryProvider is not available when using the BaseLayerPicker widget. \
@@ -166,6 +171,7 @@ Either specify options.selectedImageryProviderViewModel instead or set options.b
             throw new DeveloperError('options.selectedImageryProviderViewModel is not available when not using the BaseLayerPicker widget. \
 Either specify options.imageryProvider instead or set options.baseLayerPicker to true.');
         }
+        //>>includeEnd('debug')
 
         var viewerContainer = document.createElement('div');
         viewerContainer.className = 'cesium-viewer';
@@ -191,6 +197,10 @@ Either specify options.imageryProvider instead or set options.baseLayerPicker to
         var clockViewModel = new ClockViewModel(clock);
         var eventHelper = new EventHelper();
 
+        eventHelper.add(clock.onTick, function(clock) {
+            dataSourceDisplay.update(clock.currentTime);
+        });
+
         var toolbar = document.createElement('div');
         toolbar.className = 'cesium-viewer-toolbar';
         viewerContainer.appendChild(toolbar);
@@ -267,7 +277,7 @@ Either specify options.imageryProvider instead or set options.baseLayerPicker to
             var fullscreenContainer = document.createElement('div');
             fullscreenContainer.className = 'cesium-viewer-fullscreenContainer';
             viewerContainer.appendChild(fullscreenContainer);
-            fullscreenButton = new FullscreenButton(fullscreenContainer, defaultValue(options.fullscreenElement, container));
+            fullscreenButton = new FullscreenButton(fullscreenContainer, options.fullscreenElement);
 
             //Subscribe to fullscreenButton.viewModel.isFullscreenEnabled so
             //that we can hide/show the button as well as size the timeline.
@@ -282,14 +292,27 @@ Either specify options.imageryProvider instead or set options.baseLayerPicker to
             timeline.container.style.right = 0;
         }
 
-        function updateDataSourceDisplay(clock) {
-            dataSourceDisplay.update(clock.currentTime);
-        }
+        if (defaultValue(options.automaticallyTrackFirstDataSourceClock, true)) {
+            var trackedDataSource;
+            var changedEventRemovalFunction;
 
-        eventHelper.add(clock.onTick, updateDataSourceDisplay);
+            var onDataSourceAdded = function(dataSourceCollection, dataSource) {
+                if (dataSourceCollection.getLength() === 1) {
+                    onDataSourceChanged(dataSource);
+                    changedEventRemovalFunction = eventHelper.add(dataSource.getChangedEvent(), onDataSourceChanged);
+                    trackedDataSource = dataSource;
+                }
+            };
 
-        function setClockFromDataSource(dataSourceCollection, dataSource) {
-            if (dataSourceCollection.getLength() === 1) {
+            var onDataSourceRemoved = function(dataSourceCollection, dataSource) {
+                if (trackedDataSource === dataSource) {
+                    changedEventRemovalFunction();
+                    changedEventRemovalFunction = undefined;
+                    trackedDataSource = undefined;
+                }
+            };
+
+            var onDataSourceChanged = function(dataSource) {
                 var dataSourceClock = dataSource.getClock();
                 if (defined(dataSourceClock)) {
                     dataSourceClock.getValue(clock);
@@ -298,10 +321,11 @@ Either specify options.imageryProvider instead or set options.baseLayerPicker to
                         timeline.zoomTo(dataSourceClock.startTime, dataSourceClock.stopTime);
                     }
                 }
-            }
-        }
+            };
 
-        eventHelper.add(dataSourceCollection.dataSourceAdded, setClockFromDataSource);
+            eventHelper.add(dataSourceCollection.dataSourceAdded, onDataSourceAdded);
+            eventHelper.add(dataSourceCollection.dataSourceRemoved, onDataSourceAdded);
+        }
 
         this._container = container;
         this._element = viewerContainer;
@@ -581,9 +605,12 @@ Either specify options.imageryProvider instead or set options.baseLayerPicker to
      * @see viewerDynamicObjectMixin
      */
     Viewer.prototype.extend = function(mixin, options) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(mixin)) {
             throw new DeveloperError('mixin is required.');
         }
+        //>>includeEnd('debug')
+
         mixin(this, options);
     };