ol 4.4.1-beta.1 → 4.4.2

package/index.js

@@ -170,7 +170,7 @@ _ol_.WEBGL_TEXTURE_CACHE_HIGH_WATER_MARK = 1024;
 /**
  * @define {string} OpenLayers version.
  */
-_ol_.VERSION = 'v4.4.1-beta.1';
+_ol_.VERSION = 'v4.4.2';
 
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "4.4.1-beta.1",
+  "version": "4.4.2",
   "description": "OpenLayers as ES2015 modules",
   "main": "index.js",
   "module": "index.js",

package/render/canvas/textreplay.js

@@ -307,6 +307,7 @@ _ol_render_canvas_TextReplay_.prototype.getImage_ = function(text, fill, stroke)
     var fillState = this.textFillState_;
     var textState = this.textState_;
     var pixelRatio = this.pixelRatio;
+    var scale = this.textScale_ * pixelRatio;
     var align =  _ol_render_replay_.TEXT_ALIGN[textState.textAlign || _ol_render_canvas_.defaultTextAlign];
     var strokeWidth = stroke && strokeState.lineWidth ? strokeState.lineWidth : 0;
 
@@ -314,17 +315,17 @@ _ol_render_canvas_TextReplay_.prototype.getImage_ = function(text, fill, stroke)
     var width = _ol_render_canvas_TextReplay_.measureTextWidths(textState.font, lines, widths);
     var lineHeight = _ol_render_canvas_TextReplay_.measureTextHeight(textState.font);
     var height = lineHeight * numLines;
-    var renderWidth = (width + 2 * strokeWidth);
+    var renderWidth = (width + strokeWidth);
     var context = _ol_dom_.createCanvasContext2D(
-        Math.ceil(renderWidth * pixelRatio),
-        Math.ceil((height + 2 * strokeWidth) * pixelRatio));
+        Math.ceil(renderWidth * scale),
+        Math.ceil((height + strokeWidth) * scale));
     label = context.canvas;
     _ol_render_canvas_TextReplay_.labelCache_.set(key, label);
-    context.scale(pixelRatio, pixelRatio);
+    context.scale(scale, scale);
     context.font = textState.font;
     if (stroke) {
       context.strokeStyle = strokeState.strokeStyle;
-      context.lineWidth = strokeState.lineWidth;
+      context.lineWidth = strokeWidth * (_ol_has_.SAFARI ? scale : 1);
       context.lineCap = strokeState.lineCap;
       context.lineJoin = strokeState.lineJoin;
       context.miterLimit = strokeState.miterLimit;
@@ -339,16 +340,16 @@ _ol_render_canvas_TextReplay_.prototype.getImage_ = function(text, fill, stroke)
     context.textBaseline = 'top';
     context.textAlign = 'center';
     var leftRight = (0.5 - align);
-    var x = align * label.width / pixelRatio + leftRight * 2 * strokeWidth;
+    var x = align * label.width / scale + leftRight * strokeWidth;
     var i;
     if (stroke) {
       for (i = 0; i < numLines; ++i) {
-        context.strokeText(lines[i], x + leftRight * widths[i], strokeWidth + i * lineHeight);
+        context.strokeText(lines[i], x + leftRight * widths[i], 0.5 * strokeWidth + i * lineHeight);
       }
     }
     if (fill) {
       for (i = 0; i < numLines; ++i) {
-        context.fillText(lines[i], x + leftRight * widths[i], strokeWidth + i * lineHeight);
+        context.fillText(lines[i], x + leftRight * widths[i], 0.5 * strokeWidth + i * lineHeight);
       }
     }
   }
@@ -375,12 +376,12 @@ _ol_render_canvas_TextReplay_.prototype.drawTextImage_ = function(label, begin,
   this.instructions.push([_ol_render_canvas_Instruction_.DRAW_IMAGE, begin, end,
     label, (anchorX - this.textOffsetX_) * pixelRatio, (anchorY - this.textOffsetY_) * pixelRatio,
     label.height, 1, 0, 0, this.textRotateWithView_, this.textRotation_,
-    this.textScale_, true, label.width
+    1, true, label.width
   ]);
   this.hitDetectionInstructions.push([_ol_render_canvas_Instruction_.DRAW_IMAGE, begin, end,
     label, (anchorX - this.textOffsetX_) * pixelRatio, (anchorY - this.textOffsetY_) * pixelRatio,
     label.height, 1, 0, 0, this.textRotateWithView_, this.textRotation_,
-    this.textScale_ / pixelRatio, true, label.width
+    1 / pixelRatio, true, label.width
   ]);
 };
 
