diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/app/AppWorker.java b/codec2talkie/src/main/java/com/radio/codec2talkie/app/AppWorker.java
index bac9787..1dbd158 100644
--- a/codec2talkie/src/main/java/com/radio/codec2talkie/app/AppWorker.java
+++ b/codec2talkie/src/main/java/com/radio/codec2talkie/app/AppWorker.java
@@ -266,8 +266,8 @@ public class AppWorker extends Thread {
private final ProtocolCallback _protocolCallback = new ProtocolCallback() {
@Override
protected void onReceivePosition(Position position) {
- Log.i(TAG, String.format("Position received: %s, %s, lat: %f, lon: %f, course: %f, speed: %f, alt: %f, sym: %s, range: %.2f, status: %s, comment: %s",
- position.srcCallsign, position.maidenHead, position.latitude, position.longitude,
+ Log.i(TAG, String.format("Position received: %s→%s, %s, lat: %f, lon: %f, course: %f, speed: %f, alt: %f, sym: %s, range: %.2f, status: %s, comment: %s",
+ position.srcCallsign, position.dstCallsign, position.maidenHead, position.latitude, position.longitude,
position.bearingDegrees, position.speedMetersPerSecond, position.altitudeMeters,
position.symbolCode, position.rangeMiles, position.status, position.comment));
_positionItemRepository.upsertPositionItem(position.toPositionItem(false));
diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/maps/MapStations.java b/codec2talkie/src/main/java/com/radio/codec2talkie/maps/MapStations.java
index 1f2f91d..edc93ad 100644
--- a/codec2talkie/src/main/java/com/radio/codec2talkie/maps/MapStations.java
+++ b/codec2talkie/src/main/java/com/radio/codec2talkie/maps/MapStations.java
@@ -83,7 +83,8 @@ public class MapStations {
_stationItemLiveData.observe((LifecycleOwner) _owner, allStations -> {
Log.i(TAG, "add stations " + allStations.size());
for (StationItem station : allStations) {
- //Log.i(TAG, "new position " + station.getLatitude() + " " + station.getLongitude());
+ //Log.i(TAG, "new position " + station.getSrcCallsign() + ">" +
+ // station.getDstCallsign() + " " + station.getLatitude() + " " + station.getLongitude());
// do not add items without coordinate
if (station.getMaidenHead() == null) continue;
if (addStationPositionIcon(station)) {
@@ -200,7 +201,8 @@ public class MapStations {
private String getStatus(StationItem station) {
double range = UnitTools.milesToKilometers(station.getRangeMiles());
- return String.format(Locale.US, "%s
%s %f %f
%03d° %03dkm/h %04dm %.2fkm
%s %s",
+ return String.format(Locale.US, "%s %s
%s %f %f
%03d° %03dkm/h %04dm %.2fkm
%s %s",
+ station.getDstCallsign(),
station.getDigipath(),
station.getMaidenHead(), station.getLatitude(), station.getLongitude(),
(int)station.getBearingDegrees(),
diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AprsIs.java b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AprsIs.java
index c855585..0676d45 100644
--- a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AprsIs.java
+++ b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AprsIs.java
@@ -135,12 +135,6 @@ public class AprsIs implements Protocol, Runnable {
}
private boolean isEligibleForTxGate(AprsIsData aprsIsData) {
- /* rules:
- 1. RX gate must be heard on rf within digi hops or range
- 2. RX gate has not been heard on internet within given period of time or in third party packets
- 3. ✓ sender must not be heard within given period of time on RF
- 4. ✓ sender must not have TCPXX, NOGATE, RFONLY
- */
AprsCallsign aprsCallsign = new AprsCallsign(aprsIsData.src);
return _isTxGateEnabled &&
aprsCallsign.isValid &&
diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/storage/station/StationItem.java b/codec2talkie/src/main/java/com/radio/codec2talkie/storage/station/StationItem.java
index e74f03b..71fa3d2 100644
--- a/codec2talkie/src/main/java/com/radio/codec2talkie/storage/station/StationItem.java
+++ b/codec2talkie/src/main/java/com/radio/codec2talkie/storage/station/StationItem.java
@@ -116,7 +116,6 @@ public class StationItem {
public void updateFrom(StationItem stationItem) {
setTimestampEpoch(stationItem.getTimestampEpoch());
- setDstCallsign(stationItem.getDstCallsign());
// update position if known
if (stationItem.getMaidenHead() != null) {
setMaidenHead(stationItem.getMaidenHead());
@@ -139,6 +138,8 @@ public class StationItem {
setLogLine(stationItem.getLogLine());
if (stationItem.getDigipath() != null)
setDigipath(stationItem.getDigipath());
+ if (stationItem.getDstCallsign() != null)
+ setDstCallsign(stationItem.getDstCallsign());
}
@Override