Merge pull request #9099 from CesiumGS/terrain-throttle

Turn off throttle option when requesting for an availability tile from the parent terrain layer
CesiumGS · Aug 19, 2020 · 853ed28 · 853ed28
2 parents d33cff0 + d3c2d3a
commit 853ed28
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,7 @@
 - Fixed several artifcats on mobile devices caused by using insufficient precision. [#9064](https://github.com/CesiumGS/cesium/pull/9064)
 - Fixed handling of `data:` scheme for the Cesium ion logo URL. [#9085](https://github.com/CesiumGS/cesium/pull/9085)
 - Fixed an issue where the boundary rectangles in `TileAvailability` are not sorted correctly, causing terrain to sometimes fail to achieve its maximum detail. [#9098](https://github.com/CesiumGS/cesium/pull/9098)
+- Fixed an issue where a request for an availability tile of the reference layer is delayed because the throttle option is on. [##9099](https://github.com/CesiumGS/cesium/pull/9099)
 
 ### 1.72 - 2020-08-03
 

diff --git a/Source/Core/ArcGISTiledElevationTerrainProvider.js b/Source/Core/ArcGISTiledElevationTerrainProvider.js
@@ -624,7 +624,7 @@ function requestAvailability(that, level, x, y) {
   }
 
   var request = new Request({
-    throttle: true,
+    throttle: false,
     throttleByServer: true,
     type: RequestType.TERRAIN,
   });

diff --git a/Source/Core/CesiumTerrainProvider.js b/Source/Core/CesiumTerrainProvider.js
@@ -1278,7 +1278,7 @@ function checkLayer(provider, x, y, level, layer, topLayer) {
           // For cutout terrain, if this isn't the top layer the availability tiles
           //  may never get loaded, so request it here.
           var request = new Request({
-            throttle: true,
+            throttle: false,
             throttleByServer: true,
             type: RequestType.TERRAIN,
           });

diff --git a/Source/Core/GoogleEarthEnterpriseTerrainProvider.js b/Source/Core/GoogleEarthEnterpriseTerrainProvider.js
@@ -604,7 +604,7 @@ GoogleEarthEnterpriseTerrainProvider.prototype.getTileDataAvailable = function (
   if (metadata.isValid(quadKey)) {
     // We will need this tile, so request metadata and return false for now
     var request = new Request({
-      throttle: true,
+      throttle: false,
       throttleByServer: true,
       type: RequestType.TERRAIN,
     });

diff --git a/Source/Scene/TimeDynamicImagery.js b/Source/Scene/TimeDynamicImagery.js
@@ -282,7 +282,7 @@ function addToCache(that, tile, interval) {
 
   var keyElements = getKeyElements(key);
   var request = new Request({
-    throttle: true,
+    throttle: false,
     throttleByServer: true,
     type: RequestType.IMAGERY,
     priorityFunction: tile.priorityFunction,

diff --git a/Specs/Core/ArcGISTiledElevationTerrainProviderSpec.js b/Specs/Core/ArcGISTiledElevationTerrainProviderSpec.js
@@ -474,12 +474,11 @@ describe("Core/ArcGISTiledElevationTerrainProvider", function () {
         var promise;
         var i;
         for (i = 0; i < RequestScheduler.maximumRequestsPerServer; ++i) {
-          promise = terrainProvider.requestTileGeometry(
-            0,
-            0,
-            0,
-            createRequest()
-          );
+          var request = new Request({
+            throttle: true,
+            throttleByServer: true,
+          });
+          promise = terrainProvider.requestTileGeometry(0, 0, 0, request);
         }
         RequestScheduler.update();
         expect(promise).toBeDefined();

diff --git a/Specs/Scene/TimeDynamicImagerySpec.js b/Specs/Scene/TimeDynamicImagerySpec.js
@@ -142,7 +142,7 @@ describe("Scene/TimeDynamicImagery", function () {
     options.reloadFunction.calls.reset(); // Constructor calls reload
 
     var request = new Request({
-      throttle: true,
+      throttle: false,
       throttleByServer: true,
       type: RequestType.IMAGERY,
     });
@@ -173,7 +173,7 @@ describe("Scene/TimeDynamicImagery", function () {
     options.reloadFunction.calls.reset(); // Constructor calls reload
 
     var request = new Request({
-      throttle: true,
+      throttle: false,
       throttleByServer: true,
       type: RequestType.IMAGERY,
     });