Merge remote-tracking branch 'up/master' into fix-double-counting-ups…

…tream

CHANGES.md

@@ -1,6 +1,12 @@
 Change Log
 ==========
 
+### next
+
+##### Fixes :wrench:
+
+* Fixed issue where `RequestScheduler` double-counted image requests made via `createImageBitmap`. [#8162](https://github.com/AnalyticalGraphicsInc/cesium/issues/8162)
+
 ### 1.62 - 2019-10-01
 
 ##### Deprecated :hourglass_flowing_sand:
@@ -15,16 +21,7 @@ Change Log
 * Added `Matrix3.getRotation` to get the rotational component of a matrix with scaling removed. [#8182](https://github.com/AnalyticalGraphicsInc/cesium/pull/8182)
 
 ##### Fixes :wrench:
-* `Camera.flyTo` flies to the correct location in 2D when the destination crosses the international date line [#7909](https://github.com/AnalyticalGraphicsInc/cesium/pull/7909)
-* Fixed 3D tiles style coloring when multiple tilesets are in the scene [#8051](https://github.com/AnalyticalGraphicsInc/cesium/pull/8051)
-* Improved display of tile coordinates for `TileCoordinatesImageryProvider` [#8131](https://github.com/AnalyticalGraphicsInc/cesium/pull/8131)
-* Fixed relative-to-center check, `depthFailAppearance` resource freeing for `Primitive` [#8044](https://github.com/AnalyticalGraphicsInc/cesium/pull/8044)
-* Reduces size of approximateTerrainHeights.json by rounding the numbers [#7959](https://github.com/AnalyticalGraphicsInc/cesium/pull/7959)
-* Fixed undefined `quadDetails` error from zooming into the map really close. [#8011](https://github.com/AnalyticalGraphicsInc/cesium/pull/8011)
-* Fixed a bug where extruded polygons would sometimes be missing segments. [#8035](https://github.com/AnalyticalGraphicsInc/cesium/pull/8035)
-* 3D Tiles geometric error now scales with transform. [#8182](https://github.com/AnalyticalGraphicsInc/cesium/pull/8182)
-* Fixed per-feature post processing from sometimes selecting the wrong feature. [#7929](https://github.com/AnalyticalGraphicsInc/cesium/pull/7929)
-* Fixed issue where `RequestScheduler` double-counted image requests made via `createImageBitmap`. [#8162](https://github.com/AnalyticalGraphicsInc/cesium/issues/8162)
+
 * Fixed labels not showing for individual entities in data sources when clustering is enabled. [#6087](https://github.com/AnalyticalGraphicsInc/cesium/issues/6087)
 * Fixed an issue where polygons, corridors, rectangles, and ellipses on terrain would not render on some mobile devices. [#6739](https://github.com/AnalyticalGraphicsInc/cesium/issues/6739)
 * Fixed a bug where GlobeSurfaceTile would not render the tile until all layers completed loading causing globe to appear to hang. [#7974](https://github.com/AnalyticalGraphicsInc/cesium/issues/7974)

Specs/Scene/ArcGisMapServerImageryProviderSpec.js

@@ -1,54 +1,27 @@
-define([
-        'Core/appendForwardSlash',
-        'Core/Cartesian2',
-        'Core/Cartesian3',
-        'Core/Cartographic',
-        'Core/defined',
-        'Core/GeographicTilingScheme',
-        'Core/getAbsoluteUri',
-        'Core/objectToQuery',
-        'Core/queryToObject',
-        'Core/Rectangle',
-        'Core/Request',
-        'Core/RequestScheduler',
-        'Core/Resource',
-        'Core/WebMercatorProjection',
-        'Core/WebMercatorTilingScheme',
-        'Scene/ArcGisMapServerImageryProvider',
-        'Scene/DiscardMissingTileImagePolicy',
-        'Scene/Imagery',
-        'Scene/ImageryLayer',
-        'Scene/ImageryLayerFeatureInfo',
-        'Scene/ImageryProvider',
-        'Scene/ImageryState',
-        'Specs/pollToPromise',
-        'ThirdParty/Uri'
-    ], function(
-        appendForwardSlash,
-        Cartesian2,
-        Cartesian3,
-        Cartographic,
-        defined,
-        GeographicTilingScheme,
-        getAbsoluteUri,
-        objectToQuery,
-        queryToObject,
-        Rectangle,
-        Request,
-        RequestScheduler,
-        Resource,
-        WebMercatorProjection,
-        WebMercatorTilingScheme,
-        ArcGisMapServerImageryProvider,
-        DiscardMissingTileImagePolicy,
-        Imagery,
-        ImageryLayer,
-        ImageryLayerFeatureInfo,
-        ImageryProvider,
-        ImageryState,
-        pollToPromise,
-        Uri) {
-        'use strict';
+import { appendForwardSlash } from '../../Source/Cesium.js';
+import { Cartesian2 } from '../../Source/Cesium.js';
+import { Cartesian3 } from '../../Source/Cesium.js';
+import { Cartographic } from '../../Source/Cesium.js';
+import { defined } from '../../Source/Cesium.js';
+import { GeographicTilingScheme } from '../../Source/Cesium.js';
+import { getAbsoluteUri } from '../../Source/Cesium.js';
+import { objectToQuery } from '../../Source/Cesium.js';
+import { queryToObject } from '../../Source/Cesium.js';
+import { Rectangle } from '../../Source/Cesium.js';
+import { Request } from '../../Source/Cesium.js';
+import { RequestScheduler } from '../../Source/Cesium.js';
+import { Resource } from '../../Source/Cesium.js';
+import { WebMercatorProjection } from '../../Source/Cesium.js';
+import { WebMercatorTilingScheme } from '../../Source/Cesium.js';
+import { ArcGisMapServerImageryProvider } from '../../Source/Cesium.js';
+import { DiscardMissingTileImagePolicy } from '../../Source/Cesium.js';
+import { Imagery } from '../../Source/Cesium.js';
+import { ImageryLayer } from '../../Source/Cesium.js';
+import { ImageryLayerFeatureInfo } from '../../Source/Cesium.js';
+import { ImageryProvider } from '../../Source/Cesium.js';
+import { ImageryState } from '../../Source/Cesium.js';
+import pollToPromise from '../pollToPromise.js';
+import { Uri } from '../../Source/Cesium.js';
 
 describe('Scene/ArcGisMapServerImageryProvider', function() {
 

Specs/Scene/GoogleEarthEnterpriseImageryProviderSpec.js

@@ -1,44 +1,22 @@
-define([
-        'Core/decodeGoogleEarthEnterpriseData',
-        'Core/defaultValue',
-        'Core/defined',
-        'Core/GeographicTilingScheme',
-        'Core/GoogleEarthEnterpriseMetadata',
-        'Core/GoogleEarthEnterpriseTileInformation',
-        'Core/Rectangle',
-        'Core/Request',
-        'Core/RequestScheduler',
-        'Core/Resource',
-        'Scene/DiscardMissingTileImagePolicy',
-        'Scene/GoogleEarthEnterpriseImageryProvider',
-        'Scene/Imagery',
-        'Scene/ImageryLayer',
-        'Scene/ImageryProvider',
-        'Scene/ImageryState',
-        'Specs/pollToPromise',
-        'ThirdParty/Uri',
-        'ThirdParty/when'
-    ], function(
-        decodeGoogleEarthEnterpriseData,
-        defaultValue,
-        defined,
-        GeographicTilingScheme,
-        GoogleEarthEnterpriseMetadata,
-        GoogleEarthEnterpriseTileInformation,
-        Rectangle,
-        Request,
-        RequestScheduler,
-        Resource,
-        DiscardMissingTileImagePolicy,
-        GoogleEarthEnterpriseImageryProvider,
-        Imagery,
-        ImageryLayer,
-        ImageryProvider,
-        ImageryState,
-        pollToPromise,
-        Uri,
-        when) {
-        'use strict';
+import { decodeGoogleEarthEnterpriseData } from '../../Source/Cesium.js';
+import { defaultValue } from '../../Source/Cesium.js';
+import { defined } from '../../Source/Cesium.js';
+import { GeographicTilingScheme } from '../../Source/Cesium.js';
+import { GoogleEarthEnterpriseMetadata } from '../../Source/Cesium.js';
+import { GoogleEarthEnterpriseTileInformation } from '../../Source/Cesium.js';
+import { Rectangle } from '../../Source/Cesium.js';
+import { Request } from '../../Source/Cesium.js';
+import { RequestScheduler } from '../../Source/Cesium.js';
+import { Resource } from '../../Source/Cesium.js';
+import { DiscardMissingTileImagePolicy } from '../../Source/Cesium.js';
+import { GoogleEarthEnterpriseImageryProvider } from '../../Source/Cesium.js';
+import { Imagery } from '../../Source/Cesium.js';
+import { ImageryLayer } from '../../Source/Cesium.js';
+import { ImageryProvider } from '../../Source/Cesium.js';
+import { ImageryState } from '../../Source/Cesium.js';
+import pollToPromise from '../pollToPromise.js';
+import { Uri } from '../../Source/Cesium.js';
+import { when } from '../../Source/Cesium.js';
 
 describe('Scene/GoogleEarthEnterpriseImageryProvider', function() {
 

Specs/Scene/GoogleEarthEnterpriseMapsProviderSpec.js

@@ -1,30 +1,15 @@
-define([
-        'Core/GeographicTilingScheme',
-        'Core/Rectangle',
-        'Core/Request',
-        'Core/RequestScheduler',
-        'Core/Resource',
-        'Core/WebMercatorTilingScheme',
-        'Scene/GoogleEarthEnterpriseMapsProvider',
-        'Scene/Imagery',
-        'Scene/ImageryLayer',
-        'Scene/ImageryProvider',
-        'Scene/ImageryState',
-        'Specs/pollToPromise'
-    ], function(
-        GeographicTilingScheme,
-        Rectangle,
-        Request,
-        RequestScheduler,
-        Resource,
-        WebMercatorTilingScheme,
-        GoogleEarthEnterpriseMapsProvider,
-        Imagery,
-        ImageryLayer,
-        ImageryProvider,
-        ImageryState,
-        pollToPromise) {
-        'use strict';
+import { GeographicTilingScheme } from '../../Source/Cesium.js';
+import { Rectangle } from '../../Source/Cesium.js';
+import { Request } from '../../Source/Cesium.js';
+import { RequestScheduler } from '../../Source/Cesium.js';
+import { Resource } from '../../Source/Cesium.js';
+import { WebMercatorTilingScheme } from '../../Source/Cesium.js';
+import { GoogleEarthEnterpriseMapsProvider } from '../../Source/Cesium.js';
+import { Imagery } from '../../Source/Cesium.js';
+import { ImageryLayer } from '../../Source/Cesium.js';
+import { ImageryProvider } from '../../Source/Cesium.js';
+import { ImageryState } from '../../Source/Cesium.js';
+import pollToPromise from '../pollToPromise.js';
 
 describe('Scene/GoogleEarthEnterpriseMapsProvider', function() {
 

Specs/Scene/ImageryLayerSpec.js

@@ -1,52 +1,26 @@
-define([
-        'Core/EllipsoidTerrainProvider',
-        'Core/Rectangle',
-        'Core/Request',
-        'Core/RequestScheduler',
-        'Core/Resource',
-        'Renderer/ComputeEngine',
-        'Renderer/TextureMagnificationFilter',
-        'Renderer/TextureMinificationFilter',
-        'Scene/ArcGisMapServerImageryProvider',
-        'Scene/BingMapsImageryProvider',
-        'Scene/TileMapServiceImageryProvider',
-        'Scene/GlobeSurfaceTile',
-        'Scene/Imagery',
-        'Scene/ImageryLayer',
-        'Scene/ImageryLayerCollection',
-        'Scene/ImageryState',
-        'Scene/NeverTileDiscardPolicy',
-        'Scene/QuadtreeTile',
-        'Scene/SingleTileImageryProvider',
-        'Scene/UrlTemplateImageryProvider',
-        'Scene/WebMapServiceImageryProvider',
-        'Specs/createScene',
-        'Specs/pollToPromise'
-    ], function(
-        EllipsoidTerrainProvider,
-        Rectangle,
-        Request,
-        RequestScheduler,
-        Resource,
-        ComputeEngine,
-        TextureMagnificationFilter,
-        TextureMinificationFilter,
-        ArcGisMapServerImageryProvider,
-        BingMapsImageryProvider,
-        TileMapServiceImageryProvider,
-        GlobeSurfaceTile,
-        Imagery,
-        ImageryLayer,
-        ImageryLayerCollection,
-        ImageryState,
-        NeverTileDiscardPolicy,
-        QuadtreeTile,
-        SingleTileImageryProvider,
-        UrlTemplateImageryProvider,
-        WebMapServiceImageryProvider,
-        createScene,
-        pollToPromise) {
-        'use strict';
+import { EllipsoidTerrainProvider } from '../../Source/Cesium.js';
+import { Rectangle } from '../../Source/Cesium.js';
+import { Request } from '../../Source/Cesium.js';
+import { RequestScheduler } from '../../Source/Cesium.js';
+import { Resource } from '../../Source/Cesium.js';
+import { ComputeEngine } from '../../Source/Cesium.js';
+import { TextureMagnificationFilter } from '../../Source/Cesium.js';
+import { TextureMinificationFilter } from '../../Source/Cesium.js';
+import { ArcGisMapServerImageryProvider } from '../../Source/Cesium.js';
+import { BingMapsImageryProvider } from '../../Source/Cesium.js';
+import { TileMapServiceImageryProvider } from '../../Source/Cesium.js';
+import { GlobeSurfaceTile } from '../../Source/Cesium.js';
+import { Imagery } from '../../Source/Cesium.js';
+import { ImageryLayer } from '../../Source/Cesium.js';
+import { ImageryLayerCollection } from '../../Source/Cesium.js';
+import { ImageryState } from '../../Source/Cesium.js';
+import { NeverTileDiscardPolicy } from '../../Source/Cesium.js';
+import { QuadtreeTile } from '../../Source/Cesium.js';
+import { SingleTileImageryProvider } from '../../Source/Cesium.js';
+import { UrlTemplateImageryProvider } from '../../Source/Cesium.js';
+import { WebMapServiceImageryProvider } from '../../Source/Cesium.js';
+import createScene from '../createScene.js';
+import pollToPromise from '../pollToPromise.js';
 
 describe('Scene/ImageryLayer', function() {
 

Specs/Scene/MapboxImageryProviderSpec.js

@@ -1,32 +1,16 @@
-define([
-        'Core/MapboxApi',
-        'Core/Math',
-        'Core/Rectangle',
-        'Core/Request',
-        'Core/RequestScheduler',
-        'Core/Resource',
-        'Core/WebMercatorTilingScheme',
-        'Scene/Imagery',
-        'Scene/ImageryLayer',
-        'Scene/ImageryProvider',
-        'Scene/ImageryState',
-        'Scene/MapboxImageryProvider',
-        'Specs/pollToPromise'
-    ], function(
-        MapboxApi,
-        CesiumMath,
-        Rectangle,
-        Request,
-        RequestScheduler,
-        Resource,
-        WebMercatorTilingScheme,
-        Imagery,
-        ImageryLayer,
-        ImageryProvider,
-        ImageryState,
-        MapboxImageryProvider,
-        pollToPromise) {
-        'use strict';
+import { MapboxApi } from '../../Source/Cesium.js';
+import { Math as CesiumMath } from '../../Source/Cesium.js';
+import { Rectangle } from '../../Source/Cesium.js';
+import { Request } from '../../Source/Cesium.js';
+import { RequestScheduler } from '../../Source/Cesium.js';
+import { Resource } from '../../Source/Cesium.js';
+import { WebMercatorTilingScheme } from '../../Source/Cesium.js';
+import { Imagery } from '../../Source/Cesium.js';
+import { ImageryLayer } from '../../Source/Cesium.js';
+import { ImageryProvider } from '../../Source/Cesium.js';
+import { ImageryState } from '../../Source/Cesium.js';
+import { MapboxImageryProvider } from '../../Source/Cesium.js';
+import pollToPromise from '../pollToPromise.js';
 
 describe('Scene/MapboxImageryProvider', function() {
 

Specs/Scene/MapboxStyleImageryProviderSpec.js

@@ -1,32 +1,16 @@
-define([
-        'Core/MapboxApi',
-        'Core/Math',
-        'Core/Rectangle',
-        'Core/Request',
-        'Core/RequestScheduler',
-        'Core/Resource',
-        'Core/WebMercatorTilingScheme',
-        'Scene/Imagery',
-        'Scene/ImageryLayer',
-        'Scene/ImageryProvider',
-        'Scene/ImageryState',
-        'Scene/MapboxStyleImageryProvider',
-        'Specs/pollToPromise'
-    ], function(
-        MapboxApi,
-        CesiumMath,
-        Rectangle,
-        Request,
-        RequestScheduler,
-        Resource,
-        WebMercatorTilingScheme,
-        Imagery,
-        ImageryLayer,
-        ImageryProvider,
-        ImageryState,
-        MapboxStyleImageryProvider,
-        pollToPromise) {
-        'use strict';
+import { MapboxApi } from '../../Source/Cesium.js';
+import { Math as CesiumMath } from '../../Source/Cesium.js';
+import { Rectangle } from '../../Source/Cesium.js';
+import { Request } from '../../Source/Cesium.js';
+import { RequestScheduler } from '../../Source/Cesium.js';
+import { Resource } from '../../Source/Cesium.js';
+import { WebMercatorTilingScheme } from '../../Source/Cesium.js';
+import { Imagery } from '../../Source/Cesium.js';
+import { ImageryLayer } from '../../Source/Cesium.js';
+import { ImageryProvider } from '../../Source/Cesium.js';
+import { ImageryState } from '../../Source/Cesium.js';
+import { MapboxStyleImageryProvider } from '../../Source/Cesium.js';
+import pollToPromise from '../pollToPromise.js';
 
 describe('Scene/MapboxStyleImageryProvider', function() {