From 8409dd03b059bfd3daec9470233b1da215cda941 Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Wed, 5 Jan 2022 15:21:26 +0100
Subject: [PATCH] Use station location as base for map

---
 application/views/interface_assets/footer.php | 19 ++++++++++++++++++-
 assets/js/sections/qso.js                     |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 9164df77..80dca229 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -678,7 +678,24 @@ $(document).on('keypress',function(e) {
 
 <script>
   var markers = L.layerGroup();
-  var mymap = L.map('qsomap').setView([51.505, -0.09], 13);
+  var pos = [51.505, -0.09];
+  var mymap = L.map('qsomap').setView(pos, 12);
+  <?php
+  $this->load->model('stations');
+  $active_station_id = $this->stations->find_active();
+  $station_profile = $this->stations->profile($active_station_id);
+  $active_station_info = $station_profile->row();
+  if ($active_station_info->station_gridsquare != "") { ?>
+  $.getJSON('logbook/qralatlngjson/<?php echo $active_station_info->station_gridsquare; ?>', function(result) {
+     mymap.panTo([result[0], result[1]]);
+     pos = result;
+  })
+  <?php } else if (null !== $this->config->item('locator')) { ?>
+  $.getJSON('logbook/qralatlngjson/<?php echo $this->config->item('locator'); ?>', function(result) {
+     mymap.panTo([result[0], result[1]]);
+     pos = result;
+  })
+  <?php } ?>
 
   L.tileLayer('<?php echo $this->optionslib->get_option('map_tile_server');?>', {
     maxZoom: 18,
diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js
index 8b2a4859..f1c3fafc 100644
--- a/assets/js/sections/qso.js
+++ b/assets/js/sections/qso.js
@@ -275,7 +275,7 @@ function reset_fields() {
 	$('#qso-last-table').show();
 	$('#partial_view').hide();
 
-	mymap.setView([51.505, -0.09], 13);
+	mymap.setView(pos, 12);
 	mymap.removeLayer(markers);
 	$('.callsign-suggest').hide();
 }