A little bit reworked source

mapbox · Jan 15, 2024 · 7e8c78a · 7e8c78a
1 parent af5d590
commit 7e8c78a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/src/constants/action_types.js b/src/constants/action_types.js
@@ -1,6 +1,7 @@
 export const DESTINATION = 'DESTINATION';
 export const DESTINATION_CLEAR = 'DESTINATION_CLEAR';
 export const DESTINATION_QUERY = 'DESTINATION_QUERY';
+export const DESTINATION_QUERY_START = 'DESTINATION_QUERY_START';
 export const DESTINATION_FROM_COORDINATES = 'DESTINATION_FROM_COORDINATES';
 export const DIRECTIONS = 'DIRECTIONS';
 export const DIRECTIONS_PROFILE = 'DIRECTIONS_PROFILE';

diff --git a/src/controls/instructions.js b/src/controls/instructions.js
@@ -38,14 +38,7 @@ export default class Instructions {
 
       if (directions.length && shouldRender) {
         const direction = this.directions = directions[routeIndex];
-        const allSteps = direction.legs.reduce((steps, leg, idx) => {
-          if (idx > 0) {
-            steps[steps.length - 1].maneuver.type = 'waypoint';
-            leg.steps[0].maneuver.type = '';
-          }
-
-          return steps.concat(leg.steps)
-        }, []);
+        const allSteps = utils.getAllSteps(direction);
 
         if (compile) {
           direction.legs.forEach(function(leg) {

diff --git a/src/directions.js b/src/directions.js
@@ -191,14 +191,7 @@ export default class MapboxDirections {
             return c.reverse();
           });
 
-          const allSteps = feature.legs.reduce((steps, leg, idx) => {
-            if (idx > 0) {
-              steps[steps.length - 1].maneuver.type = 'waypoint';
-              leg.steps[0].maneuver.type = '';
-            }
-
-            return steps.concat(leg.steps)
-          }, []); 
+          const allSteps = utils.getAllSteps(feature);
 
           decoded.forEach(function(c, i) {
             var previous = features[features.length - 1];

diff --git a/src/utils.js b/src/utils.js
@@ -35,6 +35,17 @@ function createPoint(coordinates, properties) {
   };
 }
 
+function getAllSteps(feature) {
+  return feature.legs.reduce((steps, leg, idx) => {
+    if (idx > 0) {
+      steps[steps.length - 1].maneuver.type = 'waypoint';
+      leg.steps[0].maneuver.type = '';
+    }
+
+    return steps.concat(leg.steps)
+  }, []);
+}
+
 const format = {
   duration(s) {
     var m = Math.floor(s / 60),
@@ -62,4 +73,4 @@ const format = {
   }
 };
 
-export default { format, coordinateMatch, createPoint, validCoords, wrap, roundWithOriginalPrecision };
+export default { format, coordinateMatch, createPoint, validCoords, wrap, roundWithOriginalPrecision, getAllSteps };
diff --git a/test/test.instructions.js b/test/test.instructions.js
@@ -13,7 +13,7 @@ test('Directions#instructionControl', tt => {
     directions.setDestination([-77.3, 41]);
     directions.on('route', once((e) => {
       t.ok(e.route, 'route is emitted');
-      t.ok(container.querySelector('.directions-control-directions').textContent, 'instructions are shown');
+      t.ok(container.querySelector('.directions-icon-arrive'), 'instructions are shown');
     }));
   });