From 821b733428c258b2600b4938a89bfad9cfa7293d Mon Sep 17 00:00:00 2001
From: apriestman <apriestman@basistech.com>
Date: Tue, 24 Nov 2020 08:40:55 -0500
Subject: [PATCH] Cleanup

---
 .../autopsy/geolocation/AbstractWaypointFetcher.java     | 9 ++++++---
 .../sleuthkit/autopsy/ingest/Bundle.properties-MERGED    | 2 --
 .../sleuthkit/autopsy/report/modules/kml/KMLReport.java  | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/AbstractWaypointFetcher.java b/Core/src/org/sleuthkit/autopsy/geolocation/AbstractWaypointFetcher.java
index 955eb3dba7..613ffc3c85 100755
--- a/Core/src/org/sleuthkit/autopsy/geolocation/AbstractWaypointFetcher.java
+++ b/Core/src/org/sleuthkit/autopsy/geolocation/AbstractWaypointFetcher.java
@@ -118,12 +118,12 @@ abstract class AbstractWaypointFetcher implements WaypointBuilder.WaypointFilter
         for (List<Waypoint> t : geoDataSet.getAreas()) {
             areaSets.add(MapWaypoint.getWaypoints(t));
         }
-        // TODO check for area errors too TODO TODO
+
         handleFilteredWaypointSet(
             pointSet, trackSets, areaSets,
             (trackResults == null || trackResults.isSuccessfullyParsed()) 
-                    && (areaResults == null || areaResults.isSuccessfullyParsed())
-                    && waypointResults.isSuccessfullyParsed());
+                && (areaResults == null || areaResults.isSuccessfullyParsed())
+                && waypointResults.isSuccessfullyParsed());
     }
 
     /**
@@ -296,6 +296,9 @@ abstract class AbstractWaypointFetcher implements WaypointBuilder.WaypointFilter
         return -1L;
     }
     
+    /**
+     * Utility class to collect filtered GPS objects.
+     */
     static class GeoDataSet {
         private final List<Waypoint> waypoints;
         private final List<List<Waypoint>> tracks;
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties-MERGED
index c2ce001e71..157506a57f 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties-MERGED
@@ -1,6 +1,4 @@
 CTL_RunIngestAction=Run Ingest
-CustomGPSIngestModule_Description=Just makes a few custom artifacts with GPS data
-CustomGPSIngestModule_Name=Custom GPS Module
 IngestJobSettingsPanel.IngestModulesTableRenderer.info.message=A previous version of this ingest module has been run before on this data source.
 IngestJobSettingsPanel.IngestModulesTableRenderer.warning.message=This ingest module has been run before on this data source.
 IngestJobSettingsPanel.noPerRunSettings=The selected module has no per-run settings.
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 2cb311e6b9..7ca8749e15 100644
--- a/Core/src/org/sleuthkit/autopsy/report/modules/kml/KMLReport.java
+++ b/Core/src/org/sleuthkit/autopsy/report/modules/kml/KMLReport.java
@@ -747,7 +747,7 @@ public final class KMLReport implements GeneralReportModule {
         Element altitudeMode = new Element("altitudeMode", ns).addContent("clampToGround"); //NON-NLS
         polygon.addContent(altitudeMode);
         
-        // KML uses lon, lat. Deliberately reversed.1
+        // KML uses lon, lat. Deliberately reversed.
         Element coordinates = new Element("coordinates", ns);
         for (Waypoint wp : waypoints) {
             coordinates.addContent(wp.getLongitude() + "," + wp.getLatitude() + ",0 "); //NON-NLS