WIP: handling viterbi breaks as multiple sequences

matching-core/src/main/java/com/graphhopper/matching/GPXExtension.java → matching-core/src/main/java/com/graphhopper/matching/Candidate.java

@@ -38,7 +38,7 @@
  * @author kodonnell
  * @author Stefan Holder
  */
-public class GPXExtension {
+public class Candidate {
     private final GPXEntry entry;
     private final QueryResult queryResult;
     private final boolean isDirected;
@@ -48,7 +48,7 @@ public class GPXExtension {
     /**
      * Creates an undirected candidate for a real node.
      */
-    public GPXExtension(GPXEntry entry, QueryResult queryResult) {
+    public Candidate(GPXEntry entry, QueryResult queryResult) {
         this.entry = entry;
         this.queryResult = queryResult;
         this.isDirected = false;
@@ -59,7 +59,7 @@ public GPXExtension(GPXEntry entry, QueryResult queryResult) {
     /**
      * Creates a directed candidate for a virtual node.
      */
-    public GPXExtension(GPXEntry entry, QueryResult queryResult,
+    public Candidate(GPXEntry entry, QueryResult queryResult,
                         VirtualEdgeIteratorState incomingVirtualEdge,
                         VirtualEdgeIteratorState outgoingVirtualEdge) {
         this.entry = entry;

matching-core/src/main/java/com/graphhopper/matching/GPXFile.java

@@ -51,7 +51,7 @@ public class GPXFile {
     static final String DATE_FORMAT_Z_MS = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
     private final List<GPXEntry> entries;
     private boolean includeElevation = false;
-    private InstructionList instructions;
+    private List<InstructionList> instructions;
 
     public GPXFile() {
         entries = new ArrayList<GPXEntry>();
@@ -61,14 +61,14 @@ public GPXFile(List<GPXEntry> entries) {
         this.entries = entries;
     }
 
-    public GPXFile(MatchResult mr, InstructionList il) {
+    public GPXFile(MatchResult mr, List<InstructionList> il) {
         this.instructions = il;
         this.entries = new ArrayList<GPXEntry>(mr.getEdgeMatches().size());
         // TODO fetch time from GPX or from calculated route?
         long time = 0;
         for (int emIndex = 0; emIndex < mr.getEdgeMatches().size(); emIndex++) {
-            EdgeMatch em = mr.getEdgeMatches().get(emIndex);
-            PointList pl = em.getEdgeState().fetchWayGeometry(emIndex == 0 ? 3 : 2);
+            MatchEdge em = mr.getEdgeMatches().get(emIndex);
+            PointList pl = em.edge.fetchWayGeometry(emIndex == 0 ? 3 : 2);
             if (pl.is3D()) {
                 includeElevation = true;
             }
@@ -198,17 +198,20 @@ public String createString() {
         StringBuilder gpxOutput = new StringBuilder(header);
         gpxOutput.append("\n<trk><name>").append("GraphHopper MapMatching").append("</name>");
 
+        // TODO: is this correct? how do we know there's a 'gap' in the instructions i.e. multiple
+        // sequences? Do instructions only make sense for a single sequence?
         if (instructions != null && !instructions.isEmpty()) {
             gpxOutput.append("\n<rte>");
-            Instruction nextInstr = null;
-            for (Instruction currInstr : instructions) {
-                if (null != nextInstr) {
-                    instructions.createRteptBlock(gpxOutput, nextInstr, currInstr);
+            for (InstructionList instr: instructions) {
+                Instruction nextInstr = null;
+                for (Instruction currInstr : instr) {
+                    if (null != nextInstr) {
+                        instr.createRteptBlock(gpxOutput, nextInstr, currInstr);
+                    }
+                    nextInstr = currInstr;
                 }
-
-                nextInstr = currInstr;
+                instr.createRteptBlock(gpxOutput, nextInstr, null);
             }
-            instructions.createRteptBlock(gpxOutput, nextInstr, null);
             gpxOutput.append("\n</rte>");
         }
 

matching-core/src/main/java/com/graphhopper/matching/GPXMapping.java

@@ -0,0 +1,18 @@
+package com.graphhopper.matching;
+
+import com.graphhopper.util.GPXEntry;
+
+public class GPXMapping {
+    public final GPXEntry originalGPXEntry;
+    public final int matchEdgeIdx;
+    public final boolean isNeighbor;
+    public final int neighborIdx;
+    public final MatchEntry matchEntry;
+    public GPXMapping(GPXEntry originalGPXEntry, MatchEntry matchEntry, int matchEdgeIdx, boolean isNeighbor, int neighborIdx) {
+        this.originalGPXEntry = originalGPXEntry;
+        this.matchEdgeIdx = matchEdgeIdx;
+        this.isNeighbor = isNeighbor;
+        this.neighborIdx = neighborIdx;
+        this.matchEntry = matchEntry;
+    }
+}