i18n: localize WAPC/WAJA map labels to English

- wapc.json: add name_en for all 34 provinces (Beijing/Guangdong/...)
- waja.json: add name_en for all 47 prefectures (Gifu/Kyoto/...)
- AwardBoundaryOverlay: render English label on non-Chinese UI,
  fall back to source name when name_en is absent
- bump version to 4.4.6-ba7opf.10.4 (469)

README.md

@@ -6,11 +6,16 @@
 
 ## 本仓库特色功能
 
+- **网格地图模式（Grid Mode）** — 地图页内置 VUCC 网格覆盖图：已通联网格绿色填充、漫游网格蓝色 45° 斜纹（疏朗半透明样式）、当前所在方格淡黄加粗框（field 与 sub-square 缩放均显示）；极区（南北纬 80°–90°）网格线与二位标签完整可见；点击已通联网格弹出该网格内通联明细弹窗；进入网格模式默认 VUCC 视图
+- **奖状边界模式（Award Boundaries）** — 在网格地图上叠加 DXCC / WAPC / WAJA / WAZ / WAS 国界·省界·分区边界，已确认区域绿色填充；香港/澳门作为独立实体显示（DXCC 321/152），港澳标签强制显示
+- **LoTW 网格同步** — 直连 ARRL Logbook（账号密码验证）下载确认报告，worked / roamed 网格自动更新（兼容任意字段顺序的 ADIF 解析）；同步失败按凭据错误/限流/超时分类提示
 - **双站过境匹配（Mutual Pass）** — 输入友台经纬度/网格，筛选双方同时可见的卫星过境，在地图上同时显示双方仰角曲线和地面轨迹，支持一键跳转雷达页查看详情
 - **线性卫星转发器频率计算器** — 在雷达页的 Calculator 标签页中，支持 TX/RX 双向多普勒频率计算，以及下行频率偏移（offset）输入，方便操作带偏移的线性卫星
-- **CW 解码器** — 集成 Morse Expert 解码引擎，支持瀑布图、实时解码文本
+- **CW 解码器** — 集成 Morse Expert 解码引擎，支持瀑布图、实时解码文本（arm64 + armeabi-v7a 双架构）
 - **Passband 模式** — 支持通过位置滑块（Passband）自动计算 TX/RX 频率，避免切换时跳变
-- **AMSAT 状态页** — 实时查看卫星的业余无线电转发器状态（开启/关闭/待机），支持 72 小时历史记录回放
+- **AMSAT 状态页** — 实时查看卫星的业余无线电转发器状态（开启/关闭/待机），支持 72 小时历史记录回放，启动时预取缓存
+- **应用内更新检查** — 设置页一键检查 GitHub 最新 Release，展示版本说明并直接下载安装
+- **自定义 TLE 数据源** — 可添加自定义 TLE/Celestrak CSV 数据源，长按拖拽排序，数据源启停开关与 HTTP 状态码显示
 - **中文界面优化** — 翻译修正、UI 布局调整，系统语言自动切换
 
 ## 上游仓库

app/build.gradle.kts

