Merge pull request #5796 from AnalyticalGraphicsInc/tweak-terrain-sam…

…pling Use terrainProvider.readyPromise in preference to setTimeout()
CesiumGS · Sep 6, 2017 · 3646fef · 3646fef
2 parents 411944b + 49a3112
commit 3646fef
Showing 1 changed file with 1 addition and 15 deletions.
diff --git a/Source/Core/sampleTerrain.js b/Source/Core/sampleTerrain.js
@@ -47,21 +47,7 @@ define([
         Check.defined('positions', positions);
         //>>includeEnd('debug');
 
-        var deferred = when.defer();
-
-        function doSamplingWhenReady() {
-            if (terrainProvider.ready) {
-                when(doSampling(terrainProvider, level, positions), function(updatedPositions) {
-                    deferred.resolve(updatedPositions);
-                });
-            } else {
-                setTimeout(doSamplingWhenReady, 10);
-            }
-        }
-
-        doSamplingWhenReady();
-
-        return deferred.promise;
+        return terrainProvider.readyPromise.then(function() { return doSampling(terrainProvider, level, positions); });
     }
 
     function doSampling(terrainProvider, level, positions) {