All4DK
/
wikipoints
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX имторт файла GPX

This commit is contained in:
Krivchikov Dmitry 2016-05-31 22:03:55 +03:00
parent af52d235f8
commit 4b17d0e630
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
controllers/TracksController.php
View File

@ -140,7 +140,10 @@ class TracksController extends Controller
private static function importGpx($trackFile) 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( $trip = Trips::model()->add(
array( array(
@ -171,8 +174,7 @@ class TracksController extends Controller
'tripId' => $trip->id, 'tripId' => $trip->id,
'lat' => floatval($block['lat']), 'lat' => floatval($block['lat']),
'lng' => floatval($block['lon']), 'lng' => floatval($block['lon']),
'alt' => 0, 'alt' => isset($block->ele) ? floatval($block->ele) : 0,
'speed' => 0,
'createdAt' => $block->time, 'createdAt' => $block->time,
'name' => (string) $block->name, 'name' => (string) $block->name,
'description' => (string) $block->desc, 'description' => (string) $block->desc,
@ -203,6 +205,7 @@ class TracksController extends Controller
$trackPoints = array(); $trackPoints = array();
foreach ($trkpt as $tpt) { foreach ($trkpt as $tpt) {
$speed = isset($tpt->extensions->geotrackerMeta['s']) ? floatval($tpt->extensions->geotrackerMeta['s']) : 0;
$trackPoint = TrackPoints::model()->add( $trackPoint = TrackPoints::model()->add(
array( array(
'trackId' => $track->id, 'trackId' => $track->id,
@ -210,7 +213,7 @@ class TracksController extends Controller
'lng' => floatval($tpt['lon']), 'lng' => floatval($tpt['lon']),
'alt' => isset($tpt->ele) ? floatval($tpt->ele) : 0, 'alt' => isset($tpt->ele) ? floatval($tpt->ele) : 0,
'createdAt' => isset($tpt->time) ? $tpt->time : date('c'), 'createdAt' => isset($tpt->time) ? $tpt->time : date('c'),
'speed' => 0, 'speed' => $speed,
) )
); );