6218: GoogleMapLocation.py does not work.

This commit is contained in:
Raman Arora 2020-04-01 14:14:33 -04:00
parent 888f70ea47
commit 843f312c7c

View File

@ -41,8 +41,10 @@ from org.sleuthkit.datamodel import BlackboardArtifact
from org.sleuthkit.datamodel import BlackboardAttribute from org.sleuthkit.datamodel import BlackboardAttribute
from org.sleuthkit.datamodel import Content from org.sleuthkit.datamodel import Content
from org.sleuthkit.datamodel import TskCoreException from org.sleuthkit.datamodel import TskCoreException
from org.sleuthkit.datamodel.Blackboard import BlackboardException
from org.sleuthkit.datamodel.blackboardutils import GeoArtifactsHelper from org.sleuthkit.datamodel.blackboardutils import GeoArtifactsHelper
from org.sleuthkit.datamodel.blackboardutils.attributes.TskGeoWaypointsUtil import GeoWaypointList from org.sleuthkit.datamodel.blackboardutils.attributes.TskGeoWaypointsUtil import GeoWaypointList
from org.sleuthkit.datamodel.blackboardutils.attributes.TskGeoWaypointsUtil.GeoWaypointList import GeoWaypoint
import traceback import traceback
import general import general
@ -109,6 +111,7 @@ class GoogleMapLocationAnalyzer(general.AndroidComponentAnalyzer):
time = Long.valueOf(resultSet.getString("time")) / 1000 time = Long.valueOf(resultSet.getString("time")) / 1000
dest_title = resultSet.getString("dest_title") dest_title = resultSet.getString("dest_title")
dest_address = resultSet.getString("dest_address") dest_address = resultSet.getString("dest_address")
dest_lat = GoogleMapLocationAnalyzer.convertGeo(resultSet.getString("dest_lat")) dest_lat = GoogleMapLocationAnalyzer.convertGeo(resultSet.getString("dest_lat"))
dest_lng = GoogleMapLocationAnalyzer.convertGeo(resultSet.getString("dest_lng")) dest_lng = GoogleMapLocationAnalyzer.convertGeo(resultSet.getString("dest_lng"))
@ -116,8 +119,8 @@ class GoogleMapLocationAnalyzer(general.AndroidComponentAnalyzer):
source_lng = GoogleMapLocationAnalyzer.convertGeo(resultSet.getString("source_lng")) source_lng = GoogleMapLocationAnalyzer.convertGeo(resultSet.getString("source_lng"))
waypointlist = GeoWaypointList() waypointlist = GeoWaypointList()
waypointlist.addPoint(source_lat, source_lng, None, None) waypointlist.addPoint(GeoWaypoint(source_lat, source_lng, None, None))
waypointlist.addPoint(dest_lat, dest_lng, None, dest_address) waypointlist.addPoint(GeoWaypoint(dest_lat, dest_lng, None, dest_address))
artifactHelper.addRoute(dest_title, time, waypointlist, None) artifactHelper.addRoute(dest_title, time, waypointlist, None)