From 4b17d0e630b6455be64c7aaebfa7d1debb7aaef9 Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Tue, 31 May 2016 22:03:55 +0300
Subject: [PATCH] =?UTF-8?q?FIX=20=D0=B8=D0=BC=D1=82=D0=BE=D1=80=D1=82=20?=
 =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=D0=B0=20GPX?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/TracksController.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/controllers/TracksController.php b/controllers/TracksController.php
index f65b33f..63bafd6 100644
--- a/controllers/TracksController.php
+++ b/controllers/TracksController.php
@@ -140,7 +140,10 @@ class TracksController extends Controller
 
 	private static function importGpx($trackFile)
 	{
-		$gpxObject = simplexml_load_file(App::getBasedir() . 'tracks/track' . $trackFile->id . '.' . strtolower($trackFile->format));
+		$gpx = file_get_contents(App::getBasedir() . 'tracks/track' . $trackFile->id . '.' . strtolower($trackFile->format));
+		$gpx = str_replace('geotracker:meta', 'geotrackerMeta', $gpx);
+		$gpxObject = simplexml_load_string($gpx);
+		unset($gpx);
 
 		$trip = Trips::model()->add(
 				array(
@@ -171,8 +174,7 @@ class TracksController extends Controller
 							'tripId' => $trip->id,
 							'lat' => floatval($block['lat']),
 							'lng' => floatval($block['lon']),
-							'alt' => 0,
-							'speed' => 0,
+							'alt' => isset($block->ele) ? floatval($block->ele) : 0,
 							'createdAt' => $block->time,
 							'name' => (string) $block->name,
 							'description' => (string) $block->desc,
@@ -203,6 +205,7 @@ class TracksController extends Controller
 						$trackPoints = array();
 
 						foreach ($trkpt as $tpt) {
+							$speed = isset($tpt->extensions->geotrackerMeta['s']) ? floatval($tpt->extensions->geotrackerMeta['s']) : 0;
 							$trackPoint = TrackPoints::model()->add(
 									array(
 										'trackId' => $track->id,
@@ -210,7 +213,7 @@ class TracksController extends Controller
 										'lng' => floatval($tpt['lon']),
 										'alt' => isset($tpt->ele) ? floatval($tpt->ele) : 0,
 										'createdAt' => isset($tpt->time) ? $tpt->time : date('c'),
-										'speed' => 0,
+										'speed' => $speed,
 									)
 							);