resolved merge conflicts

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

@@ -112,7 +112,9 @@ public enum ARTIFACT_TYPE implements SleuthkitVisitableItem {
                                   NbBundle.getMessage(BlackboardArtifact.class, "BlackboardArtifact.tskExtMismatchDetected.text")), ///< Extension Mismatch
 		TSK_INTERESTING_ARTIFACT_HIT(35, "TSK_INTERESTING_ARTIFACT_HIT", //NON-NLS
                                      NbBundle.getMessage(BlackboardArtifact.class, "BlackboardArtifact.tskInterestingArtifactHit.text")),	// Any artifact that should be called out
-		; 
+        TSK_GPS_ROUTE(36, "TSK_GPS_ROUTE", "GPS Route"),	// Route based on GPS coordinates
+
+        ; 
 		/* SEE ABOVE -- KEEP C++ CODE IN SYNC */
 		private String label;
 		private int typeID;

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

@@ -296,6 +296,10 @@ public enum ATTRIBUTE_TYPE {
                                 NbBundle.getMessage(BlackboardArtifact.class, "BlackboardAttribute.tskAssociatedArtifact.text")), // Artifact ID of a related artifact
 		TSK_ISDELETED(97, "TSK_ISDELETED", //NON-NLS
                       NbBundle.getMessage(BlackboardArtifact.class, "BlackboardAttribute.tskIsDeleted.text")), // boolean to indicate that the artifact is recovered fom deleted content
+        TSK_GEO_LATITUDE_START(98, "TSK_GEO_LATITUDE_START", "Starting Latitude"), // Starting location lattitude
+        TSK_GEO_LATITUDE_END(99, "TSK_GEO_LATITUDE_END", "Ending Latitude"), // Ending location lattitude
+        TSK_GEO_LONGITUDE_START(100, "TSK_GEO_LONGITUDE_START", "Starting Longitude"), // Starting location longitude
+        TSK_GEO_LONGITUDE_END(101, "TSK_GEO_LONGITUDE_END", "Ending Longitude"), //Ending Location longitude
 		
 		
 		;

framework/tsk/framework/services/TskBlackboard.cpp

@@ -47,7 +47,8 @@ map<int, TskArtifactNames> initializeArtifactTypeMap(){
     retval.insert(pair<int, TskArtifactNames>(TSK_ENCRYPTION_DETECTED, TskArtifactNames("TSK_ENCRYPTION_DETECTED", "Encryption Detected")));
     retval.insert(pair<int, TskArtifactNames>(TSK_EXT_MISMATCH_DETECTED, TskArtifactNames("TSK_EXT_MISMATCH_DETECTED", "Extension Mismatch Detected")));
     retval.insert(pair<int, TskArtifactNames>(TSK_INTERESTING_ARTIFACT_HIT, TskArtifactNames("TSK_INTERESTING_ARTIFACT_HIT", "Interesting Results")));
-	
+	retval.insert(pair<int, TskArtifactNames>(TSK_GPS_ROUTE, TskArtifactNames("TSK_GPS_ROUTE", "GPS Route")));
+    
     return retval;
 }
 
@@ -147,6 +148,10 @@ map<int, TskAttributeNames> initializeAttributeTypeMap(){
 	retval.insert(pair<int, TskAttributeNames>(TSK_PERMISSIONS, TskAttributeNames("TSK_PERMISSIONS",  "Permissions")));
 	retval.insert(pair<int, TskAttributeNames>(TSK_ASSOCIATED_ARTIFACT, TskAttributeNames("TSK_ASSOCIATED_ARTIFACT", "Associated Artifact")));
     retval.insert(pair<int, TskAttributeNames>(TSK_ISDELETED, TskAttributeNames("TSK_ISDELETED", "Is Deleted")));
+    retval.insert(pair<int, TskAttributeNames>(TSK_GEO_LATITUDE_START, TskAttributeNames("TSK_GEO_LATITUDE_START", "Starting Latitude")));
+    retval.insert(pair<int, TskAttributeNames>(TSK_GEO_LATITUDE_END, TskAttributeNames("TSK_GEO_LATITUDE_END", "Ending Latitude")));
+    retval.insert(pair<int, TskAttributeNames>(TSK_GEO_LONGITUDE_START, TskAttributeNames("TSK_GEO_LONGITUDE_START", "Starting Longitude")));
+    retval.insert(pair<int, TskAttributeNames>(TSK_GEO_LONGITUDE_END, TskAttributeNames("TSK_GEO_LONGITUDE_END", "Ending Longitude")));
 
     return retval;
 }

framework/tsk/framework/services/TskBlackboard.h

@@ -81,7 +81,8 @@ enum TSK_ARTIFACT_TYPE {
     TSK_ENCRYPTION_DETECTED = 33, ///< Encrypted File
     TSK_EXT_MISMATCH_DETECTED = 34, ///< Extension Mismatch
     TSK_INTERESTING_ARTIFACT_HIT = 35,	///< Any artifact interesting enough that it should be called out in the UI.
-		
+	TSK_GPS_ROUTE = 36,	///< Route based on GPS coordinates
+    
     /* SEE ABOVE:
     * - KEEP JAVA CODE IN SYNC 
     * - UPDATE map in TskBlackboard.cpp
@@ -196,7 +197,10 @@ enum TSK_ATTRIBUTE_TYPE {
 	TSK_PERMISSIONS = 95, ///< Permissions
 	TSK_ASSOCIATED_ARTIFACT = 96, ///< Artifact ID of a related artifact
     TSK_ISDELETED = 97, ///< the artifact is recovered from deleted content
-
+    TSK_GEO_LATITUDE_START= 98, ///< Starting location lattitude
+    TSK_GEO_LATITUDE_END= 99, ///< Ending location lattitude
+    TSK_GEO_LONGITUDE_START= 100, ///< Starting location longitude
+    TSK_GEO_LONGITUDE_END = 101, ///< Ending Location longitude
     /* SEE ABOVE: 
     * - KEEP JAVA CODE IN SYNC 
     * - UPDATE map in TskBlackBoard.cpp too */