Commit 276620b7 authored by Matija Obreza's avatar Matija Obreza

Merge branch 'master' into staging

parents ba71db05 5815417d
......@@ -40,11 +40,9 @@ var GenesysMaps = {
while (config !== null && config !== undefined) {
var mapOptions = config.mapOptions;
var map = L.map(config.element, mapOptions).setView(mapOptions.center, 4);
L.tileLayer('https://otile{s}-s.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', {
attribution : 'MapQuest',
styleId : 22677,
subdomains : [ '1', '2', '3', '4' ],
opacity : 0.6
L.tileLayer('http://server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}', {
attribution: 'Tiles © Esri — Esri, DeLorme, NAVTEQ',
maxZoom: 16
}).addTo(map);
if (mapOptions.markerTitle !== null) {
var marker = L.marker(mapOptions.center).addTo(map);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment