|
|
@@ -1,5 +1,6 @@
|
|
|
package com.deliveryproject.easydelivery;
|
|
|
|
|
|
+import com.deliveryproject.easydelivery.Models.Coordinate;
|
|
|
import com.deliveryproject.easydelivery.Models.OSMRClass.Intersection;
|
|
|
import com.deliveryproject.easydelivery.Models.OSMRClass.Root;
|
|
|
import com.deliveryproject.easydelivery.Models.OSMRClass.Step;
|
|
|
@@ -95,7 +96,7 @@ public class MainController {
|
|
|
private double calculateDistance(Coordinate c1, Coordinate c2) {
|
|
|
ArrayList<ArrayList<Double>> nodes;
|
|
|
try {
|
|
|
- nodes = getNodesBetweenTwoCoordinates(c1.x, c1.y, c2.x, c2.y);
|
|
|
+ nodes = getNodesBetweenTwoCoordinates(c1.lat, c1.lon, c2.lat, c2.lon);
|
|
|
} catch (IOException e) {
|
|
|
e.printStackTrace();
|
|
|
return Double.MAX_VALUE;
|
|
|
@@ -115,14 +116,6 @@ public class MainController {
|
|
|
return sumDistance;
|
|
|
}
|
|
|
|
|
|
- class Coordinate {
|
|
|
- double x;
|
|
|
- double y;
|
|
|
- public Coordinate(double x, double y) {
|
|
|
- this.x = x;
|
|
|
- this.y = y;
|
|
|
- }
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
|