From cc113d08b2dc217f02ceb6273e5f22b70f86b616 Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Mon, 30 May 2016 20:37:22 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D1=82=D0=B5=D1=81=D1=82=D1=8B=20=D0=BF=D0=BE=20?=
 =?UTF-8?q?=D1=83=D0=BF=D1=80=D0=BE=D1=89=D0=B5=D0=BD=D0=B8=D1=8E=20=D1=82?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/JsonController.php | 10 +++++-----
 public/js/tracks.js            |  1 +
 views/indexTemplate.php        |  2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/controllers/JsonController.php b/controllers/JsonController.php
index 62edebf..1def25c 100644
--- a/controllers/JsonController.php
+++ b/controllers/JsonController.php
@@ -719,15 +719,15 @@ class JsonController extends Controller
 
 							$distance1 = Geo::distance($prevPoint, array('lat' => $trackPoint->lat, 'lng' => $trackPoint->lng));
 
-							if ($distance1 < 30) {
-								continue;
-							}
-
+//							if ($distance1 < 100) {
+//								continue;
+//							}
+//
 //							$distance2 = Geo::distance($nextPoint, array('lat' => $trackPoint->lat, 'lng' => $trackPoint->lng));
 //							$distance3 = Geo::distance($prevPoint, $nextPoint);
 //
 //
-//							if (($distance3 / ($distance1+$distance2)) > 0.982) {
+//							if (($distance3 / ($distance1+$distance2)) > 0.999) {
 //								continue;
 //							}
 						}
diff --git a/public/js/tracks.js b/public/js/tracks.js
index 07214b1..0458d1c 100644
--- a/public/js/tracks.js
+++ b/public/js/tracks.js
@@ -87,6 +87,7 @@ function loadSimpleTrack(id)
 		url: "/json/simpletrack/id/" + id,
 		success: function (data) {
 			trips[id] = L.featureGroup();
+			console.log(data.totCnt);
 
 			if (typeof (data.tracks) != 'undefined') {
 				for (var i = 0; i < data.tracks.length; i++) {
diff --git a/views/indexTemplate.php b/views/indexTemplate.php
index ee17a02..60c2bab 100644
--- a/views/indexTemplate.php
+++ b/views/indexTemplate.php
@@ -20,7 +20,7 @@ if (App::$user) {
 		<div class="glyphicon _t" id="addPointButton" title="Добавить точку" onclick="<?= $addWithoutConfirm ? 'activateAddPoint()' : 'showPointagreement()'; ?>"><img src="/img/buttons/addPoint.png" style="margin-top: -10px; height: 30px;" /></div>
 		<div class="glyphicon _c glyphicon-star boxButtonFavorites" onclick="openBox('Favorites')" title="Хочу посетить"></div>
 		<div class="glyphicon _c glyphicon-cloud-download boxButtonRoutes" onclick="openBox('Routes')" title="Мои маршруты"></div>
-		<div class="glyphicon _b glyphicon-road boxButtonTracks" onclick="openBox('Tracks')" title="Мои маршруты"></div>
+		<div class="glyphicon _b glyphicon-road boxButtonTracks" onclick="openBox('Tracks')" title="Мои треки"></div>
 	<?php else: ?>
 		<div class="glyphicon" id="addPointButton" onclick="$('#loginModal').modal('show');" title="Добавить точку"><img src="/img/buttons/addPoint.png" style="margin-top: -10px; height: 30px;" /></div>
 	<?php endif; ?>