Revert changes in #6558

CesiumGS · May 8, 2018 · a79b93f · a79b93f
1 parent 845846c
commit a79b93f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 58 deletions.
diff --git a/Source/Scene/Cesium3DTileset.js b/Source/Scene/Cesium3DTileset.js
@@ -1435,8 +1435,25 @@ define([
 
         ++statistics.numberOfPendingRequests;
 
+        var removeFunction = removeFromProcessingQueue(tileset, tile);
         tile.contentReadyToProcessPromise.then(addToProcessingQueue(tileset, tile));
-        tile.contentReadyPromise.then(handleTileSuccess(tileset, tile)).otherwise(handleTileFailure(tileset, tile));
+        tile.contentReadyPromise.then(function() {
+            removeFunction();
+            tileset.tileLoad.raiseEvent(tile);
+        }).otherwise(function(error) {
+            removeFunction();
+            var url = tile._contentResource.url;
+            var message = defined(error.message) ? error.message : error.toString();
+            if (tileset.tileFailed.numberOfListeners > 0) {
+                tileset.tileFailed.raiseEvent({
+                    url : url,
+                    message : message
+                });
+            } else {
+                console.log('A 3D tile failed to load: ' + url);
+                console.log('Error: ' + message);
+            }
+        });
     }
 
     function requestTiles(tileset, outOfCore) {
@@ -1459,32 +1476,15 @@ define([
         };
     }
 
-    function handleTileFailure(tileset, tile) {
-        return function(error) {
-            if (tileset._processingQueue.indexOf(tile) >= 0) {
-                // Failed during processing
-                --tileset._statistics.numberOfTilesProcessing;
-            } else {
-                // Failed when making request
+    function removeFromProcessingQueue(tileset, tile) {
+        return function() {
+            if (tile._contentState === Cesium3DTileContentState.FAILED) {
+                // Not in processing queue
+                // For example, when a url request fails and the ready promise is rejected
                 --tileset._statistics.numberOfPendingRequests;
+                return;
             }
 
-            var url = tile._contentResource.url;
-            var message = defined(error.message) ? error.message : error.toString();
-            if (tileset.tileFailed.numberOfListeners > 0) {
-                tileset.tileFailed.raiseEvent({
-                    url : url,
-                    message : message
-                });
-            } else {
-                console.log('A 3D tile failed to load: ' + url);
-                console.log('Error: ' + message);
-            }
-        };
-    }
-
-    function handleTileSuccess(tileset, tile) {
-        return function() {
             --tileset._statistics.numberOfTilesProcessing;
 
             if (tile.hasRenderableContent) {
@@ -1498,8 +1498,6 @@ define([
                     tile.replacementNode = tileset._replacementList.add(tile);
                 }
             }
-
-            tileset.tileLoad.raiseEvent(tile);
         };
     }
 

diff --git a/Specs/Scene/Cesium3DTilesetSpec.js b/Specs/Scene/Cesium3DTilesetSpec.js
@@ -480,38 +480,6 @@ defineSuite([
                 fail('should not resolve');
             }).otherwise(function(error) {
                 expect(root._contentState).toEqual(Cesium3DTileContentState.FAILED);
-                var statistics = tileset.statistics;
-                expect(statistics.numberOfAttemptedRequests).toBe(0);
-                expect(statistics.numberOfPendingRequests).toBe(0);
-                expect(statistics.numberOfTilesProcessing).toBe(0);
-                expect(statistics.numberOfTilesWithContentReady).toBe(0);
-            });
-        });
-    });
-
-    it('handles failed tile processing', function() {
-        viewRootOnly();
-        var tileset = scene.primitives.add(new Cesium3DTileset({
-            url : tilesetUrl
-        }));
-        return tileset.readyPromise.then(function(tileset) {
-            // Start spying after the tileset json has been loaded
-            spyOn(Resource._Implementations, 'loadWithXhr').and.callFake(function(url, responseType, method, data, headers, deferred, overrideMimeType) {
-                deferred.resolve(Cesium3DTilesTester.generateBatchedTileBuffer({
-                    version : 0 // Invalid version
-                }));
-            });
-            scene.renderForSpecs(); // Request root
-            var root = tileset._root;
-            return root.contentReadyPromise.then(function() {
-                fail('should not resolve');
-            }).otherwise(function(error) {
-                expect(root._contentState).toEqual(Cesium3DTileContentState.FAILED);
-                var statistics = tileset.statistics;
-                expect(statistics.numberOfAttemptedRequests).toBe(0);
-                expect(statistics.numberOfPendingRequests).toBe(0);
-                expect(statistics.numberOfTilesProcessing).toBe(0);
-                expect(statistics.numberOfTilesWithContentReady).toBe(0);
             });
         });
     });