ol 6.1.1-dev.1581430188339 → 6.1.1

package/VectorRenderTile.js

@@ -17,6 +17,7 @@ var __extends = (this && this.__extends) || (function () {
 import { getUid } from './util.js';
 import Tile from './Tile.js';
 import { createCanvasContext2D } from './dom.js';
+import { unlistenByKey } from './events.js';
 /**
  * @typedef {Object} ReplayState
  * @property {boolean} dirty
@@ -28,20 +29,19 @@ import { createCanvasContext2D } from './dom.js';
  * @property {number} renderedTileResolution
  * @property {number} renderedTileZ
  */
-/**
- * @type {Array<HTMLCanvasElement>}
- */
-var canvasPool = [];
 var VectorRenderTile = /** @class */ (function (_super) {
     __extends(VectorRenderTile, _super);
     /**
      * @param {import("./tilecoord.js").TileCoord} tileCoord Tile coordinate.
      * @param {import("./TileState.js").default} state State.
      * @param {import("./tilecoord.js").TileCoord} urlTileCoord Wrapped tile coordinate for source urls.
+     * @param {import("./tilegrid/TileGrid.js").default} sourceTileGrid Tile grid of the source.
      * @param {function(VectorRenderTile):Array<import("./VectorTile").default>} getSourceTiles Function
-     * to get source tiles for this tile.
+     * to get an source tiles for this tile.
+     * @param {function(VectorRenderTile):void} removeSourceTiles Function to remove this tile from its
+     * source tiles's consumer count.
      */
-    function VectorRenderTile(tileCoord, state, urlTileCoord, getSourceTiles) {
+    function VectorRenderTile(tileCoord, state, urlTileCoord, sourceTileGrid, getSourceTiles, removeSourceTiles) {
         var _this = _super.call(this, tileCoord, state, { transition: 0 }) || this;
         /**
          * @private
@@ -64,18 +64,14 @@ var VectorRenderTile = /** @class */ (function (_super) {
          */
         _this.errorSourceTileKeys = {};
         /**
-         * @type {Object<number, ImageData>}
+         * @type {ImageData}
          */
-        _this.hitDetectionImageData = {};
+        _this.hitDetectionImageData = null;
         /**
          * @private
          * @type {!Object<string, ReplayState>}
          */
         _this.replayState_ = {};
-        /**
-         * @type {Array<import("./VectorTile.js").default>}
-         */
-        _this.sourceTiles = null;
         /**
          * @type {number}
          */
@@ -83,7 +79,20 @@ var VectorRenderTile = /** @class */ (function (_super) {
         /**
          * @type {!function():Array<import("./VectorTile.js").default>}
          */
-        _this.getSourceTiles = getSourceTiles.bind(undefined, _this);
+        _this.getSourceTiles = getSourceTiles.bind(_this, _this);
+        /**
+         * @type {!function(import("./VectorRenderTile.js").default):void}
+         */
+        _this.removeSourceTiles_ = removeSourceTiles;
+        /**
+         * @private
+         * @type {import("./tilegrid/TileGrid.js").default}
+         */
+        _this.sourceTileGrid_ = sourceTileGrid;
+        /**
+         * @type {Array<import("./events.js").EventsKey>}
+         */
+        _this.sourceTileListenerKeys = [];
         /**
          * z of the source tiles of the last getSourceTiles call.
          * @type {number}
@@ -100,6 +109,26 @@ var VectorRenderTile = /** @class */ (function (_super) {
         _this.wrappedTileCoord = urlTileCoord;
         return _this;
     }
+    /**
+     * @inheritDoc
+     */
+    VectorRenderTile.prototype.disposeInternal = function () {
+        this.sourceTileListenerKeys.forEach(unlistenByKey);
+        this.sourceTileListenerKeys.length = 0;
+        this.removeSourceTiles_(this);
+        for (var key in this.context_) {
+            var canvas = this.context_[key].canvas;
+            canvas.width = 0;
+            canvas.height = 0;
+        }
+        for (var key in this.executorGroups) {
+            var executorGroups = this.executorGroups[key];
+            for (var i = 0, ii = executorGroups.length; i < ii; ++i) {
+                executorGroups[i].disposeInternal();
+            }
+        }
+        _super.prototype.disposeInternal.call(this);
+    };
     /**
      * @param {import("./layer/Layer.js").default} layer Layer.
      * @return {CanvasRenderingContext2D} The rendering context.
@@ -107,7 +136,7 @@ var VectorRenderTile = /** @class */ (function (_super) {
     VectorRenderTile.prototype.getContext = function (layer) {
         var key = getUid(layer);
         if (!(key in this.context_)) {
-            this.context_[key] = createCanvasContext2D(1, 1, canvasPool);
+            this.context_[key] = createCanvasContext2D();
         }
         return this.context_[key];
     };
@@ -152,15 +181,6 @@ var VectorRenderTile = /** @class */ (function (_super) {
     VectorRenderTile.prototype.load = function () {
         this.getSourceTiles();
     };
-    /**
-     * @inheritDoc
-     */
-    VectorRenderTile.prototype.release = function () {
-        for (var key in this.context_) {
-            canvasPool.push(this.context_[key].canvas);
-        }
-        _super.prototype.release.call(this);
-    };
     return VectorRenderTile;
 }(Tile));
 export default VectorRenderTile;

package/VectorRenderTile.js.map

@@ -1 +1 @@
-{"version":3,"file":"VectorRenderTile.js","sourceRoot":"","sources":["src/VectorRenderTile.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"VectorRenderTile.js","sourceRoot":"","sources":["src/VectorRenderTile.js"],"names":[],"mappings":";;;;;;;;;;;;;AAAA;;GAEG;AACH,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;AACjC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAC,qBAAqB,EAAC,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAC,aAAa,EAAC,MAAM,aAAa,CAAC;AAG1C;;;;;;;;;;GAUG;AAGH;IAA+B,oCAAI;IAEjC;;;;;;;;;OASG;IACH,0BAAY,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,iBAAiB;QAA7F,YAEE,kBAAM,SAAS,EAAE,KAAK,EAAE,EAAC,UAAU,EAAE,CAAC,EAAC,CAAC,SA+EzC;QA7EC;;;WAGG;QACH,KAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QAEnB;;;WAGG;QACH,KAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QAEzB;;;WAGG;QACH,KAAI,CAAC,kBAAkB,GAAG,CAAC,CAAC;QAE5B;;;WAGG;QACH,KAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;QAE9B;;WAEG;QACH,KAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;QAElC;;;WAGG;QACH,KAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QAEvB;;WAEG;QACH,KAAI,CAAC,gBAAgB,CAAC;QAEtB;;WAEG;QACH,KAAI,CAAC,cAAc,GAAG,cAAc,CAAC,IAAI,CAAC,KAAI,EAAE,KAAI,CAAC,CAAC;QAEtD;;WAEG;QACH,KAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;QAE5C;;;WAGG;QACH,KAAI,CAAC,eAAe,GAAG,cAAc,CAAC;QAEtC;;WAEG;QACH,KAAI,CAAC,sBAAsB,GAAG,EAAE,CAAC;QAEjC;;;WAGG;QACH,KAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;QAElB;;;WAGG;QACH,KAAI,CAAC,IAAI,GAAG,KAAK,CAAC;QAElB;;WAEG;QACH,KAAI,CAAC,gBAAgB,GAAG,YAAY,CAAC;;IACvC,CAAC;IAED;;OAEG;IACH,0CAAe,GAAf;QACE,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QACnD,IAAI,CAAC,sBAAsB,CAAC,MAAM,GAAG,CAAC,CAAC;QACvC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC9B,KAAK,IAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE;YAC/B,IAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;YACzC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;YACjB,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;SACnB;QACD,KAAK,IAAM,GAAG,IAAI,IAAI,CAAC,cAAc,EAAE;YACrC,IAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;YAChD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE;gBACvD,cAAc,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC;aACrC;SACF;QACD,iBAAM,eAAe,WAAE,CAAC;IAC1B,CAAC;IAED;;;OAGG;IACH,qCAAU,GAAV,UAAW,KAAK;QACd,IAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE;YAC3B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,qBAAqB,EAAE,CAAC;SAC9C;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;IAED;;;OAGG;IACH,qCAAU,GAAV,UAAW,KAAK;QACd,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC;IACxC,CAAC;IAED;;;;OAIG;IACH,mCAAQ,GAAR,UAAS,KAAK;QACZ,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IACvE,CAAC;IAED;;;OAGG;IACH,yCAAc,GAAd,UAAe,KAAK;QAClB,IAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,EAAE;YAC/B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG;gBACvB,KAAK,EAAE,KAAK;gBACZ,mBAAmB,EAAE,IAAI;gBACzB,kBAAkB,EAAE,GAAG;gBACvB,gBAAgB,EAAE,CAAC,CAAC;gBACpB,sBAAsB,EAAE,GAAG;gBAC3B,oBAAoB,EAAE,CAAC,CAAC;gBACxB,SAAS,EAAE,CAAC,CAAC;gBACb,aAAa,EAAE,CAAC,CAAC;aAClB,CAAC;SACH;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAED;;OAEG;IACH,+BAAI,GAAJ;QACE,IAAI,CAAC,cAAc,EAAE,CAAC;IACxB,CAAC;IACH,uBAAC;AAAD,CAAC,AA5KD,CAA+B,IAAI,GA4KlC;AAGD,eAAe,gBAAgB,CAAC"}

package/VectorTile.js

@@ -28,6 +28,10 @@ var VectorTile = /** @class */ (function (_super) {
      */
     function VectorTile(tileCoord, state, src, format, tileLoadFunction, opt_options) {
         var _this = _super.call(this, tileCoord, state, opt_options) || this;
+        /**
+         * @type {number}
+         */
+        _this.consumers = 0;
         /**
          * Extent of this tile; set by the source.
          * @type {import("./extent.js").Extent}
@@ -99,9 +103,7 @@ var VectorTile = /** @class */ (function (_super) {
         if (this.state == TileState.IDLE) {
             this.setState(TileState.LOADING);
             this.tileLoadFunction_(this, this.url_);
-            if (this.loader_) {
-                this.loader_(this.extent, this.resolution, this.projection);
-            }
+            this.loader_(this.extent, this.resolution, this.projection);
         }
     };
     /**

package/VectorTile.js.map

@@ -1 +1 @@
-{"version":3,"file":"VectorTile.js","sourceRoot":"","sources":["src/VectorTile.js"],"names":[],"mappings":";;;;;;;;;;;;;AAAA;;GAEG;AACH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,SAAS,MAAM,gBAAgB,CAAC;AAEvC;IAAyB,8BAAI;IAE3B;;;;;;;OAOG;IACH,oBAAY,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,gBAAgB,EAAE,WAAW;QAAxE,YAEE,kBAAM,SAAS,EAAE,KAAK,EAAE,WAAW,CAAC,SAkDrC;QAhDC;;;WAGG;QACH,KAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QAEnB;;;WAGG;QACH,KAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QAEtB;;;WAGG;QACH,KAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QAEtB;;;WAGG;QACH,KAAI,CAAC,OAAO,CAAC;QAEb;;;WAGG;QACH,KAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QAEvB;;;WAGG;QACH,KAAI,CAAC,UAAU,CAAC;QAEhB;;;WAGG;QACH,KAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;QAE1C;;;WAGG;QACH,KAAI,CAAC,IAAI,GAAG,GAAG,CAAC;;IAElB,CAAC;IAED;;;;OAIG;IACH,8BAAS,GAAT;QACE,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED;;;;OAIG;IACH,gCAAW,GAAX;QACE,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED;;OAEG;IACH,2BAAM,GAAN;QACE,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,yBAAI,GAAJ;QACE,IAAI,IAAI,CAAC,KAAK,IAAI,SAAS,CAAC,IAAI,EAAE;YAChC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YACjC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACxC,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;aAC7D;SACF;IACH,CAAC;IAED;;;;OAIG;IACH,2BAAM,GAAN,UAAO,QAAQ,EAAE,cAAc;QAC7B,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC;IAED;;OAEG;IACH,4BAAO,GAAP;QACE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED;;;;;OAKG;IACH,gCAAW,GAAX,UAAY,QAAQ;QAClB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACH,8BAAS,GAAT,UAAU,MAAM;QACd,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IACH,iBAAC;AAAD,CAAC,AAzID,CAAyB,IAAI,GAyI5B;AAED,eAAe,UAAU,CAAC"}
+{"version":3,"file":"VectorTile.js","sourceRoot":"","sources":["src/VectorTile.js"],"names":[],"mappings":";;;;;;;;;;;;;AAAA;;GAEG;AACH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,SAAS,MAAM,gBAAgB,CAAC;AAEvC;IAAyB,8BAAI;IAE3B;;;;;;;OAOG;IACH,oBAAY,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,gBAAgB,EAAE,WAAW;QAAxE,YAEE,kBAAM,SAAS,EAAE,KAAK,EAAE,WAAW,CAAC,SAuDrC;QArDC;;WAEG;QACH,KAAI,CAAC,SAAS,GAAG,CAAC,CAAC;QAEnB;;;WAGG;QACH,KAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QAEnB;;;WAGG;QACH,KAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QAEtB;;;WAGG;QACH,KAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QAEtB;;;WAGG;QACH,KAAI,CAAC,OAAO,CAAC;QAEb;;;WAGG;QACH,KAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QAEvB;;;WAGG;QACH,KAAI,CAAC,UAAU,CAAC;QAEhB;;;WAGG;QACH,KAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;QAE1C;;;WAGG;QACH,KAAI,CAAC,IAAI,GAAG,GAAG,CAAC;;IAElB,CAAC;IAED;;;;OAIG;IACH,8BAAS,GAAT;QACE,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED;;;;OAIG;IACH,gCAAW,GAAX;QACE,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED;;OAEG;IACH,2BAAM,GAAN;QACE,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,yBAAI,GAAJ;QACE,IAAI,IAAI,CAAC,KAAK,IAAI,SAAS,CAAC,IAAI,EAAE;YAChC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YACjC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACxC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;SAC7D;IACH,CAAC;IAED;;;;OAIG;IACH,2BAAM,GAAN,UAAO,QAAQ,EAAE,cAAc;QAC7B,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC;IAED;;OAEG;IACH,4BAAO,GAAP;QACE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED;;;;;OAKG;IACH,gCAAW,GAAX,UAAY,QAAQ;QAClB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACH,8BAAS,GAAT,UAAU,MAAM;QACd,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IACH,iBAAC;AAAD,CAAC,AA5ID,CAAyB,IAAI,GA4I5B;AAED,eAAe,UAAU,CAAC"}

package/View.js

@@ -15,6 +15,7 @@ var __extends = (this && this.__extends) || (function () {
  * @module ol/View
  */
 import { DEFAULT_TILE_SIZE } from './tilegrid/common.js';
+import { getUid } from './util.js';
 import { VOID } from './functions.js';
 import { createExtent, none as centerNone } from './centerconstraint.js';
 import BaseObject from './Object.js';
@@ -134,14 +135,6 @@ import { createMinMaxResolution } from './resolutionconstraint.js';
  * @property {boolean} [smoothResolutionConstraint=true] If true, the resolution
  * min/max values will be applied smoothly, i. e. allow the view to exceed slightly
  * the given resolution or zoom bounds.
- * @property {boolean} [showFullExtent=false] Allow the view to be zoomed out to
- * show the full configured extent. By default, when a view is configured with an
- * extent, users will not be able to zoom out so the viewport exceeds the extent in
- * either dimension. This means the full extent may not be visible if the viewport
- * is taller or wider than the aspect ratio of the configured extent. If
- * showFullExtent is true, the user will be able to zoom out so that the viewport
- * exceeds the height or width of the configured extent, but not both, allowing the
- * full extent to be shown.
  * @property {import("./proj.js").ProjectionLike} [projection='EPSG:3857'] The
  * projection. The default is Spherical Mercator.
  * @property {number} [resolution] The initial resolution for the view. The
@@ -292,11 +285,6 @@ var View = /** @class */ (function (_super) {
          * @type {import("./proj/Projection.js").default}
          */
         _this.projection_ = createProjection(options.projection, 'EPSG:3857');
-        /**
-         * @private
-         * @type {import("./size.js").Size}
-         */
-        _this.viewportSize_ = [100, 100];
         /**
          * @private
          * @type {import("./coordinate.js").Coordinate|undefined}
@@ -312,11 +300,6 @@ var View = /** @class */ (function (_super) {
          * @type {number|undefined}
          */
         _this.targetRotation_;
-        /**
-         * @private
-         * @type {import("./coordinate.js").Coordinate|undefined}
-         */
-        _this.cancelAnchor_ = undefined;
         if (options.center) {
             options.center = fromUserCoordinate(options.center, _this.projection_);
         }
@@ -563,19 +546,13 @@ var View = /** @class */ (function (_super) {
      */
     View.prototype.cancelAnimations = function () {
         this.setHint(ViewHint.ANIMATING, -this.hints_[ViewHint.ANIMATING]);
-        var anchor;
         for (var i = 0, ii = this.animations_.length; i < ii; ++i) {
             var series = this.animations_[i];
             if (series[0].callback) {
                 animationCallback(series[0].callback, false);
             }
-            anchor = anchor ||
-                series.filter(function (animation) {
-                    return !animation.complete;
-                })[0].anchor;
         }
         this.animations_.length = 0;
-        this.cancelAnchor_ = anchor;
     };
     /**
      * Update all animations.
@@ -622,7 +599,7 @@ var View = /** @class */ (function (_super) {
                         animation.targetResolution :
                         animation.sourceResolution + progress * (animation.targetResolution - animation.sourceResolution);
                     if (animation.anchor) {
-                        var size = this.getViewportSize_(this.getRotation());
+                        var size = this.getSizeFromViewport_(this.getRotation());
                         var constrainedResolution = this.constraints_.resolution(resolution, 0, size, true);
                         this.targetCenter_ = this.calculateCenterZoom(constrainedResolution, animation.anchor);
                     }
@@ -692,33 +669,26 @@ var View = /** @class */ (function (_super) {
         return center;
     };
     /**
-     * Returns the current viewport size.
      * @private
      * @param {number=} opt_rotation Take into account the rotation of the viewport when giving the size
      * @return {import("./size.js").Size} Viewport size or `[100, 100]` when no viewport is found.
      */
-    View.prototype.getViewportSize_ = function (opt_rotation) {
-        var size = this.viewportSize_;
+    View.prototype.getSizeFromViewport_ = function (opt_rotation) {
+        var size = [100, 100];
+        var selector = '.ol-viewport[data-view="' + getUid(this) + '"]';
+        var element = document.querySelector(selector);
+        if (element) {
+            var metrics = getComputedStyle(element);
+            size[0] = parseInt(metrics.width, 10);
+            size[1] = parseInt(metrics.height, 10);
+        }
         if (opt_rotation) {
             var w = size[0];
             var h = size[1];
-            return [
-                Math.abs(w * Math.cos(opt_rotation)) + Math.abs(h * Math.sin(opt_rotation)),
-                Math.abs(w * Math.sin(opt_rotation)) + Math.abs(h * Math.cos(opt_rotation))
-            ];
-        }
-        else {
-            return size;
+            size[0] = Math.abs(w * Math.cos(opt_rotation)) + Math.abs(h * Math.sin(opt_rotation));
+            size[1] = Math.abs(w * Math.sin(opt_rotation)) + Math.abs(h * Math.cos(opt_rotation));
         }
-    };
-    /**
-     * Stores the viewport size on the view. The viewport size is not read every time from the DOM
-     * to avoid performance hit and layout reflow.
-     * This should be done on map size change.
-     * @param {import("./size.js").Size=} opt_size Viewport size; if undefined, [100, 100] is assumed
-     */
-    View.prototype.setViewportSize = function (opt_size) {
-        this.viewportSize_ = Array.isArray(opt_size) ? opt_size.slice() : [100, 100];
+        return size;
     };
     /**
      * Get the view center.
@@ -765,8 +735,8 @@ var View = /** @class */ (function (_super) {
      * The size is the pixel dimensions of the box into which the calculated extent
      * should fit. In most cases you want to get the extent of the entire map,
      * that is `map.getSize()`.
-     * @param {import("./size.js").Size=} opt_size Box pixel size. If not provided, the size
-     * of the map that uses this view will be used.
+     * @param {import("./size.js").Size=} opt_size Box pixel size. If not provided, the size of the
+     * first map that uses this view will be used.
      * @return {import("./extent.js").Extent} Extent.
      * @api
      */
@@ -780,7 +750,7 @@ var View = /** @class */ (function (_super) {
      * @return {import("./extent.js").Extent} Extent.
      */
     View.prototype.calculateExtentInternal = function (opt_size) {
-        var size = opt_size || this.getViewportSize_();
+        var size = opt_size || this.getSizeFromViewport_();
         var center = /** @type {!import("./coordinate.js").Coordinate} */ (this.getCenterInternal());
         assert(center, 1); // The view center is not defined
         var resolution = /** @type {!number} */ (this.getResolution());
@@ -890,7 +860,7 @@ var View = /** @class */ (function (_super) {
      *     the given size.
      */
     View.prototype.getResolutionForExtentInternal = function (extent, opt_size) {
-        var size = opt_size || this.getViewportSize_();
+        var size = opt_size || this.getSizeFromViewport_();
         var xResolution = getWidth(extent) / size[0];
         var yResolution = getHeight(extent) / size[1];
         return Math.max(xResolution, yResolution);
@@ -903,7 +873,7 @@ var View = /** @class */ (function (_super) {
      */
     View.prototype.getResolutionForValueFunction = function (opt_power) {
         var power = opt_power || 2;
-        var maxResolution = this.getConstrainedResolution(this.maxResolution_);
+        var maxResolution = this.maxResolution_;
         var minResolution = this.minResolution_;
         var max = Math.log(maxResolution / minResolution) / Math.log(power);
         return (
@@ -932,17 +902,17 @@ var View = /** @class */ (function (_super) {
      * @return {function(number): number} Value for resolution function.
      */
     View.prototype.getValueForResolutionFunction = function (opt_power) {
-        var logPower = Math.log(opt_power || 2);
-        var maxResolution = this.getConstrainedResolution(this.maxResolution_);
+        var power = opt_power || 2;
+        var maxResolution = this.maxResolution_;
         var minResolution = this.minResolution_;
-        var max = Math.log(maxResolution / minResolution) / logPower;
+        var max = Math.log(maxResolution / minResolution) / Math.log(power);
         return (
         /**
          * @param {number} resolution Resolution.
          * @return {number} Value.
          */
         function (resolution) {
-            var value = (Math.log(maxResolution / resolution) / logPower) / max;
+            var value = (Math.log(maxResolution / resolution) / Math.log(power)) / max;
             return value;
         });
     };
@@ -1033,7 +1003,7 @@ var View = /** @class */ (function (_super) {
      * @api
      */
     View.prototype.fit = function (geometryOrExtent, opt_options) {
-        var options = assign({ size: this.getViewportSize_() }, opt_options || {});
+        var options = assign({ size: this.getSizeFromViewport_() }, opt_options || {});
         /** @type {import("./geom/SimpleGeometry.js").default} */
         var geometry;
         assert(Array.isArray(geometryOrExtent) || typeof /** @type {?} */ (geometryOrExtent).getSimplifiedGeometry === 'function', 24); // Invalid extent or geometry provided as `geometry`
@@ -1050,7 +1020,7 @@ var View = /** @class */ (function (_super) {
         else {
             var userProjection = getUserProjection();
             if (userProjection) {
-                geometry = /** @type {import("./geom/SimpleGeometry.js").default} */ (geometryOrExtent.clone().transform(userProjection, this.getProjection()));
+                geometry = /** @type {import("./geom/SimpleGeometry.js").default} */ (geometry.clone().transform(userProjection, this.getProjection()));
             }
             else {
                 geometry = geometryOrExtent;
@@ -1066,7 +1036,7 @@ var View = /** @class */ (function (_super) {
         var options = opt_options || {};
         var size = options.size;
         if (!size) {
-            size = this.getViewportSize_();
+            size = this.getSizeFromViewport_();
         }
         var padding = options.padding !== undefined ? options.padding : [0, 0, 0, 0];
         var nearest = options.nearest !== undefined ? options.nearest : false;
@@ -1201,9 +1171,9 @@ var View = /** @class */ (function (_super) {
      */
     View.prototype.adjustResolutionInternal = function (ratio, opt_anchor) {
         var isMoving = this.getAnimating() || this.getInteracting();
-        var size = this.getViewportSize_(this.getRotation());
+        var size = this.getSizeFromViewport_(this.getRotation());
         var newResolution = this.constraints_.resolution(this.targetResolution_ * ratio, 0, size, isMoving);
-        if (opt_anchor) {
+        if (opt_anchor !== undefined) {
             this.targetCenter_ = this.calculateCenterZoom(newResolution, opt_anchor);
         }
         this.targetResolution_ *= ratio;
@@ -1239,7 +1209,7 @@ var View = /** @class */ (function (_super) {
     View.prototype.adjustRotationInternal = function (delta, opt_anchor) {
         var isMoving = this.getAnimating() || this.getInteracting();
         var newRotation = this.constraints_.rotation(this.targetRotation_ + delta, isMoving);
-        if (opt_anchor) {
+        if (opt_anchor !== undefined) {
             this.targetCenter_ = this.calculateCenterRotate(newRotation, opt_anchor);
         }
         this.targetRotation_ += delta;
@@ -1312,7 +1282,7 @@ var View = /** @class */ (function (_super) {
         var isMoving = this.getAnimating() || this.getInteracting() || opt_forceMoving;
         // compute rotation
         var newRotation = this.constraints_.rotation(this.targetRotation_, isMoving);
-        var size = this.getViewportSize_(newRotation);
+        var size = this.getSizeFromViewport_(newRotation);
         var newResolution = this.constraints_.resolution(this.targetResolution_, 0, size, isMoving);
         var newCenter = this.constraints_.center(this.targetCenter_, newResolution, size, isMoving);
         if (this.get(ViewProperty.ROTATION) !== newRotation) {
@@ -1327,7 +1297,6 @@ var View = /** @class */ (function (_super) {
         if (this.getAnimating() && !opt_doNotCancelAnims) {
             this.cancelAnimations();
         }
-        this.cancelAnchor_ = undefined;
     };
     /**
      * If any constraints need to be applied, an animation will be triggered.
@@ -1342,18 +1311,16 @@ var View = /** @class */ (function (_super) {
         var duration = opt_duration !== undefined ? opt_duration : 200;
         var direction = opt_resolutionDirection || 0;
         var newRotation = this.constraints_.rotation(this.targetRotation_);
-        var size = this.getViewportSize_(newRotation);
+        var size = this.getSizeFromViewport_(newRotation);
         var newResolution = this.constraints_.resolution(this.targetResolution_, direction, size);
         var newCenter = this.constraints_.center(this.targetCenter_, newResolution, size);
-        if (duration === 0 && !this.cancelAnchor_) {
+        if (duration === 0) {
             this.targetResolution_ = newResolution;
             this.targetRotation_ = newRotation;
             this.targetCenter_ = newCenter;
             this.applyTargetState_();
             return;
         }
-        var anchor = opt_anchor || (duration === 0 ? this.cancelAnchor_ : undefined);
-        this.cancelAnchor_ = undefined;
         if (this.getResolution() !== newResolution ||
             this.getRotation() !== newRotation ||
             !this.getCenterInternal() ||
@@ -1367,7 +1334,7 @@ var View = /** @class */ (function (_super) {
                 resolution: newResolution,
                 duration: duration,
                 easing: easeOut,
-                anchor: anchor
+                anchor: opt_anchor
             });
         }
     };
@@ -1412,7 +1379,7 @@ var View = /** @class */ (function (_super) {
      * @return {import("./coordinate.js").Coordinate|undefined} Valid center position.
      */
     View.prototype.getConstrainedCenter = function (targetCenter, opt_targetResolution) {
-        var size = this.getViewportSize_(this.getRotation());
+        var size = this.getSizeFromViewport_(this.getRotation());
         return this.constraints_.center(targetCenter, opt_targetResolution || this.getResolution(), size);
     };
     /**
@@ -1439,7 +1406,7 @@ var View = /** @class */ (function (_super) {
      */
     View.prototype.getConstrainedResolution = function (targetResolution, opt_direction) {
         var direction = opt_direction || 0;
-        var size = this.getViewportSize_(this.getRotation());
+        var size = this.getSizeFromViewport_(this.getRotation());
         return this.constraints_.resolution(targetResolution, direction, size);
     };
     return View;
@@ -1493,7 +1460,6 @@ export function createResolutionConstraint(options) {
     var multiWorld = options.multiWorld !== undefined ?
         options.multiWorld : false;
     var smooth = options.smoothResolutionConstraint !== undefined ? options.smoothResolutionConstraint : true;
-    var showFullExtent = options.showFullExtent !== undefined ? options.showFullExtent : false;
     var projection = createProjection(options.projection, 'EPSG:3857');
     var projExtent = projection.getExtent();
     var constrainOnlyCenter = options.constrainOnlyCenter;
@@ -1508,10 +1474,10 @@ export function createResolutionConstraint(options) {
         minResolution = resolutions[maxZoom] !== undefined ?
             resolutions[maxZoom] : resolutions[resolutions.length - 1];
         if (options.constrainResolution) {
-            resolutionConstraint = createSnapToResolutions(resolutions, smooth, !constrainOnlyCenter && extent, showFullExtent);
+            resolutionConstraint = createSnapToResolutions(resolutions, smooth, !constrainOnlyCenter && extent);
         }
         else {
-            resolutionConstraint = createMinMaxResolution(maxResolution, minResolution, smooth, !constrainOnlyCenter && extent, showFullExtent);
+            resolutionConstraint = createMinMaxResolution(maxResolution, minResolution, smooth, !constrainOnlyCenter && extent);
         }
     }
     else {
@@ -1550,10 +1516,10 @@ export function createResolutionConstraint(options) {
         maxZoom = minZoom + Math.floor(Math.log(maxResolution / minResolution) / Math.log(zoomFactor));
         minResolution = maxResolution / Math.pow(zoomFactor, maxZoom - minZoom);
         if (options.constrainResolution) {
-            resolutionConstraint = createSnapToPower(zoomFactor, maxResolution, minResolution, smooth, !constrainOnlyCenter && extent, showFullExtent);
+            resolutionConstraint = createSnapToPower(zoomFactor, maxResolution, minResolution, smooth, !constrainOnlyCenter && extent);
         }
         else {
-            resolutionConstraint = createMinMaxResolution(maxResolution, minResolution, smooth, !constrainOnlyCenter && extent, showFullExtent);
+            resolutionConstraint = createMinMaxResolution(maxResolution, minResolution, smooth, !constrainOnlyCenter && extent);
         }
     }
     return { constraint: resolutionConstraint, maxResolution: maxResolution,