Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle emptry gridsquares

Browse Source
This commit is contained in:
phl0
2024-09-05 16:28:32 +02:00
parent 034421c045
commit a6a15c4c5a
2 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
application/libraries/Qra.php
View File

@@ -77,7 +77,7 @@ class Qra {
Needs following passed
$coords[]=array('lat' => '53.344104','lng'=>'-6.2674937');
$coords[]=array('lat' => '51.5081289','lng'=>'-0.128005');
$coords[]=array('lat' => '51.5081289','lng'=>'-0.128005');
*/
@@ -123,11 +123,11 @@ class Qra {
/**
* Function to calculate the maximum distance in a bunch of QSOs
*
*
* @param string $mylocator Maidenhead locator of the station
* @param object $qsos Object of QSOs
* @param string $unit Unit of measurement
*
*
* @return object $maxdistanceqso Object of the QSO with the maximum distance
* @return float $maxdistance Maximum distance
*/
@@ -145,6 +145,10 @@ class Qra {
//iterate through all qsos
foreach ($qsos->result() as $row) {
if (empty($row->COL_GRIDSQUARE)) {
continue;
}
//get distance in kilometers
$distance = $this->distance($mylocator, $row->COL_GRIDSQUARE, $unit);

35
application/libraries/Reg1testformat.php
View File

@@ -46,12 +46,12 @@ class Reg1testformat {
$edi_header .= "CToSc=" . "\r\n"; //Argument describes the total claimed score. Leave empty.
//set QSO info for QSO with max distance only if we can determine it
if($maxdistanceqso['qso'] != null){
if(!empty($maxdistanceqso['qso'])){
$edi_header .= "CODXC=" . strtoupper($maxdistanceqso['qso']->COL_CALL) . ";" . substr(strtoupper($maxdistanceqso['qso']->COL_GRIDSQUARE), 0, 6) . ";" . intval($maxdistanceqso['distance']) . "\r\n"; //Arguments describe the claimed ODX contact call, WWL and distance.
}else{
$edi_header .= "CODXC=" . "\r\n"; //Arguments describe the claimed ODX contact call, WWL and distance. Leave empty.
}
$edi_header .= "[Remarks]" . "\r\n" . $soapbox . "\r\n"; //Remarks
$edi_header .= "[QSORecords;" . $qso_count . "]" . "\r\n"; //QSO Header and QSO Count
@@ -64,16 +64,16 @@ class Reg1testformat {
//return a newline as the last line for good measure
return "\r\n";
}
public function qsos($qsodata, $mylocator, $bandmultiplicator){
//get codeigniter instance
$CI = &get_instance();
//load QRA library
if(!$CI->load->is_loaded('Qra')) {
$CI->load->library('Qra');
}
//define helper variables
$locators = [];
$dxccs = [];
@@ -89,7 +89,7 @@ class Reg1testformat {
//result string
$qsorow = "";
$qsorow .= date('ymd', strtotime($row->COL_TIME_ON)) . ';'; //Date in YYMMDD format
$qsorow .= date('Hi', strtotime($row->COL_TIME_ON)) . ';'; //Time in HHMM format
$qsorow .= substr($row->COL_CALL, 0, 14) . ';'; //Callsign, maximum 14 characters
@@ -100,15 +100,20 @@ class Reg1testformat {
$qsorow .= substr(str_pad($row->COL_SRX ?? "", 3, '0', STR_PAD_LEFT), 0, 4) . ';';; //Received Number of QSO with 3 digits with leading zeros. If number gets greater than 999, 4 characters are used at maximum
$qsorow .= substr($row->COL_SRX_STRING ?? "", 0, 6) . ';'; //Received Exchange, max 6 characters
$qsorow .= strtoupper(substr($row->COL_GRIDSQUARE ?? "" , 0, 6)) . ';'; //Gridsquare max 6 characters
//calculate or get distance in whole kilometers while determening if this is a new locator or not
if(!array_key_exists($row->COL_GRIDSQUARE, $locators)){
$newlocator = true;
$distance = intval($CI->qra->distance($mylocator, $row->COL_GRIDSQUARE, "K"));
$locators[$row->COL_GRIDSQUARE] = $distance;
}else{
if (!empty($row->COL_GRIDSQUARE)) {
if(!array_key_exists($row->COL_GRIDSQUARE, $locators)){
$newlocator = true;
$distance = intval($CI->qra->distance($mylocator, $row->COL_GRIDSQUARE, "K"));
$locators[$row->COL_GRIDSQUARE] = $distance;
}else{
$newlocator = false;
$distance = $locators[$row->COL_GRIDSQUARE];
}
} else {
$distance = 0;
$newlocator = false;
$distance = $locators[$row->COL_GRIDSQUARE];
}
//determine QSO points and add those to the total
@@ -116,7 +121,7 @@ class Reg1testformat {
$result['claimedpoints'] += $qsopoints;
$qsorow .= $qsopoints . ";"; //qso points = distance * bandmultiplicator
//determine if the exchange is new or not
if(!in_array($row->COL_SRX_STRING, $exchanges)){
$newexchange = true;
@@ -142,7 +147,7 @@ class Reg1testformat {
//add row to overall result
$result['formatted_qso'] .= $qsorow;
}
//return QSO detail