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

Merge pull request #3020 from tallcode/wapc_map

Browse Source 
feat: add WAPC map
This commit is contained in:
Andreas Kristiansen
2026-02-28 11:41:26 +01:00
committed by GitHub
parent 1078121a32 331914f255
commit c7896cc05b
6 changed files with 343 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
application/controllers/Awards.php
View File

@@ -200,6 +200,10 @@ class Awards extends CI_Controller {
public function wapc () {
$footerData = [];
$footerData['scripts'] = [
'assets/js/sections/wapcmap.js',
'assets/js/leaflet/L.Maidenhead.js',
];
$this->load->model('wapc');
$this->load->model('modes');
@@ -1698,6 +1702,58 @@ class Awards extends CI_Controller {
echo json_encode($prefectures);
}
/*
function wapc_map
*/
public function wapc_map() {
$this->load->model('wapc');
$this->load->model('bands');
$bands[] = $this->security->xss_clean($this->input->post('band'));
$postdata['qsl'] = $this->input->post('qsl') == 0 ? NULL: 1;
$postdata['lotw'] = $this->input->post('lotw') == 0 ? NULL: 1;
$postdata['eqsl'] = $this->input->post('eqsl') == 0 ? NULL: 1;
$postdata['qrz'] = $this->input->post('qrz') == 0 ? NULL: 1;
$postdata['worked'] = $this->input->post('worked') == 0 ? NULL: 1;
$postdata['clublog'] = $this->input->post('clublog') == 0 ? NULL: 1;
$postdata['confirmed'] = $this->input->post('confirmed') == 0 ? NULL: 1;
$postdata['notworked'] = $this->input->post('notworked') == 0 ? NULL: 1;
$postdata['band'] = $this->input->post('band', TRUE);
$postdata['mode'] = $this->input->post('mode', TRUE);
$wapc_array = $this->wapc->get_wapc_array($bands, $postdata);
$provinces = array();
$wapcArray = array_keys($this->wapc->cnProvinces);
foreach ($wapcArray as $state) {
$provinces[$state] = '-';
}
foreach ($wapc_array as $wapc => $value) {
foreach ($value as $key) {
if($key != "") {
if (strpos($key, '>W<') !== false) {
$provinces[$wapc] = 'W';
break;
}
if (strpos($key, '>C<') !== false) {
$provinces[$wapc] = 'C';
break;
}
if (strpos($key, '-') !== false) {
$provinces[$wapc] = '-';
break;
}
}
}
}
header('Content-Type: application/json');
echo json_encode($provinces);
}
/*
function dxcc_map
This displays the DXCC map

24
application/models/Logbook_model.php
View File

@@ -624,8 +624,28 @@ class Logbook_model extends CI_Model {
$this->db->where('COL_DXCC', '339');
break;
case 'WAPC':
$this->db->where('COL_STATE', $searchphrase);
$this->db->where('COL_DXCC', '318');
if($searchphrase == 'HK'){
$this->db->where('COL_DXCC', '321');
}
else if($searchphrase == 'MO'){
$this->db->where('COL_DXCC', '152');
}
else if($searchphrase == 'TW'){
$this->db->where_in('COL_DXCC', ['386', '505']);
}
else if($searchphrase == 'HI'){
$this->db->group_start()
->group_start()
->where('COL_DXCC', '318')
->where('COL_STATE', 'HI')
->group_end()
->or_where('COL_DXCC', '506')
->group_end();
}
else{
$this->db->where('COL_STATE', $searchphrase);
$this->db->where('COL_DXCC', '318');
}
break;
case 'QSLRDATE':
$this->db->where('date(COL_QSLRDATE)=date(SYSDATE())');

12
application/models/Wapc.php
View File

@@ -81,17 +81,17 @@ class WAPC extends CI_Model {
}
// VR
else if($line->col_dxcc == '321'){
$bandWapc['HK'][$band] = '<div class="bg-danger awardsBgWarning"><a href=\'javascript:displayContacts("' . "321" . '","' . $band . '","All","All","'. $postdata['mode'] . '","DXCC2", "")\'>W</a></div>';
$bandWapc['HK'][$band] = '<div class="bg-danger awardsBgWarning"><a href=\'javascript:displayContacts("HK","' . $band . '","All","All","'. $postdata['mode'] . '","WAPC", "")\'>W</a></div>';
$provinces['HK']['count']++;
}
// XX9
else if($line->col_dxcc == '152'){
$bandWapc['MO'][$band] = '<div class="bg-danger awardsBgWarning"><a href=\'javascript:displayContacts("' . "152" . '","' . $band . '","All","All","'. $postdata['mode'] . '","DXCC2", "")\'>W</a></div>';
$bandWapc['MO'][$band] = '<div class="bg-danger awardsBgWarning"><a href=\'javascript:displayContacts("MO","' . $band . '","All","All","'. $postdata['mode'] . '","WAPC", "")\'>W</a></div>';
$provinces['MO']['count']++;
}
// BU-BX/BV9P
else if($line->col_dxcc == '386' || $line->col_dxcc == '505'){
$bandWapc['TW'][$band] = '<div class="bg-danger awardsBgWarning"><a href=\'javascript:displayContacts("' . "386" . '","' . $band . '","All","All","'. $postdata['mode'] . '","DXCC2", "")\'>W</a></div>';
$bandWapc['TW'][$band] = '<div class="bg-danger awardsBgWarning"><a href=\'javascript:displayContacts("TW","' . $band . '","All","All","'. $postdata['mode'] . '","WAPC", "")\'>W</a></div>';
$provinces['TW']['count']++;
}
}
@@ -111,17 +111,17 @@ class WAPC extends CI_Model {
}
// VR
else if($line->col_dxcc == '321'){
$bandWapc['HK'][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("' . "321" . '","' . $band . '","All","All","'. $postdata['mode'] . '","DXCC2", "'.$qsl.'")\'>C</a></div>';
$bandWapc['HK'][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("HK","' . $band . '","All","All","'. $postdata['mode'] . '","WAPC", "'.$qsl.'")\'>C</a></div>';
$provinces['HK']['count']++;
}
// XX9
else if($line->col_dxcc == '152'){
$bandWapc['MO'][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("' . "152" . '","' . $band . '","All","All","'. $postdata['mode'] . '","DXCC2", "'.$qsl.'")\'>C</a></div>';
$bandWapc['MO'][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("MO","' . $band . '","All","All","'. $postdata['mode'] . '","WAPC", "'.$qsl.'")\'>C</a></div>';
$provinces['MO']['count']++;
}
// BU-BX/BV9P
else if($line->col_dxcc == '386' || $line->col_dxcc == '505'){
$bandWapc['TW'][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("' . "386" . '","' . $band . '","All","All","'. $postdata['mode'] . '","DXCC2", "'.$qsl.'")\'>C</a></div>';
$bandWapc['TW'][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("TW","' . $band . '","All","All","'. $postdata['mode'] . '","WAPC", "'.$qsl.'")\'>C</a></div>';
$provinces['MO']['count']++;
}
}

40
application/views/awards/wapc/index.php
View File

@@ -1,3 +1,18 @@
<script>
var tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>";
var lang_china_province = "<?= _pgettext("China Province", "Province"); ?>";
var lang_hover_over_a_province = "<?= __("Hover over a province"); ?>";
</script>
<script>
let user_map_custom = JSON.parse('<?php echo $user_map_custom; ?>');
</script>
<style>
#wapcmap {
height: calc(100vh - 500px) !important;
max-height: 900px !important;
}
</style>
<div class="container">
<!-- Award Info Box -->
<br>
@@ -103,12 +118,35 @@
<div class="col-md-10">
<button id="button2id" type="reset" name="button2id" class="btn btn-sm btn-warning"><?= __("Reset"); ?></button>
<button id="button1id" type="submit" name="button1id" class="btn btn-sm btn-primary"><?= __("Show"); ?></button>
<?php if ($wapc_array) {
?><button type="button" onclick="load_wapc_map();" class="btn btn-info btn-sm"><i class="fas fa-globe-americas"></i><?= __("Show WAPC Map"); ?></button>
<?php }?>
</div>
</div>
</fieldset>
</form>
<ul class="nav nav-tabs" id="myTab" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="table-tab" data-bs-toggle="tab" href="#table" role="tab" aria-controls="table" aria-selected="true"><?= __("Table"); ?></a>
</li>
<li class="nav-item">
<a class="nav-link" id="map-tab" onclick="load_wapc_map();" data-bs-toggle="tab" href="#wapcmaptab" role="tab" aria-controls="home" aria-selected="false"><?= __("Map"); ?></a>
</li>
</ul>
<br />
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade" id="wapcmaptab" role="tabpanel" aria-labelledby="home-tab">
<br />
<div id="wapcmap" class="map-leaflet" ></div>
</div>
<div class="tab-pane fade show active" id="table" role="tabpanel" aria-labelledby="table-tab">
<?php
$i = 1;
if ($wapc_array) {
@@ -168,4 +206,6 @@
echo '<div class="alert alert-danger" role="alert">' . __("Nothing found!") . '</div>';
}
?>
</div>
</div>
</div>

183
assets/js/sections/wapcmap.js Normal file
View File

@@ -0,0 +1,183 @@
let osmUrl = tileUrl;
let provinces;
let geojson;
let map;
let info;
let confirmedColor = 'rgba(144,238,144)';
if (typeof(user_map_custom.qsoconfirm) !== 'undefined') {
confirmedColor = user_map_custom.qsoconfirm.color;
}
let workedColor = 'rgba(229, 165, 10)';
if (typeof(user_map_custom.qso) !== 'undefined') {
workedColor = user_map_custom.qso.color;
}
let unworkedColor = 'rgba(204, 55, 45)';
if (typeof(user_map_custom.unworked) !== 'undefined') {
unworkedColor = user_map_custom.unworked.color;
}
function load_wapc_map() {
$('.nav-tabs a[href="#wapcmaptab"]').tab('show');
$.ajax({
url: base_url + 'index.php/awards/wapc_map',
type: 'post',
data: {
band: $('#band2').val(),
mode: $('#mode').val(),
worked: +$('#worked').prop('checked'),
confirmed: +$('#confirmed').prop('checked'),
notworked: +$('#notworked').prop('checked'),
qsl: +$('#qsl').prop('checked'),
lotw: +$('#lotw').prop('checked'),
eqsl: +$('#eqsl').prop('checked'),
qrz: +$('#qrz').prop('checked'),
clublog: +$('#clublog').prop('checked'),
},
success: function(data) {
provinces = data;
load_wapc_map2(data);
},
error: function() {
},
});
}
function load_wapc_map2(data) {
$.getJSON(base_url + 'assets/json/geojson/states_318.geojson', function(mapcoordinates) {
var container = L.DomUtil.get('wapcmap');
if(container != null){
container._leaflet_id = null;
container.remove();
$("#wapcmaptab").append('<div id="wapcmap" class="map-leaflet"></div>');
}
map = new L.Map('wapcmap', {
fullscreenControl: true,
fullscreenControlOptions: {
position: 'topleft'
},
});
L.tileLayer(
osmUrl,
{
attribution: option_map_tile_server_copyright,
maxZoom: 18
}
).addTo(map);
var notworked = mapcoordinates.features.length;
var confirmed = 0;
var workednotconfirmed = 0;
for(var k in data) {
var mapColor = unworkedColor;
if (data[k] == 'C') {
mapColor = confirmedColor;
confirmed++;
notworked--;
}
if (data[k] == 'W') {
mapColor = workedColor;
workednotconfirmed++;
notworked--;
}
}
var legend = L.control({ position: "topright" });
legend.onAdd = function(map) {
var div = L.DomUtil.create("div", "legend");
div.innerHTML += "<h4>" + lang_general_word_colors + "</h4>";
div.innerHTML += "<i style='background: " + confirmedColor + "'></i><span>" + lang_general_word_confirmed + " (" + confirmed + ")</span><br>";
div.innerHTML += "<i style='background: " + workedColor + "'></i><span>" + lang_general_word_worked_not_confirmed + " (" + workednotconfirmed + ")</span><br>";
div.innerHTML += "<i style='background: " + unworkedColor + "'></i><span>" + lang_general_word_not_worked + " (" + notworked + ")</span><br>";
return div;
};
legend.addTo(map);
info = L.control();
info.onAdd = function (map) {
this._div = L.DomUtil.create('div', 'info');
this.update();
return this._div;
};
info.update = function (props) {
this._div.innerHTML = '<h4>' + lang_china_province + '</h4>' + (props ?
'<b>' + props.code + ' - ' + props.name + '</b><br />' : lang_hover_over_a_province);
};
info.addTo(map);
geojson = L.geoJson(mapcoordinates, {style: style, onEachFeature: onEachFeature}).addTo(map);
map.setView([35, 105], 4);
var layerControl = new L.Control.Layers(null, { [lang_general_gridsquares]: maidenhead = L.maidenhead() }).addTo(map);
maidenhead.addTo(map);
});
}
function getColor(d) {
return provinces[d] == 'C' ? confirmedColor :
provinces[d] == 'W' ? workedColor :
unworkedColor;
}
function highlightFeature(e) {
var layer = e.target;
layer.setStyle({
weight: 3,
color: 'white',
dashArray: '',
fillOpacity: 0.8
});
layer.bringToFront();
info.update(layer.feature.properties);
}
function onEachFeature(feature, layer) {
layer.on({
mouseover: highlightFeature,
mouseout: resetHighlight,
click: onClick
});
}
function zoomToFeature(e) {
map.fitBounds(e.target.getBounds());
}
function resetHighlight(e) {
geojson.resetStyle(e.target);
info.update();
}
function style(feature) {
return {
fillColor: getColor(feature.properties.code),
weight: 1,
opacity: 1,
color: 'white',
// dashArray: '3',
fillOpacity: 0.6
};
}
function onClick(e) {
zoomToFeature(e);
var marker = e.target;
var res = marker.feature.properties.code;
displayContactsOnMap($("#wapcmap"),res, $('#band2').val(), 'All', 'All', $('#mode').val(), 'WAPC');
}

69
assets/json/geojson/states_318.geojson
View File

File diff suppressed because one or more lines are too long