From ccb9f592b3fcd5be0eb5fcb44c5fbbd24ec996a1 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Wed, 19 Jun 2024 14:29:01 +0100
Subject: [PATCH] [Gridsquare Map] Shows 2,4,6 grids

Fixes #3136
---
 application/controllers/Gridmap.php | 21 +++++++--------------
 assets/js/sections/gridmap.js       |  1 +
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/application/controllers/Gridmap.php b/application/controllers/Gridmap.php
index 075906269..b726bd00d 100644
--- a/application/controllers/Gridmap.php
+++ b/application/controllers/Gridmap.php
@@ -76,9 +76,7 @@ public function getGridsjs() {
 			foreach ($query->result() as $row) 	{
 				$grid_2char_confirmed = strtoupper(substr($row->GRID_SQUARES,0,2));
 				$grid_4char_confirmed = strtoupper(substr($row->GRID_SQUARES,0,4));
-				if ($this->config->item('map_6digit_grids')) {
-					$grid_6char_confirmed = strtoupper(substr($row->GRID_SQUARES,0,6));
-				}
+				$grid_6char_confirmed = strtoupper(substr($row->GRID_SQUARES,0,6));
 
 				// Check if 2 Char is in array
 				if(!in_array($grid_2char_confirmed, $array_grid_2char_confirmed)){
@@ -89,10 +87,8 @@ public function getGridsjs() {
 					array_push($array_grid_4char_confirmed, $grid_4char_confirmed);	
 				}
 
-				if ($this->config->item('map_6digit_grids')) {
-					if(!in_array($grid_6char_confirmed, $array_grid_6char_confirmed)){
+				if(!in_array($grid_6char_confirmed, $array_grid_6char_confirmed)){
 						array_push($array_grid_6char_confirmed, $grid_6char_confirmed);	
-					}
 				}
 			}
 		}
@@ -104,9 +100,7 @@ public function getGridsjs() {
 
 				$grid_two = strtoupper(substr($row->GRID_SQUARES,0,2));
 				$grid_four = strtoupper(substr($row->GRID_SQUARES,0,4));
-				if ($this->config->item('map_6digit_grids')) {
-					$grid_six = strtoupper(substr($row->GRID_SQUARES,0,6));
-				}
+				$grid_six = strtoupper(substr($row->GRID_SQUARES,0,6));
 
 				// Check if 2 Char is in array
 				if(!in_array($grid_two, $array_grid_2char)){
@@ -116,12 +110,11 @@ public function getGridsjs() {
 				if(!in_array($grid_four, $array_grid_4char)){
 					array_push($array_grid_4char, $grid_four);	
 				}
-
-				if ($this->config->item('map_6digit_grids')) {
-					if(!in_array($grid_six, $array_grid_6char)){
-						array_push($array_grid_6char, $grid_six);	
-					}
+				
+				if(!in_array($grid_six, $array_grid_6char)){
+					array_push($array_grid_6char, $grid_six);	
 				}
+
 			}
 		}
 		$query_vucc = $this->gridmap_model->get_band_worked_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat);
diff --git a/assets/js/sections/gridmap.js b/assets/js/sections/gridmap.js
index 3335d4440..55d096a2c 100644
--- a/assets/js/sections/gridmap.js
+++ b/assets/js/sections/gridmap.js
@@ -55,6 +55,7 @@ function gridPlot(form, visitor=true) {
             sat: $("#sats").val(),
 		},
 		success: function (data) {
+            console.log(data);
             $('.cohidden').show();
             $(".ld-ext-right-plot").removeClass('running');
             $(".ld-ext-right-plot").prop('disabled', false);