Merge pull request #28416 from rakshitjain13/map-bbox

added coordinates in get bounds
Expensify · Oct 2, 2023 · bf05f13 · bf05f13
2 parents 9cfea1a + ce09532
commit bf05f13
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/components/MapView/MapView.tsx b/src/components/MapView/MapView.tsx
@@ -39,14 +39,17 @@ const MapView = forwardRef<MapViewHandle, MapViewProps>(({accessToken, style, ma
                         centerCoordinate: waypoints[0].coordinate,
                     });
                 } else {
-                    const {southWest, northEast} = utils.getBounds(waypoints.map((waypoint) => waypoint.coordinate));
+                    const {southWest, northEast} = utils.getBounds(
+                        waypoints.map((waypoint) => waypoint.coordinate),
+                        directionCoordinates,
+                    );
                     cameraRef.current?.fitBounds(northEast, southWest, mapPadding, 1000);
                 }
             }
             return () => {
                 setIsIdle(false);
             };
-        }, [mapPadding, waypoints, isIdle]),
+        }, [mapPadding, waypoints, isIdle, directionCoordinates]),
     );
 
     useEffect(() => {

diff --git a/src/components/MapView/MapView.web.tsx b/src/components/MapView/MapView.web.tsx
@@ -43,9 +43,12 @@ const MapView = forwardRef<MapViewHandle, MapViewProps>(
 
             const map = mapRef.getMap();
 
-            const {northEast, southWest} = utils.getBounds(waypoints.map((waypoint) => waypoint.coordinate));
+            const {northEast, southWest} = utils.getBounds(
+                waypoints.map((waypoint) => waypoint.coordinate),
+                directionCoordinates,
+            );
             map.fitBounds([northEast, southWest], {padding: mapPadding});
-        }, [waypoints, mapRef, mapPadding]);
+        }, [waypoints, mapRef, mapPadding, directionCoordinates]);
 
         useEffect(() => {
             if (!mapRef) {

diff --git a/src/components/MapView/utils.ts b/src/components/MapView/utils.ts
@@ -1,6 +1,10 @@
-function getBounds(waypoints: Array<[number, number]>): {southWest: [number, number]; northEast: [number, number]} {
+function getBounds(waypoints: Array<[number, number]>, directionCoordinates: undefined | Array<[number, number]>): {southWest: [number, number]; northEast: [number, number]} {
     const lngs = waypoints.map((waypoint) => waypoint[0]);
     const lats = waypoints.map((waypoint) => waypoint[1]);
+    if (directionCoordinates) {
+        lngs.push(...directionCoordinates.map((coordinate) => coordinate[0]));
+        lats.push(...directionCoordinates.map((coordinate) => coordinate[1]));
+    }
 
     return {
         southWest: [Math.min(...lngs), Math.min(...lats)],