Change key name, fixed swapped lat/lon.
This commit is contained in:
parent
c45ccab2ab
commit
d0c0d11187
1 changed files with 9 additions and 12 deletions
|
@ -1,11 +1,11 @@
|
|||
<?php
|
||||
|
||||
function BusPosition($line, $direction){
|
||||
function BusPosition($routeid, $direction){
|
||||
global $lang;
|
||||
$buspositions = DownloadBusposition($line,$direction);
|
||||
$buspositions = DownloadBusposition($routeid,$direction);
|
||||
|
||||
$GenBusPositions = array();
|
||||
$GenBusPositions_keys = array('line', 'id', 'lat', 'lon');
|
||||
$GenBusPositions_keys = array('routeid', 'id', 'lat', 'lon');
|
||||
|
||||
foreach ($buspositions as $bp){
|
||||
$GenBusPositions_values = array();
|
||||
|
@ -17,16 +17,13 @@ function BusPosition($line, $direction){
|
|||
$pieces = explode('-', $bp);
|
||||
|
||||
$id = $pieces[0];
|
||||
if ($id == 'null'){
|
||||
$lat = '';
|
||||
$lon = '';
|
||||
}else{
|
||||
$lat = $pieces[1];
|
||||
$lon = $pieces[2];
|
||||
}
|
||||
if ($id != 'null'){
|
||||
$lat = $pieces[2];
|
||||
$lon = $pieces[1];
|
||||
|
||||
array_push($GenBusPositions_values, $line, $id, $lat, $lon);
|
||||
array_push($GenBusPositions, array_combine($GenBusPositions_keys, $GenBusPositions_values));
|
||||
array_push($GenBusPositions_values, $routeid, $id, $lat, $lon);
|
||||
array_push($GenBusPositions, array_combine($GenBusPositions_keys, $GenBusPositions_values));
|
||||
}
|
||||
}
|
||||
return $GenBusPositions;
|
||||
}
|
||||
|
|
Reference in a new issue