Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 6 chars

Browse Source
This commit is contained in:
Andreas Kristiansen
2025-10-20 16:04:49 +02:00
parent 55230aa56d
commit f8b68f9075
1 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
application/controllers/Gridmap.php
View File

@@ -146,23 +146,40 @@ class Gridmap extends CI_Controller {
$grids = explode(",", $row->COL_VUCC_GRIDS);
if ($data['grids']) {
$grids = array_intersect($data['grids'], $grids);
if (!empty($data['grids'])) {
$filtered = [];
foreach ($grids as $g6) {
foreach ($data['grids'] as $g4) {
if (strpos($g6, $g4) === 0) {
$filtered[] = $g6;
break;
}
}
}
$grids = $filtered;
}
foreach($grids as $key) {
$grid_two = strtoupper(substr(trim($key),0,2));
$grid_four = strtoupper(substr(trim($key),0,4));
if ($this->config->item('map_6digit_grids')) {
$grid_six = strtoupper(substr(trim($key),0,6));
}
// Check if 2 Char is in array
if(!in_array($grid_two, $array_grid_2char)){
array_push($array_grid_2char, $grid_two);
}
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);
}
}
}
}
}
@@ -175,23 +192,41 @@ class Gridmap extends CI_Controller {
$grids = explode(",", $row->COL_VUCC_GRIDS);
if ($data['grids']) {
$grids = array_intersect($data['grids'], $grids);
if (!empty($data['grids'])) {
$filtered = [];
foreach ($grids as $g6) {
foreach ($data['grids'] as $g4) {
if (strpos($g6, $g4) === 0) {
$filtered[] = $g6;
break;
}
}
}
$grids = $filtered;
}
foreach($grids as $key) {
$grid_2char_confirmed = strtoupper(substr(trim($key),0,2));
$grid_4char_confirmed = strtoupper(substr(trim($key),0,4));
if ($this->config->item('map_6digit_grids')) {
$grid_6char_confirmed = strtoupper(substr(trim($key),0,6));
}
// Check if 2 Char is in array
if(!in_array($grid_2char_confirmed, $array_grid_2char_confirmed)){
array_push($array_grid_2char_confirmed, $grid_2char_confirmed);
}
if(!in_array($grid_4char_confirmed, $array_grid_4char_confirmed)){
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)){
array_push($array_grid_6char_confirmed, $grid_6char_confirmed);
}
}
}
}
}