From 74b084abdf4273ad7c6ab64692609445e2d519e1 Mon Sep 17 00:00:00 2001 From: Krivchikov Dmitry Date: Thu, 28 Jul 2016 10:12:30 +0300 Subject: [PATCH] =?UTF-8?q?FIX=20-=20=D1=8F=D0=BD=D0=B4=D0=BA=D1=81=20?= =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20=D1=80=D0=B0=D0=B1?= =?UTF-8?q?=D0=BE=D1=82=D1=83=20=D1=81=20=D0=90=D0=9F=D0=98=20=D0=B8=20?= =?UTF-8?q?=D1=81=D0=BB=D0=BE=D0=BC=D0=B0=D0=BB=D0=B0=D1=81=D1=8C=20=D0=BA?= =?UTF-8?q?=D0=B0=D1=80=D1=82=D0=B0=20=D0=BD=D0=B0=20=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=86=D0=B5=20=D1=82=D0=BE=D1=87=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controllers/IndexController.php | 2 +- controllers/PointController.php | 2 +- public/js/mapPoint.js | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/controllers/IndexController.php b/controllers/IndexController.php index 6e19e0e..34a05f6 100644 --- a/controllers/IndexController.php +++ b/controllers/IndexController.php @@ -16,7 +16,7 @@ class IndexController extends Controller self::addScript('https://maps.google.com/maps/api/js?v=3'); self::addScript('/js/tile/Google.js'); - self::addScript('/js/api-maps-yandex-2.0.js'); + self::addScript('https://api-maps.yandex.ru/2.0/?load=package.map&lang=ru-RU'); self::addScript('/js/tile/Yandex.js'); self::addScript('/js/app.js?ver=' . App::getConfig('version')); diff --git a/controllers/PointController.php b/controllers/PointController.php index 1aae319..9c139de 100644 --- a/controllers/PointController.php +++ b/controllers/PointController.php @@ -21,7 +21,7 @@ class PointController extends Controller self::addScript('/js/jquery-ui-1.10.4.custom.min.js'); self::addScript('/js/bootstrap.min.js'); self::addScript('/js/leaflet.js'); - self::addScript('/js/api-maps-yandex-2.0.js'); + self::addScript('https://api-maps.yandex.ru/2.0/?load=package.map&lang=ru-RU'); self::addScript('/js/leaflet.markercluster.js'); self::addScript('/js/app.js?ver=' . App::getConfig('version')); diff --git a/public/js/mapPoint.js b/public/js/mapPoint.js index e5285b5..0f04f7e 100644 --- a/public/js/mapPoint.js +++ b/public/js/mapPoint.js @@ -30,10 +30,7 @@ categories.targetpoint = L.icon({ /** * Инициализируем яндекс-карты и узнаём расположение пользователя. */ -ymaps.ready(function () { - lat = ymaps.geolocation.latitude; - lng = ymaps.geolocation.longitude; - +$(document).ready(function(){ init(pointLat, pointLng); });