From 4b1d2942117695ec4ca83cd56669c81650a4e8b9 Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Thu, 31 Oct 2024 05:07:42 -0400 Subject: [PATCH] #2064 Moto talker GPS event TO/FROM identifiers. (#2065) Co-authored-by: Dennis Sheirer --- .../dsheirer/module/decode/p25/phase1/P25P1DecoderState.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1DecoderState.java b/src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1DecoderState.java index 920c1e93c..e42f4506a 100644 --- a/src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1DecoderState.java +++ b/src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1DecoderState.java @@ -2055,7 +2055,10 @@ private void processLC(LinkControlWord lcw, long timestamp, boolean isTerminator if(lcw instanceof LCMotorolaUnitGPS gps) { mTrafficChannelManager.processP1TrafficCurrentUser(getCurrentFrequency(), gps.getLocation(), timestamp, lcw.toString()); - MutableIdentifierCollection mic = getMutableIdentifierCollection(gps.getIdentifiers(), timestamp); + + //We want to preserve the current TO/FROM and any other identifiers for the GPS event and add the GPS location + MutableIdentifierCollection mic = new MutableIdentifierCollection(getIdentifierCollection().getIdentifiers()); + mic.update(gps.getIdentifiers()); PlottableDecodeEvent event = PlottableDecodeEvent.plottableBuilder(DecodeEventType.GPS, timestamp) .location(gps.getGeoPosition())