From 57a77509245e8be7b0fe34fc61900bc0553af066 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Tue, 20 Feb 2018 15:53:46 +0100
Subject: [PATCH] Named exports from ol/structs/PriorityQueue

---
 src/ol/PluggableMap.js                     | 6 +++---
 src/ol/structs/PriorityQueue.js            | 7 +++----
 test/spec/ol/structs/priorityqueue.test.js | 4 ++--
 test/spec/ol/tilequeue.test.js             | 4 ++--
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/ol/PluggableMap.js b/src/ol/PluggableMap.js
index 5cc9b07e4c..82bd7dee49 100644
--- a/src/ol/PluggableMap.js
+++ b/src/ol/PluggableMap.js
@@ -27,7 +27,7 @@ import LayerGroup from './layer/Group.js';
 import {getMapRendererPlugins} from './plugins.js';
 import RendererType from './renderer/Type.js';
 import {hasArea} from './size.js';
-import PriorityQueue from './structs/PriorityQueue.js';
+import {DROP} from './structs/PriorityQueue.js';
 import {create as createTransform, apply as applyTransform} from './transform.js';
 
 
@@ -878,10 +878,10 @@ PluggableMap.prototype.getTilePriority = function(tile, tileSourceKey, tileCente
   // are outside the visible extent.
   const frameState = this.frameState_;
   if (!frameState || !(tileSourceKey in frameState.wantedTiles)) {
-    return PriorityQueue.DROP;
+    return DROP;
   }
   if (!frameState.wantedTiles[tileSourceKey][tile.getKey()]) {
-    return PriorityQueue.DROP;
+    return DROP;
   }
   // Prioritize the highest zoom level tiles closest to the focus.
   // Tiles at higher zoom levels are prioritized using Math.log(tileResolution).
diff --git a/src/ol/structs/PriorityQueue.js b/src/ol/structs/PriorityQueue.js
index 7531d2d820..ff800bced3 100644
--- a/src/ol/structs/PriorityQueue.js
+++ b/src/ol/structs/PriorityQueue.js
@@ -55,10 +55,9 @@ const PriorityQueue = function(priorityFunction, keyFunction) {
 
 
 /**
- * @const
  * @type {number}
  */
-PriorityQueue.DROP = Infinity;
+export const DROP = Infinity;
 
 
 /**
@@ -102,7 +101,7 @@ PriorityQueue.prototype.enqueue = function(element) {
   assert(!(this.keyFunction_(element) in this.queuedElements_),
     31); // Tried to enqueue an `element` that was already added to the queue
   const priority = this.priorityFunction_(element);
-  if (priority != PriorityQueue.DROP) {
+  if (priority != DROP) {
     this.elements_.push(element);
     this.priorities_.push(priority);
     this.queuedElements_[this.keyFunction_(element)] = true;
@@ -262,7 +261,7 @@ PriorityQueue.prototype.reprioritize = function() {
   for (i = 0; i < n; ++i) {
     element = elements[i];
     priority = priorityFunction(element);
-    if (priority == PriorityQueue.DROP) {
+    if (priority == DROP) {
       delete this.queuedElements_[this.keyFunction_(element)];
     } else {
       priorities[index] = priority;
diff --git a/test/spec/ol/structs/priorityqueue.test.js b/test/spec/ol/structs/priorityqueue.test.js
index 8fbb19cb5f..6934b068eb 100644
--- a/test/spec/ol/structs/priorityqueue.test.js
+++ b/test/spec/ol/structs/priorityqueue.test.js
@@ -1,4 +1,4 @@
-import PriorityQueue from '../../../../src/ol/structs/PriorityQueue.js';
+import PriorityQueue, {DROP} from '../../../../src/ol/structs/PriorityQueue.js';
 
 
 describe('ol.structs.PriorityQueue', function() {
@@ -102,7 +102,7 @@ describe('ol.structs.PriorityQueue', function() {
         if (i++ % 2 === 0) {
           return Math.abs(element - target);
         } else {
-          return PriorityQueue.DROP;
+          return DROP;
         }
       };
       pq.reprioritize();
diff --git a/test/spec/ol/tilequeue.test.js b/test/spec/ol/tilequeue.test.js
index 77e41e2b49..865e78a602 100644
--- a/test/spec/ol/tilequeue.test.js
+++ b/test/spec/ol/tilequeue.test.js
@@ -3,7 +3,7 @@ import Tile from '../../../src/ol/Tile.js';
 import TileQueue from '../../../src/ol/TileQueue.js';
 import TileState from '../../../src/ol/TileState.js';
 import ImageSource from '../../../src/ol/source/Image.js';
-import PriorityQueue from '../../../src/ol/structs/PriorityQueue.js';
+import {DROP} from '../../../src/ol/structs/PriorityQueue.js';
 
 
 describe('ol.TileQueue', function() {
@@ -129,7 +129,7 @@ describe('ol.TileQueue', function() {
       let i = 0;
       tq.priorityFunction_ = function() {
         if ((i++) % 2 === 0) {
-          return PriorityQueue.DROP;
+          return DROP;
         }
         return Math.floor(Math.random() * 100);
       };