aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2018-05-26 17:32:14 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2018-05-26 17:32:14 +1200
commitbc22b44fd9c980146d862566e21f6247aafdd807 (patch)
tree486c385878262772995e611953230adaafd3e8fc
parent206342be5bb9aa9d73cf07529795a28d2606c944 (diff)
downloadetbsa-traccar-web-bc22b44fd9c980146d862566e21f6247aafdd807.tar.gz
etbsa-traccar-web-bc22b44fd9c980146d862566e21f6247aafdd807.tar.bz2
etbsa-traccar-web-bc22b44fd9c980146d862566e21f6247aafdd807.zip
Change map defaults
-rw-r--r--web/app/Style.js4
-rw-r--r--web/app/store/MapTypes.js3
-rw-r--r--web/app/view/map/BaseMap.js10
-rw-r--r--web/l10n/en.json1
4 files changed, 15 insertions, 3 deletions
diff --git a/web/app/Style.js b/web/app/Style.js
index 2724353..f12e9f5 100644
--- a/web/app/Style.js
+++ b/web/app/Style.js
@@ -42,8 +42,8 @@ Ext.define('Traccar.Style', {
columnWidthNormal: 100,
- mapDefaultLat: 1.283333,
- mapDefaultLon: 103.833333,
+ mapDefaultLat: 9.933333,
+ mapDefaultLon: -84.083333,
mapDefaultZoom: 4,
mapRouteColor: [
diff --git a/web/app/store/MapTypes.js b/web/app/store/MapTypes.js
index 77c10eb..3d32243 100644
--- a/web/app/store/MapTypes.js
+++ b/web/app/store/MapTypes.js
@@ -44,6 +44,9 @@ Ext.define('Traccar.store.MapTypes', {
key: 'yandexSat',
name: Strings.mapYandexSat
}, {
+ key: 'wikimedia',
+ name: Strings.mapWikimedia
+ }, {
key: 'custom',
name: Strings.mapCustom
}]
diff --git a/web/app/view/map/BaseMap.js b/web/app/view/map/BaseMap.js
index 68173a9..e545c30 100644
--- a/web/app/view/map/BaseMap.js
+++ b/web/app/view/map/BaseMap.js
@@ -130,10 +130,18 @@ Ext.define('Traccar.view.map.BaseMap', {
})
});
break;
- default:
+ case 'osm':
layer = new ol.layer.Tile({
source: new ol.source.OSM({})
});
+ break;
+ default:
+ layer = new ol.layer.Tile({
+ source: new ol.source.OSM({
+ url: 'https://maps.wikimedia.org/osm-intl/{z}/{x}/{y}.png'
+ })
+ })
+ break;
}
lat = Traccar.app.getPreference('latitude', Traccar.Style.mapDefaultLat);
diff --git a/web/l10n/en.json b/web/l10n/en.json
index e8ac555..65ee9e4 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -241,6 +241,7 @@
"mapBaidu": "Baidu",
"mapYandexMap": "Yandex Map",
"mapYandexSat": "Yandex Satellite",
+ "mapWikimedia": "Wikimedia",
"mapShapePolygon": "Polygon",
"mapShapeCircle": "Circle",
"mapShapePolyline": "Polyline",