mirror of
https://github.com/atsunatsu/Look4Sat.git
synced 2026-10-02 03:15:37 +00:00
fix(map): own grid never striped — bold outline only
The station's own gridsquare is in the roamed set (LoTW MY_GRIDSQUARE includes the home grid). Exclude it from the blue stripe overlay at both zoom levels so the current cell shows only its bold cyan outline, matching the user's request. chore: bump version to 4.4.6-ba7opf.10
This commit is contained in:
1 parent
d56392f3c6
commit
9c12b1eccb
2 files changed
+8
-4
No files matched your search
+7
-3
@@ -201,9 +201,10 @@ 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 nearly opaque, so the two colors never alpha-blend
|
||||
// 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).
|
||||
// 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) {
|
||||
@@ -220,13 +221,16 @@ class MaidenheadGridOverlay : Overlay() {
|
||||
val xLeft = xLeftBase + turn * worldWidthPx.toFloat()
|
||||
val xRight = xRightBase + turn * worldWidthPx.toFloat()
|
||||
if (xRight < 0f || xLeft > canvas.width) continue
|
||||
if (cellLabel(lat, lon, zoom) in roamedGrids) {
|
||||
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
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#noinspection UnusedVersionCatalogEntry
|
||||
appVersionCode = "468"
|
||||
#noinspection UnusedVersionCatalogEntry
|
||||
appVersionName = "4.4.6-ba7opf.9.19"
|
||||
appVersionName = "4.4.6-ba7opf.10"
|
||||
#noinspection UnusedVersionCatalogEntry
|
||||
compileSdk = "37"
|
||||
#noinspection UnusedVersionCatalogEntry
|
||||
|
||||
Reference in new issue
Block a user