Some classes are renamed (from distance to cost)

Author: IvanDanSantos

…java/com/osrm/client/DistanceMatrix.java …ain/java/com/osrm/client/CostMatrix.javasrc/main/java/com/osrm/client/DistanceMatrix.java renamed to src/main/java/com/osrm/client/CostMatrix.java src/main/java/com/osrm/client/DistanceMatrix.java renamed to src/main/java/com/osrm/client/CostMatrix.java

@@ -3,10 +3,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class DistanceMatrix {
+public class CostMatrix {
     private int[][] matrix;
 
-    public DistanceMatrix(int size) {
+    public CostMatrix(int size) {
         this.matrix = new int[size][size];
     }
 
@@ -23,13 +23,13 @@ public List<List<Float>> asList() {
         for (int x = 0; x < matrix.length; x++) {
             List<Float> row = new ArrayList<>();
             for (int y = 0; y < matrix.length; y++) {
-                Float distance = Float.MAX_VALUE;
+                Float cost = Float.MAX_VALUE;
                 try {
-                    distance = Double.valueOf(matrix[x][y]).floatValue();
+                    cost = Double.valueOf(matrix[x][y]).floatValue();
                 } catch (NumberFormatException e) {
                     e.printStackTrace();
                 }
-                row.add(distance);
+                row.add(cost);
             }
             list.add(row);
         }

src/main/java/com/osrm/client/CostMatrixResponse.java

@@ -0,0 +1,5 @@
+package com.osrm.client;
+
+public interface CostMatrixResponse {
+    CostMatrix toCostMatrix();
+}

src/main/java/com/osrm/client/DistanceResponse.java

@@ -31,9 +31,9 @@ public OSRMClient(String uri) throws EmptyUrlException {
   }
 
 
-  public OSRMDistanceResponse getDistanceMatrix(List<GeoLocation> locations, double speedRate, String country,
-                                                String token, String profile,
-                                                String options) throws OptimizationDistanceMatrixException {
+  public OSRMCostMatrixResponse getDistanceMatrix(List<GeoLocation> locations, double speedRate, String country,
+                                                  String token, String profile,
+                                                  String options) throws OptimizationDistanceMatrixException {
     Builder requestBuilder = new Builder();
 
     requestBuilder.readTimeout(900000, TimeUnit.MILLISECONDS);
@@ -69,7 +69,7 @@ public OSRMDistanceResponse getDistanceMatrix(List<GeoLocation> locations, doubl
     try {
       response = client.newCall(request).execute();
       if (response.isSuccessful()) {
-        return OSRMDistanceResponse.fromJSON(response.body().string());
+        return OSRMCostMatrixResponse.fromJSON(response.body().string());
       }
     } catch (Exception e) {
       System.out.print(e.getMessage());

src/main/java/com/osrm/client/OSRMClient.java

@@ -0,0 +1,40 @@
+package com.osrm.client;
+
+import com.google.gson.Gson;
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+
+public class OSRMCostMatrixResponse implements CostMatrixResponse {
+
+    @SerializedName("matrix")
+    private final List<List<Integer>> costTable;
+
+    public OSRMCostMatrixResponse(List<List<Integer>> costTable) {
+        this.costTable = costTable;
+    }
+
+    private List<List<Integer>> getCostTable() {
+        return costTable;
+    }
+
+    public CostMatrix toCostMatrix() {
+        CostMatrix matrix = new CostMatrix(getCostTable().size());
+        int i = 0;
+        for (List<Integer> rows : this.getCostTable()) {
+            int j = 0;
+            for (Integer col : rows) {
+                matrix.setValueAtCoord(i, j, col);
+                j++;
+            }
+            i++;
+        }
+        return matrix;
+    }
+
+
+    public static OSRMCostMatrixResponse fromJSON (String json) {
+        return new Gson().fromJson(json, OSRMCostMatrixResponse.class);
+    }
+}