@@ -18,7 +18,12 @@ android {
     namespace = libs.versions.packageName.get()
     defaultConfig {
         applicationId = "cn.ba7opf.look4sat"
-        ndk { abiFilters.add("armeabi-v7a") }
+        // CW decoder ships for both ABIs (see feature/cw jniLibs); the APK must
+        // not be pinned to 32-bit only or 64-bit devices fall back to ARM32.
+        ndk {
+            abiFilters.add("armeabi-v7a")
+            abiFilters.add("arm64-v8a")
+        }
     }
     signingConfigs {
         create("release") {

app/src/main/java/com/rtbishop/look4sat/MainScreen.kt

@@ -51,7 +51,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -94,16 +93,11 @@ import com.rtbishop.look4sat.feature.status.SatStatusDestination
 fun NavRoot(deeplink: String? = null) {
     val rootBackStack = rememberNavBackStack(Screen.Passes)
     val deeplinkResolver = DeeplinkResolver()
-    var openMapRequest by remember { mutableIntStateOf(0) }
     LaunchedEffect(deeplink) {
         deeplink?.let { rootBackStack.add(deeplinkResolver.resolve(it)) }
     }
     val navigateBack: () -> Unit = { rootBackStack.removeLastOrNull() }
     val navigateToRadar: () -> Unit = { rootBackStack.add(RadarDestination) }
-    val navigateToMap: () -> Unit = {
-        while (rootBackStack.size > 1) rootBackStack.removeAt(rootBackStack.size - 1)
-        openMapRequest += 1
-    }
     // Incoming screen slides in from the right, outgoing drifts left at 1/3 speed (API35+ style)
     val pushTransition = slideInHorizontally(tween(300)) { it } togetherWith
         slideOutHorizontally(tween(300)) { -it / 3 }
@@ -124,9 +118,7 @@ fun NavRoot(deeplink: String? = null) {
         entryProvider = entryProvider {
             entry<Screen.Passes> {
                 MainScreen(
-                    navigateToRadar = navigateToRadar,
-                    openMapRequest = openMapRequest,
-                    onOpenMapRequestHandled = { openMapRequest = 0 }
+                    navigateToRadar = navigateToRadar
                 )
             }
             entry<RadarDestination> {
@@ -134,7 +126,7 @@ fun NavRoot(deeplink: String? = null) {
                     modifier = Modifier.fillMaxSize(),
                     color = MaterialTheme.colorScheme.background
                 ) {
-                    RadarDestination(navigateUp = navigateBack, navigateToMap = navigateToMap)
+                    RadarDestination(navigateUp = navigateBack)
                 }
             }
         }
@@ -143,25 +135,16 @@ fun NavRoot(deeplink: String? = null) {
 
 @Composable
 fun MainScreen(
-    navigateToRadar: () -> Unit = {},
-    openMapRequest: Int = 0,
-    onOpenMapRequestHandled: () -> Unit = {}
+    navigateToRadar: () -> Unit = {}
 ) {
     val backStack = rememberNavBackStack(Screen.Passes)
     val currentKey = backStack.lastOrNull()
     val navigateBack: () -> Unit = { backStack.removeLastOrNull() }
-    val navigateToMap: () -> Unit = {
-        while (backStack.size > 1) backStack.removeAt(backStack.size - 1)
-        backStack.add(Screen.Map)
-    }
-    LaunchedEffect(openMapRequest) {
-        if (openMapRequest > 0) {
-            navigateToMap()
-            onOpenMapRequestHandled()
-        }
-    }
     val fadeTransition = fadeIn(animationSpec = tween(350)) togetherWith fadeOut(animationSpec = tween(350))
-    val navItems = listOf(Screen.Satellites, Screen.Passes, Screen.AMSAT, Screen.Mutual, Screen.Settings)
+    // Map sits at position 4 from the left, matching the upstream nav order
+    // (Satellites, Passes, AMSAT/Status, Map, ...), with the fork's Mutual tab
+    // appended before Settings.
+    val navItems = listOf(Screen.Satellites, Screen.Passes, Screen.AMSAT, Screen.Map, Screen.Mutual, Screen.Settings)
 
     val context = LocalContext.current
     val container = (context.applicationContext as IContainerProvider).getMainContainer()
@@ -185,7 +168,7 @@ fun MainScreen(
                     val isSelected = when (currentKey) {
                         is Screen.Satellites -> screen is Screen.Satellites
                         is Screen.Passes -> screen is Screen.Passes
-                        is Screen.Map -> screen is Screen.Passes
+                        is Screen.Map -> screen is Screen.Map
                         is Screen.AMSAT -> screen is Screen.AMSAT
                         is Screen.Mutual -> screen is Screen.Mutual
                         is Screen.Settings -> screen is Screen.Settings
@@ -196,7 +179,7 @@ fun MainScreen(
                         label = { Text(stringResource(screen.titleResId)) },
                         selected = isSelected,
                         onClick = {
-                            if (isSelected && !(currentKey is Screen.Map && screen is Screen.Passes)) return@item
+                            if (isSelected) return@item
                             while (backStack.size > 1) backStack.removeAt(backStack.size - 1)
                             if (screen !is Screen.Passes) backStack.add(screen)
                         }
@@ -236,8 +219,7 @@ fun MainScreen(
                                     container.setMutualPassData(MutualPassData())
                                     container.satelliteRepo.selectPass(catNum, aosTime)
                                     navigateToRadar()
-                                },
-                                navigateToMap = navigateToMap
+                                }
                             )
                         }
                         entry<Screen.Map> {

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

@@ -47,8 +47,11 @@ class LoTWRepository : ILoTWRepository {
     override suspend fun fetchConfirmedGrids(callsign: String, password: String): LoTWResult =
         withContext(Dispatchers.IO) {
             fetchReportBody(callsign, password).fold(
-                onSuccess = { body -> parseBoth(body)?.let { LoTWResult.Success(it.first, it.second) }
-                    ?: LoTWResult.RateLimited },
+                onSuccess = { body ->
+                    parseBoth(body)?.let { (grids, _, roamed) ->
+                        LoTWResult.Success(grids, emptyMap(), roamed)
+                    } ?: LoTWResult.RateLimited
+                },
                 onFailure = { toResult(it) }
             )
         }
@@ -58,8 +61,11 @@ class LoTWRepository : ILoTWRepository {
         password: String
     ): LoTWResult = withContext(Dispatchers.IO) {
         fetchReportBody(callsign, password).fold(
-            onSuccess = { body -> parseBoth(body)?.let { LoTWResult.Success(it.first, it.second) }
-                ?: LoTWResult.RateLimited },
+            onSuccess = { body ->
+                parseBoth(body)?.let { (grids, qsos, roamed) ->
+                    LoTWResult.Success(grids, qsos, roamed)
+                } ?: LoTWResult.RateLimited
+            },
             onFailure = { toResult(it) }
         )
     }
@@ -71,11 +77,14 @@ class LoTWRepository : ILoTWRepository {
         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>>>? {
+    /** Single report fetch feeding the grid set, the per-QSO detail and the roamed set. */
+    private fun parseBoth(
+        body: String
+    ): Triple<Set<String>, Map<String, List<com.rtbishop.look4sat.core.domain.model.GridQso>>, Set<String>>? {
         val grids = parseConfirmedGrids(body) ?: return null
         val qsos = parseConfirmedGridQsos(body) ?: return null
-        return grids to qsos
+        val roamed = parseRoamedGrids(body) ?: return null
+        return Triple(grids, qsos, roamed)
     }
 
     private fun fetchReportBody(callsign: String, password: String): Result<String> {
@@ -255,9 +264,6 @@ class LoTWRepository : ILoTWRepository {
     }
 
     internal fun parseConfirmedGrids(body: String): Set<String>? {
-        // LoTW answers with ADIF text; on bad credentials it returns a short error page
-        // containing "password=?" or an <eoh>-less block. Treat anything without a header
-        // marker as failure so the caller can show a sensible message.
         // LoTW answers with ADIF text; on bad credentials it returns a short error
         // page without an <eoh> header terminator. Real reports always carry <eoh>
         // (LoTW writes it lowercase). Match case-insensitively to be safe.
@@ -268,25 +274,34 @@ class LoTWRepository : ILoTWRepository {
         // QSOs omit it. Grid fields (GRIDSQUARE / VUCC_GRIDS) must only be
         // collected for records whose PROP_MODE is SAT, otherwise the map mixes
         // in terrestrial contacts.
+        //
+        // Buffered per-record pattern (same as parseConfirmedGridQsos): field order
+        // is NOT reliable — ADIF producers (incl. LoTW) emit fields alphabetically,
+        // so <GRIDSQUARE> (G) arrives BEFORE <PROP_MODE> (P) within a record. A
+        // sequential gate ("only add while propMode == SAT") silently drops every
+        // grid on real reports. Buffer the record and decide at <EOR> instead.
         var propMode: String? = null
+        var pendingGrids = mutableListOf<String>()
         for (raw in body.lineSequence()) {
             val line = raw.trim()
             when {
-                line.equals("<EOR>", ignoreCase = true) -> propMode = null
+                line.equals("<EOR>", ignoreCase = true) -> {
+                    if (propMode == "SAT") grids.addAll(pendingGrids)
+                    propMode = null
+                    pendingGrids = mutableListOf()
+                }
                 line.startsWith("<PROP_MODE:") -> {
-                    propMode = line.substringAfter('>').substringBefore("E<").trim().uppercase()
+                    propMode = adifValue(line).uppercase()
                 }
                 line.startsWith("<GRIDSQUARE:") || line.startsWith("<VUCC_GRIDS:") -> {
-                    if (propMode == "SAT") {
-                        // VUCC_GRIDS holds a comma-separated PAIR of grids
-                        // ("EN52en,EN53fa") for contacts spanning two squares —
-                        // split on ',' and take the 4-char field of each, or the
-                        // second grid is silently dropped.
-                        val value = line.substringAfter('>').substringBefore("E<")
-                        value.split(',').forEach { grid ->
-                            val field = grid.trim().uppercase()
-                            if (field.length >= 4) grids.add(field.take(4))
-                        }
+                    // VUCC_GRIDS holds a comma-separated PAIR of grids
+                    // ("EN52en,EN53fa") for contacts spanning two squares —
+                    // split on ',' and take the 4-char field of each, or the
+                    // second grid is silently dropped.
+                    val value = adifValue(line)
+                    value.split(',').forEach { grid ->
+                        val field = grid.trim().uppercase()
+                        if (field.length >= 4) pendingGrids.add(field.take(4))
                     }
                 }
             }
@@ -294,6 +309,47 @@ class LoTWRepository : ILoTWRepository {
         return grids
     }
 
+    /**
+     * Distinct 4-char gridsquares the account itself operated from, taken from
+     * ADIF <MY_GRIDSQUARE> of satellite QSO records only. This is the
+     * "roamed / activated" set shown as blue stripes on the map — the grids
+     * where the operator's own station was located during confirmed QSOs (a
+     * rover may log several distinct grids; the home grid is included too).
+     * Returns null when the body is not an ADIF report (mirrors the other parsers).
+     */
+    internal fun parseRoamedGrids(body: String): Set<String>? {
+        if (!body.contains("<eoh>", ignoreCase = true)) return null
+        val grids = mutableSetOf<String>()
+        // Buffered per-record pattern (same as parseConfirmedGridQsos): field
+        // order is NOT reliable — ADIF producers (incl. LoTW) emit fields
+        // alphabetically, so <MY_GRIDSQUARE> (M) arrives BEFORE <PROP_MODE> (P)
+        // within a record. A sequential gate ("only add while propMode == SAT")
+        // would silently drop every own grid on real reports; buffer the record
+        // and decide at <EOR> instead.
+        var propMode: String? = null
+        var myGrid: String? = null
+        for (raw in body.lineSequence()) {
+            val line = raw.trim()
+            when {
+                line.equals("<EOR>", ignoreCase = true) -> {
+                    if (propMode == "SAT" && myGrid != null) grids.add(myGrid)
+                    propMode = null
+                    myGrid = null
+                }
+                line.startsWith("<PROP_MODE:") -> {
+                    propMode = adifValue(line).uppercase()
+                }
+                line.startsWith("<MY_GRIDSQUARE:") -> {
+                    // MY_GRIDSQUARE must not be mistaken for GRIDSQUARE (the
+                    // opposite station's grid) — only own-station grids count.
+                    val value = adifValue(line)
+                    if (value.length >= 4) myGrid = value.take(4)
+                }
+            }
+        }
+        return grids
+    }
+
     private companion object {
         const val BASE_URL = "https://lotw.arrl.org/lotwuser/lotwreport.adi"
     }

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

@@ -239,6 +239,29 @@ class SettingsRepo(
         preferences.edit { putString(keyWorkedGridQsos, root.toString()) }
     }
 
+    // Distinct 4-char gridsquares the account operated from (LoTW <MY_GRIDSQUARE>,
+    // satellite QSOs only). Stored as a JSONArray like workedGrids.
+    private val keyRoamedGrids = "roamedGrids"
+
+    override fun getRoamedGrids(): Set<String> {
+        val json = preferences.getString(keyRoamedGrids, null).orEmpty()
+        if (json.isBlank()) return emptySet()
+        return try {
+            val array = org.json.JSONArray(json)
+            (0 until array.length()).mapNotNull { i ->
+                array.optString(i).takeIf { it.isNotBlank() }
+            }.toSet()
+        } catch (_: Exception) {
+            emptySet()
+        }
+    }
+
+    override fun setRoamedGrids(grids: Set<String>) {
+        val array = org.json.JSONArray()
+        grids.sorted().forEach { array.put(it) }
+        preferences.edit { putString(keyRoamedGrids, array.toString()) }
+    }
+
     // LoTW credentials (stored locally on the device only)
     private val keyLoTWCall = "lotwCallsign"
     private val keyLoTWPass = "lotwPassword"

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

@@ -296,6 +296,14 @@ private class FakeSettingsRepo(dataSources: DataSourcesSettings = defaultDataSou
     override fun getWorkedGridQsos(): Map<String, List<com.rtbishop.look4sat.core.domain.model.GridQso>> = emptyMap()
 
     override fun setWorkedGridQsos(qsos: Map<String, List<com.rtbishop.look4sat.core.domain.model.GridQso>>) = Unit
+
+    override fun getRoamedGrids(): Set<String> = emptySet()
+
+    private val roamedGrids = MutableStateFlow(emptySet<String>())
+
+    override fun setRoamedGrids(grids: Set<String>) {
+        roamedGrids.value = grids
+    }
 }
 
 private fun defaultDataSourcesSettings(): DataSourcesSettings {

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

@@ -61,6 +61,28 @@ class LoTWRepositoryTest {
         assertEquals(setOf("OL62"), result)
     }
 
+    @Test
+    fun parseHandlesAlphabeticalFieldOrder() {
+        // Real lotwreport.adi emits fields in ALPHABETICAL order: GRIDSQUARE (G)
+        // and VUCC_GRIDS come BEFORE PROP_MODE (P) inside each record. The old
+        // sequential gate (add only while propMode == SAT) dropped every grid on
+        // real reports — the buffered parser must collect them regardless of
+        // field order and filter at <EOR>.
+        val satQso = "<CALL:6>BA7OPF\n" +
+            "<GRIDSQUARE:4>NL47\n" +
+            "<MODE:3>FM\n" +
+            "<PROP_MODE:3>SAT\n" +
+            "<SAT_NAME:5>FO-29\n" +
+            "<VUCC_GRIDS:11>EN52en,EN53fa\n" +
+            "<EOR>\n"
+        val groundQso = "<CALL:6>BA7OPF\n" +
+            "<GRIDSQUARE:4>PM95\n" +
+            "<QSO_DATE:8>20260821\n" +
+            "<EOR>\n"
+        val result = repo.parseConfirmedGrids(report(satQso, groundQso))
+        assertEquals(setOf("NL47", "EN52", "EN53"), result)
+    }
+
     @Test
     fun parseReturnsEmptySetForReportWithoutGrids() {
         val satQso = "<PROP_MODE:3>SAT\n<SAT_NAME:5>AO-07\n<EOR>\n"
@@ -130,6 +152,61 @@ class LoTWRepositoryTest {
 
     // endregion
 
+    // region parseRoamedGrids (MY_GRIDSQUARE = grids the account operated from)
+
+    @Test
+    fun parseRoamedGridsCollectsOwnStationGrids() {
+        // Satellite QSOs carry MY_GRIDSQUARE = the grid the account itself
+        // operated from (the "roamed/activated" set shown as blue stripes).
+        val qso1 = "<CALL:6>BA7OPF\n<QSO_DATE:8>20260820\n<PROP_MODE:3>SAT\n<SAT_NAME:5>IO-86\n" +
+            "<MY_GRIDSQUARE:4>OL62\n<GRIDSQUARE:4>PM95\n<EOR>\n"
+        val qso2 = "<CALL:6>BA7OPF\n<QSO_DATE:8>20260901\n<PROP_MODE:3>SAT\n<SAT_NAME:5>IO-86\n" +
+            "<MY_GRIDSQUARE:4>OL72\n<GRIDSQUARE:4>NL47\n<EOR>\n"
+        assertEquals(setOf("OL62", "OL72"), repo.parseRoamedGrids(report(qso1, qso2)))
+    }
+
+    @Test
+    fun parseRoamedGridsIgnoresGroundQsos() {
+        val ground = "<CALL:6>BA7OPF\n<QSO_DATE:8>20260821\n<MY_GRIDSQUARE:4>OL72\n<EOR>\n"
+        assertEquals(emptySet<String>(), repo.parseRoamedGrids(report(ground)))
+    }
+
+    @Test
+    fun parseRoamedGridsDoesNotConfuseGridsquareWithMyGridsquare() {
+        // GRIDSQUARE (opposite station's grid) must never leak into the roamed set.
+        val qso = "<PROP_MODE:3>SAT\n<SAT_NAME:5>SO-50\n<MY_GRIDSQUARE:4>OL62\n" +
+            "<GRIDSQUARE:6>OM60IL\n<EOR>\n"
+        assertEquals(setOf("OL62"), repo.parseRoamedGrids(report(qso)))
+    }
+
+    @Test
+    fun parseRoamedGridsTruncatesSixCharToFour() {
+        val qso = "<PROP_MODE:3>SAT\n<SAT_NAME:5>IO-86\n<MY_GRIDSQUARE:6>OL62AA\n<EOR>\n"
+        assertEquals(setOf("OL62"), repo.parseRoamedGrids(report(qso)))
+    }
+
+    @Test
+    fun parseRoamedGridsHandlesAlphabeticalFieldOrder() {
+        // Real lotwreport.adi emits fields alphabetically, so <MY_GRIDSQUARE>
+        // (M) arrives BEFORE <PROP_MODE> (P). The old sequential gate (add only
+        // while propMode == SAT) silently returned an EMPTY set on real reports —
+        // this is the exact bug that made the blue roamed stripes never appear.
+        val qso = "<CALL:6>BA7OPF\n" +
+            "<GRIDSQUARE:4>PM95\n" +
+            "<MY_GRIDSQUARE:6>OL72XX\n" +
+            "<PROP_MODE:3>SAT\n" +
+            "<SAT_NAME:5>IO-86\n" +
+            "<EOR>\n"
+        assertEquals(setOf("OL72"), repo.parseRoamedGrids(report(qso)))
+    }
+
+    @Test
+    fun parseRoamedGridsRejectsBodyWithoutEoh() {
+        assertNull(repo.parseRoamedGrids("<HTML>Username/password incorrect</HTML>"))
+    }
+
+    // endregion
+
     // region failure classification (fetchReportBody -> LoTWResult mapping)
 
     @Test

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

@@ -102,6 +102,9 @@ interface ISettingsRepo {
     /** Confirmed satellite QSOs grouped by worked 4-char gridsquare (map tap detail). */
     fun getWorkedGridQsos(): Map<String, List<com.rtbishop.look4sat.core.domain.model.GridQso>>
     fun setWorkedGridQsos(qsos: Map<String, List<com.rtbishop.look4sat.core.domain.model.GridQso>>)
+    /** Distinct 4-char gridsquares the account operated from (LoTW <MY_GRIDSQUARE>). */
+    fun getRoamedGrids(): Set<String>
+    fun setRoamedGrids(grids: Set<String>)
     //endregion
 
     //region # LoTW confirmed-grids settings

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

@@ -23,7 +23,10 @@ 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>>
+        val qsos: Map<String, List<com.rtbishop.look4sat.core.domain.model.GridQso>>,
+        /** Distinct 4-char gridsquares the account itself operated from
+         *  (ADIF <MY_GRIDSQUARE>, satellite QSOs only) — "roamed/activated" grids. */
+        val roamedGrids: Set<String> = emptySet()
     ) : LoTWResult()
 
     /** HTTP 200 but LoTW replied with its login-error page (bad callsign/password). */

feature/cw/build.gradle.kts

@@ -10,10 +10,11 @@ android {
     compileOptions {
         encoding = "UTF-8"
     }
-    // 照搬 Morse Expert 1.15: native 解码器仅 armeabi-v7a
+    // Morse Expert 1.15 官方 Play 分包提供 ARM32/ARM64 原生解码器
+    // (jniLibs/armeabi-v7a + arm64-v8a), 两个 ABI 都打进 APK
     defaultConfig {
         ndk {
-            abiFilters += listOf("armeabi-v7a")
+            abiFilters += listOf("armeabi-v7a", "arm64-v8a")
         }
     }
 }

feature/map/src/main/assets/awards/dxcc.json

@@ -1 +1 @@
-{"type":"dxcc","regions":[{"id":0,"code":176,"name":"Fiji","label_lon":177.9759,"label_lat":-17.9376,"rings":[[[180.0,-16.0671],[180.0,-16.5552],[179.3641,-16.8014],[178.7251,-17.012],[178.5968,-16.6392],[179.0966,-16.434],[179.4135,-16.3791]],[[178.1256,-17.5048],[178.3736,-17.3399],[178.7181,-17.6285],[178.5527,-18.1506],[177.9327,-18.288],[177.3815,-18.1643],[177.285,-17.7247],[177.6709,-17.3811]],[[-179.7933,-16.0209],[-179.9174,-16.5018],[-180.0,-16.5552],[-180.0,-16.0671]]]},{"id":1,"code":470,"name":"Tanzania","label_lon":34.1421,"label_lat":-6.2078,"rings":[[[33.9037,-0.95],[34.0726,-1.0598],[37.6987,-3.097],[37.7669,-3.6771],[39.2022,-4.6768],[38.7405,-5.9089],[38.7998,-6.4757],[39.44,-6.84],[39.47,-7.1],[39.1947,-7.7039],[39.252,-8.0078],[39.1865,-8.4855],[39.5357,-9.1124],[39.9496,-10.0984],[40.3166,-10.3171],[40.3166,-10.3171],[39.521,-10.8969],[38.4276,-11.2852],[37.8276,-11.2688],[37.4713,-11.5688],[36.7752,-11.5945],[36.5141,-11.7209],[35.3124,-11.4391],[34.56,-11.52],[34.28,-10.16],[33.9408,-9.6937],[33.7397,-9.4171],[32.7594,-9.2306],[32.1919,-8.9304],[31.5563,-8.762],[31.1578,-8.5946],[30.74,-8.34],[30.74,-8.34],[30.2,-7.08],[29.62,-6.52],[29.42,-5.94],[29.52,-5.42],[29.34,-4.5],[29.7535,-4.4524],[30.1163,-4.0901],[30.5055,-3.5686],[30.7522,-3.3593],[30.743,-3.0343],[30.5277,-2.8076],[30.4697,-2.4139],[30.4697,-2.4138],[30.7583,-2.2872],[30.8161,-1.6989],[30.4191,-1.1347],[30.7699,-1.0146],[31.8662,-1.0274]]]},{"id":2,"code":302,"name":"W. Sahara","label_lon":-12.572,"label_lat":24.2306,"rings":[[[-8.6656,27.6564],[-8.6651,27.5895],[-8.6844,27.3957],[-8.6873,25.8811],[-11.9694,25.9334],[-11.9372,23.3746],[-12.8742,23.2848],[-13.1188,22.7712],[-12.9291,21.3271],[-16.8452,21.3333],[-17.0634,20.9998],[-17.0204,21.4223],[-17.003,21.4207],[-14.751,21.5006],[-14.6308,21.8609],[-14.2212,22.3102],[-13.8911,23.691],[-12.501,24.7701],[-12.0308,26.0309],[-11.7182,26.1041],[-11.3926,26.8834],[-10.5513,26.9908],[-10.1894,26.8609],[-9.7353,26.8609],[-9.413,27.0885],[-8.7949,27.1207],[-8.8178,27.6564]]]},{"id":3,"code":1,"name":"Canada","label_lon":-110.2438,"label_lat":56.7019,"rings":[[[-122.84,49.0],[-122.9742,49.0025],[-124.9102,49.9846],[-125.6246,50.4166],[-127.4356,50.8306],[-127.9928,51.7158],[-127.8503,52.3296],[-129.1298,52.7554],[-129.3052,53.5616],[-130.515,54.2876],[-130.5361,54.8028],[-130.5361,54.8028],[-129.98,55.285],[-130.0078,55.9158],[-131.7078,56.5521],[-132.7304,57.6929],[-133.3556,58.4103],[-134.2711,58.8611],[-134.945,59.2706],[-135.4758,59.7878],[-136.4797,59.4639],[-137.4525,58.905],[-138.3409,59.5621],[-139.039,60.0],[-140.013,60.2768],[-140.9978,60.3064],[-140.9925,66.0],[-140.986,69.712],[-140.986,69.712],[-139.1205,69.471],[-137.5464,68.99],[-136.5036,68.898],[-135.6258,69.3151],[-134.4146,69.6274],[-132.9292,69.5053],[-131.4314,69.9445],[-129.7947,70.1937],[-129.1077,69.7793],[-128.3616,70.0129],[-128.1382,70.4838],[-127.4471,70.3772],[-125.7563,69.4806],[-124.4248,70.1584],[-124.2897,69.3997],[-123.0611,69.5637],[-122.6835,69.8555],[-121.4723,69.7978],[-119.9429,69.3779],[-117.6027,69.0113],[-116.2264,68.8415],[-115.2469,68.9059],[-113.8979,68.3989],[-115.3049,67.9026],[-113.4973,67.6881],[-110.798,67.8061],[-109.9462,67.981],[-108.8802,67.3814],[-107.7924,67.8874],[-108.813,68.3116],[-108.1672,68.6539],[-106.95,68.7],[-106.15,68.8],[-105.3428,68.5612],[-104.3379,68.018],[-103.2211,68.0978],[-101.4543,67.6469],[-99.9019,67.8057],[-98.4432,67.7816],[-98.5586,68.4039],[-97.6695,68.5786],[-96.1199,68.2394],[-96.1259,67.2934],[-95.4894,68.0907],[-94.685,68.0638],[-94.2328,69.069],[-95.3041,69.6857],[-96.4713,70.0898],[-96.3911,71.1948],[-95.2088,71.9205],[-93.89,71.7601],[-92.8782,71.3187],[-91.5196,70.1913],[-92.4069,69.7],[-90.5471,69.4977],[-90.5515,68.475],[-89.2151,69.2587],[-88.0197,68.6151],[-88.3175,67.8734],[-87.3502,67.1987],[-86.3061,67.9215],[-85.5766,68.7846],[-85.522,69.8821],[-84.1008,69.8054],[-82.6226,69.6583],[-81.2804,69.162],[-81.2202,68.6657],[-81.9644,68.1325],[-81.2593,67.5972],[-81.3865,67.1108],[-83.3446,66.4115],[-84.7354,66.2573],[-85.7694,66.5583],[-86.0676,66.0563],[-87.0314,65.213],[-87.3232,64.7756],[-88.483,64.099],[-89.9144,64.0327],[-90.704,63.6102],[-90.77,62.9602],[-91.9334,62.8351],[-93.157,62.0247],[-94.2415,60.8987],[-94.6293,60.1102],[-94.6846,58.9488],[-93.215,58.7821],[-92.7646,57.8457],[-92.297,57.0871],[-90.8977,57.2847],[-89.0395,56.8517],[-88.0398,56.4716],[-87.3242,55.9991],[-86.0712,55.7238],[-85.0118,55.3026],[-83.3606,55.2449],[-82.2729,55.1483],[-82.4362,54.2823],[-82.125,53.277],[-81.4008,52.1579],[-79.9129,51.2084],[-79.143,51.5339],[-78.6019,52.5621],[-79.1242,54.1414],[-79.8296,54.6677],[-78.2287,55.1365],[-77.0956,55.8374],[-76.5414,56.5342],[-76.6232,57.2026],[-77.3023,58.0521],[-78.5169,58.8046],[-77.3368,59.8526],[-77.7727,60.7579],[-78.1069,62.3196],[-77.4107,62.5505],[-75.6962,62.2784],[-74.6682,62.1811],[-73.8399,62.4438],[-72.9085,62.1051],[-71.6771,61.5254],[-71.3737,61.1372],[-69.5904,61.0614],[-69.6203,60.2212]Line truncated
+{"type":"dxcc","regions":[{"id":0,"code":176,"name":"Fiji","label_lon":177.9759,"label_lat":-17.9376,"rings":[[[180.0,-16.0671],[180.0,-16.5552],[179.3641,-16.8014],[178.7251,-17.012],[178.5968,-16.6392],[179.0966,-16.434],[179.4135,-16.3791]],[[178.1256,-17.5048],[178.3736,-17.3399],[178.7181,-17.6285],[178.5527,-18.1506],[177.9327,-18.288],[177.3815,-18.1643],[177.285,-17.7247],[177.6709,-17.3811]],[[-179.7933,-16.0209],[-179.9174,-16.5018],[-180.0,-16.5552],[-180.0,-16.0671]]]},{"id":1,"code":470,"name":"Tanzania","label_lon":34.1421,"label_lat":-6.2078,"rings":[[[33.9037,-0.95],[34.0726,-1.0598],[37.6987,-3.097],[37.7669,-3.6771],[39.2022,-4.6768],[38.7405,-5.9089],[38.7998,-6.4757],[39.44,-6.84],[39.47,-7.1],[39.1947,-7.7039],[39.252,-8.0078],[39.1865,-8.4855],[39.5357,-9.1124],[39.9496,-10.0984],[40.3166,-10.3171],[40.3166,-10.3171],[39.521,-10.8969],[38.4276,-11.2852],[37.8276,-11.2688],[37.4713,-11.5688],[36.7752,-11.5945],[36.5141,-11.7209],[35.3124,-11.4391],[34.56,-11.52],[34.28,-10.16],[33.9408,-9.6937],[33.7397,-9.4171],[32.7594,-9.2306],[32.1919,-8.9304],[31.5563,-8.762],[31.1578,-8.5946],[30.74,-8.34],[30.74,-8.34],[30.2,-7.08],[29.62,-6.52],[29.42,-5.94],[29.52,-5.42],[29.34,-4.5],[29.7535,-4.4524],[30.1163,-4.0901],[30.5055,-3.5686],[30.7522,-3.3593],[30.743,-3.0343],[30.5277,-2.8076],[30.4697,-2.4139],[30.4697,-2.4138],[30.7583,-2.2872],[30.8161,-1.6989],[30.4191,-1.1347],[30.7699,-1.0146],[31.8662,-1.0274]]]},{"id":2,"code":302,"name":"W. Sahara","label_lon":-12.572,"label_lat":24.2306,"rings":[[[-8.6656,27.6564],[-8.6651,27.5895],[-8.6844,27.3957],[-8.6873,25.8811],[-11.9694,25.9334],[-11.9372,23.3746],[-12.8742,23.2848],[-13.1188,22.7712],[-12.9291,21.3271],[-16.8452,21.3333],[-17.0634,20.9998],[-17.0204,21.4223],[-17.003,21.4207],[-14.751,21.5006],[-14.6308,21.8609],[-14.2212,22.3102],[-13.8911,23.691],[-12.501,24.7701],[-12.0308,26.0309],[-11.7182,26.1041],[-11.3926,26.8834],[-10.5513,26.9908],[-10.1894,26.8609],[-9.7353,26.8609],[-9.413,27.0885],[-8.7949,27.1207],[-8.8178,27.6564]]]},{"id":3,"code":1,"name":"Canada","label_lon":-110.2438,"label_lat":56.7019,"rings":[[[-122.84,49.0],[-122.9742,49.0025],[-124.9102,49.9846],[-125.6246,50.4166],[-127.4356,50.8306],[-127.9928,51.7158],[-127.8503,52.3296],[-129.1298,52.7554],[-129.3052,53.5616],[-130.515,54.2876],[-130.5361,54.8028],[-130.5361,54.8028],[-129.98,55.285],[-130.0078,55.9158],[-131.7078,56.5521],[-132.7304,57.6929],[-133.3556,58.4103],[-134.2711,58.8611],[-134.945,59.2706],[-135.4758,59.7878],[-136.4797,59.4639],[-137.4525,58.905],[-138.3409,59.5621],[-139.039,60.0],[-140.013,60.2768],[-140.9978,60.3064],[-140.9925,66.0],[-140.986,69.712],[-140.986,69.712],[-139.1205,69.471],[-137.5464,68.99],[-136.5036,68.898],[-135.6258,69.3151],[-134.4146,69.6274],[-132.9292,69.5053],[-131.4314,69.9445],[-129.7947,70.1937],[-129.1077,69.7793],[-128.3616,70.0129],[-128.1382,70.4838],[-127.4471,70.3772],[-125.7563,69.4806],[-124.4248,70.1584],[-124.2897,69.3997],[-123.0611,69.5637],[-122.6835,69.8555],[-121.4723,69.7978],[-119.9429,69.3779],[-117.6027,69.0113],[-116.2264,68.8415],[-115.2469,68.9059],[-113.8979,68.3989],[-115.3049,67.9026],[-113.4973,67.6881],[-110.798,67.8061],[-109.9462,67.981],[-108.8802,67.3814],[-107.7924,67.8874],[-108.813,68.3116],[-108.1672,68.6539],[-106.95,68.7],[-106.15,68.8],[-105.3428,68.5612],[-104.3379,68.018],[-103.2211,68.0978],[-101.4543,67.6469],[-99.9019,67.8057],[-98.4432,67.7816],[-98.5586,68.4039],[-97.6695,68.5786],[-96.1199,68.2394],[-96.1259,67.2934],[-95.4894,68.0907],[-94.685,68.0638],[-94.2328,69.069],[-95.3041,69.6857],[-96.4713,70.0898],[-96.3911,71.1948],[-95.2088,71.9205],[-93.89,71.7601],[-92.8782,71.3187],[-91.5196,70.1913],[-92.4069,69.7],[-90.5471,69.4977],[-90.5515,68.475],[-89.2151,69.2587],[-88.0197,68.6151],[-88.3175,67.8734],[-87.3502,67.1987],[-86.3061,67.9215],[-85.5766,68.7846],[-85.522,69.8821],[-84.1008,69.8054],[-82.6226,69.6583],[-81.2804,69.162],[-81.2202,68.6657],[-81.9644,68.1325],[-81.2593,67.5972],[-81.3865,67.1108],[-83.3446,66.4115],[-84.7354,66.2573],[-85.7694,66.5583],[-86.0676,66.0563],[-87.0314,65.213],[-87.3232,64.7756],[-88.483,64.099],[-89.9144,64.0327],[-90.704,63.6102],[-90.77,62.9602],[-91.9334,62.8351],[-93.157,62.0247],[-94.2415,60.8987],[-94.6293,60.1102],[-94.6846,58.9488],[-93.215,58.7821],[-92.7646,57.8457],[-92.297,57.0871],[-90.8977,57.2847],[-89.0395,56.8517],[-88.0398,56.4716],[-87.3242,55.9991],[-86.0712,55.7238],[-85.0118,55.3026],[-83.3606,55.2449],[-82.2729,55.1483],[-82.4362,54.2823],[-82.125,53.277],[-81.4008,52.1579],[-79.9129,51.2084],[-79.143,51.5339],[-78.6019,52.5621],[-79.1242,54.1414],[-79.8296,54.6677],[-78.2287,55.1365],[-77.0956,55.8374],[-76.5414,56.5342],[-76.6232,57.2026],[-77.3023,58.0521],[-78.5169,58.8046],[-77.3368,59.8526],[-77.7727,60.7579],[-78.1069,62.3196],[-77.4107,62.5505],[-75.6962,62.2784],[-74.6682,62.1811],[-73.8399,62.4438],[-72.9085,62.1051],[-71.6771,61.5254],[-71.3737,61.1372],[-69.5904,61.0614],[-69.6203,60.2212]Line truncated

feature/map/src/main/assets/awards/waja.json

@@ -1 +1 @@
-{"type":"waja","regions":[{"id":0,"code":"22","name":"京都府","label_lon":135.5014,"label_lat":35.2429,"rings":[[[135.0367,35.5373],[134.9265,35.5125],[134.9143,35.5448],[134.8542,35.5881],[134.8725,35.6197],[134.8671,35.6581],[134.9353,35.6505],[134.9849,35.6923],[135.0222,35.6895],[135.0607,35.7081],[135.0857,35.7398],[135.223,35.7792],[135.308,35.6944],[135.3029,35.6628],[135.2874,35.6756],[135.268,35.6674],[135.2443,35.6205],[135.1926,35.5711],[135.1931,35.5383],[135.2547,35.5989],[135.2507,35.5702],[135.2739,35.5609],[135.2449,35.5613],[135.2442,35.5359],[135.2882,35.5155],[135.3303,35.517],[135.3163,35.4512],[135.3467,35.4753],[135.3468,35.494],[135.3975,35.4788],[135.3963,35.5152],[135.3445,35.5041],[135.3423,35.5518],[135.4263,35.5665],[135.4337,35.5907],[135.4619,35.6035],[135.4521,35.5675],[135.4865,35.558],[135.4599,35.5472],[135.449,35.5235],[135.4748,35.5049],[135.4591,35.4675],[135.4958,35.4251],[135.5253,35.4207],[135.5285,35.3797],[135.6419,35.3668],[135.7007,35.3437],[135.7684,35.3561],[135.7637,35.3445],[135.809,35.3161],[135.8313,35.2761],[135.8581,35.2891],[135.8291,35.2207],[135.8558,35.1595],[135.8355,35.059],[135.815,35.0461],[135.8334,35.0223],[135.8199,35.0129],[135.8351,35.0032],[135.8268,34.9911],[135.8493,34.991],[135.8782,34.9475],[135.8664,34.8923],[135.898,34.8712],[135.9405,34.8932],[135.9457,34.8517],[136.005,34.8427],[136.0047,34.8282],[136.0281,34.8192],[136.0104,34.8007],[136.0335,34.7789],[136.0285,34.7572],[136.0552,34.7384],[136.0285,34.7062],[135.9859,34.7151],[135.9754,34.7409],[135.9254,34.7403],[135.9254,34.7575],[135.89,34.7087],[135.7551,34.7275],[135.7284,34.7779],[135.7447,34.8043],[135.6955,34.8482],[135.6749,34.8987],[135.6307,34.9353],[135.5999,34.928],[135.6129,34.9713],[135.5733,34.9717],[135.5783,34.9557],[135.5568,34.9381],[135.58,34.937],[135.5807,34.9236],[135.5418,34.9153],[135.5132,34.9439],[135.481,34.9495],[135.4874,34.9919],[135.3821,35.0101],[135.3688,35.0536],[135.4031,35.0894],[135.3885,35.0971],[135.3894,35.1288],[135.3435,35.1357],[135.3405,35.1499],[135.2822,35.1449],[135.2898,35.1699],[135.2738,35.1771],[135.2067,35.1609],[135.1869,35.1718],[135.1967,35.2029],[135.1556,35.2262],[135.1583,35.2599],[135.109,35.2663],[135.0675,35.2372],[135.0565,35.264],[135.01,35.2698],[134.9988,35.2911],[134.9256,35.3112],[134.9185,35.3645],[134.9338,35.4074],[134.9586,35.4091],[134.9895,35.3863],[135.0483,35.4074]],[[135.4273,35.6825],[135.4214,35.6797],[135.4243,35.6882]],[[135.4809,35.5943],[135.4749,35.5956],[135.4779,35.6059]],[[135.3472,35.4959],[135.3404,35.4986],[135.3474,35.4971]]]},{"id":1,"code":"41","name":"佐賀県","label_lon":130.0903,"label_lat":33.2574,"rings":[[[129.8671,33.5967],[129.8479,33.5998],[129.8612,33.6183]],[[129.9007,33.594],[129.8967,33.6037],[129.9018,33.6029]],[[129.8447,33.5858],[129.8351,33.5891],[129.8459,33.5915]],[[129.757,33.5634],[129.7394,33.5728],[129.7412,33.5781],[129.7679,33.582]],[[129.8741,33.5438],[129.8729,33.5581],[129.8804,33.5675],[129.892,33.5561]],[[130.0387,33.4697],[130.2766,33.4783],[130.3555,33.4335],[130.3953,33.4273],[130.4144,33.4103],[130.4102,33.395],[130.4962,33.4448],[130.5362,33.4382],[130.5352,33.3428],[130.479,33.3307],[130.4863,33.3123],[130.4554,33.3017],[130.4668,33.2886],[130.4489,33.265],[130.431,33.2925],[130.4146,33.2532],[130.3907,33.2599],[130.3843,33.2403],[130.3713,33.243],[130.3766,33.2204],[130.3386,33.2033],[130.3549,33.1404],[130.2878,33.1469],[130.2454,33.2029],[130.2465,33.1923],[130.2149,33.1993],[130.2306,33.1887],[130.2217,33.1653],[130.149,33.1127],[130.1219,33.1247],[130.1277,33.1085],[130.1123,33.1011],[130.1398,33.0943],[130.2198,32.9595],[130.0857,32.9748],[130.0087,33.019],[129.9935,33.0477],[129.9215,33.0904],[129.9256,33.1075],[129.9545,33.1166],[129.9425,33.1643],[129.8877,33.1563],[129.818,33.1835],[129.8134,33.2421],[129.7588,33.2903],[129.7899,33.3403],[129.836,33.2867],[129.8528,33.2921],[129.8274,33.3124],[129.8339,33.3113],[129.8484,33.3287],[129.8273,33.3373],[129.8474,33.3369],[129.868,33.4075],[129.8227,33.4118],[129.8307,33.4218],[129.7828,33.4541],[129.8062,33.4573],[129.7936,33.4713],[129.8055,33.485],[129.8382,33.4621],[129.8352,33.4436],[129.8579,33.4538],[129.8497,33.4751],[129.8399,33.4698],[129.8314,33.4762],[129.8443,33.4786],[129.8273,33.5176],[129.8563,33.5055],[129.8396,33.5222],[129.8562,33.5191],[129.8451,33.5553],[129.8749,33.5371],[129.8744,33.5161],[129.8958,33.5494],[129.9278,33.5507],[129.9288,33.537],[129.956,33.5295],[129.967,33.5086],[129.9362,33.4786],[129.9546,33.4693],[129.9624,33.4835],[129.9671,33.4552],[130.0194,33.4463],[130.0402,33.4558]],[[129.9674,33.5271],[129.9645,33.5389],[129.9721,33.5432],[129.9772,33.5349]],[[129.9928,33.4777],[129.9846,33.4779],[129.9888,33.4806]],[[129.8563,33.4021],[129.8558,33.4049],[129.858,33.4024]],[[129.8601,33.3995],[129.8614,33.4017],[129.8656,33.4027]],[[129.8386,33.3191],[129.8351,33.3215],[129.8352,33.3227]],[[130.2242,32.9565],[130.2127,32.9546],[130.222,32.9584]]]},{"id":2,"code":Line truncated
+{"type":"waja","regions":[{"id":0,"code":"22","name":"京都府","label_lon":135.5014,"label_lat":35.2429,"rings":[[[135.0367,35.5373],[134.9265,35.5125],[134.9143,35.5448],[134.8542,35.5881],[134.8725,35.6197],[134.8671,35.6581],[134.9353,35.6505],[134.9849,35.6923],[135.0222,35.6895],[135.0607,35.7081],[135.0857,35.7398],[135.223,35.7792],[135.308,35.6944],[135.3029,35.6628],[135.2874,35.6756],[135.268,35.6674],[135.2443,35.6205],[135.1926,35.5711],[135.1931,35.5383],[135.2547,35.5989],[135.2507,35.5702],[135.2739,35.5609],[135.2449,35.5613],[135.2442,35.5359],[135.2882,35.5155],[135.3303,35.517],[135.3163,35.4512],[135.3467,35.4753],[135.3468,35.494],[135.3975,35.4788],[135.3963,35.5152],[135.3445,35.5041],[135.3423,35.5518],[135.4263,35.5665],[135.4337,35.5907],[135.4619,35.6035],[135.4521,35.5675],[135.4865,35.558],[135.4599,35.5472],[135.449,35.5235],[135.4748,35.5049],[135.4591,35.4675],[135.4958,35.4251],[135.5253,35.4207],[135.5285,35.3797],[135.6419,35.3668],[135.7007,35.3437],[135.7684,35.3561],[135.7637,35.3445],[135.809,35.3161],[135.8313,35.2761],[135.8581,35.2891],[135.8291,35.2207],[135.8558,35.1595],[135.8355,35.059],[135.815,35.0461],[135.8334,35.0223],[135.8199,35.0129],[135.8351,35.0032],[135.8268,34.9911],[135.8493,34.991],[135.8782,34.9475],[135.8664,34.8923],[135.898,34.8712],[135.9405,34.8932],[135.9457,34.8517],[136.005,34.8427],[136.0047,34.8282],[136.0281,34.8192],[136.0104,34.8007],[136.0335,34.7789],[136.0285,34.7572],[136.0552,34.7384],[136.0285,34.7062],[135.9859,34.7151],[135.9754,34.7409],[135.9254,34.7403],[135.9254,34.7575],[135.89,34.7087],[135.7551,34.7275],[135.7284,34.7779],[135.7447,34.8043],[135.6955,34.8482],[135.6749,34.8987],[135.6307,34.9353],[135.5999,34.928],[135.6129,34.9713],[135.5733,34.9717],[135.5783,34.9557],[135.5568,34.9381],[135.58,34.937],[135.5807,34.9236],[135.5418,34.9153],[135.5132,34.9439],[135.481,34.9495],[135.4874,34.9919],[135.3821,35.0101],[135.3688,35.0536],[135.4031,35.0894],[135.3885,35.0971],[135.3894,35.1288],[135.3435,35.1357],[135.3405,35.1499],[135.2822,35.1449],[135.2898,35.1699],[135.2738,35.1771],[135.2067,35.1609],[135.1869,35.1718],[135.1967,35.2029],[135.1556,35.2262],[135.1583,35.2599],[135.109,35.2663],[135.0675,35.2372],[135.0565,35.264],[135.01,35.2698],[134.9988,35.2911],[134.9256,35.3112],[134.9185,35.3645],[134.9338,35.4074],[134.9586,35.4091],[134.9895,35.3863],[135.0483,35.4074]],[[135.4273,35.6825],[135.4214,35.6797],[135.4243,35.6882]],[[135.4809,35.5943],[135.4749,35.5956],[135.4779,35.6059]],[[135.3472,35.4959],[135.3404,35.4986],[135.3474,35.4971]]],"name_en":"Kyoto"},{"id":1,"code":"41","name":"佐賀県","label_lon":130.0903,"label_lat":33.2574,"rings":[[[129.8671,33.5967],[129.8479,33.5998],[129.8612,33.6183]],[[129.9007,33.594],[129.8967,33.6037],[129.9018,33.6029]],[[129.8447,33.5858],[129.8351,33.5891],[129.8459,33.5915]],[[129.757,33.5634],[129.7394,33.5728],[129.7412,33.5781],[129.7679,33.582]],[[129.8741,33.5438],[129.8729,33.5581],[129.8804,33.5675],[129.892,33.5561]],[[130.0387,33.4697],[130.2766,33.4783],[130.3555,33.4335],[130.3953,33.4273],[130.4144,33.4103],[130.4102,33.395],[130.4962,33.4448],[130.5362,33.4382],[130.5352,33.3428],[130.479,33.3307],[130.4863,33.3123],[130.4554,33.3017],[130.4668,33.2886],[130.4489,33.265],[130.431,33.2925],[130.4146,33.2532],[130.3907,33.2599],[130.3843,33.2403],[130.3713,33.243],[130.3766,33.2204],[130.3386,33.2033],[130.3549,33.1404],[130.2878,33.1469],[130.2454,33.2029],[130.2465,33.1923],[130.2149,33.1993],[130.2306,33.1887],[130.2217,33.1653],[130.149,33.1127],[130.1219,33.1247],[130.1277,33.1085],[130.1123,33.1011],[130.1398,33.0943],[130.2198,32.9595],[130.0857,32.9748],[130.0087,33.019],[129.9935,33.0477],[129.9215,33.0904],[129.9256,33.1075],[129.9545,33.1166],[129.9425,33.1643],[129.8877,33.1563],[129.818,33.1835],[129.8134,33.2421],[129.7588,33.2903],[129.7899,33.3403],[129.836,33.2867],[129.8528,33.2921],[129.8274,33.3124],[129.8339,33.3113],[129.8484,33.3287],[129.8273,33.3373],[129.8474,33.3369],[129.868,33.4075],[129.8227,33.4118],[129.8307,33.4218],[129.7828,33.4541],[129.8062,33.4573],[129.7936,33.4713],[129.8055,33.485],[129.8382,33.4621],[129.8352,33.4436],[129.8579,33.4538],[129.8497,33.4751],[129.8399,33.4698],[129.8314,33.4762],[129.8443,33.4786],[129.8273,33.5176],[129.8563,33.5055],[129.8396,33.5222],[129.8562,33.5191],[129.8451,33.5553],[129.8749,33.5371],[129.8744,33.5161],[129.8958,33.5494],[129.9278,33.5507],[129.9288,33.537],[129.956,33.5295],[129.967,33.5086],[129.9362,33.4786],[129.9546,33.4693],[129.9624,33.4835],[129.9671,33.4552],[130.0194,33.4463],[130.0402,33.4558]],[[129.9674,33.5271],[129.9645,33.5389],[129.9721,33.5432],[129.9772,33.5349]],[[129.9928,33.4777],[129.9846,33.4779],[129.9888,33.4806]],[[129.8563,33.4021],[129.8558,33.4049],[129.858,33.4024]],[[129.8601,33.3995],[129.8614,33.4017],[129.8656,33.4027]],[[129.8386,33.3191],[129.8351,33.3215],[129.8352,33.3227]],[[130.2242,32.9565],[130.2127,32.9546],[130.222,32.9584]]Line truncated

feature/map/src/main/assets/awards/wapc.json

@@ -1 +1 @@
-{"type":"wapc","regions":[{"id":0,"code":"BJ","name":"北京市","label_lon":116.42,"label_lat":40.1899,"rings":[[[117.3486,40.5811],[117.3899,40.5616],[117.4299,40.5761],[117.4127,40.6052],[117.4675,40.6497],[117.4675,40.6497],[117.5014,40.6366],[117.5149,40.6602],[117.494,40.6752],[117.409,40.687],[117.3425,40.6738],[117.3197,40.6579],[117.2784,40.6643],[117.2082,40.6947],[117.117,40.7001],[117.1121,40.7074],[117.0123,40.6938],[116.9649,40.7096],[116.9267,40.745],[116.9242,40.7736],[116.8485,40.8393],[116.8134,40.8483],[116.7598,40.89],[116.7136,40.9099],[116.7222,40.9275],[116.6779,40.9709],[116.6988,41.0215],[116.6883,41.0445],[116.6477,41.0594],[116.6156,41.0531],[116.623,41.021],[116.5984,40.9745],[116.5676,40.9926],[116.5196,40.9813],[116.5196,40.9813],[116.4555,40.9808],[116.4475,40.9537],[116.4771,40.8999],[116.3982,40.9062],[116.3705,40.9438],[116.3397,40.9293],[116.3342,40.9044],[116.4383,40.8193],[116.466,40.7745],[116.4537,40.7659],[116.3169,40.7722],[116.3114,40.755],[116.2732,40.7627],[116.2473,40.7917],[116.2202,40.7441],[116.2048,40.74],[116.1716,40.6956],[116.1629,40.6625],[116.134,40.6665],[116.0989,40.6307],[116.0052,40.5839],[115.9825,40.5789],[115.972,40.6025],[115.9079,40.6175],[115.8851,40.5952],[115.8279,40.5875],[115.8198,40.5593],[115.7847,40.5584],[115.7552,40.5402],[115.7361,40.5034],[115.781,40.4934],[115.7718,40.4437],[115.8642,40.3594],[115.9178,40.3544],[115.9517,40.2819],[115.9689,40.264],[115.8987,40.2344],[115.8704,40.1859],[115.8556,40.1887],[115.8476,40.147],[115.8063,40.1534],[115.7737,40.1763],[115.7546,40.1457],[115.7546,40.1457],[115.6,40.1196],[115.5907,40.0962],[115.5273,40.0761],[115.4854,40.0404],[115.4546,40.0298],[115.4503,39.9927],[115.4287,39.9844],[115.4263,39.9505],[115.4811,39.9358],[115.523,39.8991],[115.5156,39.8922],[115.5156,39.8922],[115.526,39.8757],[115.5143,39.8375],[115.5673,39.8164],[115.5525,39.7948],[115.5057,39.7842],[115.4835,39.7985],[115.4835,39.7985],[115.4435,39.7856],[115.4398,39.752],[115.4866,39.7419],[115.4916,39.6701],[115.4786,39.6507],[115.4786,39.6507],[115.5224,39.6401],[115.518,39.5973],[115.5458,39.6189],[115.587,39.5899],[115.6338,39.5996],[115.6338,39.5996],[115.6677,39.6152],[115.6985,39.5779],[115.6985,39.5779],[115.6991,39.57],[115.6991,39.57],[115.717,39.5603],[115.717,39.5603],[115.7188,39.5539],[115.7188,39.5539],[115.7207,39.5511],[115.7207,39.5511],[115.7225,39.5442],[115.7213,39.5437],[115.7225,39.5442],[115.7225,39.5437],[115.7213,39.5437],[115.7225,39.5437],[115.725,39.5442],[115.725,39.5442],[115.7385,39.54],[115.7385,39.5396],[115.7385,39.54],[115.7385,39.5396],[115.7527,39.5156],[115.8063,39.51],[115.8063,39.51],[115.8211,39.523],[115.8211,39.523],[115.8285,39.5414],[115.8679,39.5465],[115.8679,39.5465],[115.9153,39.583],[115.9153,39.583],[115.9104,39.6005],[115.9104,39.6005],[115.9572,39.5608],[115.9781,39.5959],[115.9954,39.577],[116.0262,39.5876],[116.036,39.5719],[116.0989,39.5751],[116.1303,39.5677],[116.1518,39.5834],[116.1987,39.5894],[116.2405,39.564],[116.2578,39.5003],[116.3071,39.4883],[116.3379,39.4555],[116.3619,39.4551],[116.3619,39.4551],[116.4346,39.4426],[116.4549,39.4532],[116.4444,39.4823],[116.4118,39.4828],[116.4019,39.528],[116.4438,39.51],[116.4376,39.5267],[116.4783,39.5354],[116.4734,39.553],[116.5085,39.5511],[116.5245,39.5963],[116.5922,39.6212],[116.5922,39.6212],[116.6206,39.6019],[116.6649,39.6056],[116.7234,39.5926],[116.724,39.5926],[116.7234,39.5926],[116.724,39.5926],[116.7265,39.5954],[116.7265,39.5954],[116.7093,39.618],[116.7487,39.6198],[116.7906,39.5959],[116.8121,39.6157],[116.8497,39.6678],[116.9064,39.6774],[116.9057,39.688],[116.8897,39.6876],[116.8873,39.7253],[116.9168,39.7313],[116.9021,39.7635],[116.9495,39.7787],[116.9181,39.8463],[116.9076,39.8325],[116.8657,39.844],[116.8121,39.8899],[116.7844,39.8913],[116.7826,39.9477],[116.7579,39.9679],[116.7813,40.0349],[116.8201,40.0284],[116.8312,40.0514],[116.8676,40.0417],[116.9279,40.055],[116.9452,40.0413],[117.0252,40.0303],[117.0517,40.0596],[117.1053,40.0743],[117.1053,40.0743],[117.1404,40.0642],[117.1595,40.077],[117.2045,40.0697],[117.21,40.082],[117.2242,40.0949],[117.2242,40.0949],[117.255,40.1145],[117.255,40.1145],[117.255,40.1145],[117.2741,40.1059],[117.3073,40.137],[117.3492,40.1365],[117.3671,40.1726],[117.3671,40.1731],[117.3671,40.1731],[117.3671,40.1726],[117.3837,40.1882],[117.3899,40.228],[117.3511,40.2298],[117.3314,40.2896],[117.295,40.2782],[117.2716,40.3252],[117.2716,40.3252],[117.2433,40.3695],[117.226,40.369],[117.234,40.4173],[117.2636,40.4424],[117.2088,40.5016],[117.263,40.5129],[117.2476,40.5398],[117.2698,40.5607],[117.3486,40.5811]]]},{"id":1,"code":"TJ","name":"天津市","label_lon":117.347,"label_lat":39.288,"rings":[[[117.7656,39.4005],[117.8469,39.4079],[117.8715,39.4116],[117.8703,39.4551],[117.8999,39.4745],[117.9122,39.5174],[117.9122,39.5174],[117.9048,39.5336],[117.9338,39.5742],[117.8685,39.5968],[117.8297,39.5899],[117.7668,39.5986],[117.7539,39.5797],[117.7539,39.5797],[11Line truncated
+{"type":"wapc","regions":[{"id":0,"code":"BJ","name":"北京市","label_lon":116.42,"label_lat":40.1899,"rings":[[[117.3486,40.5811],[117.3899,40.5616],[117.4299,40.5761],[117.4127,40.6052],[117.4675,40.6497],[117.4675,40.6497],[117.5014,40.6366],[117.5149,40.6602],[117.494,40.6752],[117.409,40.687],[117.3425,40.6738],[117.3197,40.6579],[117.2784,40.6643],[117.2082,40.6947],[117.117,40.7001],[117.1121,40.7074],[117.0123,40.6938],[116.9649,40.7096],[116.9267,40.745],[116.9242,40.7736],[116.8485,40.8393],[116.8134,40.8483],[116.7598,40.89],[116.7136,40.9099],[116.7222,40.9275],[116.6779,40.9709],[116.6988,41.0215],[116.6883,41.0445],[116.6477,41.0594],[116.6156,41.0531],[116.623,41.021],[116.5984,40.9745],[116.5676,40.9926],[116.5196,40.9813],[116.5196,40.9813],[116.4555,40.9808],[116.4475,40.9537],[116.4771,40.8999],[116.3982,40.9062],[116.3705,40.9438],[116.3397,40.9293],[116.3342,40.9044],[116.4383,40.8193],[116.466,40.7745],[116.4537,40.7659],[116.3169,40.7722],[116.3114,40.755],[116.2732,40.7627],[116.2473,40.7917],[116.2202,40.7441],[116.2048,40.74],[116.1716,40.6956],[116.1629,40.6625],[116.134,40.6665],[116.0989,40.6307],[116.0052,40.5839],[115.9825,40.5789],[115.972,40.6025],[115.9079,40.6175],[115.8851,40.5952],[115.8279,40.5875],[115.8198,40.5593],[115.7847,40.5584],[115.7552,40.5402],[115.7361,40.5034],[115.781,40.4934],[115.7718,40.4437],[115.8642,40.3594],[115.9178,40.3544],[115.9517,40.2819],[115.9689,40.264],[115.8987,40.2344],[115.8704,40.1859],[115.8556,40.1887],[115.8476,40.147],[115.8063,40.1534],[115.7737,40.1763],[115.7546,40.1457],[115.7546,40.1457],[115.6,40.1196],[115.5907,40.0962],[115.5273,40.0761],[115.4854,40.0404],[115.4546,40.0298],[115.4503,39.9927],[115.4287,39.9844],[115.4263,39.9505],[115.4811,39.9358],[115.523,39.8991],[115.5156,39.8922],[115.5156,39.8922],[115.526,39.8757],[115.5143,39.8375],[115.5673,39.8164],[115.5525,39.7948],[115.5057,39.7842],[115.4835,39.7985],[115.4835,39.7985],[115.4435,39.7856],[115.4398,39.752],[115.4866,39.7419],[115.4916,39.6701],[115.4786,39.6507],[115.4786,39.6507],[115.5224,39.6401],[115.518,39.5973],[115.5458,39.6189],[115.587,39.5899],[115.6338,39.5996],[115.6338,39.5996],[115.6677,39.6152],[115.6985,39.5779],[115.6985,39.5779],[115.6991,39.57],[115.6991,39.57],[115.717,39.5603],[115.717,39.5603],[115.7188,39.5539],[115.7188,39.5539],[115.7207,39.5511],[115.7207,39.5511],[115.7225,39.5442],[115.7213,39.5437],[115.7225,39.5442],[115.7225,39.5437],[115.7213,39.5437],[115.7225,39.5437],[115.725,39.5442],[115.725,39.5442],[115.7385,39.54],[115.7385,39.5396],[115.7385,39.54],[115.7385,39.5396],[115.7527,39.5156],[115.8063,39.51],[115.8063,39.51],[115.8211,39.523],[115.8211,39.523],[115.8285,39.5414],[115.8679,39.5465],[115.8679,39.5465],[115.9153,39.583],[115.9153,39.583],[115.9104,39.6005],[115.9104,39.6005],[115.9572,39.5608],[115.9781,39.5959],[115.9954,39.577],[116.0262,39.5876],[116.036,39.5719],[116.0989,39.5751],[116.1303,39.5677],[116.1518,39.5834],[116.1987,39.5894],[116.2405,39.564],[116.2578,39.5003],[116.3071,39.4883],[116.3379,39.4555],[116.3619,39.4551],[116.3619,39.4551],[116.4346,39.4426],[116.4549,39.4532],[116.4444,39.4823],[116.4118,39.4828],[116.4019,39.528],[116.4438,39.51],[116.4376,39.5267],[116.4783,39.5354],[116.4734,39.553],[116.5085,39.5511],[116.5245,39.5963],[116.5922,39.6212],[116.5922,39.6212],[116.6206,39.6019],[116.6649,39.6056],[116.7234,39.5926],[116.724,39.5926],[116.7234,39.5926],[116.724,39.5926],[116.7265,39.5954],[116.7265,39.5954],[116.7093,39.618],[116.7487,39.6198],[116.7906,39.5959],[116.8121,39.6157],[116.8497,39.6678],[116.9064,39.6774],[116.9057,39.688],[116.8897,39.6876],[116.8873,39.7253],[116.9168,39.7313],[116.9021,39.7635],[116.9495,39.7787],[116.9181,39.8463],[116.9076,39.8325],[116.8657,39.844],[116.8121,39.8899],[116.7844,39.8913],[116.7826,39.9477],[116.7579,39.9679],[116.7813,40.0349],[116.8201,40.0284],[116.8312,40.0514],[116.8676,40.0417],[116.9279,40.055],[116.9452,40.0413],[117.0252,40.0303],[117.0517,40.0596],[117.1053,40.0743],[117.1053,40.0743],[117.1404,40.0642],[117.1595,40.077],[117.2045,40.0697],[117.21,40.082],[117.2242,40.0949],[117.2242,40.0949],[117.255,40.1145],[117.255,40.1145],[117.255,40.1145],[117.2741,40.1059],[117.3073,40.137],[117.3492,40.1365],[117.3671,40.1726],[117.3671,40.1731],[117.3671,40.1731],[117.3671,40.1726],[117.3837,40.1882],[117.3899,40.228],[117.3511,40.2298],[117.3314,40.2896],[117.295,40.2782],[117.2716,40.3252],[117.2716,40.3252],[117.2433,40.3695],[117.226,40.369],[117.234,40.4173],[117.2636,40.4424],[117.2088,40.5016],[117.263,40.5129],[117.2476,40.5398],[117.2698,40.5607],[117.3486,40.5811]]],"name_en":"Beijing"},{"id":1,"code":"TJ","name":"天津市","label_lon":117.347,"label_lat":39.288,"rings":[[[117.7656,39.4005],[117.8469,39.4079],[117.8715,39.4116],[117.8703,39.4551],[117.8999,39.4745],[117.9122,39.5174],[117.9122,39.5174],[117.9048,39.5336],[117.9338,39.5742],[117.8685,39.5968],[117.8297,39.5899],[117.7668,39.5986],[117.7539,39.5797],[1Line truncated

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

@@ -35,7 +35,8 @@ import kotlin.math.min
  * One administrative/boundary region loaded from the award GeoJSON assets.
  *
  * @param code     match key against award statistics (e.g. "GD", "34", "24", "CA", "318")
- * @param name     display label (province/prefecture/state/country name)
+ * @param name     display label in the source language (province/prefecture/state/country name)
+ * @param nameEn   optional English display label (null when the source already is English)
  * @param labelLon/labelLat preferred label anchor (usually the region centroid)
  * @param rings    polygon exterior rings as lon/lat pairs; the overlay projects
  *                 them per frame with the same projection helpers as the grid overlay
@@ -43,6 +44,7 @@ import kotlin.math.min
 data class AwardRegion(
     val code: String,
     val name: String,
+    val nameEn: String? = null,
     val labelLon: Double,
     val labelLat: Double,
     val rings: List<List<DoubleArray>>,
@@ -93,6 +95,7 @@ object AwardBoundaryData {
                     AwardRegion(
                         code = o.optString("code"),
                         name = o.optString("name"),
+                        nameEn = o.optString("name_en").takeIf { it.isNotEmpty() },
                         labelLon = o.optDouble("label_lon", 0.0),
                         labelLat = o.optDouble("label_lat", 0.0),
                         rings = rings,
@@ -184,6 +187,10 @@ class AwardBoundaryOverlay : Overlay() {
         labelPaint.textAlign = Paint.Align.CENTER
         val fontMetrics = labelPaint.fontMetrics
         val textHalfHeight = (fontMetrics.descent + fontMetrics.ascent) / 2f
+        // Label language follows the system: Chinese UI keeps the source
+        // (Chinese/Japanese) names; any other UI language uses the English
+        // name when the asset provides one (falls back to the source name).
+        val useEnglishLabels = mapView.context.resources.configuration.locales[0].language != "zh"
 
         for (i in regions.indices) {
             val region = regions[i]
@@ -236,7 +243,8 @@ class AwardBoundaryOverlay : Overlay() {
             // anchor sits out on the sea where there is room for the text.
             val regionH = (projectionToY(projection, b[3]) ?: 0f) - (projectionToY(projection, b[1]) ?: 0f)
             if (abs(regionH) < MIN_LABEL_REGION_PX && !region.forceLabel) continue
-            canvas.drawText(region.name, lx, ly - textHalfHeight, labelPaint)
+            val label = if (useEnglishLabels) region.nameEn ?: region.name else region.name
+            canvas.drawText(label, lx, ly - textHalfHeight, labelPaint)
         }
     }
 
@@ -261,9 +269,23 @@ class AwardBoundaryOverlay : Overlay() {
             val prevLon = pts[i - 1][0]
             val lon = pts[i][0]
             if (abs(lon - prevLon) > 180.0) {
-                // Crossed the antimeridian: start a fresh segment.
+                // Crossed the antimeridian. Do NOT drop this edge — that would
+                // leave a visible gap in the outline (WAZ Pacific zones 1/19/
+                // 31/32, e.g. zone 31's 40°N boundary from 130°W to 160°E).
+                // Split the edge IN TWO at ±180 instead: each half stays in its
+                // own segment, so the outline closes across the map's left and
+                // right edges. The crossing latitude is interpolated along the
+                // edge (constant for latitude-aligned edges).
+                val a = pts[i - 1]
+                val b = pts[i]
+                val span = 360.0 - abs(lon - prevLon) // shortest angular distance
+                val edgeLon = if (prevLon < lon) -180.0 else 180.0 // side being crossed
+                val t = abs(edgeLon - prevLon) / span
+                val latAt = a[1] + (b[1] - a[1]) * t
+                cur.add(doubleArrayOf(edgeLon, latAt))
                 if (cur.size >= 2) segments.add(cur)
                 cur = mutableListOf()
+                cur.add(doubleArrayOf(-edgeLon, latAt))
             }
             cur.add(pts[i])
         }
@@ -305,6 +327,11 @@ class AwardBoundaryOverlay : Overlay() {
         val anchorX = projectionToX(projection, anchorLon, centerLon, worldWidthPx) ?: return false
         var penDown = false
         var any = false
+        var firstX = 0f
+        var firstY = 0f
+        var lastX = 0f
+        var lastY = 0f
+        var prevDelta = 0.0
         for (i in segment.indices) {
             val pt = segment[i]
             // Continuous longitude difference from the anchor — no per-vertex
@@ -312,21 +339,40 @@ class AwardBoundaryOverlay : Overlay() {
             // split) the raw delta is already correct. For full-circle rings
             // (e.g. Antarctica, which runs from -180° eastward to +178° and
             // relies on close() to seal a ~1.7° gap at the antimeridian) the
-            // raw delta approaches ±360°, which threw the path a full world
-            // turn off-screen and drew a spurious line across the map. Normal
-            //ising to [-180,180] keeps every vertex on the nearest turn.
-            val delta = normalizeLon(pt[0] - anchorLon)
+            // raw delta approaches ±360°. Unwrapping keeps each vertex within
+            // 180° of its neighbours (a spurious fold would throw the path a
+            // full world turn and draw a line across the map).
+            val delta = if (i == 0) 0.0 else {
+                var d = pt[0] - anchorLon
+                while (d - prevDelta > 180.0) d -= 360.0
+                while (prevDelta - d > 180.0) d += 360.0
+                d
+            }
             val x = anchorX + (delta / 360.0 * worldWidthPx).toFloat()
             val y = projectionToY(projection, pt[1]) ?: continue
             if (!penDown) {
                 path.moveTo(x, y)
+                firstX = x
+                firstY = y
                 penDown = true
             } else {
                 path.lineTo(x, y)
             }
+            lastX = x
+            lastY = y
+            prevDelta = delta
             any = true
         }
-        if (penDown && closeRing) path.close()
+        if (penDown && closeRing) {
+            // Closing chord: take the SHORT way around. A full-circle ring
+            // (Antarctica) unwraps to ~360° so a plain close() would draw a
+            // chord across the whole map; folding the first point onto the
+            // adjacent world copy keeps the seal at the antimeridian tiny.
+            var fx = firstX
+            while (fx - lastX > worldWidthPx / 2f) fx -= worldWidthPx.toFloat()
+            while (lastX - fx > worldWidthPx / 2f) fx += worldWidthPx.toFloat()
+            path.lineTo(fx, firstY)
+        }
         return any
     }
 
@@ -340,21 +386,31 @@ class AwardBoundaryOverlay : Overlay() {
         return (p.x + delta / 360.0 * worldWidthPx).toFloat()
     }
 
-    /** Y pixel for a latitude. */
+    /** Y pixel for a latitude. Mercator blows up at the poles (lat ±90 → ±∞),
+     *  so clamp to the Web-Mercator maximum (~±85.05113°) — the rendered map
+     *  edge. Raw data points AT the poles (e.g. WAZ zones and Antarctica rings
+     *  with [-90, ...] vertices) otherwise project far outside the canvas and
+     *  draw long spurious lines from the pole to the map edge. */
     private fun projectionToY(projection: Projection, lat: Double): Float? {
-        val geo = org.osmdroid.util.GeoPoint(lat, 0.0)
+        val clamped = lat.coerceIn(-MAX_MERCATOR_LAT, MAX_MERCATOR_LAT)
+        val geo = org.osmdroid.util.GeoPoint(clamped, 0.0)
         val p = projection.toPixels(geo, null)
         return p.y.toFloat()
     }
 
     private fun normalizeLon(lon: Double): Double {
         var l = lon % 360.0
-        if (l >= 180.0) l -= 360.0
-        if (l < -180.0) l += 360.0
+        // Normalize into (-180, 180] — +180, not -180. An edge whose endpoint
+        // sits ON the antimeridian (e.g. a ring starting at -180°) must not be
+        // seen as a >180° jump away from a nearby 165° vertex; keeping the
+        // antimeridian value as +180 makes such edges short and un-split.
+        if (l <= -180.0) l += 360.0
+        if (l > 180.0) l -= 360.0
         return l
     }
 
     private companion object {
         const val MIN_LABEL_REGION_PX = 42f
+        const val MAX_MERCATOR_LAT = 85.05113 // Web Mercator latitude limit
     }
 }

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

@@ -56,10 +56,19 @@ class MaidenheadGridOverlay : Overlay() {
         style = android.graphics.Paint.Style.FILL
         color = Color.argb(90, 76, 217, 100)
     }
-    private val ownLinePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
-        strokeWidth = 4.5f
+    private val roamStripePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
         style = Paint.Style.STROKE
-        color = Color.argb(255, 90, 200, 255)
+        strokeWidth = 14f
+        // Same alpha as the green worked fill (90) — user req: stripe opacity
+        // must match the green grid. Wide 14f stripes at 44f spacing read as a
+        // sparse GridMaster-style zebra (user picked spacing 44 / width 14).
+        color = Color.argb(90, 66, 133, 244)
+    }
+    private val ownLinePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        strokeWidth = 6f
+        style = Paint.Style.STROKE
+        // 与普通网格线同色(淡黄), 仅加粗 — 用户要求当前网格框线不换色
+        color = Color.argb(160, 255, 224, 130)
     }
     private val selectedLinePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
         strokeWidth = 4.5f
@@ -70,6 +79,12 @@ class MaidenheadGridOverlay : Overlay() {
     /** Worked gridsquares (4-char, uppercase) to highlight, e.g. {"OL62", "PM95"}. */
     var workedGrids: Set<String> = emptySet()
 
+    /**
+     * Gridsquares the station operated from (4-char, uppercase) — drawn with
+     * blue 45° stripes (GridMaster-style zebra), e.g. {"OL62", "PM95"}.
+     */
+    var roamedGrids: Set<String> = emptySet()
+
     /** The station's own 4-char gridsquare, drawn with a distinct outline. */
     var ownGrid: String? = null
 
@@ -120,9 +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 square (4-char, only meaningful at sub-square zoom)
-        val ownCell = ownGrid?.takeIf { zoom >= GRID_ZOOM_SUB }
-        // The tapped worked grid gets a distinct outline (same zoom gate).
+        // The station's own grid: always keep a bold outline of the 4-char
+        // square. At sub-square zoom it matches the visible cell grid; at field
+        // zoom (2-char labels) the own 2°x1° square is drawn on top of the
+        // 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.
@@ -182,6 +201,57 @@ class MaidenheadGridOverlay : Overlay() {
             }
         }
 
+        // Roamed/activated grid stripes: blue 45° zebra (GridMaster style) over
+        // every cell the station operated from. Drawn AFTER the worked fills so
+        // a worked+roamed cell shows blue stripes with green between them — the
+        // stripe paint is fully opaque, so the two colors never alpha-blend
+        // into a teal/green mix. Same geometry as the worked fills (per-4-char
+        // cell at both zoom levels). The station's OWN grid is excluded: it
+        // already carries the bold outline and must not be striped (user req).
+        if (roamedGrids.isNotEmpty()) {
+            if (zoom >= GRID_ZOOM_SUB) {
+                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
+                    for (turn in -colRepeats..colRepeats) for (col in firstCol..lastCol) {
+                        val lon = col * cellLon
+                        val xLeftBase = projectionToX(projection, lon, centerLon, worldWidthPx) ?: continue
+                        val xRightBase = projectionToX(projection, lon + cellLon, centerLon, worldWidthPx) ?: continue
+                        val xLeft = xLeftBase + turn * worldWidthPx.toFloat()
+                        val xRight = xRightBase + turn * worldWidthPx.toFloat()
+                        if (xRight < 0f || xLeft > canvas.width) continue
+                        val label = cellLabel(lat, lon, zoom)
+                        if (label in roamedGrids && label != ownGrid) {
+                            drawStripes(canvas, xLeft, yTop, xRight, yBottom)
+                        }
+                    }
+                }
+            } else {
+                for (grid in roamedGrids) {
+                    // The own grid keeps only its bold outline — no stripes.
+                    if (grid == ownGrid) continue
+                    val cell = gridCellBounds(grid) ?: continue
+                    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
+                        drawStripes(canvas, xLeft, yTop, xRight, yBottom)
+                    }
+                }
+            }
+        }
+
         // Vertical lines (meridians). Worked-grid cells are NOT excluded:
         // the boundary lines between adjacent worked squares must stay visible
         // so the grid structure remains readable (reverted 2026-09-09 — the
@@ -225,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) {
-                val lat = row * cellLat
-                if (lat < -90.0 || lat >= 90.0) continue
-                for (col in firstCol..lastCol) {
-                    val lon = col * cellLon
-                    val label = cellLabel(lat, lon, zoom)
-                    if (label != ownCell && label != selectedCell) continue
-                    val yTop = projectionToY(projection, lat + cellLat) ?: continue
-                    val yBottom = projectionToY(projection, lat) ?: continue
-                    val xLeft = projectionToX(projection, lon, centerLon, worldWidthPx) ?: continue
-                    val xRight = projectionToX(projection, lon + cellLon, centerLon, worldWidthPx) ?: continue
-                    val paint = if (label == selectedCell) selectedLinePaint else ownLinePaint
-                    canvas.drawLine(xLeft, yTop, xRight, yTop, paint)
-                    canvas.drawLine(xLeft, yBottom, xRight, yBottom, paint)
-                    canvas.drawLine(xLeft, yTop, xLeft, yBottom, paint)
-                    canvas.drawLine(xRight, yTop, xRight, yBottom, paint)
+            if (zoom >= GRID_ZOOM_SUB) {
+                for (row in firstRow..lastRow) {
+                    val lat = row * cellLat
+                    if (lat < -90.0 || lat >= 90.0) continue
+                    for (col in firstCol..lastCol) {
+                        val lon = col * cellLon
+                        val label = cellLabel(lat, lon, zoom)
+                        if (label != ownCell && label != selectedCell) continue
+                        val yTop = projectionToY(projection, lat + cellLat) ?: continue
+                        val yBottom = projectionToY(projection, lat) ?: continue
+                        val xLeft = projectionToX(projection, lon, centerLon, worldWidthPx) ?: continue
+                        val xRight = projectionToX(projection, lon + cellLon, centerLon, worldWidthPx) ?: continue
+                        val paint = if (label == selectedCell) selectedLinePaint else ownLinePaint
+                        canvas.drawLine(xLeft, yTop, xRight, yTop, paint)
+                        canvas.drawLine(xLeft, yBottom, 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)
+                        }
+                    }
                 }
             }
         }
@@ -270,8 +368,14 @@ class MaidenheadGridOverlay : Overlay() {
             if (topLatCell > 90.0) continue
             val yTop = projectionToY(projection, topLatCell) ?: continue
             val yBottom = projectionToY(projection, lat) ?: continue
-            val yCenter = (yTop + yBottom) / 2f - textHalfHeight
-            if (yBottom < 0f || yTop > canvas.height) continue
+            // Polar bands (80..90 / -90..-80) extend beyond the map's latitude
+            // limit, so their geometric center falls off-screen and the label
+            // would never be visible. Center the label in the VISIBLE part of
+            // the cell instead; fully off-screen cells are still skipped.
+            val visTop = maxOf(yTop, 0f)
+            val visBottom = minOf(yBottom, canvas.height.toFloat())
+            if (visBottom < 0f || visTop > canvas.height) continue
+            val yCenter = (visTop + visBottom) / 2f - textHalfHeight
             for (turn in -colRepeats..colRepeats) for (col in firstCol..lastCol) {
                 val lon = col * cellLon
                 // World-repeat copies: keep the turn offset in pixels (same
@@ -287,6 +391,26 @@ class MaidenheadGridOverlay : Overlay() {
         }
     }
 
+    /**
+     * Draws 45° diagonal stripes (GridMaster-style zebra) clipped to the cell
+     * rectangle, from top-left to bottom-right. The paint is nearly opaque so
+     * stripes stay blue even over a green worked fill underneath.
+     */
+    private fun drawStripes(canvas: Canvas, xLeft: Float, yTop: Float, xRight: Float, yBottom: Float) {
+        if (xRight <= xLeft || yBottom <= yTop) return
+        canvas.save()
+        canvas.clipRect(xLeft, yTop, xRight, yBottom)
+        val height = yBottom - yTop
+        // Start one stripe-width left of the cell so the top-left corner is
+        // always covered; each stripe runs from (x, top) to (x+height, bottom).
+        var x = xLeft - height
+        while (x < xRight) {
+            canvas.drawLine(x, yTop, x + height, yBottom, roamStripePaint)
+            x += STRIPE_SPACING_PX
+        }
+        canvas.restore()
+    }
+
     /** X pixel for a longitude (meridians are vertical in Web Mercator). */
     private fun projectionToX(projection: Projection, lon: Double, centerLon: Double, worldWidthPx: Double): Float? {
         // Do NOT use osmdroid's toPixels() here: at low zoom its wrap-around
@@ -370,5 +494,9 @@ class MaidenheadGridOverlay : Overlay() {
         const val LABEL_ZOOM_SUB = 6.5
         const val MIN_LABEL_CELL_PX = 48f
         const val MAX_OVERSHOOT_PX = 64
+        /** Center-to-center spacing of the roamed-grid zebra stripes, in px. */
+        // 44f spacing (was 16f — too dense per user) with 14f-wide stripes;
+        // sparse GridMaster-style zebra.
+        const val STRIPE_SPACING_PX = 44f
     }
 }

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

@@ -157,8 +157,9 @@ private fun MapScreen(uiState: MapState, onAction: (MapAction) -> Unit, mapView:
     // Tapped worked grid -> centered QSO dialog. Local UI state: the map is the
     // only consumer and it resets when leaving the page.
     var selectedGrid by remember { mutableStateOf<String?>(null) }
-    // Selected award filter (null = "All" = plain worked-grid view).
-    var selectedAward by remember { mutableStateOf<AwardType?>(null) }
+    // Selected award filter. Entering grid mode defaults to VUCC (the plain
+    // worked-grid view); the reset effect below re-asserts that on every entry.
+    var selectedAward by remember { mutableStateOf<AwardType?>(AwardType.VUCC) }
     // Six-award progress derived from the confirmed QSO store; recomputed when
     // the store changes (LoTW/Wavelog sync).
     val awardProgress: List<AwardProgress> = remember(uiState.workedGridQsos) {
@@ -192,6 +193,11 @@ private fun MapScreen(uiState: MapState, onAction: (MapAction) -> Unit, mapView:
         (mapView.overlays.getOrNull(OVERLAY_GRID) as? MaidenheadGridOverlay)?.selectedGrid = selectedGrid
         mapView.invalidate()
     }
+    // Re-assert the VUCC default each time grid mode is entered; while already
+    // in grid mode the user's chip choice is preserved.
+    LaunchedEffect(uiState.isGridMode) {
+        if (uiState.isGridMode) selectedAward = AwardType.VUCC
+    }
 
     LaunchedEffect(uiState.track) {
         // In grid mode the map is centered on the local grid square; following
@@ -249,8 +255,9 @@ private fun MapScreen(uiState: MapState, onAction: (MapAction) -> Unit, mapView:
                         // stationPosition would swallow the centering forever.
                         val shouldCenter = uiState.isGridMode && !prevGridMode
                         setGridMode(
-                            uiState.isGridMode, uiState.workedGrids, view,
-                            if (shouldCenter) uiState.stationPosition else null
+                            uiState.isGridMode, uiState.workedGrids, uiState.roamedGrids, view,
+                            uiState.stationPosition,
+                            centerOnStation = shouldCenter
                         )
                         if (!shouldCenter || uiState.stationPosition != null) {
                             prevGridMode = uiState.isGridMode
@@ -383,7 +390,7 @@ private fun WorkedGridCallRow(
             )
             Text(
                 text = if (expanded) " ▴" else " ▾",
-                style = MaterialTheme.typography.bodySmall,
+                fontSize = 18.sp,
                 color = MaterialTheme.colorScheme.primary
             )
         }
@@ -631,19 +638,26 @@ private fun setAwardMode(award: AwardType, workedCodes: Set<String>, mapView: Ma
 private fun setGridMode(
     gridMode: Boolean,
     workedGrids: Set<String>,
+    roamedGrids: Set<String>,
     mapView: MapView,
-    stationPosition: GeoPos?
+    stationPosition: GeoPos?,
+    centerOnStation: Boolean = false
 ) {
     try {
         val gridOverlay = mapView.overlays[OVERLAY_GRID]
         if (gridOverlay is MaidenheadGridOverlay) {
             gridOverlay.isEnabled = gridMode
             gridOverlay.workedGrids = workedGrids
+            gridOverlay.roamedGrids = roamedGrids
+            // ownGrid must be set on EVERY update — the position is available
+            // regardless of whether this frame centers (centering happens only
+            // on entry, but passing null here would wipe the bold outline).
             gridOverlay.ownGrid = ownGridOf(stationPosition)
         } else {
             mapView.overlays[OVERLAY_GRID] = MaidenheadGridOverlay().apply {
                 isEnabled = gridMode
                 this.workedGrids = workedGrids
+                this.roamedGrids = roamedGrids
                 this.ownGrid = ownGridOf(stationPosition)
             }
         }
@@ -657,7 +671,7 @@ private fun setGridMode(
         // first composition this runs before MapView's first layout, and a
         // setCenter issued pre-layout is discarded when the view lays out —
         // the map then keeps its default center forever.
-        if (gridMode) {
+        if (gridMode && centerOnStation) {
             val pos = stationPosition ?: return
             val lat = pos.latitude
             val lon = pos.longitude
@@ -927,6 +941,11 @@ private fun rememberMapViewWithLifecycle(): MapView {
         MapView(context).apply {
             setMultiTouchControls(true)
             setUseDataConnection(false)
+            // Vertical map repetition wraps points below the viewport up to the
+            // top edge (osmdroid Y-wrap). Antarctica's full-circle ring then
+            // draws a full-height artifact line whenever its X range crosses
+            // the screen at low zoom. The map must never repeat vertically.
+            setVerticalMapRepetitionEnabled(false)
             setTileSource(tileSource)
             minZoomLevel = getMinZoom(resources.displayMetrics.heightPixels, isVertical)
             maxZoomLevel = 7.0

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

@@ -29,6 +29,8 @@ data class MapState(
     val isGridMode: Boolean = false,
     val workedGrids: Set<String> = emptySet(),
     val workedGridQsos: Map<String, List<com.rtbishop.look4sat.core.domain.model.GridQso>> = emptyMap(),
+    /** 4-char gridsquares the station operated from (LoTW MY_GRIDSQUARE) — blue stripes. */
+    val roamedGrids: Set<String> = emptySet(),
     val stationPosition: GeoPos? = null,
     val orbitalPass: OrbitalPass,
     val track: List<List<GeoPos>>? = null,

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

@@ -82,7 +82,8 @@ class MapViewModel(
                 _uiState.update {
                     it.copy(
                         workedGrids = settingsRepo.getWorkedGrids(),
-                        workedGridQsos = settingsRepo.getWorkedGridQsos()
+                        workedGridQsos = settingsRepo.getWorkedGridQsos(),
+                        roamedGrids = settingsRepo.getRoamedGrids()
                     )
                 }
             }

feature/passes/src/main/java/com/rtbishop/look4sat/feature/passes/PassesScreen.kt

@@ -85,22 +85,20 @@ import java.util.TimeZone
 
 @Composable
 fun PassesDestination(
-    navigateToRadar: (Int, Long) -> Unit,
-    navigateToMap: () -> Unit
+    navigateToRadar: (Int, Long) -> Unit
 ) {
     val context = LocalContext.current
     val container = (context.applicationContext as IContainerProvider).getMainContainer()
     val viewModel: PassesViewModel = viewModel(factory = PassesViewModel.factory(container))
     val uiState = viewModel.uiState.collectAsStateWithLifecycle().value
-    PassesScreen(uiState, viewModel::onAction, navigateToRadar, navigateToMap)
+    PassesScreen(uiState, viewModel::onAction, navigateToRadar)
 }
 
 @Composable
 private fun PassesScreen(
     uiState: PassesState,
     onAction: (PassesAction) -> Unit,
-    navigateToRadar: (Int, Long) -> Unit,
-    navigateToMap: () -> Unit
+    navigateToRadar: (Int, Long) -> Unit
 ) {
     if (uiState.isPassesDialogShown) {
         PassesFilterDialog(
@@ -158,7 +156,7 @@ private fun PassesScreen(
             TopBar(
                 isVerticalLayout = isVerticalLayout,
                 startAction = {
-                    IconCard(action = { onAction(PassesAction.TogglePassesDialog) }, resId = R.drawable.ic_filter)
+                    IconCard(action = { onAction(PassesAction.ToggleRadiosDialog) }, resId = R.drawable.ic_radios)
                 },
                 topInfo = {
                     TimerRow(timeString = uiState.nextTime, isTimeAos = uiState.isNextTimeAos)
@@ -167,7 +165,7 @@ private fun PassesScreen(
                     NextPassRow(pass = uiState.nextPass, isUtc = uiState.isUtc)
                 },
                 endAction = {
-                    IconCard(action = navigateToMap, resId = R.drawable.ic_map)
+                    IconCard(action = { onAction(PassesAction.TogglePassesDialog) }, resId = R.drawable.ic_filter)
                 }
             )
         }

feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/RadarScreen.kt

@@ -84,7 +84,7 @@ private enum class RadarPage(val title: String) {
 }
 
 @Composable
-fun RadarDestination(navigateUp: () -> Unit, navigateToMap: () -> Unit) {
+fun RadarDestination(navigateUp: () -> Unit) {
     val context = LocalContext.current
     val container = (context.applicationContext as IContainerProvider).getMainContainer()
     val viewModel: RadarViewModel = viewModel(factory = RadarViewModel.factory(container))
@@ -96,12 +96,6 @@ fun RadarDestination(navigateUp: () -> Unit, navigateToMap: () -> Unit) {
         }
         navigateUp()
     }
-    val navigateToMapAndClearMutual = {
-        if (container.mutualPassData.value.endTime > 0L) {
-            container.setMutualPassData(MutualPassData())
-        }
-        navigateToMap()
-    }
     LaunchedEffect(mutualData.endTime) {
         if (mutualData.endTime <= 0L) return@LaunchedEffect
         while (true) {
@@ -127,7 +121,7 @@ fun RadarDestination(navigateUp: () -> Unit, navigateToMap: () -> Unit) {
         viewModel.onAction(RadarAction.SstvPermissionResult(granted))
         viewModel.onAction(RadarAction.CwPermissionResult(granted))
     }
-    RadarScreen(uiState, viewModel::onAction, navigateUpAndClearMutual, navigateToMapAndClearMutual, mutualData, requestMicPermission = {
+    RadarScreen(uiState, viewModel::onAction, navigateUpAndClearMutual, mutualData, requestMicPermission = {
         permissionLauncher.launch(Manifest.permission.RECORD_AUDIO)
     })
 }
@@ -137,11 +131,14 @@ private fun RadarScreen(
     uiState: RadarState,
     onAction: (RadarAction) -> Unit,
     navigateUp: () -> Unit,
-    navigateToMap: () -> Unit,
     mutualData: MutualPassData,
     requestMicPermission: () -> Unit
 ) {
     val upcomingPass = uiState.currentPass ?: getDefaultPass()
+    // 日程功能: 把当前过境写入系统日历(原仓库的 addToCalendar, ic_calendar 按钮)
+    val addToCalendar: () -> Unit = {
+        uiState.currentPass?.let { onAction(RadarAction.AddToCalendar(it.name, it.aosTime, it.losTime)) }
+    }
     // Station-B overlay: full track line (only where B's elevation > 0) + live position dot
     // at the current moment, same display mode as the local station.
     val trackB = remember(mutualData.trackSamples) {
@@ -177,7 +174,7 @@ private fun RadarScreen(
             TopBar {
                 IconCard(action = navigateUp, resId = R.drawable.ic_back)
                 TimerRow(timeString = uiState.currentTime, isTimeAos = uiState.isTimeAos)
-                IconCard(action = navigateToMap, resId = R.drawable.ic_map)
+                IconCard(action = addToCalendar, resId = R.drawable.ic_calendar)
             }
             TopBar { NextPassRow(pass = upcomingPass, isUtc = uiState.isUtc) }
         } else {
@@ -185,7 +182,7 @@ private fun RadarScreen(
                 IconCard(action = navigateUp, resId = R.drawable.ic_back)
                 TimerRow(timeString = uiState.currentTime, isTimeAos = uiState.isTimeAos)
                 NextPassRow(pass = upcomingPass, modifier = Modifier.weight(1f), isUtc = uiState.isUtc)
-                IconCard(action = navigateToMap, resId = R.drawable.ic_map)
+                IconCard(action = addToCalendar, resId = R.drawable.ic_calendar)
             }
         }
         if (isVertical) {

feature/radar/src/main/java/com/rtbishop/look4sat/feature/radar/TransceiversPage.kt

@@ -48,6 +48,8 @@ import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Button
 import androidx.compose.material3.FilterChip
@@ -78,6 +80,7 @@ import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
@@ -123,7 +126,21 @@ fun TransceiversPage(
                 }
             }
         }
-        LazyColumn(modifier = modifier.fillMaxSize(), state = listState) {
+        // contentPadding for the system navigation bar: the radar page is a
+        // full-screen destination, so on gesture-nav devices the translucent
+        // nav bar floats over the list bottom and covers the CW decoder's
+        // decoded-text output when the panel is scrolled to the end. Padding
+        // the last item above the bar fixes it (three-button nav already
+        // resizes the window, where this padding is a harmless no-op).
+        LazyColumn(
+            modifier = modifier.fillMaxSize(),
+            state = listState,
+            contentPadding = PaddingValues(
+                bottom = with(LocalDensity.current) {
+                    (WindowInsets.navigationBars.getBottom(this) / density).dp
+                }
+            )
+        ) {
             itemsIndexed(items = transceivers, key = { _, radio -> radio.uuid }) { _, radio ->
                 val isExpanded = radio.uuid == selectedUuid
                 TransceiverItem(

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

@@ -207,6 +207,7 @@ class SettingsViewModel(
                     // synced set fully replaces the stored worked grids.
                     settingsRepo.setWorkedGrids(result.grids)
                     settingsRepo.setWorkedGridQsos(result.qsos)
+                    settingsRepo.setRoamedGrids(result.roamedGrids)
                     _uiState.update { state ->
                         state.copy(
                             lotwSyncing = false, workedGridsCount = result.grids.size,

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
 #noinspection UnusedVersionCatalogEntry
-appVersionCode = "465"
+appVersionCode = "469"
 #noinspection UnusedVersionCatalogEntry
-appVersionName = "4.4.6-ba7opf.9.15"
+appVersionName = "4.4.6-ba7opf.10.4"
 #noinspection UnusedVersionCatalogEntry
 compileSdk = "37"
 #noinspection UnusedVersionCatalogEntry