fix(map): skip labels on worked cells — bright-yellow 4-char text on green fill read as 'green too bright'

The previous fix skipped grid LINES through worked cells, but each worked cell
still got a bright-yellow (alpha 220 + black shadow) 4-char label drawn dead
center on the green fill at zoom>=7. Field zoom never shows this because 2-char
labels sit at field centers and almost never overlap a worked 2x1 square. Now
worked cells stay completely label-free, matching the field-zoom look.

core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/LoTWRepository.kt

@@ -18,11 +18,15 @@
 package com.rtbishop.look4sat.core.data.repository
 
 import com.rtbishop.look4sat.core.domain.repository.ILoTWRepository
+import com.rtbishop.look4sat.core.domain.repository.LoTWResult
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.net.HttpURLConnection
+import java.net.SocketTimeoutException
 import java.net.URL
 import java.net.URLEncoder
+import java.io.IOException
+import javax.net.ssl.SSLException
 
 /**
  * Fetches confirmed gridsquares directly from ARRL LoTW via the official report endpoint:
@@ -34,74 +38,54 @@ import java.net.URLEncoder
  * value; VUCC_GRIDS ("EN52en,EN53fa") also yields 4-char fields. All values are
  * truncated/expanded to the 4-char form used by the map overlay.
  *
- * ARRL rate-limits the report endpoint (roughly once per hour per account), which is
- * fine for a manual sync button.
+ * ARRL rate-limits the report endpoint: one download in progress per user id, and
+ * frequent full-report pulls get refused. Failures are reported with an explicit
+ * cause (see LoTWResult) so the UI can tell the user what to do next.
  */
 class LoTWRepository : ILoTWRepository {
 
-    override suspend fun fetchConfirmedGrids(callsign: String, password: String): Set<String>? =
+    override suspend fun fetchConfirmedGrids(callsign: String, password: String): LoTWResult =
         withContext(Dispatchers.IO) {
-            val call = callsign.trim().uppercase()
-            val pwd = password.trim()
-            if (call.isBlank() || pwd.isBlank()) return@withContext null
-            // qso_qslsince with an early date forces a FULL confirmed-QSL report.
-            // Without it, LoTW applies a "system supplied default" since-date and
-            // only returns confirmations newer than the account's last query —
-            // subsequent syncs would return an empty/incremental report.
-            val since = "2000-01-01"
-            val query = buildString {
-                append("login=").append(URLEncoder.encode(call, "UTF-8"))
-                append("&password=").append(URLEncoder.encode(pwd, "UTF-8"))
-                append("&qso_query=1&qso_qsl=yes&qso_qsldetail=yes&qso_mydetail=yes")
-                append("&qso_qslsince=").append(URLEncoder.encode(since, "UTF-8"))
-            }
-            try {
-                val connection = URL("$BASE_URL?$query").openConnection() as HttpURLConnection
-                // ARRL can be slow to accept connections from mobile networks
-                // (long TLS handshakes across the Pacific, occasional server-side
-                // queueing). 30s connect + 120s read gives the request enough
-                // headroom; the sync button stays disabled meanwhile so users
-                // see progress rather than a hung dialog.
-                connection.connectTimeout = 30_000
-                connection.readTimeout = 120_000
-                connection.requestMethod = "GET"
-                connection.setRequestProperty("Accept-Encoding", "gzip")
-                connection.instanceFollowRedirects = true
-                val code = connection.responseCode
-                if (code !in 200..299) {
-                    connection.disconnect()
-                    return@withContext null
-                }
-                val stream = connection.inputStream
-                val body = ("gzip".equals(connection.contentEncoding, ignoreCase = true))
-                    .let { gz -> if (gz) java.util.zip.GZIPInputStream(stream) else stream }
-                    .bufferedReader().use { it.readText() }
-                connection.disconnect()
-                if (body.contains(" password=") && !body.startsWith("ARRL")) return@withContext null
-                parseConfirmedGrids(body)
-            } catch (e: Exception) {
-                println("LoTWRepository fetch failure: $e")
-                null
-            }
+            fetchReportBody(callsign, password).fold(
+                onSuccess = { body -> parseBoth(body)?.let { LoTWResult.Success(it.first, it.second) }
+                    ?: LoTWResult.RateLimited },
+                onFailure = { toResult(it) }
+            )
         }
 
     override suspend fun fetchConfirmedGridQsos(
         callsign: String,
         password: String
-    ): Pair<Set<String>, Map<String, List<com.rtbishop.look4sat.core.domain.model.GridQso>>>? {
-        // Single report fetch: grids are derived from the same body as the
-        // per-QSO detail (avoids a second ARRL hit and keeps the two datasets
-        // perfectly consistent).
-        val body = fetchReportBody(callsign, password) ?: return null
+    ): LoTWResult = withContext(Dispatchers.IO) {
+        fetchReportBody(callsign, password).fold(
+            onSuccess = { body -> parseBoth(body)?.let { LoTWResult.Success(it.first, it.second) }
+                ?: LoTWResult.RateLimited },
+            onFailure = { toResult(it) }
+        )
+    }
+
+    internal fun toResult(e: Throwable): LoTWResult = when (e) {
+        is CredentialsException -> LoTWResult.BadCredentials
+        is RateLimitException -> LoTWResult.RateLimited
+        is TimeoutException -> LoTWResult.Timeout
+        else -> LoTWResult.NetworkError(e.message ?: e.javaClass.simpleName)
+    }
+
+    /** Single report fetch feeding both the grid set and the per-QSO detail. */
+    private fun parseBoth(body: String): Pair<Set<String>, Map<String, List<com.rtbishop.look4sat.core.domain.model.GridQso>>>? {
         val grids = parseConfirmedGrids(body) ?: return null
         val qsos = parseConfirmedGridQsos(body) ?: return null
         return grids to qsos
     }
 
-    private fun fetchReportBody(callsign: String, password: String): String? {
+    private fun fetchReportBody(callsign: String, password: String): Result<String> {
         val call = callsign.trim().uppercase()
         val pwd = password.trim()
-        if (call.isBlank() || pwd.isBlank()) return null
+        if (call.isBlank() || pwd.isBlank()) return Result.failure(IOException("empty credentials"))
+        // qso_qslsince with an early date forces a FULL confirmed-QSL report.
+        // Without it, LoTW applies a "system supplied default" since-date and
+        // only returns confirmations newer than the account's last query —
+        // subsequent syncs would return an empty/incremental report.
         val since = "2000-01-01"
         val query = buildString {
             append("login=").append(URLEncoder.encode(call, "UTF-8"))
@@ -111,6 +95,11 @@ class LoTWRepository : ILoTWRepository {
         }
         return try {
             val connection = URL("$BASE_URL?$query").openConnection() as HttpURLConnection
+            // ARRL can be slow to accept connections from mobile networks
+            // (long TLS handshakes across the Pacific, occasional server-side
+            // queueing). 30s connect + 120s read gives the request enough
+            // headroom; the sync button stays disabled meanwhile so users
+            // see progress rather than a hung dialog.
             connection.connectTimeout = 30_000
             connection.readTimeout = 120_000
             connection.requestMethod = "GET"
@@ -119,21 +108,38 @@ class LoTWRepository : ILoTWRepository {
             val code = connection.responseCode
             if (code !in 200..299) {
                 connection.disconnect()
-                return null
+                // Observed in the wild (CQRLOG #2422): LoTW answers a throttled
+                // report pull with HTTP 503 "Page request limit".
+                return if (code == 503 || code == 429) Result.failure(RateLimitException())
+                else Result.failure(IOException("HTTP $code"))
             }
             val stream = connection.inputStream
             val body = ("gzip".equals(connection.contentEncoding, ignoreCase = true))
                 .let { gz -> if (gz) java.util.zip.GZIPInputStream(stream) else stream }
                 .bufferedReader().use { it.readText() }
             connection.disconnect()
-            if (body.contains(" password=") && !body.startsWith("ARRL")) return null
-            body
+            when {
+                // Login failure: HTTP 200 + HTML login page with the error text.
+                body.contains("incorrect", ignoreCase = true) &&
+                    body.contains("assword", ignoreCase = true) -> Result.failure(CredentialsException())
+                // Any other non-ADIF body: rate-limit refusal / server error page.
+                !body.contains("<eoh>", ignoreCase = true) -> Result.failure(RateLimitException())
+                else -> Result.success(body)
+            }
+        } catch (e: SocketTimeoutException) {
+            Result.failure(TimeoutException(e.message ?: "timed out"))
+        } catch (e: SSLException) {
+            Result.failure(IOException("TLS: ${e.message ?: "handshake failed"}"))
         } catch (e: Exception) {
             println("LoTWRepository fetch failure: $e")
-            null
+            Result.failure(IOException(e.message ?: e.javaClass.simpleName))
         }
     }
 
+    internal class CredentialsException : Exception("bad callsign/password")
+    internal class RateLimitException : Exception("report refused (rate limit / server error)")
+    internal class TimeoutException(message: String) : Exception(message)
+
     internal fun parseConfirmedGridQsos(
         body: String
     ): Map<String, List<com.rtbishop.look4sat.core.domain.model.GridQso>>? {

core/data/src/test/java/com/rtbishop/look4sat/core/data/repository/LoTWRepositoryTest.kt

@@ -1,5 +1,6 @@
 package com.rtbishop.look4sat.core.data.repository
 
+import com.rtbishop.look4sat.core.domain.repository.LoTWResult
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Test
@@ -128,4 +129,28 @@ class LoTWRepositoryTest {
     }
 
     // endregion
+
+    // region failure classification (fetchReportBody -> LoTWResult mapping)
+
+    @Test
+    fun failureClassificationMapsEachException() {
+        // LoTWRepository.toResult() must keep each failure cause distinct so
+        // the UI can show a specific message per cause.
+        assertEquals(
+            LoTWResult.BadCredentials,
+            repo.toResult(LoTWRepository.CredentialsException())
+        )
+        assertEquals(
+            LoTWResult.RateLimited,
+            repo.toResult(LoTWRepository.RateLimitException())
+        )
+        assertEquals(
+            LoTWResult.Timeout,
+            repo.toResult(LoTWRepository.TimeoutException("read timed out"))
+        )
+        val net = repo.toResult(java.io.IOException("HTTP 500"))
+        assertEquals(LoTWResult.NetworkError("HTTP 500"), net)
+    }
+
+    // endregion
 }

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/repository/ILoTWRepository.kt

@@ -22,17 +22,17 @@ interface ILoTWRepository {
 
     /**
      * Fetch all confirmed (QSL_RCVD=Y) gridsquares for the given LoTW account.
-     * Returns the 4-char grid set, or null on any failure (network / bad credentials).
+     * Returns the 4-char grid set with an explicit failure cause on error.
      */
-    suspend fun fetchConfirmedGrids(callsign: String, password: String): Set<String>?
+    suspend fun fetchConfirmedGrids(callsign: String, password: String): LoTWResult
 
     /**
      * Same report, but keeps the per-QSO detail of every confirmed satellite
      * QSO (call / time / satellite / mode / bands), grouped by worked 4-char
-     * gridsquare. Returns null on any failure.
+     * gridsquare. Failure cause is kept explicit.
      */
     suspend fun fetchConfirmedGridQsos(
         callsign: String,
         password: String
-    ): Pair<Set<String>, Map<String, List<com.rtbishop.look4sat.core.domain.model.GridQso>>>?
+    ): LoTWResult
 }

core/domain/src/main/java/com/rtbishop/look4sat/core/domain/repository/LoTWResult.kt

@@ -0,0 +1,45 @@
+/*
+ * Look4Sat. Amateur radio satellite tracker and pass predictor.
+ * Copyright (C) 2019-2026 Arty Bishop and contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.rtbishop.look4sat.core.domain.repository
+
+/** Result of a LoTW report fetch, with the failure cause kept explicit. */
+sealed class LoTWResult {
+
+    /** Report downloaded and parsed successfully. */
+    data class Success(
+        val grids: Set<String>,
+        val qsos: Map<String, List<com.rtbishop.look4sat.core.domain.model.GridQso>>
+    ) : LoTWResult()
+
+    /** HTTP 200 but LoTW replied with its login-error page (bad callsign/password). */
+    data object BadCredentials : LoTWResult()
+
+    /**
+     * Report endpoint refused the request without a usable error page. LoTW
+     * limits downloads to one in progress per user id and flags accounts that
+     * pull the full report too often; the server answers those with a bare
+     * non-ADIF body (no <eoh>).
+     */
+    data object RateLimited : LoTWResult()
+
+    /** Connect/read timed out — typically a slow route to the ARRL servers. */
+    data object Timeout : LoTWResult()
+
+    /** Any other network-level failure (DNS, TLS, connection reset, HTTP 5xx). */
+    data class NetworkError(val detail: String) : LoTWResult()
+}

feature/map/src/main/java/com/rtbishop/look4sat/feature/map/MaidenheadGridOverlay.kt

@@ -87,36 +87,32 @@ class MaidenheadGridOverlay : Overlay() {
         val cellLat = if (zoom >= GRID_ZOOM_SUB) SUB_SQUARE_LAT else FIELD_LAT
         val cellLon = if (zoom >= GRID_ZOOM_SUB) SUB_SQUARE_LON else FIELD_LON
 
-        // Visible bounding box in geographic coordinates
+        // Visible bounding box. Do NOT derive longitude bounds from the left/
+        // right edge pixels: osmdroid normalizes them to [-180,180), which both
+        // garbles antimeridian-crossing views AND makes any global view (span
+        // > 180°) look like an antimeridian crossing — unwrapping then produced
+        // an inverted range and ALL meridians vanished at low zoom. Instead
+        // anchor on the view-center longitude and expand by the half-width in
+        // degrees; the range is continuous (may exceed ±180) and cell indices
+        // beyond 18 wrap correctly via normalizeLon().
         val north = projection.fromPixels(0, 0)
         val south = projection.fromPixels(canvas.width, canvas.height)
         val topLat = max(north.latitude, south.latitude).coerceIn(-90.0, 90.0)
         val bottomLat = min(north.latitude, south.latitude).coerceIn(-90.0, 90.0)
-        // Longitude: osmdroid normalizes to [-180, 180), so when the view
-        // straddles the antimeridian (e.g. left edge 170°E, right edge 170°W)
-        // the raw min/max swap sides and the bounding box spans the wrong way
-        // (center on the Pacific → grid painted 180° off-screen). Unwrap by
-        // shifting one edge by +360° so left < right again.
-        var lonA = north.longitude
-        var lonB = south.longitude
-        if (lonA > lonB) {
-            val t = lonA; lonA = lonB; lonB = t
-        }
-        if (lonB - lonA > 180.0) lonA += 360.0
-        val leftLon = lonA
-        val rightLon = lonB
+        val worldWidthPx = 256.0 * Math.pow(2.0, zoom)
+        val viewCenter = projection.fromPixels(canvas.width / 2, canvas.height / 2)
+        val centerLon = viewCenter.longitude
+        val halfSpanDeg = (canvas.width / 2.0) / worldWidthPx * 360.0
+        val leftLon = centerLon - halfSpanDeg
+        val rightLon = centerLon + halfSpanDeg
 
         val firstRow = floor(bottomLat / cellLat).toInt()
         val lastRow = ceil(topLat / cellLat).toInt()
-        // Longitude cell indices may exceed the [-180, 180) range when the view
-        // crosses the antimeridian; index arithmetic still works (PMxx at 360° == same grid)
+        // Longitude cell indices are in the continuous unwrapped space and may
+        // exceed the [-180, 180) range when the view crosses the antimeridian
+        // or spans world repeats; labels normalize each cell back.
         val firstCol = floor(leftLon / cellLon).toInt()
         val lastCol = ceil(rightLon / cellLon).toInt()
-        val centerLon = (leftLon + rightLon) / 2.0
-        // World width in screen pixels for the current zoom (256 px per tile,
-        // 2^zoom tiles across the whole 360° world). Used by the custom
-        // Mercator-X computation in projectionToX.
-        val worldWidthPx = 256.0 * Math.pow(2.0, zoom)
         // At low zoom the world is narrower than the viewport and osmdroid shows
         // repeating copies on both sides. The visible bounding box spans more
         // than 360° of longitude there; extend the column range by whole world
@@ -173,20 +169,52 @@ class MaidenheadGridOverlay : Overlay() {
             }
         }
 
-        // Vertical lines (meridians)
+        // Vertical lines (meridians), segmented per cell row so that worked
+        // grid cells stay line-free (same look as field-zoom fills: green
+        // patches without square grid lines). Only relevant at sub-square
+        // zoom; at field zoom cellLabel() yields 2-char fields which never
+        // match the 4-char workedGrids, so all lines draw.
         for (turn in -colRepeats..colRepeats) for (col in firstCol..lastCol) {
             val lon = col * cellLon
             val x = projectionToX(projection, lon, centerLon, worldWidthPx)
             if (x == null) continue
-            canvas.drawLine(x, 0f, x, canvas.height.toFloat(), linePaint)
+            for (row in firstRow..lastRow) {
+                val lat = row * cellLat
+                if (lat < -90.0 || lat >= 90.0) continue
+                val topLatCell = lat + cellLat
+                if (topLatCell > 90.0) continue
+                val yTop = projectionToY(projection, topLatCell) ?: continue
+                val yBottom = projectionToY(projection, lat) ?: continue
+                // This meridian is a border of the cell on its right (col)
+                // and of the cell on its left (col-1); skip the segment if
+                // either cell is a worked grid.
+                val workedHere =
+                    cellLabel(lat, lon, zoom) in workedGrids ||
+                        cellLabel(lat, lon - cellLon, zoom) in workedGrids
+                if (workedHere) continue
+                canvas.drawLine(x, yTop, x, yBottom, linePaint)
+            }
         }
-        // Horizontal lines (parallels)
+        // Horizontal lines (parallels), segmented per cell column so worked
+        // cells have no lines through them either.
         for (row in firstRow..lastRow) {
             val lat = row * cellLat
             if (lat <= -90.0 || lat >= 90.0) continue
             val y = projectionToY(projection, lat)
             if (y == null) continue
-            canvas.drawLine(0f, y, canvas.width.toFloat(), y, linePaint)
+            for (turn in -colRepeats..colRepeats) for (col in firstCol..lastCol) {
+                val lon = col * cellLon
+                val xLeft = projectionToX(projection, lon, centerLon, worldWidthPx) ?: continue
+                val xRight = projectionToX(projection, lon + cellLon, centerLon, worldWidthPx) ?: continue
+                if (xRight < 0f || xLeft > canvas.width) continue
+                // This parallel borders the cell above (row) and below
+                // (row-1); skip the segment if either is worked.
+                val workedHere =
+                    cellLabel(lat, lon, zoom) in workedGrids ||
+                        cellLabel(lat - cellLat, lon, zoom) in workedGrids
+                if (workedHere) continue
+                canvas.drawLine(xLeft, y, xRight, y, linePaint)
+            }
         }
 
         // The station's own grid square: redraw its four borders thicker on top.
@@ -245,6 +273,11 @@ class MaidenheadGridOverlay : Overlay() {
                 val xRight = projectionToX(projection, lon + cellLon, centerLon, worldWidthPx) ?: continue
                 if (xRight < 0f || xLeft > canvas.width) continue
                 val label = cellLabel(lat, lon, zoom)
+                // Worked cells stay label-free: a bright-yellow 4-char label
+                // centered on a green fill reads as "the green got brighter"
+                // and breaks consistency with field zoom, where 2-char labels
+                // sit at field centers and almost never overlap a worked cell.
+                if (label in workedGrids) continue
                 canvas.drawText(label, (xLeft + xRight) / 2f, yCenter, labelPaint)
             }
         }

feature/map/src/main/java/com/rtbishop/look4sat/feature/map/MapScreen.kt

@@ -503,10 +503,14 @@ private fun setGridMode(
             val pos = stationPosition ?: return
             val lat = pos.latitude
             val lon = pos.longitude
+            // Maidenhead field indices: field 0 spans -90..-80° lat and
+            // -180..-160° lon, so the field-center must be offset by those
+            // bases — omitting them maps e.g. OL62's field center to
+            // 115°N/290°E (an ocean a hemisphere away) instead of 25°N/110°E.
             val fieldLat = ((lat + 90.0) / 10.0).toInt().coerceIn(0, 17)
             val fieldLon = ((lon + 180.0) / 20.0).toInt().coerceIn(0, 17)
-            val centerLat = fieldLat * 10.0 + 5.0
-            val centerLon = fieldLon * 20.0 + 10.0
+            val centerLat = fieldLat * 10.0 + 5.0 - 90.0
+            val centerLon = fieldLon * 20.0 + 10.0 - 180.0
             mapView.post { mapView.controller.setCenter(GeoPoint(centerLat, centerLon)) }
         }
     } catch (e: Exception) {

feature/settings/src/main/java/com/rtbishop/look4sat/feature/settings/SettingsViewModel.kt

@@ -201,18 +201,47 @@ class SettingsViewModel(
         settingsRepo.updateLoTWSettings(settings)
         _uiState.update { it.copy(lotwSyncing = true, lotwMessage = null) }
         viewModelScope.launch {
-            val lotwResult = lotwRepo.fetchConfirmedGridQsos(settings.callsign, settings.password)
-            _uiState.update { state ->
-                if (lotwResult == null) {
-                    state.copy(lotwSyncing = false, lotwMessage = "LoTW sync failed — check callsign/password/network")
-                } else {
+            when (val result = lotwRepo.fetchConfirmedGridQsos(settings.callsign, settings.password)) {
+                is com.rtbishop.look4sat.core.domain.repository.LoTWResult.Success -> {
                     // Wavelog entry removed: LoTW is now the only source, so the
                     // synced set fully replaces the stored worked grids.
-                    val (grids, qsos) = lotwResult
-                    settingsRepo.setWorkedGrids(grids)
-                    settingsRepo.setWorkedGridQsos(qsos)
-                    state.copy(lotwSyncing = false, workedGridsCount = grids.size, lotwMessage = null)
+                    settingsRepo.setWorkedGrids(result.grids)
+                    settingsRepo.setWorkedGridQsos(result.qsos)
+                    _uiState.update { state ->
+                        state.copy(
+                            lotwSyncing = false, workedGridsCount = result.grids.size,
+                            lotwMessage = null
+                        )
+                    }
                 }
+                is com.rtbishop.look4sat.core.domain.repository.LoTWResult.BadCredentials ->
+                    _uiState.update { state ->
+                        state.copy(
+                            lotwSyncing = false,
+                            lotwMessage = "LoTW sync failed — callsign or password incorrect"
+                        )
+                    }
+                is com.rtbishop.look4sat.core.domain.repository.LoTWResult.RateLimited ->
+                    _uiState.update { state ->
+                        state.copy(
+                            lotwSyncing = false,
+                            lotwMessage = "LoTW sync failed — rate limited by server, wait a few minutes and retry"
+                        )
+                    }
+                is com.rtbishop.look4sat.core.domain.repository.LoTWResult.Timeout ->
+                    _uiState.update { state ->
+                        state.copy(
+                            lotwSyncing = false,
+                            lotwMessage = "LoTW sync failed — connection timed out, try another network"
+                        )
+                    }
+                is com.rtbishop.look4sat.core.domain.repository.LoTWResult.NetworkError ->
+                    _uiState.update { state ->
+                        state.copy(
+                            lotwSyncing = false,
+                            lotwMessage = "LoTW sync failed — network error (${result.detail})"
+                        )
+                    }
             }
         }
     }

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
 #noinspection UnusedVersionCatalogEntry
-appVersionCode = "459"
+appVersionCode = "461"
 #noinspection UnusedVersionCatalogEntry
-appVersionName = "4.4.6-ba7opf.9.8"
+appVersionName = "4.4.6-ba7opf.9.10"
 #noinspection UnusedVersionCatalogEntry
 compileSdk = "37"
 #noinspection UnusedVersionCatalogEntry