From e7f45a70ca91dce1b944e12e33e4b5c40c8d1c9a Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Thu, 26 Sep 2024 15:51:07 +0200
Subject: [PATCH] Remove satellite mapping function

---
 application/controllers/Lotw.php              | 32 -------------------
 .../lotw_views/adif_views/adif_export.php     |  7 ++--
 2 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/application/controllers/Lotw.php b/application/controllers/Lotw.php
index 7722681f4..d51dc0256 100644
--- a/application/controllers/Lotw.php
+++ b/application/controllers/Lotw.php
@@ -994,38 +994,6 @@ class Lotw extends CI_Controller {
 
 	}
 
-	/*
-	|	Function: lotw_satellite_map
-	|	Requires: OSCAR Satellite name $satname
-	|
-	|	Outputs if LoTW uses a different satellite name
-	|
-	*/
-	function lotw_satellite_map($satname) {
-		$arr = array(
-			"ARISS"		=>	"ISS",
-			"UKUBE1"	=>	"UKUBE-1",
-			"KEDR"		=>	"ARISSAT-1",
-			"TO-108"	=>	"CAS-6",
-			"TAURUS"	=>	"TAURUS-1",
-			"AISAT1"	=>	"AISAT-1",
-			'UVSQ'		=>	"UVSQ-SAT",
-			'CAS-3H'	=>	"LILACSAT-2",
-			'IO-117'	=>	"GREENCUBE",
-			"TEVEL1"	=>	"TEVEL-1",
-			"TEVEL2"	=>	"TEVEL-2",
-			"TEVEL3"	=>	"TEVEL-3",
-			"TEVEL4"	=>	"TEVEL-4",
-			"TEVEL5"	=>	"TEVEL-5",
-			"TEVEL6"	=>	"TEVEL-6",
-			"TEVEL7"	=>	"TEVEL-7",
-			"TEVEL8"	=>	"TEVEL-8",
-			"INSPR7"	=> "INSPIRE-SAT 7",
-		);
-
-		return array_search(strtoupper($satname),$arr,true);
-	}
-
 	/*
 	|	Function: lotw_ca_province_map
 	|	Requires: candian province map $ca_province
diff --git a/application/views/lotw_views/adif_views/adif_export.php b/application/views/lotw_views/adif_views/adif_export.php
index 9aff60aba..aff2e8e4a 100644
--- a/application/views/lotw_views/adif_views/adif_export.php
+++ b/application/views/lotw_views/adif_views/adif_export.php
@@ -55,8 +55,7 @@ $cert2 = str_replace("-----END CERTIFICATE-----", "", $cert1);
 
 <?php if($qso->COL_PROP_MODE) { ?><PROP_MODE:<?php echo strlen($qso->COL_PROP_MODE); ?>><?php echo strtoupper($qso->COL_PROP_MODE); } ?>
 
-<?php if($qso->COL_SAT_NAME) { $satellite_name_check = $CI->lotw_satellite_map(strtoupper($qso->COL_SAT_NAME)); if($satellite_name_check != FALSE) { $satname = $satellite_name_check; } else { $satname = $qso->COL_SAT_NAME; } ?>
-<SAT_NAME:<?php echo strlen($satname); ?>><?php echo strtoupper($satname); } ?>
+<?php if($qso->COL_SAT_NAME) { ?><SAT_NAME:<?php echo strlen($satname); ?>><?php echo strtoupper($satname); } ?>
 
 <?php if($qso->COL_BAND_RX) { ?><BAND_RX:<?php echo strlen($qso->COL_BAND_RX); ?>><?php echo strtoupper($qso->COL_BAND_RX); } ?>
 
@@ -157,9 +156,7 @@ $sign_string .= $new_date;
 $sign_string .= $new_on."Z";
 
 if($qso->COL_SAT_NAME) {
-	$satellite_name_check = $CI->lotw_satellite_map(strtoupper($qso->COL_SAT_NAME)); if($satellite_name_check != FALSE) { $satname = $satellite_name_check; } else { $satname = $qso->COL_SAT_NAME; }
-
-	$sign_string .= strtoupper($satname);
+	$sign_string .= strtoupper($qso->COL_SAT_NAME);
 }
 
  ?>