Merge pull request #1933 from AnalyticalGraphicsInc/issue1932

Show terrain and imagery (not just per-tile) credits.
CesiumGS · Jul 18, 2014 · 383c942 · 383c942
2 parents 2e0a1f0 + f8344cf
commit 383c942
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 1 deletion.
diff --git a/Source/Scene/GlobeSurfaceTileProvider.js b/Source/Scene/GlobeSurfaceTileProvider.js
@@ -245,15 +245,33 @@ define([
             });
         }
 
+        var i;
+        var len;
+
         var tilesToRenderByTextureCount = this._tilesToRenderByTextureCount;
-        for (var i = 0, len = tilesToRenderByTextureCount.length; i < len; ++i) {
+        for (i = 0, len = tilesToRenderByTextureCount.length; i < len; ++i) {
             var tiles = tilesToRenderByTextureCount[i];
             if (defined(tiles)) {
                 tiles.length = 0;
             }
         }
 
         this._usedDrawCommands = 0;
+
+        // Add credits for terrain and imagery providers.
+        var creditDisplay = frameState.creditDisplay;
+
+        if (this._terrainProvider.ready && defined(this._terrainProvider.credit)) {
+            creditDisplay.addCredit(this._terrainProvider.credit);
+        }
+
+        var imageryLayers = this._imageryLayers;
+        for (i = 0, len = imageryLayers.length; i < len; ++i) {
+            var imageryProvider = imageryLayers.get(i).imageryProvider;
+            if (imageryProvider.ready && defined(imageryProvider.credit)) {
+                creditDisplay.addCredit(imageryProvider.credit);
+            }
+        }
     };
 
     /**

diff --git a/Specs/Scene/GlobeSurfaceTileProviderSpec.js b/Specs/Scene/GlobeSurfaceTileProviderSpec.js
@@ -2,6 +2,8 @@
 defineSuite([
         'Scene/GlobeSurfaceTileProvider',
         'Core/Cartesian3',
+        'Core/CesiumTerrainProvider',
+        'Core/Credit',
         'Core/defined',
         'Core/Ellipsoid',
         'Core/EllipsoidTerrainProvider',
@@ -27,6 +29,8 @@ defineSuite([
     ], function(
         GlobeSurfaceTileProvider,
         Cartesian3,
+        CesiumTerrainProvider,
+        Credit,
         defined,
         Ellipsoid,
         EllipsoidTerrainProvider,
@@ -576,6 +580,31 @@ defineSuite([
         });
     });
 
+    it('adds terrain and imagery credits to the CreditDisplay', function() {
+        var layerCollection = globe.imageryLayers;
+        layerCollection.removeAll();
+
+        var imageryCredit = new Credit('imagery credit');
+        layerCollection.addImageryProvider(new SingleTileImageryProvider({
+            url : 'Data/Images/Red16x16.png',
+            credit : imageryCredit
+        }));
+
+        var terrainCredit = new Credit('terrain credit');
+        globe.terrainProvider = new CesiumTerrainProvider({
+            url : 'http://cesiumjs.org/stk-terrain/tilesets/world/tiles',
+            credit : terrainCredit
+        });
+
+        updateUntilDone(globe);
+
+        runs(function() {
+            var creditDisplay = frameState.creditDisplay;
+            expect(creditDisplay._currentFrameCredits.textCredits).toContain(imageryCredit);
+            expect(creditDisplay._currentFrameCredits.textCredits).toContain(terrainCredit);
+        });
+    });
+
     describe('switching terrain providers', function() {
         it('clears the replacement queue', function() {
             updateUntilDone(globe);