diff --git a/public/js/map.js b/public/js/map.js
index 962d077..e0a99a8 100644
--- a/public/js/map.js
+++ b/public/js/map.js
@@ -69,14 +69,18 @@ function init(lat, lng) {
L.control.scale({imperial: false}).addTo(myMap);
- layers['quest'] = L.tileLayer('https://otile1-s.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA, Imagery © Mapbox | Points data © WIKIPOINTS.RU', maxZoom: 18});
+// layers['quest'] = L.tileLayer('https://otile1-s.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA, Imagery © Mapbox | Points data © WIKIPOINTS.RU', maxZoom: 18});
layers['osm'] = L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA | Points data © WIKIPOINTS.RU', maxZoom: 18});
layers['topo'] = L.tileLayer('https://topo.wikipoints.ru/?z={z}&x={x}&y={y}&ver=0216', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA, Imagery © Маршруты.ру | Points data © WIKIPOINTS.RU', maxZoom: 15});
layers['google'] = new L.Google('HYBRID');
layers['yandexMap'] = new L.Yandex();
layers['yandex'] = new L.Yandex('hybrid');
- setLayer($.cookie('mapLayer') ? $.cookie('mapLayer') : 'quest');
+ if ($.cookie('mapLayer') && $.cookie('mapLayer') == 'quest') {
+ setLayer('osm');
+ }
+
+ setLayer($.cookie('mapLayer') ? $.cookie('mapLayer') : 'osm');
initCategories(); // getPoints внутри
@@ -186,6 +190,7 @@ function constructPoint(data)
} else {
history.pushState({pointId: id}, document.title, "/?point=" + e.target.options.id);
document.title = e.target.options.title;
+ yaCounter24682772.hit("/?point=" + e.target.options.id);
}
});
@@ -371,6 +376,7 @@ function drawInfoPopup(id, showPopup, doNotPushToHistory) {
if (!doNotPushToHistory) {
history.pushState({pointId: id}, document.title, "/?point=" + id);
+ yaCounter24682772.hit("/?point=" + id);
}
document.title = marker.options.title + ' – wikipoints.ru';