Merge branch 'master' into patch-1

jasonbeverage · Sep 5, 2019 · 4729112 · 4729112
2 parents 9a78ad4 + 64cc4dc
commit 4729112
Show file tree

Hide file tree

Showing 190 changed files with 484 additions and 12,679 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -2,7 +2,6 @@ Apps/HelloWorld.html
 Apps/Sandcastle/ThirdParty/**
 Build/**
 Documentation/**
-Instrumented/**
 Source/Shaders/**
 Source/ThirdParty/**
 Source/Workers/cesiumWorkerBootstrapper.js

diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 /.metadata
 /Build
-/Instrumented
 /Cesium-*.zip
 /cesium-*.tgz
 .DS_Store

diff --git a/.npmignore b/.npmignore
@@ -11,6 +11,7 @@
 /.travis.yml
 /.vscode
 /Apps
+/Build/Coverage
 /Build/minifyShaders.state
 /Build/Stubs
 /Build/Documentation
@@ -20,7 +21,6 @@
 /gulpfile.js
 /index.html
 /index.release.html
-/Instrumented
 /launches
 /server.js
 /Source/copyrightHeader.js

diff --git a/.slackbot.yml b/.slackbot.yml
@@ -1,11 +1,11 @@
 releaseSchedule:
-  ggetz: 2/1/2019
-  hpinkos: 3/1/2019
-  lilleyse: 4/1/2019
-  tfili: 5/1/2019
-  dbagnell: 6/3/2019
-  tfili: 7/1/2019
-  tfili: 8/1/2019
+  OmarShehata: 9/2/2019
+  mramato: 10/1/2019
+  hpinkos: 11/1/2019
+  lilleyse: 12/1/2019
+  ggetz: 1/2/2020
+  likangning93: 2/3/2020
+  tfili: 3/2/2020
 
 greetings:
   - Happy Friday everyone!

diff --git a/.travis.yml b/.travis.yml
@@ -16,9 +16,8 @@ script:
   - npm --silent run eslint
 
   - npm --silent run build
-  - npm --silent run test -- --browsers FirefoxHeadless --webgl-stub --failTaskOnError --suppressPassed
+  - npm --silent run coverage -- --browsers FirefoxHeadless --webgl-stub --failTaskOnError --suppressPassed
 
-  - npm --silent run clean
   - travis_wait 20 npm --silent run makeZipFile -- --concurrency 1
   - npm pack &> /dev/null
 
@@ -27,7 +26,7 @@ script:
   - npm --silent run deploy-s3 -- -b cesium-dev -d cesium/$TRAVIS_BRANCH --confirm -c 'no-cache'
   - npm --silent run deploy-status -- --status success --message Deployed
 
-  - npm --silent run test -- --browsers FirefoxHeadless --failTaskOnError --webgl-stub --release --suppressPassed
+  - npm --silent run test -- --browsers ChromeCI --failTaskOnError --webgl-stub --release --suppressPassed
 
 # Various Node.js smoke-screen tests
   - node -e "const Cesium = require('./');"

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -13,7 +13,6 @@
     },
     "search.exclude": {
         "Build": true,
-        "Instrumented": true,
         "node_modules": true,
         "Source/Shaders/**/*.js": true
     },

diff --git a/Apps/Sandcastle/gallery/3D Tiles Feature Picking.html b/Apps/Sandcastle/gallery/3D Tiles Feature Picking.html
@@ -22,6 +22,7 @@
 </style>
 <div id="cesiumContainer" class="fullSize"></div>
 <div id="loadingOverlay"><h1>Loading...</h1></div>
+<div id="toolbar"></div>
 <script id="cesium_sandcastle_script">
 function startup(Cesium) {
     'use strict';

diff --git a/Apps/Sandcastle/gallery/3D Tiles Inspector.html b/Apps/Sandcastle/gallery/3D Tiles Inspector.html
@@ -22,6 +22,7 @@
 </style>
 <div id="cesiumContainer" class="fullSize"></div>
 <div id="loadingOverlay"><h1>Loading...</h1></div>
+<div id="toolbar"></div>
 <script id="cesium_sandcastle_script">
 function startup(Cesium) {
     'use strict';

diff --git a/Apps/Sandcastle/gallery/3D Tiles Photogrammetry Classification.html b/Apps/Sandcastle/gallery/3D Tiles Photogrammetry Classification.html
@@ -34,7 +34,7 @@
 
 // A normal b3dm tileset of photogrammetry
 var tileset = new Cesium.Cesium3DTileset({
-    url: Cesium.IonResource.fromAssetId(6074)
+    url: Cesium.IonResource.fromAssetId(40866)
 });
 viewer.scene.primitives.add(tileset);
 viewer.zoomTo(tileset);

diff --git a/Apps/Sandcastle/gallery/3D Tiles Photogrammetry.html b/Apps/Sandcastle/gallery/3D Tiles Photogrammetry.html
@@ -22,6 +22,7 @@
 </style>
 <div id="cesiumContainer" class="fullSize"></div>
 <div id="loadingOverlay"><h1>Loading...</h1></div>
+<div id="toolbar"></div>
 <script id="cesium_sandcastle_script">
 function startup(Cesium) {
     'use strict';
@@ -31,7 +32,7 @@
 });
 
 var tileset = new Cesium.Cesium3DTileset({
-    url: Cesium.IonResource.fromAssetId(6074)
+    url: Cesium.IonResource.fromAssetId(40866)
 });
 
 viewer.scene.primitives.add(tileset);

diff --git a/Apps/Sandcastle/gallery/3D Tiles Point Cloud Classification.html b/Apps/Sandcastle/gallery/3D Tiles Point Cloud Classification.html
@@ -22,6 +22,7 @@
 </style>
 <div id="cesiumContainer" class="fullSize"></div>
 <div id="loadingOverlay"><h1>Loading...</h1></div>
+<div id="toolbar"></div>
 <script id="cesium_sandcastle_script">
 function startup(Cesium) {
     'use strict';

diff --git a/Apps/Sandcastle/gallery/3D Tiles Point Cloud.html b/Apps/Sandcastle/gallery/3D Tiles Point Cloud.html
@@ -22,6 +22,7 @@
 </style>
 <div id="cesiumContainer" class="fullSize"></div>
 <div id="loadingOverlay"><h1>Loading...</h1></div>
+<div id="toolbar"></div>
 <script id="cesium_sandcastle_script">
 function startup(Cesium) {
     'use strict';

diff --git a/Apps/Sandcastle/gallery/3D Tiles Terrain Classification.html b/Apps/Sandcastle/gallery/3D Tiles Terrain Classification.html
@@ -22,6 +22,7 @@
 </style>
 <div id="cesiumContainer" class="fullSize"></div>
 <div id="loadingOverlay"><h1>Loading...</h1></div>
+<div id="toolbar"></div>
 <script id="cesium_sandcastle_script">
 function startup(Cesium) {
     'use strict';

diff --git a/Apps/Sandcastle/gallery/Clamp to 3D Tiles.html b/Apps/Sandcastle/gallery/Clamp to 3D Tiles.html
@@ -45,7 +45,7 @@
 
 var tileset = scene.primitives.add(
     new Cesium.Cesium3DTileset({
-        url: Cesium.IonResource.fromAssetId(6074)
+        url: Cesium.IonResource.fromAssetId(40866)
     })
 );
 

diff --git a/Apps/Sandcastle/gallery/Classification Types.html b/Apps/Sandcastle/gallery/Classification Types.html
@@ -31,7 +31,7 @@
     terrainProvider: Cesium.createWorldTerrain()
 });
 
-var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(6074) });
+var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(40866) });
 viewer.scene.primitives.add(tileset);
 
 tileset.readyPromise.then(function(){

diff --git a/Apps/Sandcastle/gallery/Classification.html b/Apps/Sandcastle/gallery/Classification.html
@@ -202,7 +202,7 @@
     scene.invertClassificationColor.alpha = parseFloat(value);
 }
 
-var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(6074) });
+var tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(40866) });
 scene.primitives.add(tileset);
 
 var viewModel = {

diff --git a/Apps/Sandcastle/gallery/Custom Geocoder.html b/Apps/Sandcastle/gallery/Custom Geocoder.html
@@ -32,6 +32,7 @@
 </style>
 <div id="cesiumContainer" class="fullSize"></div>
 <div id="loadingOverlay"><h1>Loading...</h1></div>
+<div id="toolbar"></div>
 <script id="cesium_sandcastle_script">
 function startup(Cesium) {
     'use strict';

diff --git a/Apps/Sandcastle/gallery/HTML Overlays.html b/Apps/Sandcastle/gallery/HTML Overlays.html
@@ -22,6 +22,7 @@
 </style>
 <div id="cesiumContainer" class="fullSize"></div>
 <div id="loadingOverlay"><h1>Loading...</h1></div>
+<div id="toolbar"></div>
 <img id="htmlOverlay" style="position: absolute" src="../images/Cesium_Logo_overlay.png">
 <script id="cesium_sandcastle_script">
 function startup(Cesium) {

diff --git a/Apps/Sandcastle/gallery/Polylines on 3D Tiles.html b/Apps/Sandcastle/gallery/Polylines on 3D Tiles.html
@@ -59,7 +59,7 @@
 
 var building = viewer.scene.primitives.add(
     new Cesium.Cesium3DTileset({
-        url: Cesium.IonResource.fromAssetId(6074)
+        url: Cesium.IonResource.fromAssetId(40866)
     })
 );
 var route = viewer.entities.add({

diff --git a/Apps/Sandcastle/gallery/Sample Height from 3D Tiles.html b/Apps/Sandcastle/gallery/Sample Height from 3D Tiles.html
@@ -36,7 +36,7 @@
 
 var tileset = scene.primitives.add(
     new Cesium.Cesium3DTileset({
-        url: Cesium.IonResource.fromAssetId(6074)
+        url: Cesium.IonResource.fromAssetId(40866)
     })
 );
 

diff --git a/Apps/Sandcastle/gallery/Scene Rendering Performance.html b/Apps/Sandcastle/gallery/Scene Rendering Performance.html
@@ -147,7 +147,7 @@ <h4>Max delta time</h4>
 function loadTilesetScenario() {
     resetScene();
 
-    tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(6074) });
+    tileset = new Cesium.Cesium3DTileset({ url: Cesium.IonResource.fromAssetId(40866) });
     viewer.scene.primitives.add(tileset);
     viewer.zoomTo(tileset);
 }

diff --git a/Apps/Sandcastle/gallery/Terrain Clipping Planes.html b/Apps/Sandcastle/gallery/Terrain Clipping Planes.html
@@ -48,7 +48,8 @@
 var viewer = new Cesium.Viewer('cesiumContainer', {
     skyAtmosphere: false,
     shouldAnimate : true,
-    terrainProvider: Cesium.createWorldTerrain()
+    terrainProvider: Cesium.createWorldTerrain(),
+    scene3DOnly: true
 });
 var globe = viewer.scene.globe;
 

diff --git a/Apps/Sandcastle/gallery/Time Dynamic Wheels.html b/Apps/Sandcastle/gallery/Time Dynamic Wheels.html
@@ -99,7 +99,7 @@
     position : position,
     orientation : new Cesium.VelocityOrientationProperty(position), // Automatically set the vehicle's orientation to the direction it's facing.
     model : {
-        uri : '../../../../Apps/SampleData/models/GroundVehicle/GroundVehicle.glb',
+        uri : '../../SampleData/models/GroundVehicle/GroundVehicle.glb',
         runAnimations : false,
         nodeTransformations : nodeTransformations
     },

diff --git a/Apps/Sandcastle/gallery/development/Many Clipping Planes.html b/Apps/Sandcastle/gallery/development/Many Clipping Planes.html
@@ -152,7 +152,7 @@
 }
 
 var modelUrl = '../../SampleData/models/CesiumAir/Cesium_Air.glb';
-var agiHqUrl = Cesium.IonResource.fromAssetId(6074);
+var agiHqUrl = Cesium.IonResource.fromAssetId(40866);
 var instancedUrl = '../../SampleData/Cesium3DTiles/Instanced/InstancedOrientation/tileset.json';
 var pointCloudUrl = Cesium.IonResource.fromAssetId(5713);
 

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,23 @@
 Change Log
 ==========
 
+### 1.61 - 2019-09-03
+
+##### Additions :tada:
+* Added optional `index` parameter to `PrimitiveCollection.add`. [#8041](https://github.com/AnalyticalGraphicsInc/cesium/pull/8041)
+* Cesium now renders at native device resolution by default instead of CSS pixel resolution, to go back to the old behavior, set `viewer.resolutionScale = 1.0 / window.devicePixelRatio`. [#8082](https://github.com/AnalyticalGraphicsInc/cesium/issues/8082)
+* Added `getByName` method to `DataSourceCollection` allowing to retrieve `DataSource`s by their name property from the collection
+
+##### Fixes :wrench:
+* Disable FXAA by default. To re-enable, set `scene.postProcessStages.fxaa.enabled = true` [#7875](https://github.com/AnalyticalGraphicsInc/cesium/issues/7875)
+* Fixed a crash when a glTF model used `KHR_texture_transform` without a sampler defined. [#7916](https://github.com/AnalyticalGraphicsInc/cesium/issues/7916)
+* Fixed post-processing selection filtering to work for bloom. [#7984](https://github.com/AnalyticalGraphicsInc/cesium/issues/7984)
+* Disabled HDR by default to improve visual quality in most standard use cases. Set `viewer.scene.highDynamicRange = true` to re-enable. [#7966](https://github.com/AnalyticalGraphicsInc/cesium/issues/7966)
+* Fixed a bug that causes hidden point primitives to still appear on some operating systems. [#8043](https://github.com/AnalyticalGraphicsInc/cesium/issues/8043)
+* Fix negative altitude altitude handling in `GoogleEarthEnterpriseTerrainProvider`. [#8109](https://github.com/AnalyticalGraphicsInc/cesium/pull/8109)
+* Fixed issue where KTX or CRN files would not be properly identified. [#7979](https://github.com/AnalyticalGraphicsInc/cesium/issues/7979)
+* Fixed multiple globe materials making the globe darker. [#7726](https://github.com/AnalyticalGraphicsInc/cesium/issues/7726)
+
 ### 1.60 - 2019-08-01
 
 ##### Additions :tada:

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -127,6 +127,14 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
    * [Chris Andrews](https://github.com/chri7928/)
 * [Cesium GS, Inc.](https://cesium.com/)
    * [Tom Fili](https://github.com/tfili)
+   * [Sarah Chow](https://github.com/slchow)
+   * [Omar Shehata](https://github.com/OmarShehata)
+   * [Hannah Pinkos](https://github.com/hpinkos)
+   * [Kangning Li](https://github.com/likangning93)
+   * [Sean Lilley](https://github.com/lilleyse)
+   * [Matthew Amato](https://github.com/mramato)
+   * [Brandon Barker](https://github.com/ProjectBarks)
+   * [Peter Gagliardi](https://github.com/ptrgags)
 
 ## [Individual CLA](Documentation/Contributors/CLAs/individual-contributor-license-agreement-v1.0.pdf)
 * [Victor Berchet](https://github.com/vicb)
@@ -216,4 +224,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
 * [Dennis Adams](https://github.com/dennisadams)
 * [Hai Zhou](https://github.com/verybigzhouhai)
 * [Pascal Poulain](https://github.com/ppoulainpro)
+* [Abu Darda](https://github.com/abuDarda97)
+* [jony89](https://github.com/jony89)
 * [TJKoury] (https://github.com/tjkoury)
+
diff --git a/Documentation/Contributors/BuildGuide/README.md b/Documentation/Contributors/BuildGuide/README.md
@@ -103,9 +103,9 @@ Here's the full set of scripts and what they do.
       * `release` - A full release build that creates a shippable product, including building apps and generating documentation.
       * `makeZipFile` - Builds a zip file containing all release files.  This includes the source tree (suitable for use from an AMD-aware application), plus the combined and minified Cesium.js files, the generated documentation, the test suite, and the example applications (in both built and source form).
    * **Utility scripts** -- code coverage, static code analysis, and other utilities
-      * `instrumentForCoverage` - Runs [JSCoverage](http://siliconforks.com/jscoverage/) on the source tree to allow running tests with coverage information.  Use the link in index.html.  Currently Windows only.
+      * `coverage` - Runs coverage and opens the default browser with the results.
       * `eslint` - Runs [ESLint](http://eslint.org/), a static code analysis tool, on the entire source tree.
-      * `eslint-watch` - A never-ending task that watches your file system for changes to Cesium and runs ESLint on any changed source files.  
+      * `eslint-watch` - A never-ending task that watches your file system for changes to Cesium and runs ESLint on any changed source files.
       * `clean` - Removes all generated build artifacts.
       * `cloc` - Runs [CLOC](https://github.com/AlDanial/cloc) to count the lines of code on the Source and Specs directories.  This requires [Perl](http://www.perl.org/) to execute.
       * `sortRequires` - Alphabetically sorts the list of required modules in every `js` file.  It also makes sure that the top of every source file uses the same formatting.

diff --git a/Documentation/Contributors/TestingGuide/4.jpg b/Documentation/Contributors/TestingGuide/4.jpg
diff --git a/Documentation/Contributors/TestingGuide/5.jpg b/Documentation/Contributors/TestingGuide/5.jpg
diff --git a/Documentation/Contributors/TestingGuide/README.md b/Documentation/Contributors/TestingGuide/README.md
@@ -14,7 +14,7 @@ All new code should have 100% code coverage and should pass all tests.  Always r
    * [Run Only WebGL Tests](#run-only-webgl-tests)
    * [Run Only Non-WebGL Tests](#run-only-non-webgl-tests)
    * [Run All Tests against Combined File (Run All Tests against Combined File with Debug Code Removed)]()
-   * [Run All Tests with Code Coverage (Build 'instrumentForCoverage' First)](#run-all-tests-against-combined-file-run-all-tests-against-combined-file-with-debug-code-removed)
+   * [Run All Tests with Coverage](#run-all-tests-against-combined-file-run-all-tests-against-combined-file-with-debug-code-removed)
    * [Running Tests on the Command Line with Karma](#running-tests-on-the-command-line-with-karma)
 * [Testing Previous Versions of CesiumJS](#testing-previous-versions-of-cesium)
 * [`testfailure` Label for Issues](#testfailure-label-for-issues)
@@ -108,25 +108,25 @@ The **Run All Tests against Combined File with Debug Code Removed** is the same
 
 See the [Build Guide](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/Documentation/Contributors/BuildGuide/README.md#build-scripts) for all the CesiumJS build options.
 
-### Run All Tests with Code Coverage (Build 'instrumentForCoverage' First)
+## Run Coverage
 
-[JSCoverage](http://siliconforks.com/jscoverage/) is used for code coverage.  It is especially important to have outstanding code coverage since JavaScript doesn't have a compiler and linker to catch early errors.
+We use [istanbul](https://istanbul.js.org/) via [karma-coverage](https://github.com/karma-runner/karma-coverage) to generate code coverage reports. It is especially important to have outstanding code coverage since JavaScript doesn't have a compiler and linker to catch early errors.
 
-To run code coverage, first create a build of CesiumJS that is instrumented for coverage by running `npm run instrumentForCoverage`.  Currently, this is Windows only.
+To generate a coverage report, run: `npm run coverage`. This will place a report inside of the `Build/Coverage/<browser>` folder and open your default browser with the result.
 
-Then use this test option to run the tests with code coverage.  Click on the `Summary` tab to see the total code coverage and coverage for each individual source file.
+You'll see a source tree that matches Cesium's own code layout. Each directory shows aggregated results for all files it contains.
 
 ![](4.jpg)
 
-Click on a file to see line-by-line coverage for just that file.  For example, here is `AssociativeArray`:
+Click on a directory to see results for each file in that directory.  Click on a specific file to see line-by-line coverage for just that file.  For example, here is `Core/AssociativeArray`:
 
 ![](5.jpg)
 
-In the left margin, green indicates a line that was executed, and red indicates a line that was not.  Many lines, such as comments and semicolons, are not colored since they are not executable.
+In the left margin, green indicates how many times a line was executed. Many lines, such as comments and semicolons, are not colored since they are not executable.
 
 For the `contains` function above
    * `AssociativeArray.prototype.contains = function(key) {` is executed once when CesiumJS is loaded to assign the `contains` function to the `AssociativeArray`'s prototype.
-   * The `if` statement and return statement are executed 3,425 times.
+   * The `if` statement and return statement are executed 8,022 times.
    * The `throw` statement is not executed, which indicates that test coverage should be improved here.  We strive to test _all_ error conditions.
 
 When writing tests, do not confuse 100% code coverage with 100% tested.  For example, it is possible to have 100% code coverage without having any expectations.  Also consider the following code:

diff --git a/Source/Core/EllipsoidTerrainProvider.js b/Source/Core/EllipsoidTerrainProvider.js
@@ -38,7 +38,7 @@ define([
      * @see TerrainProvider
      */
     function EllipsoidTerrainProvider(options) {
-        options = defaultValue(options, {});
+        options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
         this._tilingScheme = options.tilingScheme;
         if (!defined(this._tilingScheme)) {

diff --git a/Source/Core/Fullscreen.js b/Source/Core/Fullscreen.js
@@ -251,5 +251,8 @@ define([
         document[_names.exitFullscreen]();
     };
 
+    //For unit tests
+    Fullscreen._names = _names;
+
     return Fullscreen;
 });
diff --git a/Source/Core/GeographicTilingScheme.js b/Source/Core/GeographicTilingScheme.js
@@ -38,7 +38,7 @@ define([
      * the tile tree.
      */
     function GeographicTilingScheme(options) {
-        options = defaultValue(options, {});
+        options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
         this._ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.WGS84);
         this._rectangle = defaultValue(options.rectangle, Rectangle.MAX_VALUE);

diff --git a/Source/Core/GoogleEarthEnterpriseTerrainProvider.js b/Source/Core/GoogleEarthEnterpriseTerrainProvider.js
@@ -116,7 +116,7 @@ define([
      * @see {@link http://www.w3.org/TR/cors/|Cross-Origin Resource Sharing}
      */
     function GoogleEarthEnterpriseTerrainProvider(options) {
-        options = defaultValue(options, {});
+        options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
         //>>includeStart('debug', pragmas.debug);
         if (!(defined(options.url) || defined(options.metadata))) {

diff --git a/Source/Core/Ion.js b/Source/Core/Ion.js
@@ -9,7 +9,7 @@ define([
     'use strict';
 
     var defaultTokenCredit;
-    var defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIwNDU2NmUwYi05ZTAxLTQ2MTgtODk3NC1kNTIyYjRmZTAwMzciLCJpZCI6MjU5LCJzY29wZXMiOlsiYXNyIiwiZ2MiXSwiaWF0IjoxNTY0NjI0Mzg4fQ.avNK2ld_7qZPwG3ofB74a3TdmiB0sTzz6fx8YKw3NzE';
+    var defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJiMmQ0Y2Q5MC1kMDAxLTRmMGQtOTNiNC03NDBjN2Y2NjVkZjciLCJpZCI6MjU5LCJzY29wZXMiOlsiYXNyIiwiZ2MiXSwiaWF0IjoxNTY3NTIwOTE0fQ.84UrCVzvba9W_41CRxmtBwpRhzHf6Y89RlT-ZyW6Q-I';
 
     /**
      * Default settings for accessing the Cesium ion API.

diff --git a/Source/Core/WebMercatorTilingScheme.js b/Source/Core/WebMercatorTilingScheme.js
@@ -40,7 +40,7 @@ define([
      *        direction, resulting in a square projection.
      */
     function WebMercatorTilingScheme(options) {
-        options = defaultValue(options, {});
+        options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
         this._ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.WGS84);
         this._numberOfLevelZeroTilesX = defaultValue(options.numberOfLevelZeroTilesX, 1);