6138: Update utils for JSON-valued attributes to be consistent with developer...

6138: Update utils for JSON-valued attributes to be consistent with developer guide usage instructions

bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java

@@ -1381,6 +1381,14 @@ public enum ATTRIBUTE_TYPE {
 			bundle.getString("BlackboardAttribute.tskgeowaypoints.text"),
 			TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.JSON),
 
+		TSK_DISTANCE_TRAVELED(144, "TSK_DISTANCE_TRAVELED",
+			bundle.getString("BlackboardAttribute.tskdistancetraveled.text"),
+			TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.DOUBLE),
+		
+		TSK_DISTANCE_FROM_HOMEPOINT(145, "TSK_DISTANCE_FROM_HOMEPOINT",
+			bundle.getString("BlackboardAttribute.tskdistancefromhome.text"),
+			TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.DOUBLE)
+		
 		;
 
 		private final int typeID;

bindings/java/src/org/sleuthkit/datamodel/Bundle.properties

@@ -193,6 +193,8 @@ BlackboardAttribute.tskgroups.text=Groups
 BlackboardAttribute.tskattachments.text=Message Attachments
 BlackboardAttribute.tskgeopath.text=List of Track Points
 BlackboardAttribute.tskgeowaypoints.text=List of Waypoints
+BlackboardAttribute.tskdistancetraveled.text=Distance Traveled
+BlackboardAttribute.tskdistancefromhome.text=Distance from Homepoint
 AbstractFile.readLocal.exception.msg4.text=Error reading local file\: {0}
 AbstractFile.readLocal.exception.msg1.text=Error reading local file, local path is not set
 AbstractFile.readLocal.exception.msg2.text=Error reading local file, it does not exist at local path\: {0}

bindings/java/src/org/sleuthkit/datamodel/blackboardutils/attributes/TskGeoTrackpointsUtil.java

@@ -19,6 +19,7 @@
 package org.sleuthkit.datamodel.blackboardutils.attributes;
 
 import com.google.gson.Gson;
+import com.google.gson.annotations.SerializedName;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -195,9 +196,13 @@ private List<GeoTrackPoint> getTimeOrderedPoints() {
 		 */
 		public final static class GeoTrackPoint extends TskGeoWaypointsUtil.GeoWaypointList.GeoWaypoint implements Comparable<GeoTrackPoint> {
 
+			@SerializedName("TSK_GEO_VELOCITY")
 			private final Double velocity;
+			@SerializedName("TSK_DISTANCE_FROM_HOMEPOINT")
 			private final Double distanceFromHomePoint;
+			@SerializedName("TSK_DISTANCE_TRAVELED")
 			private final Double distanceTraveled;
+			@SerializedName("TSK_DATETIME")
 			private final Long timestamp;
 
 			/**

bindings/java/src/org/sleuthkit/datamodel/blackboardutils/attributes/TskGeoWaypointsUtil.java

@@ -19,6 +19,7 @@
 package org.sleuthkit.datamodel.blackboardutils.attributes;
 
 import com.google.gson.Gson;
+import com.google.gson.annotations.SerializedName;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -143,9 +144,13 @@ public Iterator<GeoWaypointList.GeoWaypoint> iterator() {
 		 */
 		public static class GeoWaypoint {
 
+			@SerializedName("TSK_GEO_LATITUDE")
 			private final Double latitude;
+			@SerializedName("TSK_GEO_LONGITUDE")
 			private final Double longitude;
+			@SerializedName("TSK_GEO_ALTITUDE")
 			private final Double altitude;
+			@SerializedName("TSK_NAME")
 			private final String name;
 
 			/**