From b51cc70262c72aa9eeecbc7ffc3353560fe397c4 Mon Sep 17 00:00:00 2001
From: Tjalling Hattink <tjalling@hattink.net>
Date: Sun, 24 Apr 2016 22:11:58 +0200
Subject: [PATCH] Add support for intermediates in brouter navigation service

The brouter navigation service was always ignoring any intermediate
waypoints. This patch adds support by passing all intermediate
waypoints to the brouter service.
---
 .../net/osmand/plus/routing/RouteProvider.java | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
index e6054187ca..c923092a24 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
@@ -1178,9 +1178,23 @@ public class RouteProvider {
 
 	protected RouteCalculationResult findBROUTERRoute(RouteCalculationParams params) throws MalformedURLException,
 			IOException, ParserConfigurationException, FactoryConfigurationError, SAXException {
-		double[] lats = new double[] { params.start.getLatitude(), params.end.getLatitude() };
-		double[] lons = new double[] { params.start.getLongitude(), params.end.getLongitude() };
+		int numpoints = 2 + (params.intermediates != null ? params.intermediates.size() : 0);
+		double[] lats = new double[numpoints];
+		double[] lons = new double[numpoints];
+		int index = 0;
 		String mode;
+		lats[index] = params.start.getLatitude();
+		lons[index] = params.start.getLongitude();
+		index++;
+		if(params.intermediates != null && params.intermediates.size() > 0) {
+			for(LatLon il : params.intermediates) {
+				lats[index] = il.getLatitude();
+				lons[index] = il.getLongitude();
+				index++;
+			}
+		}
+		lats[index] = params.end.getLatitude();
+		lons[index] = params.end.getLongitude();
 		if (ApplicationMode.PEDESTRIAN == params.mode) {
 			mode = "foot"; //$NON-NLS-1$
 		} else if (ApplicationMode.BICYCLE == params.mode) {