From a2f24e445ef4c4c06a754b4538d51aec38e1dcbf Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Fri, 18 Aug 2017 13:53:13 +0500 Subject: Update openlayers to 4.3.1 --- web/app/view/map/BaseMap.js | 11 ++++++----- web/load.js | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/web/app/view/map/BaseMap.js b/web/app/view/map/BaseMap.js index 5829cac9..91f37841 100644 --- a/web/app/view/map/BaseMap.js +++ b/web/app/view/map/BaseMap.js @@ -182,14 +182,15 @@ Ext.define('Traccar.view.map.BaseMap', { }); this.map.on('click', function (e) { - if (this.map.hasFeatureAtPixel(e.pixel, { + var i, features = this.map.getFeaturesAtPixel(e.pixel, { layerFilter: function (layer) { return !layer.get('name'); } - })) { - this.map.forEachFeatureAtPixel(e.pixel, function (feature) { - this.fireEvent('selectfeature', feature); - }.bind(this)); + }); + if (features) { + for (i = 0; i < features.length; i++) { + this.fireEvent('selectfeature', features[i]); + } } else { this.fireEvent('deselectfeature'); } diff --git a/web/load.js b/web/load.js index 1845cd13..85772805 100644 --- a/web/load.js +++ b/web/load.js @@ -136,7 +136,7 @@ extjsVersion = '6.2.0'; fontAwesomeVersion = '4.7.0'; - olVersion = '4.2.0'; + olVersion = '4.3.1'; proj4jsVersion = '2.4.3'; if (debugMode) { -- cgit v1.2.3