From 476a50706d67495b301de907b6dcd0dc9302bf16 Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Thu, 30 Nov 2023 10:37:57 +0100
Subject: [PATCH] Fix various errors in gridmap (in context of removal of old
 maps)

---
 application/controllers/Activated_gridmap.php |  1 +
 application/controllers/Visitor.php           |  1 -
 application/views/activated_gridmap/index.php | 18 ++++++++++++------
 application/views/gridmap/index.php           | 14 ++++++++------
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/application/controllers/Activated_gridmap.php b/application/controllers/Activated_gridmap.php
index a15ec91e..46cf2d5c 100644
--- a/application/controllers/Activated_gridmap.php
+++ b/application/controllers/Activated_gridmap.php
@@ -13,6 +13,7 @@ class Activated_gridmap extends CI_Controller {
         $this->load->model('activated_gridmap_model');
 		$this->load->model('stations');
 
+		$data['visitor'] = false;
 		$data['homegrid'] = explode(',', $this->stations->find_gridsquare());
 
 		$data['modes'] = $this->activated_gridmap_model->get_worked_modes();
diff --git a/application/controllers/Visitor.php b/application/controllers/Visitor.php
index 328b96d2..0b72c091 100644
--- a/application/controllers/Visitor.php
+++ b/application/controllers/Visitor.php
@@ -439,7 +439,6 @@ class Visitor extends CI_Controller {
 		$data['grid_4char'] = js_array($array_grid_4char);
 		$data['grid_6char'] = js_array($array_grid_6char);
 
-		$data['homegrid'] = 'JO31OL';
 		$data['layer'] = $this->optionslib->get_option('option_map_tile_server');
 		$data['attribution'] = $this->optionslib->get_option('option_map_tile_server_copyright');
 
diff --git a/application/views/activated_gridmap/index.php b/application/views/activated_gridmap/index.php
index 5d60ec60..283690df 100644
--- a/application/views/activated_gridmap/index.php
+++ b/application/views/activated_gridmap/index.php
@@ -124,19 +124,25 @@
 	<div id="gridsquare_map" style="width: 100%; height: 800px"></div>
 </div>
 <div class="coordinates d-flex">
-        <div class="cohidden"><?php echo lang('gen_hamradio_latitude')?>: </div>
+        <div class="cohidden"><?php echo lang('gen_hamradio_latitude')?>:&nbsp;</div>
         <div class="cohidden col-auto text-success fw-bold" id="latDeg"></div>
-        <div class="cohidden"><?php echo lang('gen_hamradio_longitude')?>: </div>
+        <div class="cohidden"><?php echo lang('gen_hamradio_longitude')?>:&nbsp;</div>
         <div class="cohidden col-auto text-success fw-bold" id="lngDeg"></div>
-        <div class="cohidden"><?php echo lang('gen_hamradio_gridsquare')?>: </div>
+        <div class="cohidden"><?php echo lang('gen_hamradio_gridsquare')?>:&nbsp;</div>
         <div class="cohidden col-auto text-success fw-bold" id="locator"></div>
-        <div class="cohidden"><?php echo lang('gen_hamradio_distance')?>: </div>
+        <div class="cohidden"><?php echo lang('gen_hamradio_distance')?>:&nbsp;</div>
         <div class="cohidden col-auto text-success fw-bold" id="distance"></div>
-        <div class="cohidden"><?php echo lang('gen_hamradio_bearing')?>: </div>
+        <div class="cohidden"><?php echo lang('gen_hamradio_bearing')?>:&nbsp;</div>
         <div class="cohidden col-auto text-success fw-bold" id="bearing"></div>
 </div>
-<script>var gridsquaremap = true;
+<script>
+var gridsquaremap = true;
 var type = "activated";
+<?php if ($visitor == true) { ?>
+var visitor = true;
+<?php } else { ?>
+var visitor = false;
+<?php } ?>
 <?php
     echo 'var jslayer ="' . $layer .'";';
     echo "var jsattribution ='" . $attribution . "';";
diff --git a/application/views/gridmap/index.php b/application/views/gridmap/index.php
index 5b294346..4a1f692b 100644
--- a/application/views/gridmap/index.php
+++ b/application/views/gridmap/index.php
@@ -126,15 +126,15 @@
 	<div id="gridsquare_map" style="width: 100%; height: 800px"></div>
 </div>
 <div class="coordinates d-flex">
-        <div class="cohidden"><?php echo lang('gen_hamradio_latitude')?>: </div>
+        <div class="cohidden"><?php echo lang('gen_hamradio_latitude')?>:&nbsp;</div>
         <div class="cohidden col-auto text-success fw-bold" id="latDeg"></div>
-        <div class="cohidden"><?php echo lang('gen_hamradio_longitude')?>: </div>
+        <div class="cohidden"><?php echo lang('gen_hamradio_longitude')?>:&nbsp;</div>
         <div class="cohidden col-auto text-success fw-bold" id="lngDeg"></div>
-        <div class="cohidden"><?php echo lang('gen_hamradio_gridsquare')?>: </div>
+        <div class="cohidden"><?php echo lang('gen_hamradio_gridsquare')?>:&nbsp;</div>
         <div class="cohidden col-auto text-success fw-bold" id="locator"></div>
-        <div class="cohidden"><?php echo lang('gen_hamradio_distance')?>: </div>
+        <div class="cohidden"><?php echo lang('gen_hamradio_distance')?>:&nbsp;</div>
         <div class="cohidden col-auto text-success fw-bold" id="distance"></div>
-        <div class="cohidden"><?php echo lang('gen_hamradio_bearing')?>: </div>
+        <div class="cohidden"><?php echo lang('gen_hamradio_bearing')?>:&nbsp;</div>
         <div class="cohidden col-auto text-success fw-bold" id="bearing"></div>
 </div>
 <script>
@@ -148,7 +148,9 @@ var visitor = false;
 <?php
     echo "var jslayer = \"" . $layer ."\";\n";
     echo "var jsattribution ='" . $attribution . "';";
-    echo "var homegrid = \"" . strtoupper($homegrid[0]) . "\";\n";
+    if ($visitor == false) {
+       echo "var homegrid = \"" . strtoupper($homegrid[0]) . "\";\n";
+    }
 
     echo "var gridsquares_gridsquares = \"" . $gridsquares_gridsquares . "\";\n";
     echo "var gridsquares_gridsquares_confirmed = \"" . $gridsquares_gridsquares_confirmed . "\";\n";