aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-08-18 13:53:13 +0500
committerAbyss777 <abyss@fox5.ru>2017-08-18 13:53:13 +0500
commita2f24e445ef4c4c06a754b4538d51aec38e1dcbf (patch)
tree51b79ad695e27003119ad95ed354f66a55692277
parentb3d3c720f34e12e7af83e6be3bd87e304931bbe1 (diff)
downloadtrackermap-web-a2f24e445ef4c4c06a754b4538d51aec38e1dcbf.tar.gz
trackermap-web-a2f24e445ef4c4c06a754b4538d51aec38e1dcbf.tar.bz2
trackermap-web-a2f24e445ef4c4c06a754b4538d51aec38e1dcbf.zip
Update openlayers to 4.3.1
-rw-r--r--web/app/view/map/BaseMap.js11
-rw-r--r--web/load.js2
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) {