Merge pull request #2601 from AnalyticalGraphicsInc/fly-on-load

Fly to data on load

Author: emackey

Apps/CesiumViewer/CesiumViewer.js

@@ -95,6 +95,7 @@ define([
         context.throwOnWebGLError = true;
     }
 
+    var view = endUserOptions.view;
     var source = endUserOptions.source;
     if (defined(source)) {
         var loadPromise;
@@ -120,6 +121,8 @@ define([
                         var error = 'No entity with id "' + lookAt + '" exists in the provided data source.';
                         showLoadError(source, error);
                     }
+                } else if (!defined(view)) {
+                    viewer.flyTo(dataSource);
                 }
             }).otherwise(function(error) {
                 showLoadError(source, error);
@@ -142,7 +145,6 @@ define([
         }
     }
 
-    var view = endUserOptions.view;
     if (defined(view)) {
         var splitQuery = view.split(/[ ,]+/);
         if (splitQuery.length > 1) {

Source/Widgets/Viewer/viewerDragDropMixin.js

@@ -33,6 +33,7 @@ define([
      * @param {Object} [options] Object with the following properties:
      * @param {Element|String} [options.dropTarget=viewer.container] The DOM element which will serve as the drop target.
      * @param {Boolean} [options.clearOnDrop=true] When true, dropping files will clear all existing data sources first, when false, new data sources will be loaded after the existing ones.
+     * @param {Boolean} [options.flyToOnDrop=true] When true, dropping files will fly to the data source once it is loaded.
      * @param {DefaultProxy} [options.proxy] The proxy to be used for KML network links.
      *
      * @exception {DeveloperError} Element with id <options.dropTarget> does not exist in the document.
@@ -66,12 +67,16 @@ define([
         if (viewer.hasOwnProperty('clearOnDrop')) {
             throw new DeveloperError('clearOnDrop is already defined by another mixin.');
         }
+        if (viewer.hasOwnProperty('flyToOnDrop')) {
+            throw new DeveloperError('flyToOnDrop is already defined by another mixin.');
+        }
         //>>includeEnd('debug');
 
         options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
         //Local variables to be closed over by defineProperties.
         var dropEnabled = true;
+        var flyToOnDrop = true;
         var dropError = new Event();
         var clearOnDrop = defaultValue(options.clearOnDrop, true);
         var dropTarget = defaultValue(options.dropTarget, viewer.container);
@@ -149,6 +154,20 @@ define([
                 }
             },
 
+            /**
+             * Gets or sets a value indicating if the camera should fly to the data source after it is loaded.
+             * @memberof viewerDragDropMixin.prototype
+             * @type {Boolean}
+             */
+            flyToOnDrop : {
+                get : function() {
+                    return flyToOnDrop;
+                },
+                set : function(value) {
+                    flyToOnDrop = value;
+                }
+            },
+
             /**
              * Gets or sets the proxy to be used for KML.
              * @memberof viewerDragDropMixin.prototype
@@ -242,7 +261,11 @@ define([
                 }
 
                 if (defined(loadPromise)) {
-                    viewer.dataSources.add(loadPromise).otherwise(function(error) {
+                    viewer.dataSources.add(loadPromise).then(function(dataSource) {
+                        if (viewer.flyToOnDrop) {
+                            viewer.flyTo(dataSource);
+                        }
+                    }).otherwise(function(error) {
                         viewer.dropError.raiseEvent(viewer, fileName, error);
                     });
                 }

Specs/Widgets/Viewer/viewerDragDropMixinSpec.js

@@ -440,6 +440,14 @@ defineSuite([
         }).toThrowDeveloperError();
     });
 
+    it('throws if flyToOnDrop property already added by another mixin.', function() {
+        viewer = new Viewer(container);
+        viewer.flyToOnDrop = true;
+        expect(function() {
+            viewer.extend(viewerDragDropMixin);
+        }).toThrowDeveloperError();
+    });
+
     it('setting dropTarget to undefined throws exception', function() {
         viewer = new Viewer(container);
         viewer.extend(viewerDragDropMixin);