Rsclub2_2/kst4contest
1
0
Fork 0
mirror of https://github.com/praktimarc/kst4contest.git synced 2026-09-17 06:27:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add map indicator for selected-band activity hints

Browse Source
This commit is contained in:
copilot-swe-agent[bot]
2026-07-06 14:12:46 +00:00
committed by GitHub
parent 06337f15d1
commit 196e938ec4
5 changed files with 176 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/kst4contest/view/map/MapCallsignRawSnapshot.java
+3 -1
View File
@@ -20,6 +20,7 @@ public record MapCallsignRawSnapshot(
double longitudeDeg,
String bandSummary,
Map<String, String> lastKnownFrequenciesByBand,
boolean offersSelectedBand,
boolean warningToMyDirection,
boolean worked,
boolean selected,
@@ -59,9 +60,10 @@ public record MapCallsignRawSnapshot(
}
public String markerLabel() {
return bandSummary.isBlank()
String baseLabel = bandSummary.isBlank()
? displayCallSign
: displayCallSign + " (" + bandSummary + ")";
return offersSelectedBand ? baseLabel + " ★" : baseLabel;
}
public String detailFrequencyText() {
src/main/java/kst4contest/view/map/MapCallsignRawSnapshotBuilder.java
+105 -2
View File
@@ -8,11 +8,13 @@ import kst4contest.model.ChatMember;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.EnumSet;
import java.util.EnumMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.regex.Pattern;
/**
* Builds immutable map snapshots from the currently visible chat members.
@@ -22,8 +24,11 @@ import java.util.Map;
*/
public final class MapCallsignRawSnapshotBuilder {
private static final Pattern TOKEN_SPLIT_PATTERN = Pattern.compile("[^A-Z0-9]+");
public List<MapCallsignRawSnapshot> buildSnapshots(Collection<ChatMember> visibleChatMembers,
ChatMember selectedChatMember) {
ChatMember selectedChatMember,
EnumSet<Band> selectedBands) {
if (visibleChatMembers == null || visibleChatMembers.isEmpty()) {
return List.of();
@@ -69,7 +74,9 @@ public final class MapCallsignRawSnapshotBuilder {
Location location = new Location(locator6);
LinkedHashMap<String, String> frequenciesByBand = collectLastKnownFrequenciesByBand(variants);
String bandSummary = String.join(", ", frequenciesByBand.keySet());
EnumSet<Band> sureBands = collectSureBands(variants, frequenciesByBand);
String bandSummary = buildBandSummary(sureBands);
boolean offersSelectedBand = hasAnySelectedBand(sureBands, selectedBands);
boolean warningToMyDirection = variants.stream().anyMatch(ChatMember::isInAngleAndRange);
boolean worked = variants.stream().anyMatch(this::isWorkedAtAnyBand);
@@ -92,6 +99,7 @@ public final class MapCallsignRawSnapshotBuilder {
location.getLongitude().toDegrees(),
bandSummary,
frequenciesByBand,
offersSelectedBand,
warningToMyDirection,
worked,
selected,
@@ -182,6 +190,101 @@ public final class MapCallsignRawSnapshotBuilder {
return ordered;
}
private EnumSet<Band> collectSureBands(List<ChatMember> variants,
LinkedHashMap<String, String> frequenciesByBand) {
EnumSet<Band> sureBands = EnumSet.noneOf(Band.class);
if (frequenciesByBand != null) {
for (String label : frequenciesByBand.keySet()) {
Band mappedBand = bandFromDisplayLabel(label);
if (mappedBand != null) {
sureBands.add(mappedBand);
}
}
}
for (ChatMember variant : variants) {
if (variant == null || variant.getName() == null || variant.getName().isBlank()) {
continue;
}
sureBands.addAll(detectBandsFromStationName(variant.getName()));
}
return sureBands;
}
private EnumSet<Band> detectBandsFromStationName(String stationName) {
EnumSet<Band> detectedBands = EnumSet.noneOf(Band.class);
if (stationName == null || stationName.isBlank()) {
return detectedBands;
}
String normalized = stationName.toUpperCase(Locale.ROOT);
String[] tokens = TOKEN_SPLIT_PATTERN.split(normalized);
for (String token : tokens) {
if (token == null || token.isBlank()) {
continue;
}
switch (token) {
case "2", "2M", "144", "144MHZ" -> detectedBands.add(Band.B_144);
case "70", "70CM", "432", "432MHZ" -> detectedBands.add(Band.B_432);
case "23", "23CM", "1296", "1296MHZ" -> detectedBands.add(Band.B_1296);
case "13", "13CM", "2300", "2320", "2320MHZ" -> detectedBands.add(Band.B_2320);
case "9", "9CM", "3400", "3400MHZ" -> detectedBands.add(Band.B_3400);
case "6", "6CM", "5600", "5760", "5760MHZ" -> detectedBands.add(Band.B_5760);
case "3", "3CM", "10G", "10GHZ", "10368", "10368MHZ" -> detectedBands.add(Band.B_10G);
case "24G", "24GHZ", "24048", "24048MHZ" -> detectedBands.add(Band.B_24G);
default -> {
}
}
}
return detectedBands;
}
private String buildBandSummary(EnumSet<Band> sureBands) {
if (sureBands == null || sureBands.isEmpty()) {
return "";
}
List<String> labels = sureBands.stream()
.sorted()
.map(this::toBandDisplayLabel)
.toList();
return String.join(", ", labels);
}
private boolean hasAnySelectedBand(EnumSet<Band> sureBands, EnumSet<Band> selectedBands) {
if (sureBands == null || sureBands.isEmpty() || selectedBands == null || selectedBands.isEmpty()) {
return false;
}
for (Band band : selectedBands) {
if (sureBands.contains(band)) {
return true;
}
}
return false;
}
private Band bandFromDisplayLabel(String label) {
if (label == null || label.isBlank()) {
return null;
}
return switch (label) {
case "144" -> Band.B_144;
case "432" -> Band.B_432;
case "1296" -> Band.B_1296;
case "2320" -> Band.B_2320;
case "3400" -> Band.B_3400;
case "5760" -> Band.B_5760;
case "10368" -> Band.B_10G;
case "24048" -> Band.B_24G;
default -> null;
};
}
/**
* Fallback for stations where the current displayed QRG exists but the
* knownActiveBands history has not yet been filled.
src/main/java/kst4contest/view/map/StationMapBridge.java
+7 -1
View File
@@ -11,6 +11,7 @@ import kst4contest.model.ChatPreferences;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.EnumSet;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
@@ -142,8 +143,13 @@ public final class StationMapBridge {
private void refreshNow() {
List<ChatMember> visibleChatMembers = new ArrayList<>(chatController.getLst_chatMemberSortedFilteredList());
ChatMember selectedChatMember = chatController.getScoreService().getSelectedChatMember();
EnumSet<Band> selectedBands = chatController.getReachabilityService().getEnabledStationBands();
List<MapCallsignRawSnapshot> snapshots = snapshotBuilder.buildSnapshots(visibleChatMembers, selectedChatMember);
List<MapCallsignRawSnapshot> snapshots = snapshotBuilder.buildSnapshots(
visibleChatMembers,
selectedChatMember,
selectedBands
);
MapCallsignRawSnapshot selectedSnapshot = null;
if (selectedChatMember != null && selectedChatMember.getCallSignRaw() != null) {
src/main/java/kst4contest/view/map/StationMapView.java
+5 -1
View File
@@ -855,7 +855,11 @@ public final class StationMapView {
detailLocatorValue.setText(selectedSnapshot.locator6());
detailQrbValue.setText(String.format(Locale.US, "%.0f km", selectedSnapshot.qrbKm()));
detailQtfValue.setText(String.format(Locale.US, "%.0f°", selectedSnapshot.qtfDeg()));
detailBandsValue.setText(selectedSnapshot.bandSummary().isBlank() ? "-" : selectedSnapshot.bandSummary());
String bandText = selectedSnapshot.bandSummary().isBlank() ? "-" : selectedSnapshot.bandSummary();
if (selectedSnapshot.offersSelectedBand()) {
bandText += " ★";
}
detailBandsValue.setText(bandText);
detailFrequenciesArea.setText(selectedSnapshot.detailFrequencyText());
detailAirplanesValue.setText(String.valueOf(selectedSnapshot.reachableAirplanes()));
triggerClusterSpotButton.setDisable(false);
src/test/java/kst4contest/test/MapCallsignRawSnapshotBuilderTest.java
+56
View File
@@ -0,0 +1,56 @@
package kst4contest.test;
import kst4contest.model.Band;
import kst4contest.model.ChatMember;
import kst4contest.view.map.MapCallsignRawSnapshot;
import kst4contest.view.map.MapCallsignRawSnapshotBuilder;
import org.junit.jupiter.api.Test;
import java.util.EnumSet;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
class MapCallsignRawSnapshotBuilderTest {
@Test
void marksSnapshotWhenNameAdvertisesSelectedBand() {
ChatMember station = buildStation("DL1ABC", "QRV 2-70-23", "JN58TD", 1_000L);
MapCallsignRawSnapshotBuilder builder = new MapCallsignRawSnapshotBuilder();
List<MapCallsignRawSnapshot> snapshots = builder.buildSnapshots(
List.of(station),
null,
EnumSet.of(Band.B_1296)
);
assertEquals(1, snapshots.size());
assertTrue(snapshots.get(0).offersSelectedBand());
}
@Test
void keepsSnapshotUnmarkedWhenNoSelectedBandMatches() {
ChatMember station = buildStation("DL1ABC", "QRV 2m only", "JN58TD", 1_000L);
MapCallsignRawSnapshotBuilder builder = new MapCallsignRawSnapshotBuilder();
List<MapCallsignRawSnapshot> snapshots = builder.buildSnapshots(
List.of(station),
null,
EnumSet.of(Band.B_2320)
);
assertEquals(1, snapshots.size());
assertFalse(snapshots.get(0).offersSelectedBand());
}
private ChatMember buildStation(String callSign, String name, String locator, long activityEpoch) {
ChatMember chatMember = new ChatMember();
chatMember.setCallSign(callSign);
chatMember.setName(name);
chatMember.setQra(locator);
chatMember.setActivityTimeLastInEpoch(activityEpoch);
return chatMember;
}
}