diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-08-18 21:09:59 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-18 21:09:59 +1200 |
commit | cbc90c04da15fe0d57910e6180205351a894166b (patch) | |
tree | 51b79ad695e27003119ad95ed354f66a55692277 /web | |
parent | b3d3c720f34e12e7af83e6be3bd87e304931bbe1 (diff) | |
parent | a2f24e445ef4c4c06a754b4538d51aec38e1dcbf (diff) | |
download | trackermap-web-cbc90c04da15fe0d57910e6180205351a894166b.tar.gz trackermap-web-cbc90c04da15fe0d57910e6180205351a894166b.tar.bz2 trackermap-web-cbc90c04da15fe0d57910e6180205351a894166b.zip |
Merge pull request #557 from Abyss777/ol_431
Update openlayers to 4.3.1
Diffstat (limited to 'web')
-rw-r--r-- | web/app/view/map/BaseMap.js | 11 | ||||
-rw-r--r-- | 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) { |