[Map][Custom] Fixes issue where multi grid caused error
这个提交包含在：
Peter Goodhall
父节点
4253f29c56
当前提交
01a0f75f84
共有 1 个文件被更改，包括 75 次插入 和 2 次删除
|
|
@ -113,7 +113,7 @@ class Map extends CI_Controller {
|
||||||
$this->load->library('qra');
|
$this->load->library('qra');
|
||||||
|
|
||||||
$qsos = $this->logbook_model->map_custom_qsos(rawurldecode($start_date), rawurldecode($end_date), $band);
|
$qsos = $this->logbook_model->map_custom_qsos(rawurldecode($start_date), rawurldecode($end_date), $band);
|
||||||
|
header('Content-Type: application/json; charset=utf-8');
|
||||||
echo "{\"markers\": [";
|
echo "{\"markers\": [";
|
||||||
$count = 1;
|
$count = 1;
|
||||||
if ($qsos) {
|
if ($qsos) {
|
||||||
|
|
@ -132,7 +132,43 @@ class Map extends CI_Controller {
|
||||||
}
|
}
|
||||||
|
|
||||||
$count++;
|
$count++;
|
||||||
|
}elseif($row->COL_VUCC_GRIDS != null) {
|
||||||
|
|
||||||
|
$grids = explode(",", $row->COL_VUCC_GRIDS);
|
||||||
|
if (count($grids) == 2) {
|
||||||
|
$grid1 = $this->qra->qra2latlong(trim($grids[0]));
|
||||||
|
$grid2 = $this->qra->qra2latlong(trim($grids[1]));
|
||||||
|
|
||||||
|
$coords[]=array('lat' => $grid1[0],'lng'=> $grid1[1]);
|
||||||
|
$coords[]=array('lat' => $grid2[0],'lng'=> $grid2[1]);
|
||||||
|
|
||||||
|
$stn_loc = $this->qra->get_midpoint($coords);
|
||||||
|
}
|
||||||
|
if (count($grids) == 4) {
|
||||||
|
$grid1 = $this->qra->qra2latlong(trim($grids[0]));
|
||||||
|
$grid2 = $this->qra->qra2latlong(trim($grids[1]));
|
||||||
|
$grid3 = $this->qra->qra2latlong(trim($grids[2]));
|
||||||
|
$grid4 = $this->qra->qra2latlong(trim($grids[3]));
|
||||||
|
|
||||||
|
$coords[]=array('lat' => $grid1[0],'lng'=> $grid1[1]);
|
||||||
|
$coords[]=array('lat' => $grid2[0],'lng'=> $grid2[1]);
|
||||||
|
$coords[]=array('lat' => $grid3[0],'lng'=> $grid3[1]);
|
||||||
|
$coords[]=array('lat' => $grid4[0],'lng'=> $grid4[1]);
|
||||||
|
|
||||||
|
$stn_loc = $this->qra->get_midpoint($coords);
|
||||||
|
}
|
||||||
|
|
||||||
|
if($count != 1) {
|
||||||
|
echo ",";
|
||||||
|
}
|
||||||
|
|
||||||
|
if($row->COL_SAT_NAME != null) {
|
||||||
|
echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />SAT: ".$row->COL_SAT_NAME."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
|
||||||
|
} else {
|
||||||
|
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: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
|
||||||
|
}
|
||||||
|
|
||||||
|
$count++;
|
||||||
} else {
|
} else {
|
||||||
if($count != 1) {
|
if($count != 1) {
|
||||||
echo ",";
|
echo ",";
|
||||||
|
|
@ -176,7 +212,7 @@ class Map extends CI_Controller {
|
||||||
$stn_loc = $this->qra->qra2latlong($row->COL_GRIDSQUARE);
|
$stn_loc = $this->qra->qra2latlong($row->COL_GRIDSQUARE);
|
||||||
if($count != 1) {
|
if($count != 1) {
|
||||||
echo ",";
|
echo ",";
|
||||||
}
|
}
|
||||||
|
|
||||||
if($row->COL_SAT_NAME != null) {
|
if($row->COL_SAT_NAME != null) {
|
||||||
echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />SAT: ".$row->COL_SAT_NAME."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
|
echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />SAT: ".$row->COL_SAT_NAME."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
|
||||||
|
|
@ -185,7 +221,44 @@ class Map extends CI_Controller {
|
||||||
}
|
}
|
||||||
|
|
||||||
$count++;
|
$count++;
|
||||||
|
} elseif($row->COL_VUCC_GRIDS != null) {
|
||||||
|
|
||||||
|
$grids = explode(",", $row->COL_VUCC_GRIDS);
|
||||||
|
if (count($grids) == 2) {
|
||||||
|
$grid1 = $this->qra->qra2latlong(trim($grids[0]));
|
||||||
|
$grid2 = $this->qra->qra2latlong(trim($grids[1]));
|
||||||
|
|
||||||
|
$coords[]=array('lat' => $grid1[0],'lng'=> $grid1[1]);
|
||||||
|
$coords[]=array('lat' => $grid2[0],'lng'=> $grid2[1]);
|
||||||
|
|
||||||
|
$stn_loc = $this->qra->get_midpoint($coords);
|
||||||
|
}
|
||||||
|
if (count($grids) == 4) {
|
||||||
|
$grid1 = $this->qra->qra2latlong(trim($grids[0]));
|
||||||
|
$grid2 = $this->qra->qra2latlong(trim($grids[1]));
|
||||||
|
$grid3 = $this->qra->qra2latlong(trim($grids[2]));
|
||||||
|
$grid4 = $this->qra->qra2latlong(trim($grids[3]));
|
||||||
|
|
||||||
|
$coords[]=array('lat' => $grid1[0],'lng'=> $grid1[1]);
|
||||||
|
$coords[]=array('lat' => $grid2[0],'lng'=> $grid2[1]);
|
||||||
|
$coords[]=array('lat' => $grid3[0],'lng'=> $grid3[1]);
|
||||||
|
$coords[]=array('lat' => $grid4[0],'lng'=> $grid4[1]);
|
||||||
|
|
||||||
|
$stn_loc = $this->qra->get_midpoint($coords);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if($count != 1) {
|
||||||
|
echo ",";
|
||||||
|
}
|
||||||
|
|
||||||
|
if($row->COL_SAT_NAME != null) {
|
||||||
|
echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."<br />Date/Time: ".$row->COL_TIME_ON."<br />SAT: ".$row->COL_SAT_NAME."<br />Mode: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
|
||||||
|
} else {
|
||||||
|
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: ".$row->COL_MODE."\",\"label\":\"".$row->COL_CALL."\"}";
|
||||||
|
}
|
||||||
|
|
||||||
|
$count++;
|
||||||
} else {
|
} else {
|
||||||
$query = $this->db->query('
|
$query = $this->db->query('
|
||||||
SELECT *
|
SELECT *
|
||||||
|
|
|
||||||
正在加载…
在新工单中引用