WIP: handling viterbi breaks as multiple sequences

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

@@ -60,7 +60,7 @@ public static enum SequenceType { SEQUENCE, STATIONARY, UNKNOWN };
     /**
      * The matched sequence, as returned from viterbi.computeMostLikelySequence().
      */
-    private final List<SequenceState<Candidate, MatchEntry, Path>> matchedSequence;
+    public final List<SequenceState<Candidate, MatchEntry, Path>> matchedSequence;
     /**
      * Time (inclusive, in milliseconds) when first began on this sequence. -1 if not set.
      * TODO: is in inclusive?

matching-web/src/main/java/com/graphhopper/matching/http/MatchResultToJson.java

@@ -21,12 +21,16 @@
 import org.json.JSONObject;
 
 import com.graphhopper.matching.MatchEdge;
+import com.graphhopper.matching.MatchEntry;
+import com.bmw.hmm.SequenceState;
 import com.graphhopper.matching.Candidate;
 import com.graphhopper.matching.MatchResult;
+import com.graphhopper.matching.MatchSequence;
+import com.graphhopper.routing.Path;
 import com.graphhopper.util.PointList;
 
 /**
- * Transform MatchResult in Json Object with fallow structure:
+ * Transform MatchResult in JSON Object with following structure:
  * <pre>
  * { "diary": {
  *   "routes": [
@@ -52,32 +56,38 @@ public JSONObject exportTo() {
         JSONArray entries = new JSONArray();
         JSONObject route = new JSONObject();
         JSONArray links = new JSONArray();
-        for (int emIndex = 0; emIndex < result.getEdgeMatches().size(); emIndex++) {
-            JSONObject link = new JSONObject();
-            JSONObject geometry = new JSONObject();
+        for (MatchSequence matchSequence: result.sequences) {
 
-            MatchEdge edgeMatch = result.getEdgeMatches().get(emIndex);
-            PointList pointList = edgeMatch.getEdgeState().fetchWayGeometry(emIndex == 0 ? 3 : 2);
+    		JSONObject link = new JSONObject();
+
+        	// add sequence geometry
+        	int emIndex = 0;
+        	for (MatchEdge matchEdge: matchSequence.matchEdges) {
+                JSONObject geometry = new JSONObject();
+                PointList pointList = matchEdge.edge.fetchWayGeometry(emIndex == 0 ? 3 : 2);
 
-            if (pointList.size() < 2) {
-                geometry.put("coordinates", pointList.toGeoJson().get(0));
-                geometry.put("type", "Point");
-            } else {
-                geometry.put("coordinates", pointList.toGeoJson());
-                geometry.put("type", "LineString");
-            }
+                if (pointList.size() < 2) {
+                    geometry.put("coordinates", pointList.toGeoJson().get(0));
+                    geometry.put("type", "Point");
+                } else {
+                    geometry.put("coordinates", pointList.toGeoJson());
+                    geometry.put("type", "LineString");
+                }
 
-            link.put("id", edgeMatch.getEdgeState().getEdge());
-            link.put("geometry", geometry.toString());
+                link.put("id", matchEdge.edge.getEdge());
+                link.put("geometry", geometry.toString());
 
+                emIndex++;
+        	}
+
+        	// add waypoints:
             JSONArray wpts = new JSONArray();
             link.put("wpts", wpts);
-
-            for (Candidate extension : edgeMatch.getGpxExtensions()) {
+            for (SequenceState<Candidate, MatchEntry, Path> step : matchSequence.matchedSequence) {
                 JSONObject wpt = new JSONObject();
-                wpt.put("x", extension.getQueryResult().getSnappedPoint().lon);
-                wpt.put("y", extension.getQueryResult().getSnappedPoint().lat);
-                wpt.put("timestamp", extension.getEntry().getTime());
+                wpt.put("x", step.state.getQueryResult().getSnappedPoint().lon);
+                wpt.put("y", step.state.getQueryResult().getSnappedPoint().lat);
+                wpt.put("timestamp", step.observation.gpxEntry.getTime());
                 wpts.put(wpt);
             }
 

matching-web/src/main/java/com/graphhopper/matching/http/MatchServlet.java

@@ -124,13 +124,13 @@ public void doPost(HttpServletRequest httpReq, HttpServletResponse httpRes)
                 matchRsp = matching.doWork(gpxFile.getEntries());
 
                 // fill GHResponse for identical structure            
-                Path path = matching.calcPath(matchRsp);
-                Translation tr = trMap.getWithFallBack(locale);
-                DouglasPeucker peucker = new DouglasPeucker().setMaxDistance(wayPointMaxDistance);
-                PathMerger pathMerger = new PathMerger().
-                        setDouglasPeucker(peucker).
-                        setSimplifyResponse(wayPointMaxDistance > 0);
-                pathMerger.doWork(matchGHRsp, Collections.singletonList(path), tr);
+//                Path path = matching.calcPath(matchRsp);
+//                Translation tr = trMap.getWithFallBack(locale);
+//                DouglasPeucker peucker = new DouglasPeucker().setMaxDistance(wayPointMaxDistance);
+//                PathMerger pathMerger = new PathMerger().
+//                        setDouglasPeucker(peucker).
+//                        setSimplifyResponse(wayPointMaxDistance > 0);
+//                pathMerger.doWork(matchGHRsp, Collections.singletonList(path), tr);
 
             } catch (Exception ex) {
                 matchGHRsp.addError(ex);
@@ -181,7 +181,7 @@ public void doPost(HttpServletRequest httpReq, HttpServletResponse httpRes)
                     // decode simply by multiplying with 0.5
                     List<Integer> traversalKeylist = new ArrayList<Integer>();
                     for (MatchEdge em : matchRsp.getEdgeMatches()) {
-                        EdgeIteratorState edge = em.getEdgeState();
+                        EdgeIteratorState edge = em.edge;
                         traversalKeylist.add(GHUtility.createEdgeKey(edge.getBaseNode(), edge.getAdjNode(), edge.getEdge(), false));
                     }
                     map.put("traversal_keys", traversalKeylist);