From f4b4bb2b4aa4a900dc40ff8e26943eaeab904696 Mon Sep 17 00:00:00 2001 From: Krivchikov Dmitry Date: Thu, 19 May 2016 20:59:14 +0300 Subject: [PATCH] =?UTF-8?q?ADD=20=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=20=D0=91=D0=94=20=D0=B8=D0=BD?= =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BE=20?= =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=D0=B5-=D1=82=D1=80=D0=B5=D0=BA=D0=B5?= =?UTF-8?q?=20-=20=D0=BA=D0=BE=D0=BB-=D0=B2=D0=BE=20=D1=82=D0=BE=D1=87?= =?UTF-8?q?=D0=B5=D0=BA=20=D0=B8=20=D1=82=D0=BE=D0=BC=D1=83=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=BD=D0=BE=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controllers/TracksController.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/controllers/TracksController.php b/controllers/TracksController.php index 0552efd..a464e10 100644 --- a/controllers/TracksController.php +++ b/controllers/TracksController.php @@ -95,6 +95,7 @@ class TracksController extends Controller $tracks = array(); $latlngs = array(); $tracksCounter = 1; + $tracksCount = $tptCount = $wptCount = 0; foreach ($gpxObject as $key => $block) { if ($key == 'wpt') { @@ -114,6 +115,8 @@ class TracksController extends Controller 'description' => (string) $block->desc, ) ); + + $wptCount++; } if ($key == 'trk') { @@ -150,13 +153,13 @@ class TracksController extends Controller if ($prevPoint) { $distanceTmp += Geo::distance($prevPoint, array('lat' => floatval($tpt['lat']), 'lng' => floatval($tpt['lon']))); -// print $distanceTmp.'
'; } $prevPoint = array( 'lat' => floatval($tpt['lat']), 'lng' => floatval($tpt['lon']), ); + $tptCount++; } $distance += $distanceTmp; @@ -164,13 +167,19 @@ class TracksController extends Controller $track->save(); } } - + $tracksCount++; } } $trip->distance = $distance; $trip->save(); + $trackFile->tracksCount = $tracksCount; + $trackFile->tptCount = $tptCount; + $trackFile->wptCount = $wptCount; + $trackFile->distance = $distance; + $trackFile->save(); + App::redirect('/tracks'); }