@@ -421,14 +422,14 @@ _ol_render_canvas_TextReplay_.prototype.drawChars_ = function(begin, end) {
   this.instructions.push([_ol_render_canvas_Instruction_.DRAW_CHARS,
     begin, end, labels, baseline,
     textState.exceedLength, textState.maxAngle,
-    _ol_render_canvas_TextReplay_.getTextWidth.bind(widths, context, pixelRatio),
-    offsetY, this.text_, align, this.textScale_
+    _ol_render_canvas_TextReplay_.getTextWidth.bind(widths, context, pixelRatio * this.textScale_),
+    offsetY, this.text_, align, 1
   ]);
   this.hitDetectionInstructions.push([_ol_render_canvas_Instruction_.DRAW_CHARS,
     begin, end, labels, baseline,
     textState.exceedLength, textState.maxAngle,
-    _ol_render_canvas_TextReplay_.getTextWidth.bind(widths, context, 1),
-    offsetY, this.text_, align, this.textScale_ / pixelRatio
+    _ol_render_canvas_TextReplay_.getTextWidth.bind(widths, context, this.textScale_),
+    offsetY, this.text_, align, 1 / pixelRatio
   ]);
 };
 
@@ -528,7 +529,7 @@ _ol_render_canvas_TextReplay_.prototype.setTextStyle = function(textStyle) {
       strokeState.lineCap + strokeState.lineDashOffset + '|' + strokeState.lineWidth +
       strokeState.lineJoin + strokeState.miterLimit + '[' + strokeState.lineDash.join() + ']' :
       '';
-    this.textKey_ = textState.font + textState.textAlign;
+    this.textKey_ = textState.font + (textState.textAlign || '?') + this.textScale_;
     this.fillKey_ = fillState ?
       (typeof fillState.fillStyle == 'string' ? fillState.fillStyle : ('|' + _ol_.getUid(fillState.fillStyle))) :
       '';

package/renderer/canvas/tilelayer.js

@@ -226,7 +226,9 @@ _ol_renderer_canvas_TileLayer_.prototype.prepareFrame = function(frameState, lay
         canvas.width = width;
         canvas.height = height;
       } else {
-        context.clearRect(0, 0, width, height);
+        if (this.renderedExtent_ && !_ol_extent_.equals(imageExtent, this.renderedExtent_)) {
+          context.clearRect(0, 0, width, height);
+        }
         oversampling = this.oversampling_;
       }
     }

package/renderer/layer.js

