PathMerger builds ResponsePath

Author: michaz

core/src/main/java/com/graphhopper/routing/Router.java

@@ -195,9 +195,8 @@ protected List<Path> routeAlt(GHRequest request, GHResponse ghRsp, AlgorithmOpti
         // each path represents a different alternative and we do the path merging for each of them
         PathMerger pathMerger = createPathMerger(request, weighting, queryGraph);
         for (Path path : result.paths) {
-            ResponsePath responsePath = new ResponsePath();
-            responsePath.setWaypoints(getWaypoints(qResults));
-            pathMerger.doWork(responsePath, Collections.singletonList(path), encodingManager, translationMap.getWithFallBack(request.getLocale()));
+            PointList waypoints = getWaypoints(qResults);
+            ResponsePath responsePath = pathMerger.doWork(waypoints, Collections.singletonList(path), encodingManager, translationMap.getWithFallBack(request.getLocale()));
             ghRsp.add(responsePath);
         }
         ghRsp.getHints().putObject("visited_nodes.sum", result.visitedNodes);
@@ -305,11 +304,8 @@ private PathMerger createPathMerger(GHRequest request, Weighting weighting, Grap
     }
 
     private ResponsePath concatenatePaths(GHRequest request, Weighting weighting, QueryGraph queryGraph, List<Path> paths, PointList waypoints) {
-        ResponsePath responsePath = new ResponsePath();
-        responsePath.setWaypoints(waypoints);
         PathMerger pathMerger = createPathMerger(request, weighting, queryGraph);
-        pathMerger.doWork(responsePath, paths, encodingManager, translationMap.getWithFallBack(request.getLocale()));
-        return responsePath;
+        return pathMerger.doWork(waypoints, paths, encodingManager, translationMap.getWithFallBack(request.getLocale()));
     }
 
     private PointList getWaypoints(List<QueryResult> queryResults) {

core/src/main/java/com/graphhopper/routing/util/TestAlgoCollector.java

@@ -66,8 +66,7 @@ public TestAlgoCollector assertDistance(EncodingManager encodingManager, AlgoHel
                 setCalcPoints(true).
                 setSimplifyResponse(false).
                 setEnableInstructions(true);
-        ResponsePath responsePath = new ResponsePath();
-        pathMerger.doWork(responsePath, altPaths, encodingManager, trMap.getWithFallBack(Locale.US));
+        ResponsePath responsePath = pathMerger.doWork(new PointList(), altPaths, encodingManager, trMap.getWithFallBack(Locale.US));
 
         if (responsePath.hasErrors()) {
             errors.add("response for " + algoEntry + " contains errors. Expected distance: " + oneRun.getDistance()

core/src/main/java/com/graphhopper/util/PathMerger.java

@@ -88,8 +88,8 @@ public PathMerger setEnableInstructions(boolean enableInstructions) {
         return this;
     }
 
-    public void doWork(ResponsePath responsePath, List<Path> paths, EncodedValueLookup evLookup, Translation tr) {
-        // todo: this method should return the/a new response path and not take it as a parameter
+    public ResponsePath doWork(PointList waypoints, List<Path> paths, EncodedValueLookup evLookup, Translation tr) {
+        ResponsePath responsePath = new ResponsePath();
         int origPoints = 0;
         long fullTimeInMillis = 0;
         double fullWeight = 0;
@@ -161,11 +161,13 @@ public void doWork(ResponsePath responsePath, List<Path> paths, EncodedValueLook
                 setPoints(fullPoints).
                 setRouteWeight(fullWeight).
                 setDistance(fullDistance).
-                setTime(fullTimeInMillis);
+                setTime(fullTimeInMillis).
+                setWaypoints(waypoints);
 
         if (allFound && simplifyResponse && (calcPoints || enableInstructions)) {
             PathSimplification.simplify(responsePath, douglasPeucker, enableInstructions);
         }
+        return responsePath;
     }
 
     /**