diff --git a/controllers/IndexController.php b/controllers/IndexController.php index 377c561..405f115 100644 --- a/controllers/IndexController.php +++ b/controllers/IndexController.php @@ -57,8 +57,8 @@ class IndexController extends Controller App::setConfig('title', App::$defaultTitle); self::addVar('isAdmin', (int) (App::$user && App::$user->isAdmin == 1)); - self::addVar('pointLat', 0); - self::addVar('pointLng', 0); + self::addVar('pointLat', (isset($_GET['lat'])?floatval($_GET['lat']):0)); + self::addVar('pointLng', (isset($_GET['lng'])?floatval($_GET['lng']):0)); $categoryArray = array(); foreach ($category as $cat) { diff --git a/controllers/JsonController.php b/controllers/JsonController.php index bd26842..0fdaf59 100644 --- a/controllers/JsonController.php +++ b/controllers/JsonController.php @@ -491,7 +491,7 @@ class JsonController extends Controller $lat = $coords[1]; $lng = $coords[0]; $name = "Координаты N°" . $lat . ' E°' . $lng; - $results[] = array('value' => $name, 'data' => "/?lat=$lat&lng=$lng&zoom=13"); + $results[] = array('value' => $name, 'data' => "/?lat=$lat&lng=$lng&zoom=13&marker=true"); } } } @@ -517,7 +517,7 @@ class JsonController extends Controller $name = (string) $obj->results[$index]->formatted_address; $lat = (string) $obj->results[$index]->geometry->location->lat; $lng = (string) $obj->results[$index]->geometry->location->lng; - $results[] = array('value' => $name, 'data' => "/?lat=$lat&lng=$lng&zoom=13"); + $results[] = array('value' => $name, 'data' => "/?lat=$lat&lng=$lng&zoom=13&marker=true"); } } } diff --git a/public/js/map.js b/public/js/map.js index cd97d31..21887ed 100644 --- a/public/js/map.js +++ b/public/js/map.js @@ -218,6 +218,13 @@ function initPoints(useBounds) } else if ((getURLParameter('lat') != 'null') && (getURLParameter('lng') != 'null') && (getURLParameter('zoom') != 'null')) { myMap.setView([getURLParameter('lat'), getURLParameter('lng')], getURLParameter('zoom')); + + if (getURLParameter('marker') == 'true') { + L.popup() + .setLatLng([getURLParameter('lat'), getURLParameter('lng')]) + .setContent('Координаты: N°' + getURLParameter('lat').substring(0,8) + ' E°' + getURLParameter('lng').substring(0,8)) + .openOn(myMap); + } } } });