Version 18, July 2015

[GpsPrune.git] / tim / prune / data / SourceInfo.java

diff --git a/tim/prune/data/SourceInfo.java b/tim/prune/data/SourceInfo.java
index 341bf0299410a3f767adcf9fbe9f3064d9053aef..5e40eee953e1f31bd7c7755a8201665810215b7c 100644 (file)
--- a/tim/prune/data/SourceInfo.java
+++ b/tim/prune/data/SourceInfo.java
@@ -9,7 +9,7 @@ import java.io.File;
 public class SourceInfo
 {
        /** File type of source file */
-       public enum FILE_TYPE {TEXT, GPX, KML, NMEA, GPSBABEL, GPSIES};
+       public enum FILE_TYPE {TEXT, GPX, KML, NMEA, GPSBABEL, GPSIES, JSON};
 
        /** Source file */
        private File _sourceFile = null;
@@ -122,9 +122,14 @@ public class SourceInfo
        public int getIndex(DataPoint inPoint)
        {
                int idx = -1;
-               for (int i=0; i<_points.length && (idx < 0); i++) {
-                       if (_points[i] == inPoint) {idx = i;}
+               for (int i=0; i<_points.length; i++)
+               {
+                       if (_points[i] == inPoint) {
+                               idx = i;
+                               break;
+                       }
                }
+               if (idx == -1) {return idx;}             // point not found
                if (_pointIndices == null) {return idx;} // All points loaded
                return _pointIndices[idx]; // use point index mapping
        }