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) {

