Merge pull request #1 from dkyeremeh/device_list

Thank you. Merged.

1 files changed, 29 insertions, 1 deletions

diff --git a/web/app/view/map/BaseMap.js b/web/app/view/map/BaseMap.js
index 6891598..0107acd 100644
--- a/web/app/view/map/BaseMap.js
+++ b/web/app/view/map/BaseMap.js
@@ -103,9 +103,29 @@ Ext.define('Traccar.view.map.BaseMap', {
                     })
                 }),
                 new ol.layer.Tile({
+                    title: Strings.mapYandexMap,
+                    type: 'base',
+                    visible: type === 'yandexMap',
+                    source: new ol.source.XYZ({
+                        url: 'https://core-renderer-tiles.maps.yandex.net/tiles?l=map&x={x}&y={y}&z={z}',
+                        projection: 'EPSG:3395',
+                        attributions: '&copy; <a href="https://yandex.com/maps/">Yandex</a>'
+                    })
+                }),
+                new ol.layer.Tile({
+                    title: Strings.mapYandexSat,
+                    type: 'base',
+                    visible: type === 'yandexSat',
+                    source: new ol.source.XYZ({
+                        url: 'https://core-sat.maps.yandex.net/tiles?l=sat&x={x}&y={y}&z={z}',
+                        projection: 'EPSG:3395',
+                        attributions: '&copy; <a href="https://yandex.com/maps/">Yandex</a>'
+                    })
+                }),
+                new ol.layer.Tile({
                     title: Strings.mapOsm,
                     type: 'base',
-                    visible: type === 'osm' || type === 'yandexMap' || type === 'yandexSat' || type === 'wikimedia' || !type,
+                    visible: type === 'osm' || type === 'wikimedia' || !type,
                     source: new ol.source.OSM({})
                 })
             ]
@@ -204,4 +224,12 @@ Ext.define('Traccar.view.map.BaseMap', {
             this.map.updateSize();
         }
     }
+}, function () {
+    var projection;
+    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.proj4.register(proj4);
+    projection = ol.proj.get('EPSG:3395');
+    if (projection) {
+        projection.setExtent([-20037508.342789244, -20037508.342789244, 20037508.342789244, 20037508.342789244]);
+    }
 });