From d9d931b9cd442b4ddeea7370cff3ed5b97942016 Mon Sep 17 00:00:00 2001
From: Xav Dmz <XDmz@protonmail.com>
Date: Thu, 18 Jan 2024 16:16:16 +0100
Subject: [PATCH] Fixed OSRM native response's waypoints, and intersections
 geometry format.

---
 .../apis/osrm/1.0.0/controller/controller.js   |  2 +-
 src/js/sources/osrmSource.js                   | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/js/apis/osrm/1.0.0/controller/controller.js b/src/js/apis/osrm/1.0.0/controller/controller.js
index 522d195..56dcfdf 100644
--- a/src/js/apis/osrm/1.0.0/controller/controller.js
+++ b/src/js/apis/osrm/1.0.0/controller/controller.js
@@ -419,4 +419,4 @@ module.exports = {
     return userResponse;
   }
 
-}
\ No newline at end of file
+}
diff --git a/src/js/sources/osrmSource.js b/src/js/sources/osrmSource.js
index 136f9dc..d257593 100644
--- a/src/js/sources/osrmSource.js
+++ b/src/js/sources/osrmSource.js
@@ -439,14 +439,15 @@ module.exports = class osrmSource extends Source {
       LOGGER.debug("osrm response has 1 or more routes");
     }
 
-    for (let sourceWaypoint in osrmResponse.waypoints) {
-      let nativeWaypoint = {
-        "hint": sourceWaypoint.hint,
-        "distance": sourceWaypoint.distance,
-        "name": sourceWaypoint.name
+    for (let waypointIdx = 0; waypointIdx < osrmResponse.waypoints.length; waypointIdx++) {
+      engineExtras.waypoints[waypointIdx] = {
+        "hint": osrmResponse.waypoints[waypointIdx].hint,
+        "distance": osrmResponse.waypoints[waypointIdx].distance,
+        "name": osrmResponse.waypoints[waypointIdx].name
       };
-      engineExtras.waypoints.push(nativeWaypoint);
     }
+    LOGGER.debug("OSRM engineExtras waypoints (before adding to routeResponse:");
+    LOGGER.debug(engineExtras.waypoints);
 
     // routes
     // Il peut y avoir plusieurs itinéraires
@@ -556,10 +557,11 @@ module.exports = class osrmSource extends Source {
           for (let intersectionIndex = 0; intersectionIndex < currentOsrmRouteStep.intersections.length; intersectionIndex++) {
             let currentIntersection = currentOsrmRouteStep.intersections[intersectionIndex];
             nativeIntersections[intersectionIndex] = copyManager.deepCopy(currentIntersection);
-            nativeIntersections[intersectionIndex].location = new Point(currentIntersection.location[0], currentIntersection.location[1], super.projection)
-            if (!nativeIntersections[intersectionIndex].location.transform(askedProjection)) {
+            let location = new Point(currentIntersection.location[0], currentIntersection.location[1], super.projection);
+            if (!location.transform(askedProjection)) {
               throw errorManager.createError(" Error during reprojection of intersection in OSRM response. ");
             }
+            nativeIntersections[intersectionIndex].location = [location.x, location.y];
           }
           nativeSteps[k].intersections = nativeIntersections;
         }