From e15a8811900f4c13b013430a33e94afa5ec918fd Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 19 Aug 2025 16:21:35 +0000
Subject: [PATCH] Fix visitor gridmap initialization and JavaScript integration

Co-authored-by: magicbug <84308+magicbug@users.noreply.github.com>
---
 application/views/visitor/layout/footer.php | 52 +++++++--------------
 1 file changed, 18 insertions(+), 34 deletions(-)

diff --git a/application/views/visitor/layout/footer.php b/application/views/visitor/layout/footer.php
index 74ab0e3e..99f05728 100644
--- a/application/views/visitor/layout/footer.php
+++ b/application/views/visitor/layout/footer.php
@@ -57,53 +57,37 @@
 
 <?php if ($this->uri->segment(2) == "satellites") { ?>
 
-<script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/L.MaidenheadColoured.js"></script>
+<script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/geocoding.js"></script>
+<script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/L.MaidenheadColouredGridMap.js"></script>
 <script type="text/javascript" src="<?php echo base_url();?>assets/js/sections/gridmap.js?"></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');?>',
-    id: 'mapbox.streets'
-  });
-
-  var map = L.map('gridsquare_map', {
-    layers: [layer],
-    center: [19, 0],
-    zoom: 2,
-    fullscreenControl: true,
-        fullscreenControlOptions: {
-          position: 'topleft'
-        },
-  });
-
-  var printer = L.easyPrint({
-        tileLayer: layer,
-        sizeModes: ['Current'],
-        filename: 'myMap',
-        exportOnly: true,
-        hideControlContainer: true
-    }).addTo(map);
-
+  // Set up global variables for gridmap functionality
   var grid_two = <?php echo $grid_2char; ?>;
   var grid_four = <?php echo $grid_4char; ?>;
   var grid_six = <?php echo $grid_6char; ?>;
 
-  var grid_two_count = grid_two.length;
-  var grid_four_count = grid_four.length;
-  var grid_six_count = grid_six.length;
-
-
   var grid_two_confirmed = <?php echo $grid_2char_confirmed; ?>;
   var grid_four_confirmed = <?php echo $grid_4char_confirmed; ?>;
   var grid_six_confirmed = <?php echo $grid_6char_confirmed; ?>;
 
-  var grid_two_confirmed_count = grid_two_confirmed.length;
-  var grid_four_confirmed_count = grid_four_confirmed.length;
-  var grid_six_confirmed_count = grid_six_confirmed.length;
+  // Set up other required global variables
+  var jslayer = '<?php echo $this->optionslib->get_option('option_map_tile_server');?>';
+  var jsattribution = '<?php echo $this->optionslib->get_option('option_map_tile_server_copyright');?>';
+  var gridsquares_gridsquares = "<?php echo lang('gridsquares_gridsquares'); ?>";
+  var gridsquares_gridsquares_confirmed = "<?php echo lang('gridsquares_gridsquares_confirmed'); ?>";
+  var gridsquares_gridsquares_not_confirmed = "<?php echo lang('gridsquares_gridsquares_not_confirmed'); ?>";
+  var gridsquares_gridsquares_total_worked = "<?php echo lang('gridsquares_gridsquares_total_worked'); ?>";
+  
+  var visitor = true;
+  var type = "worked";
 
-  var maidenhead = L.maidenhead().addTo(map);
+  // Initialize the map when document is ready
+  $(document).ready(function() {
+    // Use the plot function from gridmap.js to render the initial map
+    plot(visitor, grid_two, grid_four, grid_six, grid_two_confirmed, grid_four_confirmed, grid_six_confirmed);
+  });
 
 <?php if ($this->uri->segment(1) == "gridsquares" && $this->uri->segment(2) == "band") { ?>