GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 16:47:31 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Show geo locations from DMR on map (#1001)

Browse Source 
Thank you!
This commit is contained in:
Wojciech
2021-11-14 13:36:34 +01:00
committed by GitHub
parent 4b806ecfde
commit 770f58c668
2 changed files with 67 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/io/github/dsheirer/module/decode/dmr/DMRDecoderState.java
View File

@@ -73,7 +73,11 @@ import io.github.dsheirer.module.decode.dmr.message.type.ServiceOptions;
import io.github.dsheirer.module.decode.dmr.message.voice.VoiceMessage;
import io.github.dsheirer.module.decode.event.DecodeEvent;
import io.github.dsheirer.module.decode.event.DecodeEventType;
import io.github.dsheirer.module.decode.event.PlottableDecodeEvent;
import io.github.dsheirer.protocol.Protocol;
import io.github.dsheirer.source.tuner.channel.rotation.AddChannelRotationActiveStateRequest;
import io.github.dsheirer.util.PacketUtil;
import org.jdesktop.swingx.mapviewer.GeoPosition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -282,6 +286,20 @@ public class DMRDecoderState extends TimeslotDecoderState
.build();
broadcast(packetEvent);
GeoPosition geoPosition = PacketUtil.extractGeoPosition(packet.getPacket());
if (geoPosition != null) {
PlottableDecodeEvent plottableDecodeEvent = PlottableDecodeEvent.plottableBuilder(packet.getTimestamp())
.channel(getCurrentChannel())
.eventDescription(DecodeEventType.GPS.toString())
.identifiers(getMergedIdentifierCollection(packet.getIdentifiers()))
.protocol(Protocol.LRRP)
.location(geoPosition)
.build();
broadcast(plottableDecodeEvent);
}
}
/**

49
src/main/java/io/github/dsheirer/util/PacketUtil.java Normal file
View File

@@ -0,0 +1,49 @@
package io.github.dsheirer.util;
import io.github.dsheirer.module.decode.ip.IPacket;
import io.github.dsheirer.module.decode.ip.ipv4.IPV4Packet;
import io.github.dsheirer.module.decode.ip.lrrp.LRRPPacket;
import io.github.dsheirer.module.decode.ip.lrrp.token.Position;
import io.github.dsheirer.module.decode.ip.lrrp.token.Token;
import io.github.dsheirer.module.decode.ip.udp.UDPPacket;
import org.jdesktop.swingx.mapviewer.GeoPosition;
public class PacketUtil {
public static GeoPosition extractGeoPosition(IPacket packet) {
if (packet instanceof IPV4Packet) {
IPV4Packet ipPacket = (IPV4Packet) packet;
if (ipPacket.getPayload() instanceof UDPPacket) {
UDPPacket udpPacket = (UDPPacket) ipPacket.getPayload();
return extractGeoPosition(udpPacket);
}
return null;
}
if (packet instanceof UDPPacket) {
UDPPacket udpPacket = (UDPPacket) packet;
if (udpPacket.getPayload() instanceof LRRPPacket) {
LRRPPacket lrrpPacket = (LRRPPacket) udpPacket.getPayload();
return extractGeoPosition(lrrpPacket);
}
return null;
}
if (packet instanceof LRRPPacket) {
LRRPPacket lrrpPacket = (LRRPPacket) packet;
for (Token token: lrrpPacket.getTokens())
{
if (token instanceof Position) {
Position position = (Position) token;
return new GeoPosition(position.getLatitude(), position.getLongitude());
}
}
}
return null;
}
}