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

Placed CQ Zone markers in it's own file. Remove unused JS loading

Browse Source
This commit is contained in:
Andreas Kristiansen
2024-06-27 09:05:10 +02:00
parent 1b24c6fd3f
commit f799ed7684
5 changed files with 52 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/views/visitor/exportmap/footer.php
View File

@@ -17,13 +17,9 @@
var site_url = "<?php echo site_url(); ?>"; // Site URL
var icon_dot_url = "<?php echo base_url();?>assets/images/dot.png";
</script>
<script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/L.Maidenhead.js"></script>
<script id="leafembed" type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leafembed.js" tileUrl="<?php echo $this->optionslib->get_option('map_tile_server');?>"></script>
<script type="text/javascript" src="<?php echo base_url();?>assets/js/sections/exportmap.js"></script>
<script type="text/javascript" src="<?php echo base_url();?>assets/js/sections/cqmap_geojson.js"></script>
<script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leaflet.geodesic.js"></script>
<script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/L.Terminator.js"></script>
</body>
</html>

49
assets/js/sections/cqmap.js
View File

@@ -32,49 +32,6 @@ function load_cq_map() {
function load_cq_map2(data) {
const zonemarkers = [
[ "75", "-140" ],
[ "70", "-82.5" ],
[ "45", "-125" ],
[ "45", "-100" ],
[ "45", "-65" ],
[ "25.5", "-115" ],
[ "14.5", "-90" ],
[ "22", "-60" ],
[ "11.5", "-70" ],
[ "-5", "-100" ],
[ "-9", "-45" ],
[ "-45", "-106" ],
[ "-45", "-55" ],
[ "52", "-14" ],
[ "46", "11" ],
[ "60", "35" ],
[ "55", "65" ],
[ "70", "90" ],
[ "70", "150" ],
[ "42", "29" ],
[ "28", "53" ],
[ "6", "75" ],
[ "44", "93" ],
[ "33", "110" ],
[ "38", "134" ],
[ "16", "100" ],
[ "15", "140" ],
[ "0", "125" ],
[ "-25", "115" ],
[ "-25", "145" ],
[ "15", "-165" ],
[ "-25", "-165" ],
[ "32", "-26" ],
[ "25", "25.5" ],
[ "15", "-6" ],
[ "-5", "-6" ],
[ "6", "51" ],
[ "-45", "8" ],
[ "-25", "55"],
[ "78", "-10"],
];
// If map is already initialized
var container = L.DomUtil.get('cqmap');
@@ -99,11 +56,11 @@ function load_cq_map2(data) {
}
).addTo(map);
var notworked = zonemarkers.length;
var notworked = cqzonenames.length;
var confirmed = 0;
var workednotconfirmed = 0;
for (var i = 0; i < zonemarkers.length; i++) {
for (var i = 0; i < cqzonenames.length; i++) {
var mapColor = 'red';
if (data[i] == 'C') {
@@ -121,7 +78,7 @@ function load_cq_map2(data) {
var myIcon = L.divIcon({className: 'my-div-icon', html: title});
L.marker(
[zonemarkers[i][0], zonemarkers[i][1]], {
[cqzonenames[i][0], cqzonenames[i][1]], {
icon: myIcon,
title: (Number(i)+Number(1)),
zIndex: 1000,

43
assets/js/sections/cqmap_geojson.js
View File

@@ -1,3 +1,46 @@
const cqzonenames = [
[ "75", "-140" ],
[ "70", "-82.5" ],
[ "45", "-125" ],
[ "45", "-100" ],
[ "45", "-65" ],
[ "25.5", "-115" ],
[ "14.5", "-90" ],
[ "22", "-60" ],
[ "11.5", "-70" ],
[ "-5", "-100" ],
[ "-9", "-45" ],
[ "-45", "-106" ],
[ "-45", "-55" ],
[ "52", "-14" ],
[ "46", "11" ],
[ "60", "35" ],
[ "55", "65" ],
[ "70", "90" ],
[ "70", "150" ],
[ "42", "29" ],
[ "28", "53" ],
[ "6", "75" ],
[ "44", "93" ],
[ "33", "110" ],
[ "38", "134" ],
[ "16", "100" ],
[ "15", "140" ],
[ "0", "125" ],
[ "-25", "115" ],
[ "-25", "145" ],
[ "15", "-165" ],
[ "-25", "-165" ],
[ "32", "-26" ],
[ "25", "25.5" ],
[ "15", "-6" ],
[ "-5", "-6" ],
[ "6", "51" ],
[ "-45", "8" ],
[ "-25", "55"],
[ "78", "-10"],
];
const zonestuff ={
"type": "FeatureCollection",
"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },

61
assets/js/sections/exportmap.js
View File

@@ -19,14 +19,6 @@ $(document).ready(function () {
});
function mapQsos() {
// const queryString = window.location.search;
// const urlParams = new URLSearchParams(queryString);
// const slug = urlParams.get('slug');
// const qsocount = urlParams.get('qsocount');
// const showgrid = urlParams.get('showgrid');
// const showcq = urlParams.get('showcq');
// const band = urlParams.get('band');
// const showlines = urlParams.get('showlines');
let iconsList;
let json_mapinfo = user_map_custom;
@@ -35,8 +27,6 @@ function mapQsos() {
iconsList = json_mapinfo;
}
loadQsos(slug, iconsList);
};
function loadQsos(slug, iconsList) {
@@ -107,9 +97,13 @@ function loadMap(data, iconsList) {
this.latlng1[1] = parseFloat(this.latlng1[1])+360;
}
var marker = L.marker([this.latlng1[0], this.latlng1[1]], {icon: stationIcon}, {closeOnClick: false, autoClose: false}).addTo(map);
if ((this.latlng1[1] - this.latlng2[1]) < -180) {
this.latlng2[1] = parseFloat(this.latlng2[1]) -360;
} else if ((this.latlng1[1] - this.latlng2[1]) > 180) {
this.latlng2[1] = parseFloat(this.latlng2[1]) +360;
}
// var marker2 = L.marker([this.latlng2[0], this.latlng2[1]], {icon: redIcon},{closeOnClick: false, autoClose: false}).addTo(map);
var marker = L.marker([this.latlng1[0], this.latlng1[1]], {icon: stationIcon}, {closeOnClick: false, autoClose: false}).addTo(map);
if (this.confirmed && iconsList.qsoconfirm.icon !== "0") {
var marker2 = L.marker([this.latlng2[0], this.latlng2[1]], {icon: qsoconfirmIcon},{closeOnClick: false, autoClose: false}).addTo(map);
@@ -192,46 +186,3 @@ function style(feature) {
weight: 1,
};
}
const cqzonenames = [
[ "75", "-140" ],
[ "70", "-82.5" ],
[ "45", "-125" ],
[ "45", "-100" ],
[ "45", "-65" ],
[ "25.5", "-115" ],
[ "14.5", "-90" ],
[ "22", "-60" ],
[ "11.5", "-70" ],
[ "-5", "-100" ],
[ "-9", "-45" ],
[ "-45", "-106" ],
[ "-45", "-55" ],
[ "52", "-14" ],
[ "46", "11" ],
[ "60", "35" ],
[ "55", "65" ],
[ "70", "90" ],
[ "70", "150" ],
[ "42", "29" ],
[ "28", "53" ],
[ "6", "75" ],
[ "44", "93" ],
[ "33", "110" ],
[ "38", "134" ],
[ "16", "100" ],
[ "15", "140" ],
[ "0", "125" ],
[ "-25", "115" ],
[ "-25", "145" ],
[ "15", "-165" ],
[ "-25", "-165" ],
[ "32", "-26" ],
[ "25", "25.5" ],
[ "15", "-6" ],
[ "-5", "-6" ],
[ "6", "51" ],
[ "-45", "8" ],
[ "-25", "55"],
[ "78", "-10"],
];

43
assets/js/sections/logbookadvanced_map.js
View File

@@ -124,49 +124,6 @@ function toggleGridsquares(bool) {
}
};
const cqzonenames = [
[ "75", "-140" ],
[ "70", "-82.5" ],
[ "45", "-125" ],
[ "45", "-100" ],
[ "45", "-65" ],
[ "25.5", "-115" ],
[ "14.5", "-90" ],
[ "22", "-60" ],
[ "11.5", "-70" ],
[ "-5", "-100" ],
[ "-9", "-45" ],
[ "-45", "-106" ],
[ "-45", "-55" ],
[ "52", "-14" ],
[ "46", "11" ],
[ "60", "35" ],
[ "55", "65" ],
[ "70", "90" ],
[ "70", "150" ],
[ "42", "29" ],
[ "28", "53" ],
[ "6", "75" ],
[ "44", "93" ],
[ "33", "110" ],
[ "38", "134" ],
[ "16", "100" ],
[ "15", "140" ],
[ "0", "125" ],
[ "-25", "115" ],
[ "-25", "145" ],
[ "15", "-165" ],
[ "-25", "-165" ],
[ "32", "-26" ],
[ "25", "25.5" ],
[ "15", "-6" ],
[ "-5", "-6" ],
[ "6", "51" ],
[ "-45", "8" ],
[ "-25", "55"],
[ "78", "-10"],
];
const ituzonenames = [
["60","-160"],
["55","-125"],