From bfe44bf57f6bf1dcdb062b031b04e78b2d441a46 Mon Sep 17 00:00:00 2001 From: Krivchikov Dmitry Date: Fri, 4 Mar 2016 19:21:31 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=95=D0=A0=D0=9D=D0=A3=D0=9B=20MAPQUEST?= =?UTF-8?q?,=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BF=D0=BE=20HTTPS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/map.js | 11 +++-------- public/js/mapPoint.js | 6 +++--- views/indexTemplate.php | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/public/js/map.js b/public/js/map.js index a4386a5..9d4a39c 100644 --- a/public/js/map.js +++ b/public/js/map.js @@ -58,19 +58,14 @@ function init(lat, lng) { markers = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 30}); markersPlus = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 25}); -// layers['quest'] = L.tileLayer('http://otile1.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('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA | Points data © WIKIPOINTS.RU', maxZoom: 18}); - layers['osm'] = L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA | 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'); - if ($.cookie('mapLayer') == 'quest') { - $.cookie('mapLayer', 'osm'); - } - - setLayer($.cookie('mapLayer') ? $.cookie('mapLayer') : 'osm'); + setLayer($.cookie('mapLayer') ? $.cookie('mapLayer') : 'quest'); initCategories(); // getPoints внутри diff --git a/public/js/mapPoint.js b/public/js/mapPoint.js index 9b4c17c..ca0447f 100644 --- a/public/js/mapPoint.js +++ b/public/js/mapPoint.js @@ -45,10 +45,10 @@ function init(lat, lng) { myMap = L.map('map', {zoomControl: true}).setView([lat, lng], defaultZoom); markers = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 45}); -// layers['quest'] = L.tileLayer('http://otile1.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('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA | 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('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA | Points data © WIKIPOINTS.RU', maxZoom: 18}); - setLayer('osm'); + setLayer('quest'); initPoints() diff --git a/views/indexTemplate.php b/views/indexTemplate.php index 193995b..c1d63b5 100644 --- a/views/indexTemplate.php +++ b/views/indexTemplate.php @@ -62,8 +62,8 @@ if (App::$user) {

Карты

+
map Quest
Open Street Map
-
Генштаб от маршруты.ру
Google maps
Яндекс.Карты