Rename _ol_TileQueue_ to TileQueue

src/ol/PluggableMap.js

@@ -12,7 +12,7 @@ import _ol_MapEventType_ from './MapEventType.js';
 import _ol_MapProperty_ from './MapProperty.js';
 import _ol_Object_ from './Object.js';
 import _ol_ObjectEventType_ from './ObjectEventType.js';
-import _ol_TileQueue_ from './TileQueue.js';
+import TileQueue from './TileQueue.js';
 import _ol_View_ from './View.js';
 import _ol_ViewHint_ from './ViewHint.js';
 import _ol_asserts_ from './asserts.js';
@@ -325,7 +325,7 @@ var _ol_PluggableMap_ = function(options) {
    * @private
    * @type {ol.TileQueue}
    */
-  this.tileQueue_ = new _ol_TileQueue_(
+  this.tileQueue_ = new TileQueue(
       this.getTilePriority.bind(this),
       this.handleTileChange_.bind(this));
 

src/ol/TileQueue.js

@@ -16,7 +16,7 @@ import PriorityQueue from './structs/PriorityQueue.js';
  *     Function called on each tile change event.
  * @struct
  */
-var _ol_TileQueue_ = function(tilePriorityFunction, tileChangeCallback) {
+var TileQueue = function(tilePriorityFunction, tileChangeCallback) {
 
   PriorityQueue.call(
       this,
@@ -55,13 +55,13 @@ var _ol_TileQueue_ = function(tilePriorityFunction, tileChangeCallback) {
 
 };
 
-inherits(_ol_TileQueue_, PriorityQueue);
+inherits(TileQueue, PriorityQueue);
 
 
 /**
  * @inheritDoc
  */
-_ol_TileQueue_.prototype.enqueue = function(element) {
+TileQueue.prototype.enqueue = function(element) {
   var added = PriorityQueue.prototype.enqueue.call(this, element);
   if (added) {
     var tile = element[0];
@@ -75,7 +75,7 @@ _ol_TileQueue_.prototype.enqueue = function(element) {
 /**
  * @return {number} Number of tiles loading.
  */
-_ol_TileQueue_.prototype.getTilesLoading = function() {
+TileQueue.prototype.getTilesLoading = function() {
   return this.tilesLoading_;
 };
 
@@ -84,7 +84,7 @@ _ol_TileQueue_.prototype.getTilesLoading = function() {
  * @param {ol.events.Event} event Event.
  * @protected
  */
-_ol_TileQueue_.prototype.handleTileChange = function(event) {
+TileQueue.prototype.handleTileChange = function(event) {
   var tile = /** @type {ol.Tile} */ (event.target);
   var state = tile.getState();
   if (state === _ol_TileState_.LOADED || state === _ol_TileState_.ERROR ||
@@ -105,7 +105,7 @@ _ol_TileQueue_.prototype.handleTileChange = function(event) {
  * @param {number} maxTotalLoading Maximum number tiles to load simultaneously.
  * @param {number} maxNewLoads Maximum number of new tiles to load.
  */
-_ol_TileQueue_.prototype.loadMoreTiles = function(maxTotalLoading, maxNewLoads) {
+TileQueue.prototype.loadMoreTiles = function(maxTotalLoading, maxNewLoads) {
   var newLoads = 0;
   var abortedTiles = false;
   var state, tile, tileKey;
@@ -129,4 +129,4 @@ _ol_TileQueue_.prototype.loadMoreTiles = function(maxTotalLoading, maxNewLoads)
     this.tileChangeCallback_();
   }
 };
-export default _ol_TileQueue_;
+export default TileQueue;

src/ol/source/Raster.js

@@ -3,7 +3,7 @@
  */
 import {getUid, inherits} from '../index.js';
 import _ol_ImageCanvas_ from '../ImageCanvas.js';
-import _ol_TileQueue_ from '../TileQueue.js';
+import TileQueue from '../TileQueue.js';
 import {createCanvasContext2D} from '../dom.js';
 import _ol_events_ from '../events.js';
 import Event from '../events/Event.js';
@@ -69,7 +69,7 @@ var _ol_source_Raster_ = function(options) {
    * @private
    * @type {ol.TileQueue}
    */
-  this.tileQueue_ = new _ol_TileQueue_(
+  this.tileQueue_ = new TileQueue(
       function() {
         return 1;
       },

test/spec/ol/tilequeue.test.js

@@ -1,6 +1,6 @@
 import _ol_ImageTile_ from '../../../src/ol/ImageTile.js';
 import _ol_Tile_ from '../../../src/ol/Tile.js';
-import _ol_TileQueue_ from '../../../src/ol/TileQueue.js';
+import TileQueue from '../../../src/ol/TileQueue.js';
 import _ol_TileState_ from '../../../src/ol/TileState.js';
 import _ol_source_Image_ from '../../../src/ol/source/Image.js';
 import PriorityQueue from '../../../src/ol/structs/PriorityQueue.js';
@@ -40,8 +40,8 @@ describe('ol.TileQueue', function() {
     var noop = function() {};
 
     it('works when tile queues share tiles', function(done) {
-      var q1 = new _ol_TileQueue_(noop, noop);
-      var q2 = new _ol_TileQueue_(noop, noop);
+      var q1 = new TileQueue(noop, noop);
+      var q2 = new TileQueue(noop, noop);
 
       var numTiles = 20;
       for (var i = 0; i < numTiles; ++i) {
@@ -91,7 +91,7 @@ describe('ol.TileQueue', function() {
 
     it('calls #tileChangeCallback_ when all wanted tiles are aborted', function() {
       var tileChangeCallback = sinon.spy();
-      var queue = new _ol_TileQueue_(noop, tileChangeCallback);
+      var queue = new TileQueue(noop, tileChangeCallback);
       var numTiles = 20;
       for (var i = 0; i < numTiles; ++i) {
         var tile = createImageTile();
@@ -108,7 +108,7 @@ describe('ol.TileQueue', function() {
   describe('heapify', function() {
     it('does convert an arbitrary array into a heap', function() {
 
-      var tq = new _ol_TileQueue_(function() {});
+      var tq = new TileQueue(function() {});
       addRandomPriorityTiles(tq, 100);
 
       tq.heapify_();
@@ -118,7 +118,7 @@ describe('ol.TileQueue', function() {
   describe('reprioritize', function() {
     it('does reprioritize the array', function() {
 
-      var tq = new _ol_TileQueue_(function() {});
+      var tq = new TileQueue(function() {});
       addRandomPriorityTiles(tq, 100);
 
       tq.heapify_();
@@ -145,7 +145,7 @@ describe('ol.TileQueue', function() {
     var noop = function() {};
 
     it('abort queued tiles', function() {
-      var tq = new _ol_TileQueue_(noop, noop);
+      var tq = new TileQueue(noop, noop);
       var tile = createImageTile();
       expect(tile.hasListener('change')).to.be(false);
 
@@ -158,7 +158,7 @@ describe('ol.TileQueue', function() {
     });
 
     it('abort loading tiles', function() {
-      var tq = new _ol_TileQueue_(noop, noop);
+      var tq = new TileQueue(noop, noop);
       var tile = createImageTile(noop);
 
       tq.enqueue([tile]);