GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-09 15:17:24 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#1924 Resolves issue with talker GPS positions showing up in map panel as user identifiers. (#1925)

Browse Source 
Co-authored-by: sheirerd <sheirerd@ainfosec.com>
This commit is contained in:
Denny Sheirer
2024-05-26 06:29:07 -04:00
committed by GitHub
parent dddda052fa
commit 03792b0245
4 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/github/dsheirer/map/MapPanel.java
View File

@@ -468,7 +468,7 @@ public class MapPanel extends JPanel implements IPlottableUpdateListener
if(mPlottedTracksTable == null)
{
mPlottedTracksTable = new JTable(mMapService.getPlottableEntityModel());
mPlottedTracksTable.setAutoCreateRowSorter(true);
mMapService.getPlottableEntityModel().addTableModelListener(e ->
{
//Update the followed entity for DELETE/UPDATE operations

38
src/main/java/io/github/dsheirer/map/PlottableEntityHistory.java
View File

@@ -87,12 +87,42 @@ public class PlottableEntityHistory
*/
public void add(PlottableDecodeEvent event)
{
mCurrentEvent = event;
mLocationHistory.add(0, new TimestampedGeoPosition(event.getLocation(), event.getTimeStart()));
TimestampedGeoPosition mostRecentPosition = getLatestPosition();
TimestampedGeoPosition latest = new TimestampedGeoPosition(event.getLocation(), event.getTimeStart());
while(mLocationHistory.size() > MAX_LOCATION_HISTORY)
if(isUnique(latest, mostRecentPosition))
{
mLocationHistory.remove(mLocationHistory.size() - 1);
mCurrentEvent = event;
mLocationHistory.add(0, latest);
while(mLocationHistory.size() > MAX_LOCATION_HISTORY)
{
mLocationHistory.remove(mLocationHistory.size() - 1);
}
}
}
/**
* Indicates if the latest time and position is at least 30 seconds newer than the previous position and either the
* latitude or longitude differs by at least 0.00001 degrees.
* @param latest location
* @param previous location
* @return indication of uniqueness.
*/
private boolean isUnique(TimestampedGeoPosition latest, TimestampedGeoPosition previous)
{
if(latest != null && previous == null)
{
return true;
}
if(latest != null && previous != null)
{
return latest.getTimestamp() > (previous.getTimestamp() + 30_000) ||
Math.abs(latest.getLatitude() - previous.getLatitude()) > 0.00001 ||
Math.abs(latest.getLongitude() - previous.getLongitude()) > 0.00001;
}
return false;
}
}

3
src/main/java/io/github/dsheirer/map/PlottableEntityModel.java
View File

@@ -22,6 +22,7 @@ package io.github.dsheirer.map;
import io.github.dsheirer.alias.Alias;
import io.github.dsheirer.alias.AliasList;
import io.github.dsheirer.alias.AliasModel;
import io.github.dsheirer.identifier.Form;
import io.github.dsheirer.identifier.Identifier;
import io.github.dsheirer.identifier.configuration.AliasListConfigurationIdentifier;
import io.github.dsheirer.module.decode.event.PlottableDecodeEvent;
@@ -104,7 +105,7 @@ public class PlottableEntityModel extends AbstractTableModel implements Listener
EventQueue.invokeLater(() -> {
Identifier from = plottableDecodeEvent.getIdentifierCollection().getFromIdentifier();
if(from != null)
if(from != null && from.getForm() != Form.LOCATION)
{
AliasListConfigurationIdentifier aliasList = plottableDecodeEvent.getIdentifierCollection().getAliasListConfiguration();
String key = (aliasList != null ? aliasList.toString() : KEY_NO_ALIAS_LIST) + from;

8
src/main/java/io/github/dsheirer/module/decode/p25/phase2/P25P2DecoderState.java
View File

@@ -40,6 +40,7 @@ import io.github.dsheirer.identifier.patch.PatchGroupPreLoadDataContent;
import io.github.dsheirer.log.LoggingSuppressor;
import io.github.dsheirer.message.IMessage;
import io.github.dsheirer.module.decode.DecoderType;
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.module.decode.p25.IServiceOptionsProvider;
@@ -1523,13 +1524,14 @@ public class P25P2DecoderState extends TimeslotDecoderState implements Identifie
collection.update(fromRadio);
}
broadcast(PlottableDecodeEvent.plottableBuilder(DecodeEventType.GPS, message.getTimestamp())
DecodeEvent decodeEvent = PlottableDecodeEvent.plottableBuilder(DecodeEventType.GPS, message.getTimestamp())
.protocol(Protocol.APCO25)
.location(gps.getGeoPosition()).channel(getCurrentChannel()).details("LOCATION: " +
gps.getLocation().toString())
.identifiers(collection)
.build());
.build();
broadcast(decodeEvent);
mTrafficChannelManager.broadcast(decodeEvent);
mTrafficChannelManager.processP2CurrentUser(getCurrentFrequency(), getTimeslot(), gps.getLocation(),
message.getTimestamp());
}