diff --git a/controllers/JsonController.php b/controllers/JsonController.php index 4519f28..62edebf 100644 --- a/controllers/JsonController.php +++ b/controllers/JsonController.php @@ -637,6 +637,7 @@ class JsonController extends Controller $resTracks[] = array( 'name' => (string) $track->name, + 'description' => $track->description, 'length' => 0, 'latlngs' => $resLatlngs, ); diff --git a/public/js/tracks.js b/public/js/tracks.js index 0dac8e7..07214b1 100644 --- a/public/js/tracks.js +++ b/public/js/tracks.js @@ -55,7 +55,7 @@ function loadTrack(id) colorIndex = (colorIndex == colors.length-1) ? 0 : colorIndex+1; tracks[i] = L.polyline(data.tracks[i].latlngs, {color: color, width: 4, opacity: 0.8}); - tracks[i].bindPopup(data.tracks[i].name); + tracks[i].bindPopup('' + data.tracks[i].name + '
' + data.tracks[i].description); trips[id].addLayer(tracks[i]) } }