From b6f9e5e648509182bfca450a70b543c38d1b6a8a Mon Sep 17 00:00:00 2001
From: Viola <karuru@aerodefense.co.uk>
Date: Tue, 13 Aug 2024 09:51:09 +0800
Subject: [PATCH 1/3]  fix visitor page map attribution

Issue: 'views/interface_assets/footer' is not included in '/visitor/<callsign>' page, so that leafembed.js cannot access the option_map_tile_server_copyright variable.
---
 application/views/visitor/layout/footer.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/views/visitor/layout/footer.php b/application/views/visitor/layout/footer.php
index 12638ee7f..6b879d5db 100644
--- a/application/views/visitor/layout/footer.php
+++ b/application/views/visitor/layout/footer.php
@@ -18,6 +18,7 @@
   var base_url = "<?php echo base_url(); ?>"; // Base URL
   var site_url = "<?php echo site_url(); ?>"; // Site URL
   var icon_dot_url = "<?php echo base_url();?>assets/images/dot.png";
+  var option_map_tile_server_copyright = '<?php echo $this->optionslib->get_option('option_map_tile_server_copyright');?>';
 </script>
 
 <!-- DATATABLES LANGUAGE -->

From 6bc4b9011093bb62a91893e460fa5958927720c8 Mon Sep 17 00:00:00 2001
From: Viola <karuru@aerodefense.co.uk>
Date: Tue, 13 Aug 2024 09:52:32 +0800
Subject: [PATCH 2/3]  fix logbook_advanced map attribution

another part of #730
---
 assets/js/sections/logbookadvanced_map.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/js/sections/logbookadvanced_map.js b/assets/js/sections/logbookadvanced_map.js
index 9e1fb1d82..b66a0f4d6 100644
--- a/assets/js/sections/logbookadvanced_map.js
+++ b/assets/js/sections/logbookadvanced_map.js
@@ -220,7 +220,7 @@ const ituzonenames = [
 function loadMap(data, iconsList) {
 	$('#mapButton').prop("disabled", false).removeClass("running");
 	var osmUrl = tileUrl;
-	var osmAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
+	var osmAttrib = option_map_tile_server_copyright;
 	// If map is already initialized
 	var container = L.DomUtil.get('advancedmap');
 
@@ -257,7 +257,7 @@ function loadMap(data, iconsList) {
 	var osm = L.tileLayer(
 		osmUrl,
 		{
-			attribution: '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
+			attribution: osmAttrib,
 			maxZoom: 18,
 			zoom: 3,
             minZoom: 2,

From da865b310329d96443a4960710913bfd28654fde Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Tue, 13 Aug 2024 09:10:44 +0200
Subject: [PATCH 3/3] Fixed hardcoded attributes in exportmap

---
 application/views/visitor/exportmap/footer.php | 1 +
 application/views/visitor/layout/footer.php    | 6 +++---
 assets/js/sections/exportmap.js                | 5 ++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/views/visitor/exportmap/footer.php b/application/views/visitor/exportmap/footer.php
index 6c53ce6c8..5b5a41ebf 100644
--- a/application/views/visitor/exportmap/footer.php
+++ b/application/views/visitor/exportmap/footer.php
@@ -16,6 +16,7 @@
 	var base_url = "<?php echo base_url(); ?>"; // Base URL
 	var site_url = "<?php echo site_url(); ?>"; // Site URL
 	var icon_dot_url = "<?php echo base_url();?>assets/images/dot.png";
+	var option_map_tile_server_copyright = '<?php echo $this->optionslib->get_option('option_map_tile_server_copyright');?>';
 </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>
diff --git a/application/views/visitor/layout/footer.php b/application/views/visitor/layout/footer.php
index 6b879d5db..badbb5e4d 100644
--- a/application/views/visitor/layout/footer.php
+++ b/application/views/visitor/layout/footer.php
@@ -94,7 +94,7 @@ if ($lang_code != 'en' && !file_exists(FCPATH . "assets/json/datatables_language
 <script type="text/javascript" src="<?php echo base_url();?>assets/js/sections/gridmap.js?"></script>
 
 <script>
-  
+
   // auto setting of gridmap height
   function set_map_height() {
 
@@ -117,13 +117,13 @@ if ($lang_code != 'en' && !file_exists(FCPATH . "assets/json/datatables_language
       $('#gridsquare_map').css('height', gridsquareMapHeight + 'px');
       // console.log('#gridsquare_map: ' + gridsquareMapHeight);
   }
-</script>  
+</script>
 
 <script>
 
   var layer = L.tileLayer('<?php echo $this->optionslib->get_option('option_map_tile_server');?>', {
     maxZoom: 18,
-    attribution: '<?php echo $this->optionslib->get_option('option_map_tile_server_copyright');?>',
+    attribution: option_map_tile_server_copyright,
     id: 'mapbox.streets'
   });
 
diff --git a/assets/js/sections/exportmap.js b/assets/js/sections/exportmap.js
index 6711f3d55..bccfde63b 100644
--- a/assets/js/sections/exportmap.js
+++ b/assets/js/sections/exportmap.js
@@ -48,8 +48,7 @@ function loadQsos(slug, iconsList) {
 }
 
 function loadMap(data, iconsList) {
-	var osmUrl=tileUrl;
-	var osmAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
+	var osmUrl = tileUrl;
 	// If map is already initialized
 	var container = L.DomUtil.get('exportmap');
 
@@ -71,7 +70,7 @@ function loadMap(data, iconsList) {
 	var osm = L.tileLayer(
 		osmUrl,
 		{
-			attribution: '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
+			attribution: option_map_tile_server_copyright,
 			maxZoom: 18,
 			zoom: 3,
             minZoom: 2,