feat(map): own 4-char grid bold outline also at field zoom; bump v4.4.6-ba7opf.10.2

Field zoom (2-char labels) now draws the station's own 2°x1° square outline
on top of the field grid, so the operator always sees their exact grid.
Polar labels + order-independent LoTW parsing fixes ride along in this release.

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

@@ -135,10 +135,13 @@ class MaidenheadGridOverlay : Overlay() {
         val worldTurns = ceil(((rightLon - leftLon) / 360.0) - 1e-9).toInt().coerceAtLeast(0)
         val colRepeats = if (worldTurns > 0) worldTurns else 0
 
-        // The station's own grid: bold outline only at sub-square zoom — at
+        // The station's own grid: always keep a bold outline of the 4-char
-        // field zoom (2-char labels) the current grid is NOT marked (user req).
+        // square. At sub-square zoom it matches the visible cell grid; at field
-        val ownCell = ownGrid?.takeIf { zoom >= GRID_ZOOM_SUB }
+        // zoom (2-char labels) the own 2°x1° square is drawn on top of the
-        // The tapped worked grid gets a distinct outline (same zoom gate).
+        // field grid so the operator still sees exactly where they are (user
+        // req: "field zoom must also draw the own 4-char grid, bolded").
+        val ownCell = ownGrid
+        // The tapped worked grid gets a distinct outline (sub-square zoom only).
         val selectedCell = selectedGrid?.takeIf { zoom >= GRID_ZOOM_SUB }
 
         // Worked-grid highlight fills.
@@ -292,22 +295,50 @@ class MaidenheadGridOverlay : Overlay() {
         // The station's own grid square: redraw its four borders thicker on top.
         // The tapped worked grid gets the same treatment in a different color.
         if (ownCell != null || selectedCell != null) {
-            for (row in firstRow..lastRow) {
+            if (zoom >= GRID_ZOOM_SUB) {
-                val lat = row * cellLat
+                for (row in firstRow..lastRow) {
-                if (lat < -90.0 || lat >= 90.0) continue
+                    val lat = row * cellLat
-                for (col in firstCol..lastCol) {
+                    if (lat < -90.0 || lat >= 90.0) continue
-                    val lon = col * cellLon
+                    for (col in firstCol..lastCol) {
-                    val label = cellLabel(lat, lon, zoom)
+                        val lon = col * cellLon
-                    if (label != ownCell && label != selectedCell) continue
+                        val label = cellLabel(lat, lon, zoom)
-                    val yTop = projectionToY(projection, lat + cellLat) ?: continue
+                        if (label != ownCell && label != selectedCell) continue
-                    val yBottom = projectionToY(projection, lat) ?: continue
+                        val yTop = projectionToY(projection, lat + cellLat) ?: continue
-                    val xLeft = projectionToX(projection, lon, centerLon, worldWidthPx) ?: continue
+                        val yBottom = projectionToY(projection, lat) ?: continue
-                    val xRight = projectionToX(projection, lon + cellLon, centerLon, worldWidthPx) ?: continue
+                        val xLeft = projectionToX(projection, lon, centerLon, worldWidthPx) ?: continue
-                    val paint = if (label == selectedCell) selectedLinePaint else ownLinePaint
+                        val xRight = projectionToX(projection, lon + cellLon, centerLon, worldWidthPx) ?: continue
-                    canvas.drawLine(xLeft, yTop, xRight, yTop, paint)
+                        val paint = if (label == selectedCell) selectedLinePaint else ownLinePaint
-                    canvas.drawLine(xLeft, yBottom, xRight, yBottom, paint)
+                        canvas.drawLine(xLeft, yTop, xRight, yTop, paint)
-                    canvas.drawLine(xLeft, yTop, xLeft, yBottom, paint)
+                        canvas.drawLine(xLeft, yBottom, xRight, yBottom, paint)
-                    canvas.drawLine(xRight, yTop, xRight, yBottom, paint)
+                        canvas.drawLine(xLeft, yTop, xLeft, yBottom, paint)
+                        canvas.drawLine(xRight, yTop, xRight, yBottom, paint)
+                    }
+                }
+            } else {
+                // Field zoom: the visible grid shows 2-char fields only, but the
+                // station's own 2°x1° square still gets its bold outline drawn
+                // on top of the field grid (user req). selectedCell is null here.
+                val grid = ownCell
+                if (grid != null) {
+                    val cell = gridCellBounds(grid)
+                    if (cell != null) {
+                        for (turn in -colRepeats..colRepeats) {
+                            val dLon = turn * 360.0
+                            if (cell.lonRight + dLon <= leftLon || cell.lonLeft + dLon >= rightLon) continue
+                            val yTop = projectionToY(projection, cell.latTop) ?: continue
+                            val yBottom = projectionToY(projection, cell.latBottom) ?: continue
+                            val xLeftBase = projectionToX(projection, cell.lonLeft, centerLon, worldWidthPx) ?: continue
+                            val xRightBase = projectionToX(projection, cell.lonRight, centerLon, worldWidthPx) ?: continue
+                            val xLeft = xLeftBase + turn * worldWidthPx.toFloat()
+                            val xRight = xRightBase + turn * worldWidthPx.toFloat()
+                            if (xRight < 0f || xLeft > canvas.width) continue
+                            if (yBottom < 0f || yTop > canvas.height) continue
+                            canvas.drawLine(xLeft, yTop, xRight, yTop, ownLinePaint)
+                            canvas.drawLine(xLeft, yBottom, xRight, yBottom, ownLinePaint)
+                            canvas.drawLine(xLeft, yTop, xLeft, yBottom, ownLinePaint)
+                            canvas.drawLine(xRight, yTop, xRight, yBottom, ownLinePaint)
+                        }
+                    }
                 }
             }
         }

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 #noinspection UnusedVersionCatalogEntry
 appVersionCode = "468"
 #noinspection UnusedVersionCatalogEntry
-appVersionName = "4.4.6-ba7opf.10.1"
+appVersionName = "4.4.6-ba7opf.10.2"
 #noinspection UnusedVersionCatalogEntry
 compileSdk = "37"
 #noinspection UnusedVersionCatalogEntry