From 206b134fce93f04c21905bc71dcc61ce1b73984c Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Tue, 28 Jan 2020 14:25:58 -0500 Subject: [PATCH] Added label to track point waypoint objects --- .../geolocation/datamodel/Bundle.properties-MERGED | 2 ++ .../autopsy/geolocation/datamodel/Track.java | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Bundle.properties-MERGED index 86acb2fdb1..a3ed4a8ad3 100755 --- a/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Bundle.properties-MERGED @@ -1,3 +1,5 @@ +# {0} - track name +GEOTrack_point_label_header=Trackpoint for track: {0} LastKnownWaypoint_Label=Last Known Location Route_End_Label=End Route_Label=As-the-crow-flies Route diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Track.java b/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Track.java index aed8b76848..cb0dd95303 100755 --- a/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Track.java +++ b/Core/src/org/sleuthkit/autopsy/geolocation/datamodel/Track.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import org.openide.util.NbBundle.Messages; import org.sleuthkit.datamodel.BlackboardArtifact; import org.sleuthkit.datamodel.BlackboardAttribute; import org.sleuthkit.datamodel.blackboardutils.attributes.GeoTrackPoints; @@ -106,9 +107,13 @@ public final class Track extends GeoPath{ * * @throws GeoLocationDataException */ + @Messages({ + "# {0} - track name", + "GEOTrack_point_label_header=Trackpoint for track: {0}" + }) private void buildPath(List points) throws GeoLocationDataException { for (GeoTrackPoint point : points) { - addToPath(new TrackWaypoint(point)); + addToPath(new TrackWaypoint(Bundle.GEOTrack_point_label_header(getLabel()), point)); } } @@ -183,8 +188,8 @@ public final class Track extends GeoPath{ * * @throws GeoLocationDataException */ - TrackWaypoint(GeoTrackPoint point) throws GeoLocationDataException { - super(null, "", + TrackWaypoint(String pointLabel, GeoTrackPoint point) throws GeoLocationDataException { + super(null, pointLabel, point.getTimeStamp(), point.getLatitude(), point.getLongitude(),