Added State lookup for HamQTH and also added US country to returned data

This commit is contained in:
Peter Goodhall
2020-03-07 16:46:31 +00:00
parent b951b24c54
commit 7103d74635
3 changed files with 14 additions and 0 deletions

View File

@@ -72,6 +72,7 @@ class Logbook extends CI_Controller {
"callsign_qth" => "",
"callsign_iota" => "",
"callsign_state" => "",
"callsign_us_county" => "",
"qsl_manager" => "",
"bearing" => "",
"workedBefore" => false,
@@ -141,6 +142,7 @@ class Logbook extends CI_Controller {
$return['callsign_qth'] = $callbook['city'];
$return['callsign_iota'] = $callbook['iota'];
$return['callsign_state'] = $callbook['state'];
$return['callsign_us_county'] = $callbook['us_county'];
if(isset($callbook['qslmgr'])) {
$return['qsl_manager'] = $callbook['qslmgr'];

View File

@@ -79,8 +79,18 @@ class Hamqth {
$data['lat'] = (string) $xml->search->latitude;
$data['long'] = (string) $xml->search->longitude;
$data['iota'] = (string) $xml->search->iota;
$data['us_state'] = (string) $xml->search->us_state;
$data['us_county'] = (string) $xml->search->us_county;
$data['error'] = (string) $xml->session->error;
if($xml->search->country == "United States") {
$data['state'] = (string) $xml->search->us_state;
$data['us_county'] = (string) $xml->search->us_county;
} else {
$data['state'] = null;
$data['us_county'] = null;
}
return $data;
}
}

View File

@@ -83,8 +83,10 @@ class Qrz {
if($xml->Callsign->country == "United States") {
$data['state'] = (string) $xml->Callsign->state;
$data['us_county'] = (string) $xml->Callsign->county;
} else {
$data['state'] = null;
$data['us_county'] = null;
}