kopia lustrzana https://github.com/magicbug/Cloudlog
[Visitors] Correctly map callsigns without gridsquares
rodzic
da29103430
commit
ed56211e93
|
@ -214,23 +214,19 @@ class Visitor extends CI_Controller {
|
||||||
$count++;
|
$count++;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
$query = $this->db->query('
|
if($count != 1) {
|
||||||
SELECT *
|
|
||||||
FROM dxcc_entities
|
|
||||||
WHERE prefix = SUBSTRING( \''.$row->COL_CALL.'\', 1, LENGTH( prefix ) )
|
|
||||||
ORDER BY LENGTH( prefix ) DESC
|
|
||||||
LIMIT 1
|
|
||||||
');
|
|
||||||
|
|
||||||
foreach ($query->result() as $dxcc) {
|
|
||||||
if($count != 1) {
|
|
||||||
echo ",";
|
echo ",";
|
||||||
}
|
|
||||||
echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ";
|
|
||||||
echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE;
|
|
||||||
echo "\",\"label\":\"".$row->COL_CALL."\"}";
|
|
||||||
$count++;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(isset($row->lat) && isset($row->long)) {
|
||||||
|
$lat = $row->lat;
|
||||||
|
$lng = $row->long;
|
||||||
|
}
|
||||||
|
|
||||||
|
echo "{\"lat\":\"".$lat."\",\"lng\":\"".$lng."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />Band: ".$row->COL_BAND."<br />Mode: ";
|
||||||
|
echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE;
|
||||||
|
echo "\",\"label\":\"".$row->COL_CALL."\"}";
|
||||||
|
$count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue