From a3fc9c73e022ad97aff7b360e901b11c95c9495b Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Wed, 17 Jun 2015 23:36:14 +0300
Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=BA=D0=B0=D1=82=D0=B5=D0=B3=D0=BE=D1=80=D0=B8=D0=B9?=
 =?UTF-8?q?=20=D0=BD=D0=B0=20=D1=8D=D1=82=D0=B0=D0=BF=D0=B5=20=D1=84=D0=BE?=
 =?UTF-8?q?=D1=80=D0=BC=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=8B,=20=D0=B1?=
 =?UTF-8?q?=D0=B5=D0=B7=20AJAX?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ground/controllers/IndexController.php |  6 ++++++
 ground/views/indexTemplate.php         |  5 +++++
 public/js/app.js                       | 26 ++++++++++----------------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/ground/controllers/IndexController.php b/ground/controllers/IndexController.php
index 578b9d6..8f80dd7 100644
--- a/ground/controllers/IndexController.php
+++ b/ground/controllers/IndexController.php
@@ -68,6 +68,11 @@ class IndexController extends Controller
 		self::addVar('pointLat', 0);
 		self::addVar('pointLng', 0);
 
+		$categoryArray = array();
+		foreach ($category as $cat) {
+			$categoryArray[] = $cat->getValues();
+		}
+
 		$og = array();
 		if (isset($_GET['point']) && $_GET['point'] && is_numeric($_GET['point']))
 		{
@@ -95,6 +100,7 @@ class IndexController extends Controller
 
 		self::render('indexTemplate.php', array(
 			'categories' => $category,
+			'categoryArray' => $categoryArray,
 			'user' => App::$user,
 			'routes' => $routes,
 			'favorites' => $favorites,
diff --git a/ground/views/indexTemplate.php b/ground/views/indexTemplate.php
index a3f5848..f5931de 100644
--- a/ground/views/indexTemplate.php
+++ b/ground/views/indexTemplate.php
@@ -117,6 +117,11 @@
 	<area onclick="hideBigLogo();" shape="rect" coords="0,0,40,40" style="cursor: pointer" title="Спрятать надолго"/>
 	<area href="https://vk.com/wikipoints" shape="rect" coords="40,0,230,40" title="Посетить группу в VK - это интересно и полезно!" target="_blank"/>
 </map>
+<?php if (isset($categoryArray)): ?>
+	<script type="text/javascript">
+		var categoryArray = '<?= json_encode($categoryArray)?>';
+	</script>
+<?php endif; ?>
 <script>
 	$(document).ready(function () {
 		if ($.cookie('doNotShowVKgroup')) {
diff --git a/public/js/app.js b/public/js/app.js
index 2d091f9..efff2da 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -184,23 +184,17 @@ function showRandomPoint()
  */
 function initCategories()
 {
-	$.ajax({
-		url: "/json/categories/",
-		success: function (data) {
-			for (var k in data) {
-				categories[data[k]['id']] = L.icon({
-					iconUrl: data[k]['icon'],
-					iconSize: [32, 37],
-					iconAnchor: [16, 37],
-					popupAnchor: [0, 1]
-				});
-			}
+	data = JSON.parse(categoryArray);
+	for (var k in data) {
+		categories[data[k]['id']] = L.icon({
+			iconUrl: data[k]['icon'],
+			iconSize: [32, 37],
+			iconAnchor: [16, 37],
+			popupAnchor: [0, 1]
+		});
+	}
 
-			initPoints();
-		}
-	});
-
-	return true;
+	return initPoints();
 }
 
 /**