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

26
src/ol/TileRange.js
View File

@@ -12,7 +12,7 @@
* @param {number} maxY Maximum Y.
* @struct
*/
var _ol_TileRange_ = function(minX, maxX, minY, maxY) {
var TileRange = function(minX, maxX, minY, maxY) {
/**
* @type {number}
@@ -45,7 +45,7 @@ var _ol_TileRange_ = function(minX, maxX, minY, maxY) {
* @param {ol.TileRange|undefined} tileRange TileRange.
* @return {ol.TileRange} Tile range.
*/
_ol_TileRange_.createOrUpdate = function(minX, maxX, minY, maxY, tileRange) {
TileRange.createOrUpdate = function(minX, maxX, minY, maxY, tileRange) {
if (tileRange !== undefined) {
tileRange.minX = minX;
tileRange.maxX = maxX;
@@ -53,7 +53,7 @@ _ol_TileRange_.createOrUpdate = function(minX, maxX, minY, maxY, tileRange) {
tileRange.maxY = maxY;
return tileRange;
} else {
return new _ol_TileRange_(minX, maxX, minY, maxY);
return new TileRange(minX, maxX, minY, maxY);
}
};
@@ -62,7 +62,7 @@ _ol_TileRange_.createOrUpdate = function(minX, maxX, minY, maxY, tileRange) {
* @param {ol.TileCoord} tileCoord Tile coordinate.
* @return {boolean} Contains tile coordinate.
*/
_ol_TileRange_.prototype.contains = function(tileCoord) {
TileRange.prototype.contains = function(tileCoord) {
return this.containsXY(tileCoord[1], tileCoord[2]);
};
@@ -71,7 +71,7 @@ _ol_TileRange_.prototype.contains = function(tileCoord) {
* @param {ol.TileRange} tileRange Tile range.
* @return {boolean} Contains.
*/
_ol_TileRange_.prototype.containsTileRange = function(tileRange) {
TileRange.prototype.containsTileRange = function(tileRange) {
return this.minX <= tileRange.minX && tileRange.maxX <= this.maxX &&
this.minY <= tileRange.minY && tileRange.maxY <= this.maxY;
};
@@ -82,7 +82,7 @@ _ol_TileRange_.prototype.containsTileRange = function(tileRange) {
* @param {number} y Tile coordinate y.
* @return {boolean} Contains coordinate.
*/
_ol_TileRange_.prototype.containsXY = function(x, y) {
TileRange.prototype.containsXY = function(x, y) {
return this.minX <= x && x <= this.maxX && this.minY <= y && y <= this.maxY;
};
@@ -91,7 +91,7 @@ _ol_TileRange_.prototype.containsXY = function(x, y) {
* @param {ol.TileRange} tileRange Tile range.
* @return {boolean} Equals.
*/
_ol_TileRange_.prototype.equals = function(tileRange) {
TileRange.prototype.equals = function(tileRange) {
return this.minX == tileRange.minX && this.minY == tileRange.minY &&
this.maxX == tileRange.maxX && this.maxY == tileRange.maxY;
};
@@ -100,7 +100,7 @@ _ol_TileRange_.prototype.equals = function(tileRange) {
/**
* @param {ol.TileRange} tileRange Tile range.
*/
_ol_TileRange_.prototype.extend = function(tileRange) {
TileRange.prototype.extend = function(tileRange) {
if (tileRange.minX < this.minX) {
this.minX = tileRange.minX;
}
@@ -119,7 +119,7 @@ _ol_TileRange_.prototype.extend = function(tileRange) {
/**
* @return {number} Height.
*/
_ol_TileRange_.prototype.getHeight = function() {
TileRange.prototype.getHeight = function() {
return this.maxY - this.minY + 1;
};
@@ -127,7 +127,7 @@ _ol_TileRange_.prototype.getHeight = function() {
/**
* @return {ol.Size} Size.
*/
_ol_TileRange_.prototype.getSize = function() {
TileRange.prototype.getSize = function() {
return [this.getWidth(), this.getHeight()];
};
@@ -135,7 +135,7 @@ _ol_TileRange_.prototype.getSize = function() {
/**
* @return {number} Width.
*/
_ol_TileRange_.prototype.getWidth = function() {
TileRange.prototype.getWidth = function() {
return this.maxX - this.minX + 1;
};
@@ -144,10 +144,10 @@ _ol_TileRange_.prototype.getWidth = function() {
* @param {ol.TileRange} tileRange Tile range.
* @return {boolean} Intersects.
*/
_ol_TileRange_.prototype.intersects = function(tileRange) {
TileRange.prototype.intersects = function(tileRange) {
return this.minX <= tileRange.maxX &&
this.maxX >= tileRange.minX &&
this.minY <= tileRange.maxY &&
this.maxY >= tileRange.minY;
};
export default _ol_TileRange_;
export default TileRange;

4
src/ol/renderer/canvas/TileLayer.js
View File

@@ -3,7 +3,7 @@
*/
import {getUid, inherits} from '../../index.js';
import _ol_LayerType_ from '../../LayerType.js';
import _ol_TileRange_ from '../../TileRange.js';
import TileRange from '../../TileRange.js';
import _ol_TileState_ from '../../TileState.js';
import _ol_ViewHint_ from '../../ViewHint.js';
import {createCanvasContext2D} from '../../dom.js';
@@ -62,7 +62,7 @@ var _ol_renderer_canvas_TileLayer_ = function(tileLayer) {
* @private
* @type {ol.TileRange}
*/
this.tmpTileRange_ = new _ol_TileRange_(0, 0, 0, 0);
this.tmpTileRange_ = new TileRange(0, 0, 0, 0);
/**
* @private

4
src/ol/renderer/webgl/TileLayer.js
View File

@@ -6,7 +6,7 @@
import {inherits} from '../../index.js';
import _ol_LayerType_ from '../../LayerType.js';
import _ol_TileRange_ from '../../TileRange.js';
import TileRange from '../../TileRange.js';
import _ol_TileState_ from '../../TileState.js';
import _ol_array_ from '../../array.js';
import {createEmpty, intersects} from '../../extent.js';
@@ -247,7 +247,7 @@ _ol_renderer_webgl_TileLayer_.prototype.prepareFrame = function(frameState, laye
var useInterimTilesOnError = tileLayer.getUseInterimTilesOnError();
var allTilesLoaded = true;
var tmpExtent = createEmpty();
var tmpTileRange = new _ol_TileRange_(0, 0, 0, 0);
var tmpTileRange = new TileRange(0, 0, 0, 0);
var childTileRange, drawable, fullyLoaded, tile, tileState;
var x, y, tileExtent;
for (x = tileRange.minX; x <= tileRange.maxX; ++x) {

10
src/ol/tilegrid/TileGrid.js
View File

@@ -3,7 +3,7 @@
*/
import {DEFAULT_TILE_SIZE} from './common.js';
import _ol_asserts_ from '../asserts.js';
import _ol_TileRange_ from '../TileRange.js';
import TileRange from '../TileRange.js';
import _ol_array_ from '../array.js';
import {createOrUpdate, getTopLeft} from '../extent.js';
import _ol_math_ from '../math.js';
@@ -139,7 +139,7 @@ var _ol_tilegrid_TileGrid_ = function(options) {
if (options.sizes !== undefined) {
this.fullTileRanges_ = options.sizes.map(function(size, z) {
var tileRange = new _ol_TileRange_(
var tileRange = new TileRange(
Math.min(0, size[0]), Math.max(size[0] - 1, -1),
Math.min(0, size[1]), Math.max(size[1] - 1, -1));
return tileRange;
@@ -199,7 +199,7 @@ _ol_tilegrid_TileGrid_.prototype.forEachTileCoordParentTileRange = function(tile
if (this.zoomFactor_ === 2) {
x = Math.floor(x / 2);
y = Math.floor(y / 2);
tileRange = _ol_TileRange_.createOrUpdate(x, x, y, y, opt_tileRange);
tileRange = TileRange.createOrUpdate(x, x, y, y, opt_tileRange);
} else {
tileRange = this.getTileRangeForExtentAndZ(tileCoordExtent, z, opt_tileRange);
}
@@ -288,7 +288,7 @@ _ol_tilegrid_TileGrid_.prototype.getTileCoordChildTileRange = function(tileCoord
if (this.zoomFactor_ === 2) {
var minX = tileCoord[1] * 2;
var minY = tileCoord[2] * 2;
return _ol_TileRange_.createOrUpdate(minX, minX + 1, minY, minY + 1, opt_tileRange);
return TileRange.createOrUpdate(minX, minX + 1, minY, minY + 1, opt_tileRange);
}
var tileCoordExtent = this.getTileCoordExtent(tileCoord, opt_extent);
return this.getTileRangeForExtentAndZ(
@@ -330,7 +330,7 @@ _ol_tilegrid_TileGrid_.prototype.getTileRangeForExtentAndZ = function(extent, z,
var minX = tileCoord[1];
var minY = tileCoord[2];
this.getTileCoordForXYAndZ_(extent[2], extent[3], z, true, tileCoord);
return _ol_TileRange_.createOrUpdate(
return TileRange.createOrUpdate(
minX, tileCoord[1], minY, tileCoord[2], opt_tileRange);
};