From 4b5447cc4ab8a3bfb44652163be1dfcfe70dc0cd Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Tue, 5 Nov 2019 14:58:13 -0500
Subject: [PATCH] Fixed bug in KMLReport

---
 .../autopsy/report/modules/kml/KMLReport.java | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/kml/KMLReport.java b/Core/src/org/sleuthkit/autopsy/report/modules/kml/KMLReport.java
index 002215bf04..79fb65ec0c 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/kml/KMLReport.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/kml/KMLReport.java
@@ -730,9 +730,9 @@ class KMLReport implements GeneralReportModule {
      *
      * @param route
      *
-     * @return
+     * @return A HTML formatted list of the Route attributes
      */
-    private String getFormattedDetails(Route route) {
+     private String getFormattedDetails(Route route) {
         List<Waypoint> points = route.getRoute();
         StringBuilder result = new StringBuilder(); //NON-NLS
 
@@ -749,13 +749,20 @@ class KMLReport implements GeneralReportModule {
             Waypoint end = points.get(1);
 
             result.append(formatAttribute("Start Latitude", start.getLatitude().toString()))
-                    .append(formatAttribute("Start Longitude", start.getLongitude().toString()))
-                    .append(formatAttribute("End Latitude", end.getLatitude().toString()))
+                    .append(formatAttribute("Start Longitude", start.getLongitude().toString()));
+            
+            Double altitude = start.getAltitude();
+            if(altitude != null) {
+                result.append(formatAttribute("Start Altitude", altitude.toString()));
+            }
+            
+            result.append(formatAttribute("End Latitude", end.getLatitude().toString()))
                     .append(formatAttribute("End Longitude", end.getLongitude().toString()));
-        }
-
-        if (route.getAltitude() != null) {
-            result.append(formatAttribute("Altitude", route.getAltitude().toString()));
+            
+            altitude = end.getAltitude();
+            if(altitude != null) {
+                result.append(formatAttribute("End Altitude", altitude.toString()));
+            }
         }
 
         List<Waypoint.Property> list = route.getOtherProperties();