aboutsummaryrefslogtreecommitdiff
path: root/web/app/view/map/BaseMap.js
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-08-18 11:22:48 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2017-08-18 11:22:48 +1200
commit3c2a5c249d2a0cec1d5c371efcd1dfcf7e8c7f2e (patch)
tree74f6b995121b615fe39f3d7a23864c37a8db89a8 /web/app/view/map/BaseMap.js
parent1e10dfb3c9f93998c6060297b8458f2a3c3df485 (diff)
downloadetbsa-traccar-web-3c2a5c249d2a0cec1d5c371efcd1dfcf7e8c7f2e.tar.gz
etbsa-traccar-web-3c2a5c249d2a0cec1d5c371efcd1dfcf7e8c7f2e.tar.bz2
etbsa-traccar-web-3c2a5c249d2a0cec1d5c371efcd1dfcf7e8c7f2e.zip
Fix various style issues
Diffstat (limited to 'web/app/view/map/BaseMap.js')
-rw-r--r--web/app/view/map/BaseMap.js10
1 files changed, 4 insertions, 6 deletions
diff --git a/web/app/view/map/BaseMap.js b/web/app/view/map/BaseMap.js
index c4297f6..5829cac 100644
--- a/web/app/view/map/BaseMap.js
+++ b/web/app/view/map/BaseMap.js
@@ -95,10 +95,10 @@ Ext.define('Traccar.view.map.BaseMap', {
index = index < 0 ? index + urlsLength : index;
if (x < 0) {
- x = 'M' + (-x);
+ x = 'M' + -x;
}
if (y < 0) {
- y = 'M' + (-y);
+ y = 'M' + -y;
}
return 'http://online{}.map.bdimg.com/onlinelabel/?qt=tile&x={x}&y={y}&z={z}&styles=pl'
.replace('{}', index).replace('{x}', x).replace('{y}', y).replace('{z}', z);
@@ -171,7 +171,7 @@ Ext.define('Traccar.view.map.BaseMap', {
}
this.map.on('pointermove', function (e) {
- var hit = this.forEachFeatureAtPixel(e.pixel, function (feature, layer) {
+ var hit = this.forEachFeatureAtPixel(e.pixel, function () {
return true;
});
if (hit) {
@@ -187,7 +187,7 @@ Ext.define('Traccar.view.map.BaseMap', {
return !layer.get('name');
}
})) {
- this.map.forEachFeatureAtPixel(e.pixel, function (feature, layer) {
+ this.map.forEachFeatureAtPixel(e.pixel, function (feature) {
this.fireEvent('selectfeature', feature);
}.bind(this));
} else {
@@ -206,9 +206,7 @@ Ext.define('Traccar.view.map.BaseMap', {
}
}
}, function () {
-
proj4.defs('BD-MC', '+proj=merc +lon_0=0 +units=m +ellps=clrk66 +no_defs');
proj4.defs('EPSG:3395', '+proj=merc +lon_0=0 +k=1 +x_0=0 +y_0=0 +datum=WGS84 +units=m +no_defs');
ol.proj.get('EPSG:3395').setExtent([-20037508.342789244, -20037508.342789244, 20037508.342789244, 20037508.342789244]);
-
});