diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-08-18 09:11:02 +1200 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-08-18 09:11:02 +1200 |
commit | f804916f5842da7150651aa83a58633c02de9523 (patch) | |
tree | f7420ec739a5465d460984c615338aa4efc37a4e /web/app | |
parent | 24c04679c356f21d82419d9cb4f2bcd256653132 (diff) | |
parent | e6b9901b9e86b328010716ebcc8303e06d3dd206 (diff) | |
download | trackermap-server-f804916f5842da7150651aa83a58633c02de9523.tar.gz trackermap-server-f804916f5842da7150651aa83a58633c02de9523.tar.bz2 trackermap-server-f804916f5842da7150651aa83a58633c02de9523.zip |
Merge branch 'master' of github.com:tananaev/traccar
Diffstat (limited to 'web/app')
-rw-r--r-- | web/app/Resources.js | 4 | ||||
-rw-r--r-- | web/app/view/map/Map.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/web/app/Resources.js b/web/app/Resources.js index 851658646..73cee7b2d 100644 --- a/web/app/Resources.js +++ b/web/app/Resources.js @@ -26,8 +26,8 @@ var styles = { reportTime: 100, reportFormat: 'Y-m-d H:i:s', - mapDefaultLat: -0.1275, - mapDefaultLon: 51.507222, + mapDefaultLat: 51.507222, + mapDefaultLon: -0.1275, mapDefaultZoom: 6, mapMaxZoom: 19, diff --git a/web/app/view/map/Map.js b/web/app/view/map/Map.js index 6b323e555..9d9a92886 100644 --- a/web/app/view/map/Map.js +++ b/web/app/view/map/Map.js @@ -63,7 +63,7 @@ Ext.define('Traccar.view.map.Map', { var zoom = user.get('zoom') || server.get('zoom') || styles.mapDefaultZoom; this.mapView = new ol.View({ - center: ol.proj.fromLonLat([lat, lon]), + center: ol.proj.fromLonLat([ lon, lat ]), zoom: zoom, maxZoom: styles.mapMaxZoom }); |