Central config

Wait with merge until Viktoriya has merged her LLC algorithm and after I merged the endpoint rework

• Create central config to include Bounding box.
• Create new Docker volume to have same config in all Containers.
• Check in /addressmatching endpoint, whether a coordinate is inside our Bounding box

routing-server/src/main/java/de/fuberlin/navigator/routingserver/utility/ApplyShortestPath.java

@@ -6,8 +6,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
-import java.util.Map.Entry;
-
 import de.fuberlin.navigator.routingserver.model.*;
 import org.jgrapht.graph.SimpleDirectedWeightedGraph;
 import org.jgrapht.GraphPath;
@@ -49,15 +47,15 @@ public class ApplyShortestPath {
         // find the shortest path 
         GraphPath<Long, ExtendedEdge> path = getShortestPathInTime(routingRequest);
 
-        List<Point> coordinateList = covertToCoordinates(path.getVertexList());
+        List<Point> coordinateList = covertToCoordinates(path);
 
         // duration of path in minutes
         int duration = calculateDuration(path);
 
         // length of path in meters
-        double length = calculateLength(path);
+        int length = calculateLength(path);
 
-        System.out.println("List of Point: "+Arrays.deepToString(coordinateList.toArray()));
+        System.out.println("List of Coordinates: "+Arrays.deepToString(coordinateList.toArray()));
         System.out.println("duration: " + duration + " min");
         System.out.println("length of path: " + length + " meter");
     }
@@ -85,9 +83,9 @@ public class ApplyShortestPath {
         //in minutes
         int duration = calculateDuration(path);
         //in meters
-        int distance = (int) calculateLength(path);
+        int distance = calculateLength(path);
 
-        return RoutingResponse.of(covertToCoordinates(path.getVertexList()), distance, duration, daysAfterToday);
+        return RoutingResponse.of(covertToCoordinates(path), distance, duration, daysAfterToday);
     }
 
     private static GraphPath<Long, ExtendedEdge> getShortestPathInTime(RoutingRequest routingRequest){
@@ -224,36 +222,18 @@ public class ApplyShortestPath {
         }
     }
 
-    private static long CoordinatesToID(Point Point){
-        // map Point of start and end point to node ID
-
-        double lat = Point.getLat();
-        double lon = Point.getLon();
-        double epsilon = 0.0001; // 14m difference
-
-        for (Entry<Long, Coordinates> node : mapper.getNodeMap().entrySet()) {
-            if (Math.abs(lat-node.getValue().getLat()) < epsilon) {
-                if (Math.abs(lon-node.getValue().getLon()) < epsilon) {
-                    return (long) node.getKey();
-                }
-            }
-        }
-        System.out.println("No start or end point found!");
-        return 0;
-    }
-
-    private static double calculateLength(GraphPath<Long, ExtendedEdge> path){
+    private static int calculateLength(GraphPath<Long, ExtendedEdge> path){
         double length = 0;
         for (ExtendedEdge edge : path.getEdgeList()) {
     
             // filtering out the newly generated edges because length cannot be accessed
-            if(roadnetwork.getSegmentsMap().get((long)edge.getId()) == null) continue;
+            if(roadnetwork.getSegmentsMap().get(edge.getId()) == null) continue;
 
-            double edgeLen = roadnetwork.getSegmentsMap().get((long)edge.getId()).getLength();
+            double edgeLen = roadnetwork.getSegmentsMap().get(edge.getId()).getLength();
             length += edgeLen;    
         }
 
-        return length;
+        return (int)length;
     }
 
     private static int calculateDuration(GraphPath<Long, ExtendedEdge> path){
@@ -262,15 +242,38 @@ public class ApplyShortestPath {
         return durationMin;
     }
 
-
-    private static List<Point> covertToCoordinates(List<Long> vertexList){
-        // convert path consisting of node ids into path of Coordinates
+    private static List<Point> covertToCoordinates(GraphPath<Long, ExtendedEdge> path){
+        // convert path into path of Coordinates
         List<Point> coordinateList = new ArrayList<>();
-        for (Long nodeId : vertexList) {
-            double lat = mapper.getNodeMap().get(nodeId).getLat();
-            double lon = mapper.getNodeMap().get(nodeId).getLon();
-            coordinateList.add(new Point(lat, lon));
+
+        // add coordinates of generated start node
+        Long startNodeID = path.getStartVertex();
+        double lat = mapper.getNodeMap().get(startNodeID).getLat();
+        double lon = mapper.getNodeMap().get(startNodeID).getLon();
+        coordinateList.add(new Point(lat, lon));
+
+        // add coordinates of edges
+        int index = 0;
+        for (ExtendedEdge edge : path.getEdgeList()) {
+            // filter out generated first and last edge, which have no geometryList
+            if (index == 0 || index == path.getEdgeList().size()-1) {
+                index ++;
+                continue;
+            }
+      
+            Segment segment = roadnetwork.getSegmentsMap().get(edge.getId());
+            List<Coordinates> geometryList= segment.getGeometryList();
+            for(Coordinates coordinates : geometryList){
+                coordinateList.add(new Point(coordinates.getLat(), coordinates.getLon()));
+            }
+            index ++;    
         }
+   
+        // add coordinates of generated end node
+        Long endNodeID = path.getEndVertex();
+        lat = mapper.getNodeMap().get(endNodeID).getLat();
+        lon = mapper.getNodeMap().get(endNodeID).getLon();
+        coordinateList.add(new Point(lat, lon));
         return coordinateList;
     }