Source updates for new extent structure

This commit is contained in:
Tim Schaub
2013-09-03 17:50:33 -06:00
parent a670b7979c
commit 75cb19d7e1
9 changed files with 21 additions and 19 deletions

View File

@@ -192,7 +192,7 @@ describe('ol.source.Tile', function() {
* @param {Object.<string, boolean>} loaded Lookup of already loaded tiles.
*/
ol.test.source.TileMock = function(loaded) {
var extent = [-180, 180, -180, 180];
var extent = [[-180, -180], [180, 180]];
var tileGrid = new ol.tilegrid.TileGrid({
resolutions: [360 / 256, 180 / 256, 90 / 256, 45 / 256],
extent: extent,

View File

@@ -20,7 +20,7 @@ describe('ol.source.Vector', function() {
var layer = new ol.layer.Vector({
source: source
});
source.prepareFeatures(layer, [-180, 180, -90, 90],
source.prepareFeatures(layer, [[-180, -90], [180, 90]],
ol.proj.get('EPSG:4326'),
function() {
expect(source.loadState_).to.be(ol.source.VectorLoadState.LOADED);
@@ -66,7 +66,7 @@ describe('ol.source.Vector', function() {
var layer = new ol.layer.Vector({
source: source
});
source.prepareFeatures(layer, [-180, 180, -90, 90],
source.prepareFeatures(layer, [[-180, -90], [180, 90]],
ol.proj.get('EPSG:4326'),
function() {
expect(source.loadState_).to.be(ol.source.VectorLoadState.LOADED);

View File

@@ -5,7 +5,7 @@ describe('ol.source.wms', function() {
describe('ol.source.wms.getUrl', function() {
it('creates expected URL', function() {
var epsg3857 = ol.proj.get('EPSG:3857');
var extent = [-20037508.342789244, 0, -20037508.342789244, 0];
var extent = [[-20037508.342789244, -20037508.342789244], [0, 0]];
var expected = 'http://wms?SERVICE=WMS&VERSION=1.3.0&REQUEST=' +
'GetMap&FORMAT=image%2Fpng&TRANSPARENT=true&WIDTH=256&HEIGHT=256&' +
'foo=bar&STYLES=&CRS=EPSG%3A3857&BBOX=' +
@@ -16,7 +16,7 @@ describe('ol.source.wms', function() {
});
it('creates expected URL respecting axis orientation', function() {
var epsg4326 = ol.proj.get('EPSG:4326');
var extent = [-180, 0, -90, 90];
var extent = [[-180, -90], [0, 90]];
var expected = 'http://wms?SERVICE=WMS&VERSION=1.3.0&REQUEST=' +
'GetMap&FORMAT=image%2Fpng&TRANSPARENT=true&WIDTH=256&HEIGHT=256&' +
'foo=bar&STYLES=&CRS=EPSG%3A4326&BBOX=-90%2C-180%2C90%2C0';