Populate COL_DISTANCE at DB when plotting

这个提交包含在:
int2001 2023-08-27 05:37:16 +00:00
父节点 67bad9fcbb
当前提交 2f694e060e
找不到此签名对应的密钥
GPG 密钥 ID: DFB1C13CD2DB037B

查看文件

@ -25,7 +25,7 @@ class Distances_model extends CI_Model
if ($station_gridsquare != null) { if ($station_gridsquare != null) {
$gridsquare = explode(',', $station_gridsquare); // We need to convert to an array, since a user can enter several gridsquares $gridsquare = explode(',', $station_gridsquare); // We need to convert to an array, since a user can enter several gridsquares
$this->db->select('col_call callsign, col_gridsquare grid'); $this->db->select('COL_PRIMARY_KEY,COL_DISTANCE,col_call callsign, col_gridsquare grid');
$this->db->where('LENGTH(col_gridsquare) >', 0); $this->db->where('LENGTH(col_gridsquare) >', 0);
if ($postdata['band'] == 'sat') { if ($postdata['band'] == 'sat') {
@ -121,80 +121,82 @@ class Distances_model extends CI_Model
// then calculates distance between homelocator and locator given in qso. // then calculates distance between homelocator and locator given in qso.
// It builds an array, which has 50km intervals, then inputs each length into the correct spot // It builds an array, which has 50km intervals, then inputs each length into the correct spot
// The function returns a json-encoded array. // The function returns a json-encoded array.
function plot($qsoArray, $gridsquare, $measurement_base) { function plot($qsoArray, $gridsquare, $measurement_base) {
$stationgrid = strtoupper($gridsquare[0]); // We use only the first entered gridsquare from the active profile $stationgrid = strtoupper($gridsquare[0]); // We use only the first entered gridsquare from the active profile
if (strlen($stationgrid) == 4) $stationgrid .= 'MM'; // adding center of grid if only 4 digits are specified if (strlen($stationgrid) == 4) $stationgrid .= 'MM'; // adding center of grid if only 4 digits are specified
switch ($measurement_base) { switch ($measurement_base) {
case 'M': case 'M':
$unit = "mi"; $unit = "mi";
$dist = '13000'; $dist = '13000';
break; break;
case 'K': case 'K':
$unit = "km"; $unit = "km";
$dist = '20000'; $dist = '20000';
break; break;
case 'N': case 'N':
$unit = "nmi"; $unit = "nmi";
$dist = '11000'; $dist = '11000';
break; break;
default: default:
$unit = "km"; $unit = "km";
$dist = '20000'; $dist = '20000';
} }
if (!$this->valid_locator($stationgrid)) { if (!$this->valid_locator($stationgrid)) {
header('Content-Type: application/json'); header('Content-Type: application/json');
echo json_encode(array('Error' => 'Error. There is a problem with the gridsquare set in your profile!')); echo json_encode(array('Error' => 'Error. There is a problem with the gridsquare set in your profile!'));
exit; exit;
} } else {
else { // Making the array we will use for plotting, we save occurrences of the length of each qso in the array
// Making the array we will use for plotting, we save occurrences of the length of each qso in the array $j = 0;
$j = 0; for ($i = 0; $j < $dist; $i++) {
for ($i = 0; $j < $dist; $i++) { $dataarray[$i]['dist'] = $j . $unit . ' - ' . ($j + 50) . $unit;
$dataarray[$i]['dist'] = $j . $unit . ' - ' . ($j + 50) . $unit; $dataarray[$i]['count'] = 0;
$dataarray[$i]['count'] = 0; $dataarray[$i]['calls'] = '';
$dataarray[$i]['calls'] = ''; $dataarray[$i]['callcount'] = 0;
$dataarray[$i]['callcount'] = 0; $j += 50;
$j += 50; }
}
$qrb = array ( // Used for storing the QSO with the longest QRB $qrb = array ( // Used for storing the QSO with the longest QRB
'Callsign' => '', 'Callsign' => '',
'Grid' => '', 'Grid' => '',
'Distance' => '', 'Distance' => '',
'Qsos' => '', 'Qsos' => '',
'Grids' => '' 'Grids' => ''
); );
foreach ($qsoArray as $qso) { foreach ($qsoArray as $qso) {
$qrb['Qsos']++; // Counts up number of qsos $qrb['Qsos']++; // Counts up number of qsos
$bearingdistance = $this->bearing_dist($stationgrid, $qso['grid'], $measurement_base); // Calculates distance based on grids $bearingdistance = $this->bearing_dist($stationgrid, $qso['grid'], $measurement_base); // Calculates distance based on grids
$arrayplacement = (int)($bearingdistance / 50); // Resolution is 50, calculates where to put result in array if (($qso['COL_DISTANCE'] ?? -1) != $bearingdistance) {
if ($bearingdistance > $qrb['Distance']) { // Saves the longest QSO log_message("error",$qso['COL_PRIMARY_KEY'].' from '.$qso['COL_DISTANCE'].' to '.$bearingdistance);
$qrb['Distance'] = $bearingdistance; }
$qrb['Callsign'] = $qso['callsign']; $arrayplacement = (int)($bearingdistance / 50); // Resolution is 50, calculates where to put result in array
$qrb['Grid'] = $qso['grid']; if ($bearingdistance > $qrb['Distance']) { // Saves the longest QSO
} $qrb['Distance'] = $bearingdistance;
$dataarray[$arrayplacement]['count']++; // Used for counting total qsos plotted $qrb['Callsign'] = $qso['callsign'];
if ($dataarray[$arrayplacement]['callcount'] < 5) { // Used for tooltip in graph, set limit to 5 calls shown $qrb['Grid'] = $qso['grid'];
if ($dataarray[$arrayplacement]['callcount'] > 0) { }
$dataarray[$arrayplacement]['calls'] .= ', '; $dataarray[$arrayplacement]['count']++; // Used for counting total qsos plotted
} if ($dataarray[$arrayplacement]['callcount'] < 5) { // Used for tooltip in graph, set limit to 5 calls shown
$dataarray[$arrayplacement]['calls'] .= $qso['callsign']; if ($dataarray[$arrayplacement]['callcount'] > 0) {
$dataarray[$arrayplacement]['callcount']++; $dataarray[$arrayplacement]['calls'] .= ', ';
} }
} $dataarray[$arrayplacement]['calls'] .= $qso['callsign'];
$dataarray[$arrayplacement]['callcount']++;
}
}
$data['ok'] = 'OK'; $data['ok'] = 'OK';
$data['qrb'] = $qrb; $data['qrb'] = $qrb;
$data['qsodata'] = $dataarray; $data['qsodata'] = $dataarray;
$data['unit'] = $unit; $data['unit'] = $unit;
return $data; return $data;
} }
} }
/* /*
* Checks the validity of the locator * Checks the validity of the locator