From 521f0019446c8e7a7cd4fc966d86b8cd7f12c9fc Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 23 Sep 2017 09:56:04 -0600 Subject: [PATCH 1/2] Convert pointerId to string for object lookups --- src/ol/interaction/pointer.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ol/interaction/pointer.js b/src/ol/interaction/pointer.js index 6632a7f555..e288738370 100644 --- a/src/ol/interaction/pointer.js +++ b/src/ol/interaction/pointer.js @@ -69,7 +69,7 @@ ol.interaction.Pointer = function(opt_options) { this.handlingDownUpSequence = false; /** - * @type {Object.} + * @type {Object.} * @private */ this.trackedPointers_ = {}; @@ -123,14 +123,15 @@ ol.interaction.Pointer.prototype.updateTrackedPointers_ = function(mapBrowserEve if (this.isPointerDraggingEvent_(mapBrowserEvent)) { var event = mapBrowserEvent.pointerEvent; + var id = event.pointerId.toString(); if (mapBrowserEvent.type == ol.MapBrowserEventType.POINTERUP) { - delete this.trackedPointers_[event.pointerId]; + delete this.trackedPointers_[id]; } else if (mapBrowserEvent.type == ol.MapBrowserEventType.POINTERDOWN) { - this.trackedPointers_[event.pointerId] = event; - } else if (event.pointerId in this.trackedPointers_) { + this.trackedPointers_[id] = event; + } else if (id in this.trackedPointers_) { // update only when there was a pointerdown event for this pointer - this.trackedPointers_[event.pointerId] = event; + this.trackedPointers_[id] = event; } this.targetPointers = ol.obj.getValues(this.trackedPointers_); } From 080b93f1b893c9f08febc8a84229a93859d899f8 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Mon, 25 Sep 2017 22:35:44 -0700 Subject: [PATCH 2/2] Changes for v4.3.4 --- changelog/v4.3.3.md | 4 ++-- changelog/v4.3.4.md | 7 +++++++ package.json | 2 +- package/package.json | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 changelog/v4.3.4.md diff --git a/changelog/v4.3.3.md b/changelog/v4.3.3.md index cb5200cfb3..784430e65a 100644 --- a/changelog/v4.3.3.md +++ b/changelog/v4.3.3.md @@ -1,6 +1,6 @@ -# 4.3.2 +# 4.3.3 -The v4.3.3 reverts the fractional pixel positioning of overlays. +The v4.3.3 release reverts the fractional pixel positioning of overlays. ## Fixes diff --git a/changelog/v4.3.4.md b/changelog/v4.3.4.md new file mode 100644 index 0000000000..48aebde404 --- /dev/null +++ b/changelog/v4.3.4.md @@ -0,0 +1,7 @@ +# 4.3.4 + +The v4.3.4 release includes a fix for Safari on iOS 11. + +## Fixes + + * [#7285](https://github.com/openlayers/openlayers/pull/7285) - Convert pointerId to string for object lookups ([@tschaub](https://github.com/tschaub)) diff --git a/package.json b/package.json index 3ff27d3dad..b61a8bb031 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openlayers", - "version": "4.3.3", + "version": "4.3.4", "description": "Build tools and sources for developing OpenLayers based mapping applications", "keywords": [ "map", diff --git a/package/package.json b/package/package.json index b91279f664..660e1e19b3 100644 --- a/package/package.json +++ b/package/package.json @@ -1,6 +1,6 @@ { "name": "ol", - "version": "4.3.3", + "version": "4.3.4", "description": "OpenLayers as ES2015 modules", "main": "index.js", "module": "index.js",