Update package version to 4.6.5

Changelog for v4.6.5
Backport types
2018-03-18 23:33:43 +01:00 · 2018-03-18 23:32:50 +01:00 · 2018-03-18 23:20:32 +01:00 · 2018-03-18 22:45:40 +01:00
20 changed files with 82 additions and 98207 deletions
--- a/changelog/upgrade-notes.md
+++ b/changelog/upgrade-notes.md
@@ -1,103 +1,5 @@
 ## Upgrade notes

-### Next release
-
-#### Changed behavior of the `Draw` interaction
-
-For better drawing experience, two changes were made to the behavior of the Draw interaction:
-
- 1. On long press, the current vertex can be dragged to its desired position.
- 2. On touch move (e.g. when panning the map on a mobile device), no draw cursor is shown, and the geometry being drawn is not updated. But because of 1., the draw cursor will appear on long press. Mouse moves are not affected by this change.
-
-#### Changes in proj4 integration
-
-Because relying on a globally available proj4 is not practical with ES modules, we have made a change to the way we integrate proj4:
-
- * The `setProj4()` function from the `ol/proj` module was removed.
- * A new `ol/proj/proj4` module with a `register()` function was added. Regardless of whether the application imports `proj4` or uses a global `proj4`, this function needs to be called with the proj4 instance as argument whenever projection definitions were added to proj4's registry with (`proj4.defs`).
-
-It is also recommended to no longer use a global `proj4`. Instead,
-
-    npm install proj4
-
-and import it:
-
-```js
-import proj4 from 'proj4';
-```
-
-Applications can be updated by importing the `register` function from the `ol/proj/proj4` module
-
-```js
-import {register} from 'ol/proj/proj4'
-```
-
-and calling it before using projections, and any time the proj4 registry was changed by `proj4.defs()` calls:
-
-```js
-register(proj4);
-```
-
-#### Removal of logos
-
-The map and sources no longer accept a `logo` option.  Instead, if you wish to append a logo to your map, add the desired markup directly in your HTML.  In addition, you can use the `attributions` property of a source to display arbitrary markup per-source with the attribution control.
-
-#### Replacement of `ol/Sphere` constructor with `ol/sphere` functions
-
-The `ol/Sphere` constructor has been removed.  If you were using the `getGeodesicArea` method, use the `getArea` function instead.  If you were using the `haversineDistance` method, use the `getDistance` function instead.
-
-Examples before:
-```js
-// using ol@4
-import Sphere from 'ol/sphere';
-
-var sphere = new Sphere(Sphere.DEFAULT_RADIUS);
-var area = sphere.getGeodesicArea(polygon);
-var distance = sphere.haversineDistance(g1, g2);
-```
-
-Examples after:
-```js
-// using ol@5
-import {circular as circularPolygon} from 'ol/geom/Polygon';
-import {getArea, getDistance} from 'ol/sphere';
-
-var area = getArea(polygon);
-var distance = getDistance(g1, g2);
-var circle = circularPolygon(center, radius);
-```
-
-#### New signature for the `circular` function for creating polygons
-
-The `circular` function exported from `ol/geom/Polygon` no longer requires a `Sphere` as the first argument.
-
-Example before:
-```js
-// using ol@4
-import Polygon from 'ol/geom/polygon';
-import Sphere from 'ol/sphere';
-
-var poly = Polygon.circular(new Sphere(Sphere.DEFAULT_RADIUS), center, radius);
-```
-
-Example after:
-```js
-// using ol@5
-import {circular as circularPolygon} from 'ol/geom/Polygon';
-
-var poly = circularPolygon(center, radius);
-```
-
-#### Removal of optional this arguments.
-
-The following methods did get the optional this (i.e. opt_this) arguments removed. Please use closures, the es6 arrow function or the bind method to achieve this effect (Bind is explained here: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/bind).
-
-* Collection#forEach
-* geom/LineString#forEachSegment
-* Observable#on, #once, #un
-* source/TileUTFGrid#forDataAtCoordinateAndResolution
-* source/Vector#forEachFeature, #forEachFeatureInExtent, #forEachFeatureIntersectingExtent
-
 ### v4.6.0

 #### Renamed `exceedLength` option of `ol.style.Text` to `overflow`
