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

[LBA] Added custom mapping icons

Browse Source
This commit is contained in:
Andreas
2024-02-07 10:55:35 +01:00
parent d886d595da
commit bb54f8bde4
2 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
application/controllers/Logbookadvanced.php
View File

@@ -338,14 +338,13 @@ class Logbookadvanced extends CI_Controller {
$measurement_base = $this->session->userdata('user_measurement_base');
}
$CI =& get_instance();
// Get Date format
if($CI->session->userdata('user_date_format')) {
if($this->session->userdata('user_date_format')) {
// If Logged in and session exists
$custom_date_format = $CI->session->userdata('user_date_format');
$custom_date_format = $this->session->userdata('user_date_format');
} else {
// Get Default date format from /config/wavelog.php
$custom_date_format = $CI->config->item('qso_date_format');
$custom_date_format = $this->config->item('qso_date_format');
}
switch ($measurement_base) {
@@ -400,6 +399,7 @@ class Logbookadvanced extends CI_Controller {
$data['mycallsign'] = $qso['station_callsign'];
$data['datetime'] = date($custom_date_format, strtotime($qso['COL_TIME_ON'])). date(' H:i',strtotime($qso['COL_TIME_ON']));
$data['satname'] = $qso['COL_SAT_NAME'];
$data['confirmed'] = ((($qso['COL_EQSL_QSL_RCVD'] == 'Y') || ($qso['COL_LOTW_QSL_RCVD'] == 'Y') || ($qso['COL_QSL_RCVD'] == 'Y')) == true ? true : false);
return $data;
}
@@ -424,6 +424,7 @@ class Logbookadvanced extends CI_Controller {
$data['mycallsign'] = $qso['station_callsign'];
$data['datetime'] = date($custom_date_format, strtotime($qso['COL_TIME_ON'])). date(' H:i',strtotime($qso['COL_TIME_ON']));
$data['satname'] = $qso['COL_SAT_NAME'];
$data['confirmed'] = ((($qso['COL_EQSL_QSL_RCVD'] == 'Y') || ($qso['COL_LOTW_QSL_RCVD'] == 'Y') || ($qso['COL_QSL_RCVD'] == 'Y')) == true ? true : false);
return $data;
}

42
assets/js/sections/logbookadvanced.js
View File

@@ -8,6 +8,12 @@ var geojson;
var itugeojson;
var zonemarkers = [];
var ituzonemarkers = [];
var iconsList = { 'qso': { 'color': '#FF0000', 'icon': 'fas fa-dot-circle' } };
var stationIcon = L.divIcon({ 'className': 'cspot_station'});
var qsoIcon = L.divIcon({ className: 'cspot_qso' }); //default (fas fa-dot-circle red)
var qsoconfirmIcon = L.divIcon({ className: 'cspot_qsoconfirm' });
var redIconImg = L.icon({ iconUrl: icon_dot_url, iconSize: [10, 10] }); // old //
$('#band').change(function () {
var band = $("#band option:selected").text();
@@ -865,7 +871,7 @@ function mapQsos(form) {
de: form.de.value
},
success: function(data) {
loadMap(data);
loadMapOptions(data);
},
error: function() {
$('#mapButton').prop("disabled", false);
@@ -906,7 +912,7 @@ function mapQsos(form) {
qslimages: form.qslimages.value,
},
success: function(data) {
loadMap(data);
loadMapOptions(data);
},
error: function() {
$('#mapButton').prop("disabled", false);
@@ -915,7 +921,23 @@ function mapQsos(form) {
}
};
function loadMap(data) {
function loadMapOptions(data) {
$.ajax({
url: base_url + 'index.php/user_options/get_map_custom',
type: 'GET',
dataType: 'json',
error: function () {
},
success: function (json_mapinfo) {
if (typeof json_mapinfo.qso !== "undefined") {
iconsList = json_mapinfo;
}
loadMap(data, iconsList)
}
});
}
function loadMap(data, iconsList) {
$('#mapButton').prop("disabled", false);
var osmUrl='https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
var osmAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
@@ -980,14 +1002,20 @@ function loadMap(data) {
var popupmessage = createContentMessage(this);
var popupmessage2 = createContentMessageDx(this);
var marker = L.marker([this.latlng1[0], this.latlng1[1]], {icon: redIcon}, {closeOnClick: false, autoClose: false}).addTo(map).bindPopup(popupmessage);
var marker = L.marker([this.latlng1[0], this.latlng1[1]], {icon: stationIcon}, {closeOnClick: false, autoClose: false}).addTo(map).bindPopup(popupmessage);
marker.on('mouseover',function(ev) {
ev.target.openPopup();
});
let lat_lng = [this.latlng1[0], this.latlng1[1]];
bounds.extend(lat_lng);
var marker2 = L.marker([this.latlng2[0], this.latlng2[1]], {icon: redIcon},{closeOnClick: false, autoClose: false}).addTo(map).bindPopup(popupmessage2);;
if (this.confirmed) {
var marker2 = L.marker([this.latlng2[0], this.latlng2[1]], {icon: qsoconfirmIcon},{closeOnClick: false, autoClose: false}).addTo(map).bindPopup(popupmessage2);;
} else {
var marker2 = L.marker([this.latlng2[0], this.latlng2[1]], {icon: qsoIcon},{closeOnClick: false, autoClose: false}).addTo(map).bindPopup(popupmessage2);;
}
marker2.on('mouseover',function(ev) {
ev.target.openPopup();
});
@@ -1031,6 +1059,10 @@ function loadMap(data) {
map.fitBounds(bounds);
$.each(iconsList, function (icon, data) {
$('#advancedmap' + ' .cspot_' + icon).addClass(data.icon).css("color", data.color);
});
}
function createContentMessage(qso) {