Commita7657d3

authored

navigate fix: zero legs (#3237)

1 parentb654a5d commita7657d3Copy full SHA for a7657d3

File tree

+36

-1

lines changed

.gitignore
navigation/src
- main/java/com/graphhopper/navigation
  - NavigateResponseConverter.java
- test/java/com/graphhopper/navigation
  - NavigateResponseConverterTest.java

+36

-1

lines changed

Lines changed: 2 additions & 1 deletion

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,10 @@ private static void putRouteInformation(ObjectNode pathJson, ResponsePath path,`
`121`	`121`	`if (isDepartInstruction) {`
`122`	`122`	`maneuverType =ManeuverType.DEPART;`
`123`	`123`	`fixDepartIntersectionDetail(intersectionDetails,i);`
	`124`	`+// if the depart is on a REACHED_VIA or FINISH node, add the summary`
	`125`	`+if (instruction.getSign() ==Instruction.REACHED_VIA \|\|instruction.getSign() ==Instruction.FINISH) {`
	`126`	`+putLegInformation(legJson,path,routeNr,time,distance);`
	`127`	`+ }`
`124`	`128`	`}else {`
`125`	`129`	`switch (instruction.getSign()) {`
`126`	`130`	`caseInstruction.REACHED_VIA,Instruction.FINISH:`

Lines changed: 30 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -614,6 +614,36 @@ public void testMultipleWaypoints() {`
`614`	`614`	`assertEquals(route.get("distance").asDouble(),distance,1);`
`615`	`615`	`}`
`616`	`616`
	`617`	`+`
	`618`	`+@Test`
	`619`	`+publicvoidtestMultipleWaypointsAndLastDuplicate() {`
	`620`	`+`
	`621`	`+GHRequestrequest =newGHRequest();`
	`622`	`+request.addPoint(newGHPoint(42.505144,1.526113));`
	`623`	`+request.addPoint(newGHPoint(42.50529,1.527218));`
	`624`	`+request.addPoint(newGHPoint(42.50529,1.527218));`
	`625`	`+request.setProfile(profile).setPathDetails(Collections.singletonList("intersection"));`
	`626`	`+`
	`627`	`+GHResponsersp =hopper.route(request);`
	`628`	`+`
	`629`	`+ObjectNodejson =NavigateResponseConverter.convertFromGHResponse(rsp,trMap,Locale.ENGLISH,distanceConfig);`
	`630`	`+`
	`631`	`+// Check that all waypoints are there and in the right order`
	`632`	`+JsonNodewaypointsJson =json.get("waypoints");`
	`633`	`+assertEquals(3,waypointsJson.size());`
	`634`	`+`
	`635`	`+// Check that there are 2 legs`
	`636`	`+JsonNoderoute =json.get("routes").get(0);`
	`637`	`+JsonNodelegs =route.get("legs");`
	`638`	`+assertEquals(2,legs.size());`
	`639`	`+`
	`640`	`+// check last leg`
	`641`	`+JsonNodeleg =legs.get(1);`
	`642`	`+`
	`643`	`+JsonNodesummary =leg.get("summary");`
	`644`	`+assertNotNull(summary);`
	`645`	`+ }`
	`646`	`+`
`617`	`647`	`@Test`
`618`	`648`	`publicvoidtestError() {`
`619`	`649`	`GHResponsersp =hopper.route(newGHRequest(42.554851,111.536198,42.510071,1.548128).setProfile(profile));`

Comments

(0)