2 次代碼提交 bc219e65c9 ... e6548ba7b4

作者 SHA1 備註 提交日期
  wpfat23-5 e6548ba7b4 deleted Coordinates class from MainController 2 年之前
  wpfat23-5 72882deb53 added one algorithm for route selecting (Miguel) 2 年之前

+ 3 - 9
src/main/java/com/deliveryproject/easydelivery/MainController.java

@@ -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;
@@ -52,6 +53,7 @@ public class MainController {
                 location.add(intersection.location.get(0));
                 coordinates.add(location);
             }
+
         }
         System.out.println(coordinates);
         return coordinates;
@@ -94,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;
@@ -114,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;
-        }
-    }
 }
 
 

+ 10 - 0
src/main/java/com/deliveryproject/easydelivery/Models/Coordinate.java

@@ -0,0 +1,10 @@
+package com.deliveryproject.easydelivery.Models;
+
+public class Coordinate {
+    public double lat;
+    public double lon;
+    public Coordinate(double lat, double lon) {
+        this.lat = lat;
+        this.lon = lon;
+    }
+}