Merge pull request #5250 from AnalyticalGraphicsInc/random-fixes

Master to 3D Tiles Cleanup

Author: bagnell

Apps/Sandcastle/Sandcastle-header.js

@@ -62,7 +62,6 @@
             };
             button.textContent = text;
             document.getElementById(toolbarID || 'toolbar').appendChild(button);
-            return button;
         },
         addDefaultToolbarButton : function(text, onclick, toolbarID) {
             window.Sandcastle.addToolbarButton(text, onclick, toolbarID);
@@ -94,7 +93,6 @@
                 option.value = options[i].value;
                 menu.appendChild(option);
             }
-            return menu;
         },
         reset : function() {
         }

CONTRIBUTORS.md

@@ -61,7 +61,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
    * [Sergio Flores](https://github.com/relfos)
 * [CubeWerx Inc.](http://www.cubewerx.com/)
    * [Keith Pomakis](https://github.com/pomakis)
-* [Vricon](http://www.vricon.com/)
+* [Vricon](https://www.vricon.com/)
    * [Erik Andersson](https://github.com/e-andersson)
 * [Simulation Curriculum](http://www.simulationcurriculum.com/)
    * [Dave Whipps](https://github.com/dwhipps)

Specs/Core/QueueSpec.js

@@ -35,19 +35,15 @@ defineSuite([
     });
 
     it('compacts underlying array', function() {
-        var q = new Queue({
-            compact : true
-        });
-
         var i;
         for (i = 0; i < 1000; i++) {
-            q.enqueue(i);
+            queue.enqueue(i);
         }
         for (i = 0; i < 1000; i++) {
-            q.dequeue();
+            queue.dequeue();
         }
 
-        expect(q._array.length).toBeLessThan(1000);
+        expect(queue._array.length).toBeLessThan(1000);
     });
 
     it('can peek at the item at the head of the queue', function() {

Specs/Scene/WebMapServiceImageryProviderSpec.js

@@ -266,32 +266,6 @@ defineSuite([
         });
     });
 
-    it('defaults WMS version to 1.1.1', function() {
-
-        var provider = new WebMapServiceImageryProvider({
-            url : 'made/up/wms/server?foo=bar',
-            layers : 'someLayer'
-        });
-
-        return pollToPromise(function() {
-            return provider.ready;
-        }).then(function() {
-            spyOn(loadImage, 'createImage').and.callFake(function(url, crossOrigin, deferred) {
-
-                var uri = new Uri(url);
-                var params = queryToObject(uri.query);
-                expect(params.version).toEqual('1.1.1');
-
-                // Don't need to actually load image, but satisfy the request.
-                deferred.resolve(true);
-            });
-
-            return provider.requestImage(0, 0, 0).then(function(image) {
-                expect(loadImage.createImage).toHaveBeenCalled();
-            });
-        });
-    });
-
     it('requestImage returns a promise for an image and loads it for cross-origin use', function() {
         var provider = new WebMapServiceImageryProvider({
             url : 'made/up/wms/server',
@@ -574,50 +548,6 @@ defineSuite([
         });
     });
 
-    it('requestImage requests tiles with CRS CRS:84 when tiling scheme is GeographicTilingScheme, WMS 1.3.1', function() {
-        var tilingScheme = new GeographicTilingScheme();
-        var provider = new WebMapServiceImageryProvider({
-            url : 'made/up/wms/server',
-            layers : 'someLayer',
-            tilingScheme : tilingScheme,
-            parameters: {
-              version: '1.3.1'
-            }
-        });
-
-        expect(provider.url).toEqual('made/up/wms/server');
-        expect(provider.layers).toEqual('someLayer');
-
-        return pollToPromise(function() {
-            return provider.ready;
-        }).then(function() {
-            expect(provider.tileWidth).toEqual(256);
-            expect(provider.tileHeight).toEqual(256);
-            expect(provider.maximumLevel).toBeUndefined();
-            expect(provider.tilingScheme).toBeInstanceOf(GeographicTilingScheme);
-            expect(provider.rectangle).toEqual(new GeographicTilingScheme().rectangle);
-
-            spyOn(loadImage, 'createImage').and.callFake(function(url, crossOrigin, deferred) {
-                var uri = new Uri(url);
-                var params = queryToObject(uri.query);
-
-                expect(params.crs).toEqual('CRS:84');
-                expect(params.version).toEqual('1.3.1');
-
-                var rect = tilingScheme.tileXYToNativeRectangle(0, 0, 0);
-                expect(params.bbox).toEqual(rect.west + ',' + rect.south + ',' + rect.east + ',' + rect.north);
-
-                // Just return any old image.
-                loadImage.defaultCreateImage('Data/Images/Red16x16.png', crossOrigin, deferred);
-            });
-
-            return provider.requestImage(0, 0, 0).then(function(image) {
-                expect(loadImage.createImage).toHaveBeenCalled();
-                expect(image).toBeInstanceOf(Image);
-            });
-        });
-    });
-
     it('does not treat parameter names as case sensitive', function() {
         var provider = new WebMapServiceImageryProvider({
             url : 'made/up/wms/server?foo=bar',