fix: Added LOTW badge for Lotw users colored depending on their last upload

internal/dxcc/dxcc.go

@@ -339,17 +339,25 @@ func normalizeCallsign(s string) string {
 	// which can change the DXCC entity (HD5MW/8 → HD8MW → Galápagos, not
 	// Ecuador). This is the same class of rule as KG4 and /MM.
 	if areaDigit != 0 {
-		main = replaceFirstDigit(main, areaDigit)
+		main = replaceAreaDigit(main, areaDigit)
 	}
 	return main
 }
 
-// replaceFirstDigit substitutes the first 0-9 digit of a call with d (used to
-// apply a "/N" call-area change). Returns the call unchanged if it has no digit.
-func replaceFirstDigit(call string, d byte) string {
+// replaceAreaDigit substitutes the CALL-AREA digit of a call with d (used to
+// apply a "/N" call-area change). The area digit is the first digit that comes
+// AFTER a prefix letter — NOT a leading digit that is part of a digit-first
+// prefix (7X, 3A, 4X, 9A, 2E…). So 7X2ARA/4 → 7X4ARA (still Algeria, area 4),
+// NOT 4X2ARA (which is Israel — the old first-digit bug). Returns the call
+// unchanged if it has no such digit.
+func replaceAreaDigit(call string, d byte) string {
 	b := []byte(call)
+	seenLetter := false
 	for i := range b {
-		if b[i] >= '0' && b[i] <= '9' {
+		switch {
+		case b[i] >= 'A' && b[i] <= 'Z':
+			seenLetter = true
+		case b[i] >= '0' && b[i] <= '9' && seenLetter:
 			b[i] = d
 			return string(b)
 		}

internal/dxcc/dxcc_test.go

@@ -219,6 +219,9 @@ func TestNormalize(t *testing.T) {
 		"F4BPO/M":    "F4BPO", // plain mobile keeps the home entity
 		"F4BPO/5":    "F5BPO", // "/5" re-homes to call area 5
 		"HD5MW/8":    "HD8MW", // "/8" → Galápagos call area (HD8)
+		"7X2ARA/4":   "7X4ARA", // "/4" changes the AREA digit (2→4), NOT the 7 of the 7X prefix (was wrongly 4X2ARA = Israel)
+		"3A2ABC/6":   "3A6ABC", // digit-first prefix 3A: area digit is the 2, not the 3
+		"4X1AB/2":    "4X2AB",  // 4X (Israel) area 1→2, keep the leading 4
 		"DL/F4BPO":   "DL",
 		"MM/KA9P":    "MM",    // leading MM = Scotland operating prefix
 		"MM/LY3X/P":  "MM",