Rename _ol_TileRange_ to TileRange

src/ol/TileRange.js

@@ -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;

src/ol/renderer/canvas/TileLayer.js

@@ -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

src/ol/renderer/webgl/TileLayer.js

@@ -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) {

src/ol/tilegrid/TileGrid.js

@@ -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);
 };
 

test/spec/ol/source/tile.test.js

@@ -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,

test/spec/ol/tilegrid/tilegrid.test.js

@@ -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;

test/spec/ol/tilerange.test.js

@@ -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);
+      var range = new TileRange(1, 3, 2, 4);
-      expect(range).to.be.a(_ol_TileRange_);
+      expect(range).to.be.a(TileRange);
     });
 
     it('can represent a range of one tile', function() {
-      var range = new _ol_TileRange_(2, 2, 3, 3);
+      var range = new TileRange(2, 2, 3, 3);
-      expect(range).to.be.a(_ol_TileRange_);
+      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 one = new TileRange(0, 2, 1, 4);
-      var same = new _ol_TileRange_(0, 2, 1, 4);
+      var same = new TileRange(0, 2, 1, 4);
-      var diff1 = new _ol_TileRange_(0, 2, 1, 5);
+      var diff1 = new TileRange(0, 2, 1, 5);
-      var diff2 = new _ol_TileRange_(0, 3, 1, 4);
+      var diff2 = new TileRange(0, 3, 1, 4);
-      var diff3 = new _ol_TileRange_(0, 2, 2, 4);
+      var diff3 = new TileRange(0, 2, 2, 4);
-      var diff4 = new _ol_TileRange_(1, 2, 1, 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 one = new TileRange(0, 2, 1, 4);
-      var other = new _ol_TileRange_(-1, -3, 10, 12);
+      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 one = new TileRange(0, 2, 1, 4);
-      var overlapsRight = new _ol_TileRange_(2, 4, 1, 4);
+      var overlapsRight = new TileRange(2, 4, 1, 4);
-      var overlapsLeft = new _ol_TileRange_(-3, 0, 1, 4);
+      var overlapsLeft = new TileRange(-3, 0, 1, 4);
-      var overlapsTop = new _ol_TileRange_(0, 2, 4, 5);
+      var overlapsTop = new TileRange(0, 2, 4, 5);
-      var overlapsBottom = new _ol_TileRange_(0, 2, -3, 1);
+      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 right = new TileRange(3, 5, 1, 4);
-      var left = new _ol_TileRange_(-3, -1, 1, 4);
+      var left = new TileRange(-3, -1, 1, 4);
-      var above = new _ol_TileRange_(0, 2, 5, 6);
+      var above = new TileRange(0, 2, 5, 6);
-      var below = new _ol_TileRange_(0, 2, -3, 0);
+      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);