--- a/changelog/v4.6.5.md
+++ b/changelog/v4.6.5.md
@@ -0,0 +1,7 @@
+# 4.6.5
+
+The v4.6.5 release fixes a hit detection issue when `declutter: true` is set on an `ol.layer.VectorTile`.
+
+## Fixes
+
+ * [#7669](https://github.com/openlayers/openlayers/pull/7559) - Use declutter tree only for text and image replays ([@ahocevar](https://github.com/ahocevar))
--- a/dist/ol-debug.css
+++ b/dist/ol-debug.css
@@ -1,261 +0,0 @@
-.ol-box {
-  box-sizing: border-box;
-  border-radius: 2px;
-  border: 2px solid blue;
-}
-
-.ol-mouse-position {
-  top: 8px;
-  right: 8px;
-  position: absolute;
-}
-
-.ol-scale-line {
-  background: rgba(0,60,136,0.3);
-  border-radius: 4px;
-  bottom: 8px;
-  left: 8px;
-  padding: 2px;
-  position: absolute;
-}
-.ol-scale-line-inner {
-  border: 1px solid #eee;
-  border-top: none;
-  color: #eee;
-  font-size: 10px;
-  text-align: center;
-  margin: 1px;
-  will-change: contents, width;
-}
-.ol-overlay-container {
-  will-change: left,right,top,bottom;
-}
-
-.ol-unsupported {
-  display: none;
-}
-.ol-viewport, .ol-unselectable {
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  -webkit-tap-highlight-color: rgba(0,0,0,0);
-}
-.ol-selectable {
-  -webkit-touch-callout: default;
-  -webkit-user-select: auto;
-  -moz-user-select: auto;
-  -ms-user-select: auto;
-  user-select: auto;
-}
-.ol-grabbing {
-  cursor: -webkit-grabbing;
-  cursor: -moz-grabbing;
-  cursor: grabbing;
-}
-.ol-grab {
-  cursor: move;
-  cursor: -webkit-grab;
-  cursor: -moz-grab;
-  cursor: grab;
-}
-.ol-control {
-  position: absolute;
-  background-color: rgba(255,255,255,0.4);
-  border-radius: 4px;
-  padding: 2px;
-}
-.ol-control:hover {
-  background-color: rgba(255,255,255,0.6);
-}
-.ol-zoom {
-  top: .5em;
-  left: .5em;
-}
-.ol-rotate {
-  top: .5em;
-  right: .5em;
-  transition: opacity .25s linear, visibility 0s linear;
-}
-.ol-rotate.ol-hidden {
-  opacity: 0;
-  visibility: hidden;
-  transition: opacity .25s linear, visibility 0s linear .25s;
-}
-.ol-zoom-extent {
-  top: 4.643em;
-  left: .5em;
-}
-.ol-full-screen {
-  right: .5em;
-  top: .5em;
-}
-@media print {
-  .ol-control {
-    display: none;
-  }
-}
-
-.ol-control button {
-  display: block;
-  margin: 1px;
-  padding: 0;
-  color: white;
-  font-size: 1.14em;
-  font-weight: bold;
-  text-decoration: none;
-  text-align: center;
-  height: 1.375em;
-  width: 1.375em;
-  line-height: .4em;
-  background-color: rgba(0,60,136,0.5);
-  border: none;
-  border-radius: 2px;
-}
-.ol-control button::-moz-focus-inner {
-  border: none;
-  padding: 0;
-}
-.ol-zoom-extent button {
-  line-height: 1.4em;
-}
-.ol-compass {
-  display: block;
-  font-weight: normal;
-  font-size: 1.2em;
-  will-change: transform;
-}
-.ol-touch .ol-control button {
-  font-size: 1.5em;
-}
-.ol-touch .ol-zoom-extent {
-  top: 5.5em;
-}
-.ol-control button:hover,
-.ol-control button:focus {
-  text-decoration: none;
-  background-color: rgba(0,60,136,0.7);
-}
-.ol-zoom .ol-zoom-in {
-  border-radius: 2px 2px 0 0;
-}
-.ol-zoom .ol-zoom-out {
-  border-radius: 0 0 2px 2px;
-}
-
-
-.ol-attribution {
-  text-align: right;
-  bottom: .5em;
-  right: .5em;
-  max-width: calc(100% - 1.3em);
-}
-
-.ol-attribution ul {
-  margin: 0;
-  padding: 0 .5em;
-  font-size: .7rem;
-  line-height: 1.375em;
-  color: #000;
-  text-shadow: 0 0 2px #fff;
-}
-.ol-attribution li {
-  display: inline;
-  list-style: none;
-  line-height: inherit;
-}
-.ol-attribution li:not(:last-child):after {
-  content: " ";
-}
-.ol-attribution img {
-  max-height: 2em;
-  max-width: inherit;
-  vertical-align: middle;
-}
-.ol-attribution ul, .ol-attribution button {
-  display: inline-block;
-}
-.ol-attribution.ol-collapsed ul {
-  display: none;
-}
-.ol-attribution.ol-logo-only ul {
-  display: block;
-}
-.ol-attribution:not(.ol-collapsed) {
-  background: rgba(255,255,255,0.8);
-}
-.ol-attribution.ol-uncollapsible {
-  bottom: 0;
-  right: 0;
-  border-radius: 4px 0 0;
-  height: 1.1em;
-  line-height: 1em;
-}
-.ol-attribution.ol-logo-only {
-  background: transparent;
-  bottom: .4em;
-  height: 1.1em;
-  line-height: 1em;
-}
-.ol-attribution.ol-uncollapsible img {
-  margin-top: -.2em;
-  max-height: 1.6em;
-}
-.ol-attribution.ol-logo-only button,
-.ol-attribution.ol-uncollapsible button {
-  display: none;
-}
-
-.ol-zoomslider {
-  top: 4.5em;
-  left: .5em;
-  height: 200px;
-}
-.ol-zoomslider button {
-  position: relative;
-  height: 10px;
-}
-
-.ol-touch .ol-zoomslider {
-  top: 5.5em;
-}
-
-.ol-overviewmap {
-  left: 0.5em;
-  bottom: 0.5em;
-}
-.ol-overviewmap.ol-uncollapsible {
-  bottom: 0;
-  left: 0;
-  border-radius: 0 4px 0 0;
-}
-.ol-overviewmap .ol-overviewmap-map,
-.ol-overviewmap button {
-  display: inline-block;
-}
-.ol-overviewmap .ol-overviewmap-map {
-  border: 1px solid #7b98bc;
-  height: 150px;
-  margin: 2px;
-  width: 150px;
-}
-.ol-overviewmap:not(.ol-collapsed) button{
-  bottom: 1px;
-  left: 2px;
-  position: absolute;
-}
-.ol-overviewmap.ol-collapsed .ol-overviewmap-map,
-.ol-overviewmap.ol-uncollapsible button {
-  display: none;
-}
-.ol-overviewmap:not(.ol-collapsed) {
-  background: rgba(255,255,255,0.8);
-}
-.ol-overviewmap-box {
-  border: 2px dotted rgba(0,60,136,0.7);
-}
-
-.ol-overviewmap .ol-overviewmap-box:hover {
-  cursor: move;
-}
--- a/dist/ol-debug.js
+++ b/dist/ol-debug.js
--- a/dist/ol.css
+++ b/dist/ol.css
@@ -1 +0,0 @@
-.ol-box{box-sizing:border-box;border-radius:2px;border:2px solid #00f}.ol-mouse-position{top:8px;right:8px;position:absolute}.ol-scale-line{background:rgba(0,60,136,.3);border-radius:4px;bottom:8px;left:8px;padding:2px;position:absolute}.ol-scale-line-inner{border:1px solid #eee;border-top:none;color:#eee;font-size:10px;text-align:center;margin:1px;will-change:contents,width}.ol-overlay-container{will-change:left,right,top,bottom}.ol-unsupported{display:none}.ol-unselectable,.ol-viewport{-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-tap-highlight-color:transparent}.ol-selectable{-webkit-touch-callout:default;-webkit-user-select:auto;-moz-user-select:auto;-ms-user-select:auto;user-select:auto}.ol-grabbing{cursor:-webkit-grabbing;cursor:-moz-grabbing;cursor:grabbing}.ol-grab{cursor:move;cursor:-webkit-grab;cursor:-moz-grab;cursor:grab}.ol-control{position:absolute;background-color:rgba(255,255,255,.4);border-radius:4px;padding:2px}.ol-control:hover{background-color:rgba(255,255,255,.6)}.ol-zoom{top:.5em;left:.5em}.ol-rotate{top:.5em;right:.5em;transition:opacity .25s linear,visibility 0s linear}.ol-rotate.ol-hidden{opacity:0;visibility:hidden;transition:opacity .25s linear,visibility 0s linear .25s}.ol-zoom-extent{top:4.643em;left:.5em}.ol-full-screen{right:.5em;top:.5em}@media print{.ol-control{display:none}}.ol-control button{display:block;margin:1px;padding:0;color:#fff;font-size:1.14em;font-weight:700;text-decoration:none;text-align:center;height:1.375em;width:1.375em;line-height:.4em;background-color:rgba(0,60,136,.5);border:none;border-radius:2px}.ol-control button::-moz-focus-inner{border:none;padding:0}.ol-zoom-extent button{line-height:1.4em}.ol-compass{display:block;font-weight:400;font-size:1.2em;will-change:transform}.ol-touch .ol-control button{font-size:1.5em}.ol-touch .ol-zoom-extent{top:5.5em}.ol-control button:focus,.ol-control button:hover{text-decoration:none;background-color:rgba(0,60,136,.7)}.ol-zoom .ol-zoom-in{border-radius:2px 2px 0 0}.ol-zoom .ol-zoom-out{border-radius:0 0 2px 2px}.ol-attribution{text-align:right;bottom:.5em;right:.5em;max-width:calc(100% - 1.3em)}.ol-attribution ul{margin:0;padding:0 .5em;font-size:.7rem;line-height:1.375em;color:#000;text-shadow:0 0 2px #fff}.ol-attribution li{display:inline;list-style:none;line-height:inherit}.ol-attribution li:not(:last-child):after{content:" "}.ol-attribution img{max-height:2em;max-width:inherit;vertical-align:middle}.ol-attribution button,.ol-attribution ul{display:inline-block}.ol-attribution.ol-collapsed ul{display:none}.ol-attribution.ol-logo-only ul{display:block}.ol-attribution:not(.ol-collapsed){background:rgba(255,255,255,.8)}.ol-attribution.ol-uncollapsible{bottom:0;right:0;border-radius:4px 0 0;height:1.1em;line-height:1em}.ol-attribution.ol-logo-only{background:0 0;bottom:.4em;height:1.1em;line-height:1em}.ol-attribution.ol-uncollapsible img{margin-top:-.2em;max-height:1.6em}.ol-attribution.ol-logo-only button,.ol-attribution.ol-uncollapsible button{display:none}.ol-zoomslider{top:4.5em;left:.5em;height:200px}.ol-zoomslider button{position:relative;height:10px}.ol-touch .ol-zoomslider{top:5.5em}.ol-overviewmap{left:.5em;bottom:.5em}.ol-overviewmap.ol-uncollapsible{bottom:0;left:0;border-radius:0 4px 0 0}.ol-overviewmap .ol-overviewmap-map,.ol-overviewmap button{display:inline-block}.ol-overviewmap .ol-overviewmap-map{border:1px solid #7b98bc;height:150px;margin:2px;width:150px}.ol-overviewmap:not(.ol-collapsed) button{bottom:1px;left:2px;position:absolute}.ol-overviewmap.ol-collapsed .ol-overviewmap-map,.ol-overviewmap.ol-uncollapsible button{display:none}.ol-overviewmap:not(.ol-collapsed){background:rgba(255,255,255,.8)}.ol-overviewmap-box{border:2px dotted rgba(0,60,136,.7)}.ol-overviewmap .ol-overviewmap-box:hover{cursor:move}
--- a/dist/ol.js
+++ b/dist/ol.js
--- a/externs/olx.js
+++ b/externs/olx.js
@@ -3003,7 +3003,6 @@ olx.interaction.DragZoomOptions.prototype.out;
 * @typedef {{clickTolerance: (number|undefined),
 *     features: (ol.Collection.<ol.Feature>|undefined),
 *     source: (ol.source.Vector|undefined),
- *     dragVertexDelay: (number|undefined),
 *     snapTolerance: (number|undefined),
 *     type: (ol.geom.GeometryType|string),
 *     stopClick: (boolean|undefined),
@@ -3049,14 +3048,6 @@ olx.interaction.DrawOptions.prototype.features;
 olx.interaction.DrawOptions.prototype.source;


-/**
- * Delay in milliseconds after pointerdown before the current vertex can be
- * dragged to its exact position. Default is 500 ms.
- * @type {number|undefined}
- */
-olx.interaction.DrawOptions.prototype.dragVertexDelay;
-
-
 /**
 * Pixel distance for snapping to the drawing finish. Default is `12`.
 * @type {number|undefined}
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "openlayers",
-  "version": "4.6.4",
+  "version": "4.6.5",
  "description": "Build tools and sources for developing OpenLayers based mapping applications",
  "keywords": [
    "map",
--- a/package/package.json
+++ b/package/package.json
@@ -1,6 +1,6 @@
 {
  "name": "ol",
-  "version": "4.6.4",
+  "version": "4.6.5",
  "description": "OpenLayers as ES2015 modules",
  "main": "index.js",
  "module": "index.js",
--- a/src/ol/events/eventtype.js
+++ b/src/ol/events/eventtype.js
@@ -13,7 +13,6 @@ ol.events.EventType = {
  CHANGE: 'change',

  CLEAR: 'clear',
-  CONTEXTMENU: 'contextmenu',
  CLICK: 'click',
  DBLCLICK: 'dblclick',
  DRAGENTER: 'dragenter',
--- a/src/ol/interaction/draw.js
+++ b/src/ol/interaction/draw.js
@@ -1,10 +1,8 @@
 goog.provide('ol.interaction.Draw');

 goog.require('ol');
-goog.require('ol.events.EventType');
 goog.require('ol.Feature');
 goog.require('ol.MapBrowserEventType');
-goog.require('ol.MapBrowserPointerEvent');
 goog.require('ol.Object');
 goog.require('ol.coordinate');
 goog.require('ol.events');
@@ -24,7 +22,6 @@ goog.require('ol.interaction.DrawEventType');
 goog.require('ol.interaction.Pointer');
 goog.require('ol.interaction.Property');
 goog.require('ol.layer.Vector');
-goog.require('ol.pointer.MouseSource');
 goog.require('ol.source.Vector');
 goog.require('ol.style.Style');

@@ -59,18 +56,6 @@ ol.interaction.Draw = function(options) {
   */
  this.downPx_ = null;

-  /**
-   * @type {number|undefined}
-   * @private
-   */
-  this.downTimeout_;
-
-  /**
-   * @type {number|undefined}
-   * @private
-   */
-  this.lastDragTime_;
-
  /**
   * @type {boolean}
   * @private
@@ -206,12 +191,6 @@ ol.interaction.Draw = function(options) {
   */
  this.geometryFunction_ = geometryFunction;

-  /**
-   * @type {number}
-   * @private
-   */
-  this.dragVertexDelay_ = options.dragVertexDelay !== undefined ? options.dragVertexDelay : 500;
-
  /**
   * Finish coordinate for the feature (first point for polygons, last point for
   * linestrings).
@@ -276,8 +255,7 @@ ol.interaction.Draw = function(options) {
      wrapX: options.wrapX ? options.wrapX : false
    }),
    style: options.style ? options.style :
-      ol.interaction.Draw.getDefaultStyleFunction(),
-    updateWhileInteracting: true
+      ol.interaction.Draw.getDefaultStyleFunction()
  });

  /**
@@ -343,27 +321,8 @@ ol.interaction.Draw.prototype.setMap = function(map) {
 * @api
 */
 ol.interaction.Draw.handleEvent = function(event) {
-  if (event.originalEvent.type === ol.events.EventType.CONTEXTMENU) {
-    // Avoid context menu for long taps when drawing on mobile
-    event.preventDefault();
-  }
  this.freehand_ = this.mode_ !== ol.interaction.Draw.Mode_.POINT && this.freehandCondition_(event);
-  let move = event.type === ol.MapBrowserEventType.POINTERMOVE;
-  let pass = true;
-  if (this.lastDragTime_ && event.type === ol.MapBrowserEventType.POINTERDRAG) {
-    const now = Date.now();
-    if (now - this.lastDragTime_ >= this.dragVertexDelay_) {
-      this.downPx_ = event.pixel;
-      this.shouldHandle_ = !this.freehand_;
-      move = true;
-    } else {
-      this.lastDragTime_ = undefined;
-    }
-    if (this.shouldHandle_ && this.downTimeout_) {
-      clearTimeout(this.downTimeout_);
-      this.downTimeout_ = undefined;
-    }
-  }
+  var pass = true;
  if (this.freehand_ &&
      event.type === ol.MapBrowserEventType.POINTERDRAG &&
      this.sketchFeature_ !== null) {
@@ -372,18 +331,11 @@ ol.interaction.Draw.handleEvent = function(event) {
  } else if (this.freehand_ &&
      event.type === ol.MapBrowserEventType.POINTERDOWN) {
    pass = false;
-  } else if (move) {
-    pass = event.type === ol.MapBrowserEventType.POINTERMOVE;
-    if (pass && this.freehand_) {
-      pass = this.handlePointerMove_(event);
-    } else if (event.pointerEvent.pointerType == ol.pointer.MouseSource.POINTER_TYPE ||
-        (event.type === ol.MapBrowserEventType.POINTERDRAG && !this.downTimeout_)) {
-      this.handlePointerMove_(event);
-    }
+  } else if (event.type === ol.MapBrowserEventType.POINTERMOVE) {
+    pass = this.handlePointerMove_(event);
  } else if (event.type === ol.MapBrowserEventType.DBLCLICK) {
    pass = false;
  }
-
  return ol.interaction.Pointer.handleEvent.call(this, event) && pass;
 };

@@ -404,11 +356,6 @@ ol.interaction.Draw.handleDownEvent_ = function(event) {
    }
    return true;
  } else if (this.condition_(event)) {
-    this.lastDragTime_ = Date.now();
-    this.downTimeout_ = setTimeout(function() {
-      this.handlePointerMove_(new ol.MapBrowserPointerEvent(
-          ol.MapBrowserEventType.POINTERMOVE, event.map, event.pointerEvent, true, event.frameState));
-    }.bind(this), this.dragVertexDelay_);
    this.downPx_ = event.pixel;
    return true;
  } else {
@@ -426,11 +373,6 @@ ol.interaction.Draw.handleDownEvent_ = function(event) {
 ol.interaction.Draw.handleUpEvent_ = function(event) {
  var pass = true;

-  if (this.downTimeout_) {
-    clearTimeout(this.downTimeout_);
-    this.downTimeout_ = undefined;
-  }
-
  this.handlePointerMove_(event);

  var circleMode = this.mode_ === ol.interaction.Draw.Mode_.CIRCLE;
@@ -480,9 +422,6 @@ ol.interaction.Draw.prototype.handlePointerMove_ = function(event) {
    this.shouldHandle_ = this.freehand_ ?
      squaredDistance > this.squaredClickTolerance_ :
      squaredDistance <= this.squaredClickTolerance_;
-    if (!this.shouldHandle_) {
-      return true;
-    }
  }

  if (this.finishCoordinate_) {
@@ -565,6 +504,9 @@ ol.interaction.Draw.prototype.startDrawing_ = function(event) {
    this.sketchLineCoords_ = this.sketchCoords_[0];
  } else {
    this.sketchCoords_ = [start.slice(), start.slice()];
+    if (this.mode_ === ol.interaction.Draw.Mode_.CIRCLE) {
+      this.sketchLineCoords_ = this.sketchCoords_;
+    }
  }
  if (this.sketchLineCoords_) {
    this.sketchLine_ = new ol.Feature(
--- a/src/ol/pluggablemap.js
+++ b/src/ol/pluggablemap.js
@@ -205,8 +205,6 @@ ol.PluggableMap = function(options) {
   */
  this.keyHandlerKeys_ = null;

-  ol.events.listen(this.viewport_, ol.events.EventType.CONTEXTMENU,
-      this.handleBrowserEvent, this);
  ol.events.listen(this.viewport_, ol.events.EventType.WHEEL,
      this.handleBrowserEvent, this);
  ol.events.listen(this.viewport_, ol.events.EventType.MOUSEWHEEL,
@@ -430,8 +428,6 @@ ol.PluggableMap.prototype.addOverlayInternal_ = function(overlay) {
 */
 ol.PluggableMap.prototype.disposeInternal = function() {
  this.mapBrowserEventHandler_.dispose();
-  ol.events.unlisten(this.viewport_, ol.events.EventType.CONTEXTMENU,
-      this.handleBrowserEvent, this);
  ol.events.unlisten(this.viewport_, ol.events.EventType.WHEEL,
      this.handleBrowserEvent, this);
  ol.events.unlisten(this.viewport_, ol.events.EventType.MOUSEWHEEL,
--- a/src/ol/render/canvas/polygonreplay.js
+++ b/src/ol/render/canvas/polygonreplay.js
@@ -215,7 +215,7 @@ ol.render.canvas.PolygonReplay.prototype.setFillStrokeStyles_ = function(geometr
  var state = this.state;
  var fillStyle = state.fillStyle;
  if (fillStyle !== undefined) {
-    this.updateFillStyle(state, this.createFill, geometry);
+    this.updateFillStyle(state, this.applyFill, geometry);
  }
  if (state.strokeStyle !== undefined) {
    this.updateStrokeStyle(state, this.applyStroke);
--- a/src/ol/render/canvas/replay.js
+++ b/src/ol/render/canvas/replay.js
@@ -270,16 +270,7 @@ ol.render.canvas.Replay.prototype.replayImage_ = function(context, x, y, image,
    ol.extent.createOrUpdate(boxX, boxY, boxX + boxW, boxY + boxH, box);
  }
  var canvas = context.canvas;
-  var strokePadding = strokeInstruction ? (/** @type {number} */ (strokeInstruction[2]) * scale / 2) : 0;
-  var intersects =
-      box[0] - strokePadding <= canvas.width && box[2] + strokePadding >= 0 &&
-      box[1] - strokePadding <= canvas.height && box[3] + strokePadding >= 0;
-
-  if (snapToPixel) {
-    x = Math.round(x);
-    y = Math.round(y);
-  }
-
+  var intersects = box[0] <= canvas.width && box[2] >= 0 && box[1] <= canvas.height && box[3] >= 0;
  if (declutterGroup) {
    if (!intersects && declutterGroup[4] == 1) {
      return;
@@ -965,16 +956,15 @@ ol.render.canvas.Replay.prototype.setFillStrokeStyle = function(fillStyle, strok
 /**
 * @param {ol.CanvasFillStrokeState} state State.
 * @param {ol.geom.Geometry|ol.render.Feature} geometry Geometry.
- * @return {Array.<*>} Fill instruction.
 */
-ol.render.canvas.Replay.prototype.createFill = function(state, geometry) {
+ol.render.canvas.Replay.prototype.applyFill = function(state, geometry) {
  var fillStyle = state.fillStyle;
  var fillInstruction = [ol.render.canvas.Instruction.SET_FILL_STYLE, fillStyle];
  if (typeof fillStyle !== 'string') {
    var fillExtent = geometry.getExtent();
    fillInstruction.push([fillExtent[0], fillExtent[3]]);
  }
-  return fillInstruction;
+  this.instructions.push(fillInstruction);
 };


@@ -982,35 +972,24 @@ ol.render.canvas.Replay.prototype.createFill = function(state, geometry) {
 * @param {ol.CanvasFillStrokeState} state State.
 */
 ol.render.canvas.Replay.prototype.applyStroke = function(state) {
-  this.instructions.push(this.createStroke(state));
-};
-
-
-/**
- * @param {ol.CanvasFillStrokeState} state State.
- * @return {Array.<*>} Stroke instruction.
- */
-ol.render.canvas.Replay.prototype.createStroke = function(state) {
-  return [
+  this.instructions.push([
    ol.render.canvas.Instruction.SET_STROKE_STYLE,
    state.strokeStyle, state.lineWidth * this.pixelRatio, state.lineCap,
    state.lineJoin, state.miterLimit,
    this.applyPixelRatio(state.lineDash), state.lineDashOffset * this.pixelRatio
-  ];
+  ]);
 };


 /**
 * @param {ol.CanvasFillStrokeState} state State.
- * @param {function(this:ol.render.canvas.Replay, ol.CanvasFillStrokeState, (ol.geom.Geometry|ol.render.Feature)):Array.<*>} createFill Create fill.
+ * @param {function(this:ol.render.canvas.Replay, ol.CanvasFillStrokeState, (ol.geom.Geometry|ol.render.Feature))} applyFill Apply fill.
 * @param {ol.geom.Geometry|ol.render.Feature} geometry Geometry.
 */
-ol.render.canvas.Replay.prototype.updateFillStyle = function(state, createFill, geometry) {
+ol.render.canvas.Replay.prototype.updateFillStyle = function(state, applyFill, geometry) {
  var fillStyle = state.fillStyle;
  if (typeof fillStyle !== 'string' || state.currentFillStyle != fillStyle) {
-    if (fillStyle !== undefined) {
-      this.instructions.push(createFill.call(this, state, geometry));
-    }
+    applyFill.call(this, state, geometry);
    state.currentFillStyle = fillStyle;
  }
 };
@@ -1035,9 +1014,7 @@ ol.render.canvas.Replay.prototype.updateStrokeStyle = function(state, applyStrok
      state.currentLineJoin != lineJoin ||
      state.currentLineWidth != lineWidth ||
      state.currentMiterLimit != miterLimit) {
-    if (strokeStyle !== undefined) {
-      applyStroke.call(this, state);
-    }
+    applyStroke.call(this, state);
    state.currentStrokeStyle = strokeStyle;
    state.currentLineCap = lineCap;
    state.currentLineDash = lineDash;
--- a/src/ol/render/canvas/replaygroup.js
+++ b/src/ol/render/canvas/replaygroup.js
@@ -321,18 +321,21 @@ ol.render.canvas.ReplayGroup.prototype.forEachFeatureAtCoordinate = function(
    });
  }

+  var replayType;
+
  /**
   * @param {ol.Feature|ol.render.Feature} feature Feature.
   * @return {?} Callback result.
   */
-  function hitDetectionCallback(feature) {
+  function featureCallback(feature) {
    var imageData = context.getImageData(0, 0, contextSize, contextSize).data;
    for (var i = 0; i < contextSize; i++) {
      for (var j = 0; j < contextSize; j++) {
        if (mask[i][j]) {
          if (imageData[(j * contextSize + i) * 4 + 3] > 0) {
            var result;
-            if (!declutteredFeatures || declutteredFeatures.indexOf(feature) !== -1) {
+            if (!(declutteredFeatures && (replayType == ol.render.ReplayType.IMAGE || replayType == ol.render.ReplayType.TEXT)) ||
+                declutteredFeatures.indexOf(feature) !== -1) {
              result = callback(feature);
            }
            if (result) {
@@ -347,8 +350,37 @@ ol.render.canvas.ReplayGroup.prototype.forEachFeatureAtCoordinate = function(
    }
  }

-  return this.replayHitDetection_(context, transform, rotation,
-      skippedFeaturesHash, hitDetectionCallback, hitExtent, declutterReplays);
+  /** @type {Array.<number>} */
+  var zs = Object.keys(this.replaysByZIndex_).map(Number);
+  zs.sort(ol.array.numberSafeCompareFunction);
+
+  var i, j, replays, replay, result;
+  for (i = zs.length - 1; i >= 0; --i) {
+    var zIndexKey = zs[i].toString();
+    replays = this.replaysByZIndex_[zIndexKey];
+    for (j = ol.render.replay.ORDER.length - 1; j >= 0; --j) {
+      replayType = ol.render.replay.ORDER[j];
+      replay = replays[replayType];
+      if (replay !== undefined) {
+        if (declutterReplays &&
+            (replayType == ol.render.ReplayType.IMAGE || replayType == ol.render.ReplayType.TEXT)) {
+          var declutter = declutterReplays[zIndexKey];
+          if (!declutter) {
+            declutterReplays[zIndexKey] = [replay, transform.slice(0)];
+          } else {
+            declutter.push(replay, transform.slice(0));
+          }
+        } else {
+          result = replay.replayHitDetection(context, transform, rotation,
+              skippedFeaturesHash, featureCallback, hitExtent);
+          if (result) {
+            return result;
+          }
+        }
+      }
+    }
+  }
+  return undefined;
 };


@@ -457,59 +489,6 @@ ol.render.canvas.ReplayGroup.prototype.replay = function(context,
 };


-/**
- * @private
- * @param {CanvasRenderingContext2D} context Context.
- * @param {ol.Transform} transform Transform.
- * @param {number} viewRotation View rotation.
- * @param {Object.<string, boolean>} skippedFeaturesHash Ids of features
- *     to skip.
- * @param {function((ol.Feature|ol.render.Feature)): T} featureCallback
- *     Feature callback.
- * @param {ol.Extent=} opt_hitExtent Only check features that intersect this
- *     extent.
- * @param {Object.<string, ol.DeclutterGroup>=} opt_declutterReplays Declutter
- *     replays.
- * @return {T|undefined} Callback result.
- * @template T
- */
-ol.render.canvas.ReplayGroup.prototype.replayHitDetection_ = function(
-    context, transform, viewRotation, skippedFeaturesHash,
-    featureCallback, opt_hitExtent, opt_declutterReplays) {
-  /** @type {Array.<number>} */
-  var zs = Object.keys(this.replaysByZIndex_).map(Number);
-  zs.sort(ol.array.numberSafeCompareFunction);
-
-  var i, j, replays, replay, result;
-  for (i = zs.length - 1; i >= 0; --i) {
-    var zIndexKey = zs[i].toString();
-    replays = this.replaysByZIndex_[zIndexKey];
-    for (j = ol.render.replay.ORDER.length - 1; j >= 0; --j) {
-      var replayType = ol.render.replay.ORDER[j];
-      replay = replays[replayType];
-      if (replay !== undefined) {
-        if (opt_declutterReplays &&
-            (replayType == ol.render.ReplayType.IMAGE || replayType == ol.render.ReplayType.TEXT)) {
-          var declutter = opt_declutterReplays[zIndexKey];
-          if (!declutter) {
-            opt_declutterReplays[zIndexKey] = [replay, transform.slice(0)];
-          } else {
-            declutter.push(replay, transform.slice(0));
-          }
-        } else {
-          result = replay.replayHitDetection(context, transform, viewRotation,
-              skippedFeaturesHash, featureCallback, opt_hitExtent);
-          if (result) {
-            return result;
-          }
-        }
-      }
-    }
-  }
-  return undefined;
-};
-
-
 /**
 * @const
 * @private
--- a/src/ol/render/canvas/textreplay.js
+++ b/src/ol/render/canvas/textreplay.js
@@ -263,10 +263,8 @@ ol.render.canvas.TextReplay.prototype.drawText = function(geometry, feature) {
    this.beginGeometry(geometry, feature);
    if (textState.backgroundFill || textState.backgroundStroke) {
      this.setFillStrokeStyle(textState.backgroundFill, textState.backgroundStroke);
-      this.updateFillStyle(this.state, this.createFill, geometry);
-      this.hitDetectionInstructions.push(this.createFill(this.state, geometry));
+      this.updateFillStyle(this.state, this.applyFill, geometry);
      this.updateStrokeStyle(this.state, this.applyStroke);
-      this.hitDetectionInstructions.push(this.createStroke(this.state));
    }
    this.drawTextImage_(label, begin, end);
    this.endGeometry(geometry, feature);
--- a/src/ol/style/text.js
+++ b/src/ol/style/text.js
@@ -155,9 +155,7 @@ ol.style.Text.prototype.clone = function() {
    fill: this.getFill() ? this.getFill().clone() : undefined,
    stroke: this.getStroke() ? this.getStroke().clone() : undefined,
    offsetX: this.getOffsetX(),
-    offsetY: this.getOffsetY(),
-    backgroundFill: this.getBackgroundFill() ? this.getBackgroundFill().clone() : undefined,
-    backgroundStroke: this.getBackgroundStroke() ? this.getBackgroundStroke().clone() : undefined
+    offsetY: this.getOffsetY()
  });
 };

--- a/test/rendering/ol/style/text.test.js
+++ b/test/rendering/ol/style/text.test.js
@@ -352,9 +352,6 @@ describe('ol.rendering.style.Text', function() {
      }));
      features[2].getStyle().getText().setPadding([5, 10, 15, 0]);
      map.getView().fit(vectorSource.getExtent());
-      map.once('postrender', function() {
-        expect(map.getFeaturesAtPixel([178, 120])).to.have.length(1);
-      });
      expectResemble(map, 'rendering/ol/style/expected/text-background.png', IMAGE_TOLERANCE, done);
    });

--- a/test/spec/ol/interaction/draw.test.js
+++ b/test/spec/ol/interaction/draw.test.js
@@ -105,15 +105,6 @@ describe('ol.interaction.Draw', function() {
      expect(draw.freehandCondition_(event)).to.be(true);
    });

-    it('accepts a dragVertexDelay option', function() {
-      const draw = new ol.interaction.Draw({
-        source: source,
-        type: 'LineString',
-        dragVertexDelay: 42
-      });
-      expect(draw.dragVertexDelay_).to.be(42);
-    });
-
  });

  describe('specifying a geometryName', function() {
@@ -350,6 +341,7 @@ describe('ol.interaction.Draw', function() {
      simulateEvent('pointermove', 20, 30);

      // freehand
+      simulateEvent('pointerdown', 20, 30, true);
      simulateEvent('pointermove', 20, 30, true);
      simulateEvent('pointerdrag', 20, 30, true);
      simulateEvent('pointermove', 30, 40, true);
@@ -406,38 +398,6 @@ describe('ol.interaction.Draw', function() {
      expect(geometry.getCoordinates()).to.eql([[10, -20], [30, -20]]);
    });

-    it('allows dragging of the vertex after dragVertexDelay', function(done) {
-      // first point
-      simulateEvent('pointermove', 10, 20);
-      simulateEvent('pointerdown', 10, 20);
-      simulateEvent('pointerup', 10, 20);
-
-      // second point, drag vertex
-      simulateEvent('pointermove', 15, 20);
-      simulateEvent('pointerdown', 15, 20);
-      setTimeout(function() {
-        simulateEvent('pointermove', 20, 10);
-        simulateEvent('pointerdrag', 20, 10);
-        simulateEvent('pointerup', 20, 10);
-        // third point
-        simulateEvent('pointermove', 30, 20);
-        simulateEvent('pointerdown', 30, 20);
-        simulateEvent('pointerup', 30, 20);
-
-        // finish on third point
-        simulateEvent('pointerdown', 30, 20);
-        simulateEvent('pointerup', 30, 20);
-
-        const features = source.getFeatures();
-        expect(features).to.have.length(1);
-        const geometry = features[0].getGeometry();
-        expect(geometry).to.be.a(ol.geom.LineString);
-        expect(geometry.getCoordinates()).to.eql([[10, -20], [20, -10], [30, -20]]);
-
-        done();
-      }, 600);
-    });
-
    it('triggers draw events', function() {
      var ds = sinon.spy();
      var de = sinon.spy();
--- a/test/spec/ol/map.test.js
+++ b/test/spec/ol/map.test.js
@@ -5,7 +5,7 @@ goog.require('ol.Map');
 goog.require('ol.MapEvent');
 goog.require('ol.Overlay');
 goog.require('ol.View');
-goog.require('ol.geom.Point');
+goog.require('ol.geom.LineString');
 goog.require('ol.has');
 goog.require('ol.interaction');
 goog.require('ol.interaction.DoubleClickZoom');
@@ -199,12 +199,12 @@ describe('ol.Map', function() {
        target: target,
        layers: [new ol.layer.Vector({
          source: new ol.source.Vector({
-            features: [new ol.Feature(new ol.geom.Point([0, 0]))]
+            features: [new ol.Feature(new ol.geom.LineString([[-50, 0], [50, 0]]))]
          })
        })],
        view: new ol.View({
          center: [0, 0],
-          zoom: 2
+          zoom: 17
        })
      });
      map.renderSync();
@@ -224,6 +224,20 @@ describe('ol.Map', function() {
      expect(features[0]).to.be.an(ol.Feature);
    });

+    it('returns an array of found features with declutter: true', function() {
+      var layer = map.getLayers().item(0);
+      map.removeLayer(layer);
+      var otherLayer = new ol.layer.Vector({
+        declutter: true,
+        source: layer.getSource()
+      });
+      map.addLayer(otherLayer);
+      map.renderSync();
+      var features = map.getFeaturesAtPixel([50, 50]);
+      expect(features).to.be.an(Array);
+      expect(features[0]).to.be.an(ol.Feature);
+    });
+
    it('respects options', function() {
      var otherLayer = new ol.layer.Vector({
        source: new ol.source.Vector
Author	SHA1	Message	Date
ahocevar	2eea8df75a	Update package version to 4.6.5	2018-03-18 23:33:43 +01:00
ahocevar	c3870aed81	Changelog for v4.6.5	2018-03-18 23:32:50 +01:00
ahocevar	98d0fc05c8	Backport types	2018-03-18 23:20:32 +01:00
Andreas Hocevar	2912a5d7a7	Merge pull request #7669 from ahocevar/hit-detect-declutter Use declutter tree only for text and image replays	2018-03-18 22:45:40 +01:00
				`@@ -1 +0,0 @@`
				.ol-box{box-sizing:border-box;border-radius:2px;border:2px solid #00f}.ol-mouse-position{top:8px;right:8px;position:absolute}.ol-scale-line{background:rgba(0,60,136,.3);border-radius:4px;bottom:8px;left:8px;padding:2px;position:absolute}.ol-scale-line-inner{border:1px solid #eee;border-top:none;color:#eee;font-size:10px;text-align:center;margin:1px;will-change:contents,width}.ol-overlay-container{will-change:left,right,top,bottom}.ol-unsupported{display:none}.ol-unselectable,.ol-viewport{-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-tap-highlight-color:transparent}.ol-selectable{-webkit-touch-callout:default;-webkit-user-select:auto;-moz-user-select:auto;-ms-user-select:auto;user-select:auto}.ol-grabbing{cursor:-webkit-grabbing;cursor:-moz-grabbing;cursor:grabbing}.ol-grab{cursor:move;cursor:-webkit-grab;cursor:-moz-grab;cursor:grab}.ol-control{position:absolute;background-color:rgba(255,255,255,.4);border-radius:4px;padding:2px}.ol-control:hover{background-color:rgba(255,255,255,.6)}.ol-zoom{top:.5em;left:.5em}.ol-rotate{top:.5em;right:.5em;transition:opacity .25s linear,visibility 0s linear}.ol-rotate.ol-hidden{opacity:0;visibility:hidden;transition:opacity .25s linear,visibility 0s linear .25s}.ol-zoom-extent{top:4.643em;left:.5em}.ol-full-screen{right:.5em;top:.5em}@media print{.ol-control{display:none}}.ol-control button{display:block;margin:1px;padding:0;color:#fff;font-size:1.14em;font-weight:700;text-decoration:none;text-align:center;height:1.375em;width:1.375em;line-height:.4em;background-color:rgba(0,60,136,.5);border:none;border-radius:2px}.ol-control button::-moz-focus-inner{border:none;padding:0}.ol-zoom-extent button{line-height:1.4em}.ol-compass{display:block;font-weight:400;font-size:1.2em;will-change:transform}.ol-touch .ol-control button{font-size:1.5em}.ol-touch .ol-zoom-extent{top:5.5em}.ol-control button:focus,.ol-control button:hover{text-decoration:none;background-color:rgba(0,60,136,.7)}.ol-zoom .ol-zoom-in{border-radius:2px 2px 0 0}.ol-zoom .ol-zoom-out{border-radius:0 0 2px 2px}.ol-attribution{text-align:right;bottom:.5em;right:.5em;max-width:calc(100% - 1.3em)}.ol-attribution ul{margin:0;padding:0 .5em;font-size:.7rem;line-height:1.375em;color:#000;text-shadow:0 0 2px #fff}.ol-attribution li{display:inline;list-style:none;line-height:inherit}.ol-attribution li:not(:last-child):after{content:" "}.ol-attribution img{max-height:2em;max-width:inherit;vertical-align:middle}.ol-attribution button,.ol-attribution ul{display:inline-block}.ol-attribution.ol-collapsed ul{display:none}.ol-attribution.ol-logo-only ul{display:block}.ol-attribution:not(.ol-collapsed){background:rgba(255,255,255,.8)}.ol-attribution.ol-uncollapsible{bottom:0;right:0;border-radius:4px 0 0;height:1.1em;line-height:1em}.ol-attribution.ol-logo-only{background:0 0;bottom:.4em;height:1.1em;line-height:1em}.ol-attribution.ol-uncollapsible img{margin-top:-.2em;max-height:1.6em}.ol-attribution.ol-logo-only button,.ol-attribution.ol-uncollapsible button{display:none}.ol-zoomslider{top:4.5em;left:.5em;height:200px}.ol-zoomslider button{position:relative;height:10px}.ol-touch .ol-zoomslider{top:5.5em}.ol-overviewmap{left:.5em;bottom:.5em}.ol-overviewmap.ol-uncollapsible{bottom:0;left:0;border-radius:0 4px 0 0}.ol-overviewmap .ol-overviewmap-map,.ol-overviewmap button{display:inline-block}.ol-overviewmap .ol-overviewmap-map{border:1px solid #7b98bc;height:150px;margin:2px;width:150px}.ol-overviewmap:not(.ol-collapsed) button{bottom:1px;left:2px;position:absolute}.ol-overviewmap.ol-collapsed .ol-overviewmap-map,.ol-overviewmap.ol-uncollapsible button{display:none}.ol-overviewmap:not(.ol-collapsed){background:rgba(255,255,255,.8)}.ol-overviewmap-box{border:2px dotted rgba(0,60,136,.7)}.ol-overviewmap .ol-overviewmap-box:hover{cursor:move}