ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename _ol_TileRange_ to TileRange

Browse Source
This commit is contained in:
Frederic Junod
2017-12-17 17:46:10 +01:00
parent 72319c0b52
commit a7b743da07
7 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/spec/ol/source/tile.test.js
View File

@@ -1,6 +1,6 @@
import {inherits} from '../../../../src/ol/index.js';
import _ol_Tile_ from '../../../../src/ol/Tile.js';
import _ol_TileRange_ from '../../../../src/ol/TileRange.js';
import TileRange from '../../../../src/ol/TileRange.js';
import {get as getProjection} from '../../../../src/ol/proj.js';
import _ol_proj_Projection_ from '../../../../src/ol/proj/Projection.js';
import _ol_source_Source_ from '../../../../src/ol/source/Source.js';
@@ -154,7 +154,7 @@ describe('ol.source.Tile', function() {
});
var zoom = 1;
var range = new _ol_TileRange_(0, 1, 0, 1);
var range = new TileRange(0, 1, 0, 1);
source.forEachLoadedTile(source.getProjection(), zoom, range, callback);
expect(callback.callCount).to.be(3);
@@ -170,7 +170,7 @@ describe('ol.source.Tile', function() {
});
var zoom = 1;
var range = new _ol_TileRange_(0, 1, 0, 1);
var range = new TileRange(0, 1, 0, 1);
var covered = source.forEachLoadedTile(
source.getProjection(), zoom, range,
@@ -190,7 +190,7 @@ describe('ol.source.Tile', function() {
});
var zoom = 1;
var range = new _ol_TileRange_(0, 1, 0, 1);
var range = new TileRange(0, 1, 0, 1);
var covered = source.forEachLoadedTile(
source.getProjection(), zoom,
@@ -210,7 +210,7 @@ describe('ol.source.Tile', function() {
});
var zoom = 1;
var range = new _ol_TileRange_(0, 1, 0, 1);
var range = new TileRange(0, 1, 0, 1);
var covered = source.forEachLoadedTile(
source.getProjection(), zoom, range,

4
test/spec/ol/tilegrid/tilegrid.test.js
View File

@@ -1,5 +1,5 @@
import {DEFAULT_MAX_ZOOM, DEFAULT_TILE_SIZE} from '../../../../src/ol/tilegrid/common.js';
import _ol_TileRange_ from '../../../../src/ol/TileRange.js';
import TileRange from '../../../../src/ol/TileRange.js';
import * as _ol_extent_ from '../../../../src/ol/extent.js';
import {get as getProjection, METERS_PER_UNIT} from '../../../../src/ol/proj.js';
import _ol_proj_EPSG3857_ from '../../../../src/ol/proj/EPSG3857.js';
@@ -504,7 +504,7 @@ describe('ol.tilegrid.TileGrid', function() {
tileCoord,
function(z, tileRange) {
zs.push(z);
tileRanges.push(new _ol_TileRange_(
tileRanges.push(new TileRange(
tileRange.minX, tileRange.maxX,
tileRange.minY, tileRange.maxY));
return false;

48
test/spec/ol/tilerange.test.js
View File

@@ -1,17 +1,17 @@
import _ol_TileRange_ from '../../../src/ol/TileRange.js';
import TileRange from '../../../src/ol/TileRange.js';
describe('ol.TileRange', function() {
describe('constructor', function() {
it('creates a range', function() {
var range = new _ol_TileRange_(1, 3, 2, 4);
expect(range).to.be.a(_ol_TileRange_);
var range = new TileRange(1, 3, 2, 4);
expect(range).to.be.a(TileRange);
});
it('can represent a range of one tile', function() {
var range = new _ol_TileRange_(2, 2, 3, 3);
expect(range).to.be.a(_ol_TileRange_);
var range = new TileRange(2, 2, 3, 3);
expect(range).to.be.a(TileRange);
expect(range.getHeight()).to.be(1);
expect(range.getWidth()).to.be(1);
});
@@ -19,7 +19,7 @@ describe('ol.TileRange', function() {
describe('contains', function() {
it('returns the expected value', function() {
var tileRange = new _ol_TileRange_(1, 3, 1, 3);
var tileRange = new TileRange(1, 3, 1, 3);
expect(tileRange.contains([0, 0, 0])).to.not.be();
expect(tileRange.contains([0, 0, 1])).to.not.be();
expect(tileRange.contains([0, 0, 2])).to.not.be();
@@ -50,12 +50,12 @@ describe('ol.TileRange', function() {
describe('equals', function() {
it('determines equivalence of two ranges', function() {
var one = new _ol_TileRange_(0, 2, 1, 4);
var same = new _ol_TileRange_(0, 2, 1, 4);
var diff1 = new _ol_TileRange_(0, 2, 1, 5);
var diff2 = new _ol_TileRange_(0, 3, 1, 4);
var diff3 = new _ol_TileRange_(0, 2, 2, 4);
var diff4 = new _ol_TileRange_(1, 2, 1, 4);
var one = new TileRange(0, 2, 1, 4);
var same = new TileRange(0, 2, 1, 4);
var diff1 = new TileRange(0, 2, 1, 5);
var diff2 = new TileRange(0, 3, 1, 4);
var diff3 = new TileRange(0, 2, 2, 4);
var diff4 = new TileRange(1, 2, 1, 4);
expect(one.equals(same)).to.be(true);
expect(one.equals(diff1)).to.be(false);
expect(one.equals(diff2)).to.be(false);
@@ -66,8 +66,8 @@ describe('ol.TileRange', function() {
describe('extent', function() {
it('modifies range so it includes another', function() {
var one = new _ol_TileRange_(0, 2, 1, 4);
var other = new _ol_TileRange_(-1, -3, 10, 12);
var one = new TileRange(0, 2, 1, 4);
var other = new TileRange(-1, -3, 10, 12);
one.extend(other);
expect(one.minX).to.be(-1);
@@ -80,7 +80,7 @@ describe('ol.TileRange', function() {
describe('getSize', function() {
it('returns the expected size', function() {
var tileRange = new _ol_TileRange_(0, 2, 1, 4);
var tileRange = new TileRange(0, 2, 1, 4);
var size = tileRange.getSize();
expect(size).to.eql([3, 4]);
});
@@ -88,20 +88,20 @@ describe('ol.TileRange', function() {
describe('intersects', function() {
it('determines if two ranges overlap', function() {
var one = new _ol_TileRange_(0, 2, 1, 4);
var overlapsRight = new _ol_TileRange_(2, 4, 1, 4);
var overlapsLeft = new _ol_TileRange_(-3, 0, 1, 4);
var overlapsTop = new _ol_TileRange_(0, 2, 4, 5);
var overlapsBottom = new _ol_TileRange_(0, 2, -3, 1);
var one = new TileRange(0, 2, 1, 4);
var overlapsRight = new TileRange(2, 4, 1, 4);
var overlapsLeft = new TileRange(-3, 0, 1, 4);
var overlapsTop = new TileRange(0, 2, 4, 5);
var overlapsBottom = new TileRange(0, 2, -3, 1);
expect(one.intersects(overlapsLeft)).to.be(true);
expect(one.intersects(overlapsRight)).to.be(true);
expect(one.intersects(overlapsTop)).to.be(true);
expect(one.intersects(overlapsBottom)).to.be(true);
var right = new _ol_TileRange_(3, 5, 1, 4);
var left = new _ol_TileRange_(-3, -1, 1, 4);
var above = new _ol_TileRange_(0, 2, 5, 6);
var below = new _ol_TileRange_(0, 2, -3, 0);
var right = new TileRange(3, 5, 1, 4);
var left = new TileRange(-3, -1, 1, 4);
var above = new TileRange(0, 2, 5, 6);
var below = new TileRange(0, 2, -3, 0);
expect(one.intersects(right)).to.be(false);
expect(one.intersects(left)).to.be(false);
expect(one.intersects(above)).to.be(false);