Add computing of the path to follow (node to node) (handles whole edg…

…es with their default direction)

geotrek/core/static/core/dijkstra.js

@@ -17,7 +17,6 @@ Geotrek.Dijkstra = (function() {
                 // Warning - weight is in fact edge.length in our data
                 l.push({'node_id': node_dest_id, 'weight': graph_edges[edge_id].length});
             });
-            console.log("getPairWeightNode", l)
             return l;
         }
 
@@ -193,7 +192,6 @@ Geotrek.shortestPath = (function() {
          *  Returns list of paths, and null if not found.
          */
         var paths = [];
-        console.log('tzhrhtrztszth')
         for (var j = 0; j < steps.length - 1; j++) {
             var path = computeTwoStepsPath(graph, steps[j], steps[j + 1]);
             if (!path)
@@ -219,7 +217,6 @@ Geotrek.shortestPath = (function() {
         //   path : Array of { start: Node_id, end: Node_id, edge: Edge, weight: Int (edge.length) }
         //   weight: Int
         // }
-        console.log("AZERTY")
         var weighted_path = Geotrek.Dijkstra.get_shortest_path_from_graph(graph, from_nodes, to_nodes);
 
         // restore graph

geotrek/core/static/core/multipath.js

@@ -521,7 +521,7 @@ L.Handler.MultiPath = L.Handler.extend({
                 sent_steps.push(sent_step)
             })
 
-            console.log('computePaths:', 'graph', this.graph, 'steps', sent_steps)
+            console.log('computePaths:', 'graph', this.graph, 'steps', this.steps)
             fetch(window.SETTINGS.urls['trek_geometry'], {
                 method: 'POST',
                 headers: {
@@ -592,9 +592,9 @@ L.Handler.MultiPath = L.Handler.extend({
         this.fire('computed_paths', {
             'computed_paths': new_computed_paths,
             'new_edges': this.all_edges,
-            'old': old_computed_paths,
-            'marker_source': this.marker_source,
-            'marker_dest': this.marker_dest
+            // 'old': old_computed_paths,
+            // 'marker_source': this.marker_source,
+            // 'marker_dest': this.marker_dest
         });
     },
 

geotrek/core/views.py

@@ -496,7 +496,7 @@ def get_start_and_end_node_ids(self):
 
         path_starting_node = bound_nodes[0][0]
         path_ending_node = bound_nodes[-1][-1]
-        return path_starting_node, path_ending_node
+        return str(path_starting_node), str(path_ending_node)
 
     def post(self, request):
         try:
@@ -511,15 +511,47 @@ def post(self, request):
 
         cs_graph = self.get_cs_graph()
         matrix = csr_matrix(cs_graph)
+        print("cs_graph:", cs_graph)
 
-        start_node, end_node = self.get_start_and_end_node_ids()
-        print("start_node, end_node", start_node, end_node)
+        start_node_id, end_node_id = self.get_start_and_end_node_ids()
+        print("start_node_id, end_node_id", start_node_id, end_node_id)
 
-        result = dijkstra(matrix, return_predecessors=True, indices=2,
+        # Tuples (index, id) for all nodes -> for interpreting the results
+        self.nodes_idx_per_id = list(enumerate(self.nodes.keys()))
+        print(self.nodes_idx_per_id)
+
+        def get_node_idx_per_id(node_id):
+            for (index, id) in self.nodes_idx_per_id:
+                if node_id == id:
+                    return index
+            return None
+
+        def get_node_id_per_idx(node_idx):
+            for (index, id) in self.nodes_idx_per_id:
+                if node_idx == index:
+                    return id
+            return None
+
+        start_node_idx = get_node_idx_per_id(start_node_id)
+        end_node_idx = get_node_idx_per_id(end_node_id)
+        result = dijkstra(matrix, return_predecessors=True, indices=start_node_idx,
                           directed=False)
         print(result)
 
+        # Retracing the path index by index, from end to start
+        predecessors = result[1]
+        current_node_id, current_node_idx = end_node_id, end_node_idx
+        path = [current_node_id]
+        while current_node_id != start_node_id:
+            # print("current_node_id", current_node_id, "current_node_idx", current_node_idx)
+            # print('start_node_id', start_node_id)
+            # print(type(current_node_id), type(start_node_id))
+            current_node_idx = predecessors[current_node_idx]
+            current_node_id = get_node_id_per_idx(current_node_idx)
+            path.append(current_node_id)
+
+        print(path)
+
         return JsonResponse({
-            'graph': params['graph'],
-            'steps': params['steps'],
+            'path': path,
         })