Also take care of existing VUCC_GRIDS stored with whitespace
这个提交包含在:
父节点
1d86af760b
当前提交
0352d01366
共有 2 个文件被更改,包括 3 次插入 和 3 次删除
|
|
@ -173,7 +173,7 @@ function get_bearing($lat1, $lon1, $lat2, $lon2) {
|
|||
}
|
||||
|
||||
function qra2latlong($strQRA) {
|
||||
$strQRA=trim($strQRA);
|
||||
$strQRA=preg_replace('/\s+/', '', $strQRA);
|
||||
if (substr_count($strQRA, ',') > 0) {
|
||||
if (substr_count($strQRA, ',') == 3) {
|
||||
// Handle grid corners
|
||||
|
|
|
|||
|
|
@ -433,9 +433,9 @@
|
|||
$distancestring = "(Gridsquare: ".$row->COL_GRIDSQUARE." / distance: ".$distance.")";
|
||||
} else {
|
||||
if (substr_count($row->COL_VUCC_GRIDS, ',') == 1) {
|
||||
$distancestring = "(Gridline: ".$row->COL_VUCC_GRIDS." / distance: ".$distance.")";
|
||||
$distancestring = "(Gridline: ".preg_replace('/\s+/', '', $row->COL_VUCC_GRIDS)." / distance: ".$distance.")";
|
||||
} else if (substr_count($row->COL_VUCC_GRIDS, ',') == 3) {
|
||||
$distancestring = "(Gridcorner: ".$row->COL_VUCC_GRIDS." / distance: ".$distance.")";
|
||||
$distancestring = "(Gridcorner: ".preg_replace('/\s+/', '', $row->COL_VUCC_GRIDS)." / distance: ".$distance.")";
|
||||
} else {
|
||||
$distancestring = "(Grids: ".$row->COL_VUCC_GRIDS.")";
|
||||
}
|
||||
|
|
|
|||
正在加载…
在新工单中引用