@@ -254,7 +254,7 @@ _ol_renderer_Layer_.prototype.manageTilePyramid = function(
   var tileQueue = frameState.tileQueue;
   var minZoom = tileGrid.getMinZoom();
   var tile, tileRange, tileResolution, x, y, z;
-  for (z = currentZ; z >= minZoom; --z) {
+  for (z = minZoom; z <= currentZ; ++z) {
     tileRange = tileGrid.getTileRangeForExtentAndZ(extent, z, tileRange);
     tileResolution = tileGrid.getResolution(z);
     for (x = tileRange.minX; x <= tileRange.maxX; ++x) {

package/source/raster.js

@@ -179,6 +179,8 @@ _ol_source_Raster_.prototype.updateFrameState_ = function(extent, resolution, pr
   frameState.focus = center;
   frameState.size[0] = Math.round(_ol_extent_.getWidth(extent) / resolution);
   frameState.size[1] = Math.round(_ol_extent_.getHeight(extent) / resolution);
+  frameState.time = Date.now();
+  frameState.animate = false;
 
   var viewState = frameState.viewState;
   viewState.center = center;
@@ -232,6 +234,11 @@ _ol_source_Raster_.prototype.getImage = function(extent, resolution, pixelRatio,
   }
 
   frameState.tileQueue.loadMoreTiles(16, 16);
+
+  if (frameState.animate) {
+    requestAnimationFrame(this.changed.bind(this));
+  }
+
   return this.renderedImageCanvas_;
 };
 

package/source/tile.js

@@ -118,7 +118,7 @@ _ol_source_Tile_.prototype.forEachLoadedTile = function(projection, z, tileRange
   var tile, tileCoordKey, loaded;
   for (var x = tileRange.minX; x <= tileRange.maxX; ++x) {
     for (var y = tileRange.minY; y <= tileRange.maxY; ++y) {
-      tileCoordKey = this.getKeyZXY(z, x, y);
+      tileCoordKey = _ol_tilecoord_.getKeyZXY(z, x, y);
       loaded = false;
       if (tileCache.containsKey(tileCoordKey)) {
         tile = /** @type {!ol.Tile} */ (tileCache.get(tileCoordKey));
@@ -168,16 +168,6 @@ _ol_source_Tile_.prototype.setKey = function(key) {
 };
 
 
-/**
- * @param {number} z Z.
- * @param {number} x X.
- * @param {number} y Y.
- * @return {string} Key.
- * @protected
- */
-_ol_source_Tile_.prototype.getKeyZXY = _ol_tilecoord_.getKeyZXY;
-
-
 /**
  * @param {ol.proj.Projection} projection Projection.
  * @return {boolean} Opaque.

package/source/tiledebug.js

@@ -4,6 +4,7 @@ import _ol_TileState_ from '../tilestate.js';
 import _ol_dom_ from '../dom.js';
 import _ol_size_ from '../size.js';
 import _ol_source_Tile_ from '../source/tile.js';
+import _ol_tilecoord_ from '../tilecoord.js';
 
 /**
  * @classdesc
@@ -36,7 +37,7 @@ _ol_.inherits(_ol_source_TileDebug_, _ol_source_Tile_);
  * @inheritDoc
  */
 _ol_source_TileDebug_.prototype.getTile = function(z, x, y) {
-  var tileCoordKey = this.getKeyZXY(z, x, y);
+  var tileCoordKey = _ol_tilecoord_.getKeyZXY(z, x, y);
   if (this.tileCache.containsKey(tileCoordKey)) {
     return /** @type {!ol.source.TileDebug.Tile_} */ (this.tileCache.get(tileCoordKey));
   } else {

package/source/tileimage.js

@@ -7,6 +7,7 @@ import _ol_events_EventType_ from '../events/eventtype.js';
 import _ol_proj_ from '../proj.js';
 import _ol_reproj_Tile_ from '../reproj/tile.js';
 import _ol_source_UrlTile_ from '../source/urltile.js';
+import _ol_tilecoord_ from '../tilecoord.js';
 import _ol_tilegrid_ from '../tilegrid.js';
 
 /**
@@ -243,7 +244,7 @@ _ol_source_TileImage_.prototype.getTile = function(z, x, y, pixelRatio, projecti
     var cache = this.getTileCacheForProjection(projection);
     var tileCoord = [z, x, y];
     var tile;
-    var tileCoordKey = this.getKeyZXY.apply(this, tileCoord);
+    var tileCoordKey = _ol_tilecoord_.getKey(tileCoord);
     if (cache.containsKey(tileCoordKey)) {
       tile = /** @type {!ol.Tile} */ (cache.get(tileCoordKey));
     }
@@ -291,7 +292,7 @@ _ol_source_TileImage_.prototype.getTile = function(z, x, y, pixelRatio, projecti
  */
 _ol_source_TileImage_.prototype.getTileInternal = function(z, x, y, pixelRatio, projection) {
   var tile = null;
-  var tileCoordKey = this.getKeyZXY(z, x, y);
+  var tileCoordKey = _ol_tilecoord_.getKeyZXY(z, x, y);
   var key = this.getKey();
   if (!this.tileCache.containsKey(tileCoordKey)) {
     tile = this.createTile_(z, x, y, pixelRatio, projection, key);

package/source/tileutfgrid.js

@@ -11,6 +11,7 @@ import _ol_net_ from '../net.js';
 import _ol_proj_ from '../proj.js';
 import _ol_source_State_ from '../source/state.js';
 import _ol_source_Tile_ from '../source/tile.js';
+import _ol_tilecoord_ from '../tilecoord.js';
 import _ol_tilegrid_ from '../tilegrid.js';
 
 /**
@@ -221,7 +222,7 @@ _ol_source_TileUTFGrid_.prototype.handleTileJSONResponse = function(tileJSON) {
  * @inheritDoc
  */
 _ol_source_TileUTFGrid_.prototype.getTile = function(z, x, y, pixelRatio, projection) {
-  var tileCoordKey = this.getKeyZXY(z, x, y);
+  var tileCoordKey = _ol_tilecoord_.getKeyZXY(z, x, y);
   if (this.tileCache.containsKey(tileCoordKey)) {
     return /** @type {!ol.Tile} */ (this.tileCache.get(tileCoordKey));
   } else {
@@ -246,7 +247,7 @@ _ol_source_TileUTFGrid_.prototype.getTile = function(z, x, y, pixelRatio, projec
  * @inheritDoc
  */
 _ol_source_TileUTFGrid_.prototype.useTile = function(z, x, y) {
-  var tileCoordKey = this.getKeyZXY(z, x, y);
+  var tileCoordKey = _ol_tilecoord_.getKeyZXY(z, x, y);
   if (this.tileCache.containsKey(tileCoordKey)) {
     this.tileCache.get(tileCoordKey);
   }

package/source/tilewms.js

@@ -79,13 +79,6 @@ var _ol_source_TileWMS_ = function(opt_options) {
    */
   this.hidpi_ = options.hidpi !== undefined ? options.hidpi : true;
 
-  /**
-   * @private
-   * @type {string}
-   */
-  this.coordKeyPrefix_ = '';
-  this.resetCoordKeyPrefix_();
-
   /**
    * @private
    * @type {ol.Extent}
@@ -170,14 +163,6 @@ _ol_source_TileWMS_.prototype.getGutterInternal = function() {
 };
 
 
-/**
- * @inheritDoc
- */
-_ol_source_TileWMS_.prototype.getKeyZXY = function(z, x, y) {
-  return this.coordKeyPrefix_ + _ol_source_TileImage_.prototype.getKeyZXY.call(this, z, x, y);
-};
-
-
 /**
  * Get the user-provided params, i.e. those passed to the constructor through
  * the "params" option, and possibly updated using the updateParams method.
@@ -272,24 +257,6 @@ _ol_source_TileWMS_.prototype.getTilePixelRatio = function(pixelRatio) {
 };
 
 
-/**
- * @private
- */
-_ol_source_TileWMS_.prototype.resetCoordKeyPrefix_ = function() {
-  var i = 0;
-  var res = [];
-
-  if (this.urls) {
-    var j, jj;
-    for (j = 0, jj = this.urls.length; j < jj; ++j) {
-      res[i++] = this.urls[j];
-    }
-  }
-
-  this.coordKeyPrefix_ = res.join('#');
-};
-
-
 /**
  * @private
  * @return {string} The key for the current params.
@@ -351,15 +318,6 @@ _ol_source_TileWMS_.prototype.fixedTileUrlFunction = function(tileCoord, pixelRa
       pixelRatio, projection, baseParams);
 };
 
-/**
- * @inheritDoc
- */
-_ol_source_TileWMS_.prototype.setUrls = function(urls) {
-  _ol_source_TileImage_.prototype.setUrls.call(this, urls);
-  this.resetCoordKeyPrefix_();
-};
-
-
 /**
  * Update the user-provided params.
  * @param {Object} params Params.
@@ -367,7 +325,6 @@ _ol_source_TileWMS_.prototype.setUrls = function(urls) {
  */
 _ol_source_TileWMS_.prototype.updateParams = function(params) {
   _ol_obj_.assign(this.params_, params);
-  this.resetCoordKeyPrefix_();
   this.updateV13_();
   this.setKey(this.getKeyForParams_());
 };

package/source/urltile.js

@@ -3,6 +3,7 @@ import _ol_TileState_ from '../tilestate.js';
 import _ol_TileUrlFunction_ from '../tileurlfunction.js';
 import _ol_source_Tile_ from '../source/tile.js';
 import _ol_source_TileEventType_ from '../source/tileeventtype.js';
+import _ol_tilecoord_ from '../tilecoord.js';
 
 /**
  * @classdesc
@@ -153,6 +154,7 @@ _ol_source_UrlTile_.prototype.setTileLoadFunction = function(tileLoadFunction) {
  */
 _ol_source_UrlTile_.prototype.setTileUrlFunction = function(tileUrlFunction, opt_key) {
   this.tileUrlFunction = tileUrlFunction;
+  this.tileCache.pruneExceptNewestZ();
   if (typeof opt_key !== 'undefined') {
     this.setKey(opt_key);
   } else {
@@ -192,7 +194,7 @@ _ol_source_UrlTile_.prototype.setUrls = function(urls) {
  * @inheritDoc
  */
 _ol_source_UrlTile_.prototype.useTile = function(z, x, y) {
-  var tileCoordKey = this.getKeyZXY(z, x, y);
+  var tileCoordKey = _ol_tilecoord_.getKeyZXY(z, x, y);
   if (this.tileCache.containsKey(tileCoordKey)) {
     this.tileCache.get(tileCoordKey);
   }

package/source/vectortile.js

@@ -3,8 +3,9 @@ import _ol_TileState_ from '../tilestate.js';
 import _ol_VectorImageTile_ from '../vectorimagetile.js';
 import _ol_VectorTile_ from '../vectortile.js';
 import _ol_size_ from '../size.js';
-import _ol_tilegrid_ from '../tilegrid.js';
 import _ol_source_UrlTile_ from '../source/urltile.js';
+import _ol_tilecoord_ from '../tilecoord.js';
+import _ol_tilegrid_ from '../tilegrid.js';
 
 /**
  * @classdesc
@@ -108,7 +109,7 @@ _ol_source_VectorTile_.prototype.clear = function() {
  * @inheritDoc
  */
 _ol_source_VectorTile_.prototype.getTile = function(z, x, y, pixelRatio, projection) {
-  var tileCoordKey = this.getKeyZXY(z, x, y);
+  var tileCoordKey = _ol_tilecoord_.getKeyZXY(z, x, y);
   if (this.tileCache.containsKey(tileCoordKey)) {
     return /** @type {!ol.Tile} */ (this.tileCache.get(tileCoordKey));
   } else {

package/structs/lrucache.js

@@ -113,6 +113,34 @@ _ol_structs_LRUCache_.prototype.get = function(key) {
 };
 
 
+/**
+ * Remove an entry from the cache.
+ * @param {string} key The entry key.
+ * @return {T} The removed entry.
+ */
+_ol_structs_LRUCache_.prototype.remove = function(key) {
+  var entry = this.entries_[key];
+  _ol_asserts_.assert(entry !== undefined, 15); // Tried to get a value for a key that does not exist in the cache
+  if (entry === this.newest_) {
+    this.newest_ = /** @type {ol.LRUCacheEntry} */ (entry.older);
+    if (this.newest_) {
+      this.newest_.newer = null;
+    }
+  } else if (entry === this.oldest_) {
+    this.oldest_ = /** @type {ol.LRUCacheEntry} */ (entry.newer);
+    if (this.oldest_) {
+      this.oldest_.older = null;
+    }
+  } else {
+    entry.newer.older = entry.older;
+    entry.older.newer = entry.newer;
+  }
+  delete this.entries_[key];
+  --this.count_;
+  return entry.value_;
+};
+
+
 /**
  * @return {number} Count.
  */
@@ -165,6 +193,15 @@ _ol_structs_LRUCache_.prototype.peekLastKey = function() {
 };
 
 
+/**
+ * Get the key of the newest item in the cache.  Throws if the cache is empty.
+ * @return {string} The newest key.
+ */
+_ol_structs_LRUCache_.prototype.peekFirstKey = function() {
+  return this.newest_.key_;
+};
+
+
 /**
  * @return {T} value Value.
  */

package/tilecache.js

@@ -1,5 +1,6 @@
 import _ol_ from './index.js';
 import _ol_structs_LRUCache_ from './structs/lrucache.js';
+import _ol_tilecoord_ from './tilecoord.js';
 
 /**
  * @constructor
@@ -31,4 +32,23 @@ _ol_TileCache_.prototype.expireCache = function(usedTiles) {
     }
   }
 };
+
+
+/**
+ * Prune all tiles from the cache that don't have the same z as the newest tile.
+ */
+_ol_TileCache_.prototype.pruneExceptNewestZ = function() {
+  if (this.getCount() === 0) {
+    return;
+  }
+  var key = this.peekFirstKey();
+  var tileCoord = _ol_tilecoord_.fromKey(key);
+  var z = tileCoord[0];
+  this.forEach(function(tile) {
+    if (tile.tileCoord[0] !== z) {
+      this.remove(_ol_tilecoord_.getKey(tile.tileCoord));
+      tile.dispose();
+    }
+  }, this);
+};
 export default _ol_TileCache_;

package/tilecoord.js

@@ -31,6 +31,26 @@ _ol_tilecoord_.getKeyZXY = function(z, x, y) {
 };
 
 
+/**
+ * Get the key for a tile coord.
+ * @param {ol.TileCoord} tileCoord The tile coord.
+ * @return {string} Key.
+ */
+_ol_tilecoord_.getKey = function(tileCoord) {
+  return _ol_tilecoord_.getKeyZXY(tileCoord[0], tileCoord[1], tileCoord[2]);
+};
+
+
+/**
+ * Get a tile coord given a key.
+ * @param {string} key The tile coord key.
+ * @return {ol.TileCoord} The tile coord.
+ */
+_ol_tilecoord_.fromKey = function(key) {
+  return key.split('/').map(Number);
+};
+
+
 /**
  * @param {ol.TileCoord} tileCoord Tile coord.
  * @return {number} Hash.