Update GHMRequest for curbside

Author: easbar

client-hc/src/main/java/com/graphhopper/api/GHMRequest.java

@@ -18,6 +18,8 @@ public class GHMRequest extends GHRequest {
     private List<GHPoint> toPoints;
     private List<String> fromPointHints;
     private List<String> toPointHints;
+    private List<String> fromCurbSides;
+    private List<String> toCurbSides;
     private int called = 0;
     boolean identicalLists = true;
     private final Set<String> outArrays = new HashSet<>(5);
@@ -33,6 +35,8 @@ public GHMRequest(int size) {
         toPoints = new ArrayList<>(size);
         fromPointHints = new ArrayList<>(size);
         toPointHints = new ArrayList<>(size);
+        fromCurbSides = new ArrayList<>(size);
+        toCurbSides = new ArrayList<>(size);
     }
 
     /**
@@ -105,6 +109,20 @@ public List<String> getFromPointHints() {
         return fromPointHints;
     }
 
+    public GHMRequest addFromCurbSide(String curbSide) {
+        fromCurbSides.add(curbSide);
+        return this;
+    }
+
+    public GHMRequest setFromCurbSides(List<String> curbSides) {
+        fromCurbSides = curbSides;
+        return this;
+    }
+
+    public List<String> getFromCurbSides() {
+        return fromCurbSides;
+    }
+
     public GHMRequest addToPoint(GHPoint point) {
         toPoints.add(point);
         identicalLists = false;
@@ -131,6 +149,20 @@ public List<String> getToPointHints() {
         return toPointHints;
     }
 
+    public GHMRequest addToCurbSide(String curbSide) {
+        toCurbSides.add(curbSide);
+        return this;
+    }
+
+    public GHMRequest setToCurbSides(List<String> curbSides) {
+        toCurbSides = curbSides;
+        return this;
+    }
+
+    public List<String> getToCurbSides() {
+        return toCurbSides;
+    }
+
     @Override
     public GHRequest setPointHints(List<String> pointHints) {
         this.fromPointHints = pointHints;
@@ -149,6 +181,24 @@ public boolean hasPointHints() {
                 this.toPointHints.size() == this.toPoints.size() && !toPoints.isEmpty();
     }
 
+    @Override
+    public GHRequest setCurbSides(List<String> curbSides) {
+        fromCurbSides = curbSides;
+        toCurbSides = curbSides;
+        return this;
+    }
+
+    @Override
+    public List<String> getCurbSides() {
+        throw new IllegalStateException("Use getFromCurbSides or getToCurbSides");
+    }
+
+    @Override
+    public boolean hasCurbSides() {
+        return fromCurbSides.size() == fromPoints.size() && !fromPoints.isEmpty() &&
+                toCurbSides.size() == toPoints.size() && !toPoints.isEmpty();
+    }
+
     /**
      * @param failFast if false the matrix calculation will be continued even when some points are not connected
      */

client-hc/src/main/java/com/graphhopper/api/GHMatrixBatchRequester.java

@@ -71,13 +71,17 @@ public MatrixResponse route(GHMRequest ghRequest) {
         if (ghRequest.identicalLists) {
             requestJson.putArray("points").addAll(createPointList(ghRequest.getFromPoints()));
             requestJson.putArray("point_hints").addAll(createStringList(ghRequest.getFromPointHints()));
+            requestJson.putArray("curbsides").addAll(createStringList(ghRequest.getFromCurbSides()));
         } else {
             ArrayNode fromPointList = createPointList(ghRequest.getFromPoints());
             ArrayNode toPointList = createPointList(ghRequest.getToPoints());
             requestJson.putArray("from_points").addAll(fromPointList);
             requestJson.putArray("from_point_hints").addAll(createStringList(ghRequest.getFromPointHints()));
             requestJson.putArray("to_points").addAll(toPointList);
             requestJson.putArray("to_point_hints").addAll(createStringList(ghRequest.getToPointHints()));
+            // todonow: there should be some kind of test
+            requestJson.putArray("from_curbsides").addAll(createStringList(ghRequest.getFromCurbSides()));
+            requestJson.putArray("to_curbsides").addAll(createStringList(ghRequest.getToPointHints()));
         }
 
         requestJson.putArray("out_arrays").addAll(outArrayListJson);
@@ -168,9 +172,7 @@ public MatrixResponse route(GHMRequest ghRequest) {
                 throw new IllegalStateException("Maximum number of iterations reached " + maxIterations + ", increasing should only be necessary for big matrices. For smaller ones this is a bug, please contact us");
             }
 
-        } catch (InterruptedException ex) {
-            throw new RuntimeException(ex);
-        } catch (IOException ex) {
+        } catch (InterruptedException | IOException ex) {
             throw new RuntimeException(ex);
         }
 

client-hc/src/main/java/com/graphhopper/api/GHMatrixSyncRequester.java

@@ -47,15 +47,20 @@ private void initIgnore() {
     public MatrixResponse route(GHMRequest ghRequest) {
         String pointsStr;
         String pointHintsStr;
+        String curbSidesStr;
         if (ghRequest.identicalLists) {
-            pointsStr = createPointQuery(ghRequest.getFromPoints(), "point");
+            pointsStr = createPointQuery("point", ghRequest.getFromPoints());
             pointHintsStr = createUrlString("point_hint", ghRequest.getFromPointHints());
+            curbSidesStr = createUrlString("curbside", ghRequest.getFromCurbSides());
         } else {
-            pointsStr = createPointQuery(ghRequest.getFromPoints(), "from_point");
-            pointsStr += "&" + createPointQuery(ghRequest.getToPoints(), "to_point");
+            pointsStr = createPointQuery("from_point", ghRequest.getFromPoints());
+            pointsStr += "&" + createPointQuery("to_point", ghRequest.getToPoints());
 
             pointHintsStr = createUrlString("from_point_hint", ghRequest.getFromPointHints());
             pointHintsStr += "&" + createUrlString("to_point_hint", ghRequest.getToPointHints());
+
+            curbSidesStr = createUrlString("from_curbside", ghRequest.getFromCurbSides());
+            curbSidesStr += "&" + createUrlString("to_curbside", ghRequest.getToCurbSides());
         }
 
         String outArrayStr = "";
@@ -73,7 +78,8 @@ public MatrixResponse route(GHMRequest ghRequest) {
         }
 
         String url = buildURL("", ghRequest);
-        url += "&" + pointsStr + "&" + pointHintsStr + "&" + outArrayStr;
+        // todonow: there should be some kind of test
+        url += "&" + pointsStr + "&" + pointHintsStr + "&" + curbSidesStr + "&" + outArrayStr;
         if (!Helper.isEmpty(ghRequest.getVehicle())) {
             url += "&vehicle=" + ghRequest.getVehicle();
         }
@@ -115,7 +121,7 @@ private String createUrlString(String paramName, List<String> params) {
         return result.toString();
     }
 
-    private String createPointQuery(List<GHPoint> list, String pointName) {
+    private String createPointQuery(String pointName, List<GHPoint> list) {
         StringBuilder pointsStr = new StringBuilder();
         for (GHPoint p : list) {
             if (pointsStr.length() > 0)