CesiumGS · pjcozzi · Mar 1, 2015 · Aug 22, 2013 · Aug 22, 2013 · Aug 23, 2013
diff --git a/Apps/CesiumViewer/CesiumViewer.js b/Apps/CesiumViewer/CesiumViewer.js
@@ -6,6 +6,7 @@ define([
         'Cesium/Core/queryToObject',
         'Cesium/DataSources/CzmlDataSource',
         'Cesium/DataSources/GeoJsonDataSource',
+        'Cesium/DataSources/KmlDataSource',
         'Cesium/Scene/TileMapServiceImageryProvider',
         'Cesium/Widgets/Viewer/Viewer',
         'Cesium/Widgets/Viewer/viewerCesiumInspectorMixin',
@@ -18,6 +19,7 @@ define([
         queryToObject,
         CzmlDataSource,
         GeoJsonDataSource,
+        KmlDataSource,
         TileMapServiceImageryProvider,
         Viewer,
         viewerCesiumInspectorMixin,
@@ -86,23 +88,20 @@ define([
 
     var source = endUserOptions.source;
     if (defined(source)) {
-        var dataSource;
         var loadPromise;
 
         if (/\.czml$/i.test(source)) {
-            dataSource = new CzmlDataSource(getFilenameFromUri(source));
-            loadPromise = dataSource.loadUrl(source);
+            loadPromise = CzmlDataSource.load(source);
         } else if (/\.geojson$/i.test(source) || /\.json$/i.test(source) || /\.topojson$/i.test(source)) {
-            dataSource = new GeoJsonDataSource(getFilenameFromUri(source));
-            loadPromise = dataSource.load(source);
+            loadPromise = GeoJsonDataSource.load(source);
+        } else if (/\.kml$/i.test(source) || /\.kmz$/i.test(source)) {
+            loadPromise = KmlDataSource.load(source);
         } else {
             showLoadError(source, 'Unknown format.');
         }
 
-        if (defined(dataSource)) {
-            viewer.dataSources.add(dataSource);
-
-            loadPromise.then(function() {
+        if (defined(loadPromise)) {
+            viewer.dataSources.add(loadPromise).then(function(dataSource) {
                 var lookAt = endUserOptions.lookAt;
                 if (defined(lookAt)) {
                     var entity = dataSource.entities.getById(lookAt);

diff --git a/Apps/SampleData/kml/bikeRide.kml b/Apps/SampleData/kml/bikeRide.kml
diff --git a/Apps/SampleData/kml/facilities/GroundStation.png b/Apps/SampleData/kml/facilities/GroundStation.png
diff --git a/Apps/SampleData/kml/facilities/LaserStation.png b/Apps/SampleData/kml/facilities/LaserStation.png
diff --git a/Apps/SampleData/kml/facilities/LaunchPad.png b/Apps/SampleData/kml/facilities/LaunchPad.png
diff --git a/Apps/SampleData/kml/facilities/LaunchSite.png b/Apps/SampleData/kml/facilities/LaunchSite.png
diff --git a/Apps/SampleData/kml/facilities/OpticalTrackingStation.png b/Apps/SampleData/kml/facilities/OpticalTrackingStation.png
diff --git a/Apps/SampleData/kml/facilities/RadarStation.png b/Apps/SampleData/kml/facilities/RadarStation.png
diff --git a/Apps/SampleData/kml/facilities/facilities.kml b/Apps/SampleData/kml/facilities/facilities.kml
diff --git a/Apps/SampleData/kml/gdpPerCapita2008.kmz b/Apps/SampleData/kml/gdpPerCapita2008.kmz
diff --git a/Apps/Sandcastle/gallery/KML.html b/Apps/Sandcastle/gallery/KML.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">  <!-- Use Chrome Frame in IE -->
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
+    <meta name="description" content="A simple KML example.">
+    <meta name="cesium-sandcastle-labels" content="Showcases, DataSources">
+    <title>Cesium Demo</title>
+    <script type="text/javascript" src="../Sandcastle-header.js"></script>
+    <script type="text/javascript" src="../../../ThirdParty/requirejs-2.1.9/require.js"></script>
+    <script type="text/javascript">
+    require.config({
+        baseUrl : '../../../Source',
+        waitSeconds : 60
+    });
+    </script>
+</head>
+<body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
+<style>
+    @import url(../templates/bucket.css);
+</style>
+<div id="cesiumContainer" class="fullSize"></div>
+<div id="loadingOverlay"><h1>Loading...</h1></div>
+<div id="toolbar"></div>
+
+<script id="cesium_sandcastle_script">
+function startup(Cesium) {
+    "use strict";
+//Sandcastle_Begin
+var viewer = new Cesium.Viewer('cesiumContainer');
+
+Sandcastle.addToolbarMenu([{
+    text : 'KML - Global Science Facilities',
+    onselect : function() {
+        viewer.homeButton.viewModel.command();
+        viewer.dataSources.add(Cesium.KmlDataSource.load('../../SampleData/kml/facilities/facilities.kml'));
+    }
+}, {
+    text : 'KMZ with embedded data - GDP per capita',
+    onselect : function() {
+        viewer.homeButton.viewModel.command();
+        viewer.dataSources.add(Cesium.KmlDataSource.load('../../SampleData/kml/gdpPerCapita2008.kmz'));
+    }
+}, {
+    text : 'gx KML extensions - Bike Ride',
+    onselect : function() {
+        viewer.dataSources.add(Cesium.KmlDataSource.load('../../SampleData/kml/bikeRide.kml')).then(function(dataSource){
+            viewer.clock.shouldAnimate = false;
+            var rider = dataSource.entities.getById('tour');
+            viewer.flyTo(rider).then(function(){
+                viewer.trackedEntity = rider;
+                viewer.selectedEntity = viewer.trackedEntity;
+                viewer.clock.multiplier = 30;
+                viewer.clock.shouldAnimate = true;
+            });
+        });
+    }
+}], 'toolbar');
+
+Sandcastle.reset = function() {
+    viewer.dataSources.removeAll();
+    viewer.clock.clockRange = Cesium.ClockRange.UNBOUNDED;
+    viewer.clock.clockStep = Cesium.ClockStep.SYSTEM_CLOCK;
+};
+//Sandcastle_End
+    Sandcastle.finishedLoading();
+}
+if (typeof Cesium !== "undefined") {
+    startup(Cesium);
+} else if (typeof require === "function") {
+    require(["Cesium"], startup);
+}
+</script>
+</body>
+</html>
diff --git a/Apps/Sandcastle/gallery/KML.jpg b/Apps/Sandcastle/gallery/KML.jpg
diff --git a/CHANGES.md b/CHANGES.md
@@ -16,6 +16,7 @@ Change Log
   * Deprecated `CzmlDataSource.prototype.loadUrl`, it will be removed in 1.10.  Instead, pass a url as the first parameter to `CzmlDataSource.prototype.load`.
   * Deprecated `CzmlDataSource.prototype.processUrl`, it will be removed in 1.10.  Instead, pass a url as the first parameter to `CzmlDataSource.prototype.process`.
   * Deprecated the `sourceUri` parameter to all `CzmlDataSource` load and process functions. Support will be removed in 1.10.  Instead pass an `options` object with `sourceUri` property.
+* Added initial support for [KML 2.2](https://developers.google.com/kml/) via `KmlDataSource`. Check out the new [Sandcastle Demo](http://cesiumjs.org/Cesium/Apps/Sandcastle/index.html?src=KML.html) and the [reference documentation](http://cesiumjs.org/Cesium/Build/Documentation/KmlDataSource.html) for more details.
 * `InfoBox` sanitization now relies on [iframe sandboxing](http://www.html5rocks.com/en/tutorials/security/sandboxed-iframes/). This allows for much more content to be displayed in the InfoBox (and still be secure).
 * Added `InfoBox.frame` which is the instance of the iframe that is used to host description content. Sanitization can be controlled via the frame's `sandbox` attribute.  See the above link for additional information. 
 * Fixed incorrect ellipse texture coordinates. [#2363](https://github.com/AnalyticalGraphicsInc/cesium/issues/2363) and [#2465](https://github.com/AnalyticalGraphicsInc/cesium/issues/2465)

diff --git a/Source/DataSources/EntityView.js b/Source/DataSources/EntityView.js
@@ -278,9 +278,14 @@ define([
         }
         //>>includeEnd('debug');
 
+        var sceneMode = scene.mode;
+        if (sceneMode === SceneMode.MORPHING) {
+            return;
+        }
+
         var positionProperty = entity.position;
         var objectChanged = entity !== this._lastEntity;
-        var sceneModeChanged = scene.mode !== this._mode && scene.mode !== SceneMode.MORPHING;
+        var sceneModeChanged = sceneMode !== this._mode;
 
         var offset3D = this._offset3D;
         var offset2D = this._offset2D;