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

FIX имена фрагментов трека

This commit is contained in:
Krivchikov Dmitry 2016-05-16 12:27:40 +03:00
parent 24365e064c
commit e714778062
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/JsonController.php
View File

@ -609,7 +609,7 @@ class JsonController extends Controller
'lng' => floatval($block->lng), 'lng' => floatval($block->lng),
'time' => strtotime($block->createdAt), 'time' => strtotime($block->createdAt),
'name' => (string) $block->name, 'name' => (string) $block->name,
'desc' => (string) $block->description, 'description' => nl2br($block->description),
); );
} }
} }
@ -630,7 +630,7 @@ class JsonController extends Controller
} }
$resTracks[] = array( $resTracks[] = array(
'name' => (string) $block->name, 'name' => (string) $track->name,
'length' => 0, 'length' => 0,
'latlngs' => $resLatlngs, 'latlngs' => $resLatlngs,
); );

2
controllers/TracksController.php
View File

@ -77,8 +77,6 @@ class TracksController extends Controller
App::error404(); App::error404();
} }
print_r($trackFile);
$gpxObject = simplexml_load_file(App::getBasedir().'tracks/track'.$trackFile->id.'.gpx'); $gpxObject = simplexml_load_file(App::getBasedir().'tracks/track'.$trackFile->id.'.gpx');
$trip = Trips::model()->add( $trip = Trips::model()->add(

4
public/js/map.js
View File

@ -595,7 +595,9 @@ function drawTrek(id)
if (typeof (data.wayPoints) != 'undefined') { if (typeof (data.wayPoints) != 'undefined') {
for (var i = 0; i < data.wayPoints.length; i++) { for (var i = 0; i < data.wayPoints.length; i++) {
L.marker([data.wayPoints[i]['lat'], data.wayPoints[i]['lng']], {icon: categories.marker, title: data.wayPoints[i]['name']}).addTo(myMap); marker = L.marker([data.wayPoints[i]['lat'], data.wayPoints[i]['lng']], {icon: categories.marker, title: data.wayPoints[i]['name']})
marker.bindPopup('<b>' + data.wayPoints[i]['name'] + '</b><br/>' +data.wayPoints[i]['description']);
marker.addTo(myMap);
} }
} }
} }