Merge pull request #6136 from AnalyticalGraphicsInc/cesium-ion

Tom Fili · web-flow · commit 6896cd5debc5 · 2018-01-19T17:02:36.000-05:00
New utility object for working with the Cesium ion beta API
diff --git a/CHANGES.md b/CHANGES.md
@@ -9,9 +9,10 @@ Change Log
   * For all classes/functions that can now take a `Resource` instance, all additional parameters that are part of the `Resource` class have been deprecated and will be removed in Cesium 1.44. This generally includes `proxy`, `headers` and `query` parameters.
 * Major refactor of URL handling. All classes that take a url parameter, can now take a Resource or a String. This includes all imagery providers, all terrain providers, `Cesium3DTileset`, `KMLDataSource`, `CZMLDataSource`, `GeoJsonDataSource`, `Model`, `Billboard`, along with all the low level `load*()` functions.
 * Added `ClippingPlaneCollection.isSupported` function for checking if rendering with clipping planes is supported.
+* Added new `CesiumIon` utility class for working with the Cesium ion beta API.
 * Improved CZML Custom Properties sandcastle example [#6086](https://github.com/AnalyticalGraphicsInc/cesium/pull/6086)
-* Added `Plane.projectPointOntoPlane` for projecting a `Cartesian3` position onto a `Plane` [#6092](https://github.com/AnalyticalGraphicsInc/cesium/pull/6092) 
-* Added `Cartesian3.projectVector` for projecting one vector to another [#6093](https://github.com/AnalyticalGraphicsInc/cesium/pull/6093) 
+* Added `Plane.projectPointOntoPlane` for projecting a `Cartesian3` position onto a `Plane` [#6092](https://github.com/AnalyticalGraphicsInc/cesium/pull/6092)
+* Added `Cartesian3.projectVector` for projecting one vector to another [#6093](https://github.com/AnalyticalGraphicsInc/cesium/pull/6093)
 * Added `Cesium3DTileset.tileFailed` event that will be raised when a tile fails to load. The object passed to the event listener will have a url and message property. If there are no event listeners, error messages will be logged to the console. [#6088](https://github.com/AnalyticalGraphicsInc/cesium/pull/6088)
 * Added `AttributeCompression.zigZagDeltaDecode` which will decode delta and ZigZag encoded buffers in place.
 * Added `pack` and `unpack` functions to `OrientedBoundingBox` for packing to and unpacking from a flat buffer.
@@ -28,7 +29,7 @@ Change Log
    * Only one node is supported.
    * Only one mesh per node is supported.
    * Only one primitive per mesh is supported.
-* Updated documentation links to reflect new locations on cesiumjs.org and cesium.com. 
+* Updated documentation links to reflect new locations on cesiumjs.org and cesium.com.
 * Updated 'Viewer.zoomTo' and 'Viewer.flyTo' to take in Cesium3DTilesets as a target and updated sandcastle 3DTileset examples to reflect this change
 * Fixed a glTF animation bug that caused certain animations to jitter. [#5740](https://github.com/AnalyticalGraphicsInc/cesium/pull/5740)
 * Fixed a bug when creating billboard and model entities without a globe. [#6109](https://github.com/AnalyticalGraphicsInc/cesium/pull/6109)
diff --git a/Source/Core/loadImage.js b/Source/Core/loadImage.js
@@ -79,11 +79,11 @@ define([
     }
 
     function makeRequest(resource, allowCrossOrigin) {
-        var url = resource.url;
         var request = resource.request;
-        request.url = url;
+        request.url = resource.url;
         request.requestFunction = function() {
             var crossOrigin;
+            var url = resource.url;
 
             // data URIs can't have allowCrossOrigin set.
             if (isDataUri(url) || isBlobUri(url)) {
@@ -106,16 +106,20 @@ define([
 
         return promise
             .otherwise(function(e) {
+                //Don't retry cancelled or otherwise aborted requests
+                if (request.state !== RequestState.FAILED) {
+                    return when.reject(e);
+                }
+
                 return resource.retryOnError(e)
                     .then(function(retry) {
                         if (retry) {
                             // Reset request so it can try again
                             request.state = RequestState.UNISSUED;
                             request.deferred = undefined;
 
-                            return makeRequest(resource);
+                            return makeRequest(resource, allowCrossOrigin);
                         }
-
                         return when.reject(e);
                     });
             });
diff --git a/Source/Core/loadJsonp.js b/Source/Core/loadJsonp.js
@@ -97,8 +97,7 @@ define([
         resource.addQueryParameters(callbackQuery);
 
         var request = resource.request;
-        var url = resource.url;
-        request.url = url;
+        request.url = resource.url;
         request.requestFunction = function() {
             var deferred = when.defer();
 
@@ -113,7 +112,7 @@ define([
                 }
             };
 
-            loadJsonp.loadAndExecuteScript(url, functionName, deferred);
+            loadJsonp.loadAndExecuteScript(resource.url, functionName, deferred);
             return deferred.promise;
         };
 
@@ -124,22 +123,21 @@ define([
 
         return promise
             .otherwise(function(e) {
-                if (request.state === RequestState.FAILED) {
-                    return resource.retryOnError(e)
-                        .then(function(retry) {
-                            if (retry) {
-                                // Reset request so it can try again
-                                request.state = RequestState.UNISSUED;
-                                request.deferred = undefined;
-
-                                return makeRequest(resource, callbackParameterName, functionName);
-                            }
-
-                            return when.reject(e);
-                        });
+                if (request.state !== RequestState.FAILED) {
+                    return when.reject(e);
                 }
-
-                return when.reject(e);
+                return resource.retryOnError(e)
+                    .then(function(retry) {
+                        if (retry) {
+                            // Reset request so it can try again
+                            request.state = RequestState.UNISSUED;
+                            request.deferred = undefined;
+
+                            return makeRequest(resource, callbackParameterName, functionName);
+                        }
+
+                        return when.reject(e);
+                    });
             });
     }
 
diff --git a/Source/Core/loadWithXhr.js b/Source/Core/loadWithXhr.js
@@ -85,19 +85,17 @@ define([
     }
 
     function makeRequest(optionsOrResource) {
-        var url = optionsOrResource.url;
         var request = optionsOrResource.request;
-        request.url = url;
-
-        var responseType = optionsOrResource.responseType;
-        var method = optionsOrResource.method;
-        var data = optionsOrResource.data;
-        var headers = optionsOrResource.headers;
-        var overrideMimeType = optionsOrResource.overrideMimeType;
+        request.url = optionsOrResource.url;
 
         request.requestFunction = function() {
+            var responseType = optionsOrResource.responseType;
+            var method = optionsOrResource.method;
+            var data = optionsOrResource.data;
+            var headers = optionsOrResource.headers;
+            var overrideMimeType = optionsOrResource.overrideMimeType;
             var deferred = when.defer();
-            var xhr = loadWithXhr.load(url, responseType, method, data, headers, deferred, overrideMimeType);
+            var xhr = loadWithXhr.load(optionsOrResource.url, responseType, method, data, headers, deferred, overrideMimeType);
             if (defined(xhr) && defined(xhr.abort)) {
                 request.cancelFunction = function() {
                     xhr.abort();
@@ -116,22 +114,22 @@ define([
                 return data;
             })
             .otherwise(function(e) {
-                if ((request.state === RequestState.FAILED) && defined(optionsOrResource.retryOnError)) {
-                    return optionsOrResource.retryOnError(e)
-                        .then(function(retry) {
-                            if (retry) {
-                                // Reset request so it can try again
-                                request.state = RequestState.UNISSUED;
-                                request.deferred = undefined;
-
-                                return makeRequest(optionsOrResource);
-                            }
-
-                            return when.reject(e);
-                        });
+                if ((request.state !== RequestState.FAILED) || !defined(optionsOrResource.retryOnError)) {
+                    return when.reject(e);
                 }
 
-                return when.reject(e);
+                return optionsOrResource.retryOnError(e)
+                    .then(function(retry) {
+                        if (retry) {
+                            // Reset request so it can try again
+                            request.state = RequestState.UNISSUED;
+                            request.deferred = undefined;
+
+                            return makeRequest(optionsOrResource);
+                        }
+
+                        return when.reject(e);
+                    });
             });
     }
 
diff --git a/Source/Scene/CesiumIon.js b/Source/Scene/CesiumIon.js
diff --git a/Specs/Scene/CesiumIonSpec.js b/Specs/Scene/CesiumIonSpec.js
