FE CCCV Zoom out to printable zoom on click

Greater-Wellington-Regional-Council · Nov 29, 2024 · f36fcb5 · f36fcb5
1 parent 04f37c2
commit f36fcb5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/packages/cccv/src/lib/useMapFocus.tsx b/packages/cccv/src/lib/useMapFocus.tsx
@@ -38,6 +38,7 @@ const useMapFocus = (
         if (location.description) {
             pin.setPopup(new mapboxgl.Popup({ closeButton: false }).setLngLat([location.longitude!, location.latitude!]).setHTML(location.description || '<></>'))
         }
+
         setFocusPin(pin)
     }
 

diff --git a/packages/cccv/src/lib/zoomIntoFeatures.ts b/packages/cccv/src/lib/zoomIntoFeatures.ts
@@ -13,7 +13,8 @@ export default function zoomIntoFeatures(
     padding: number = 200,
     maxZoom: number = 20
 ) {
-    if (!focus) return
+    if (!focus)
+        return
 
     const featureOrCollection =
         (isFeatureCollection(focus) || isFeature(focus)) ? focus :

diff --git a/packages/cccv/src/pages/MapPage/MapPage.tsx b/packages/cccv/src/pages/MapPage/MapPage.tsx
@@ -237,9 +237,15 @@ export default function MapPage() {
         clearErrors()
         const clickedFeatures = getFeaturesUnderMouse(mapRef, e, BOUNDARY_LINES_LAYER)
         if (clickedFeatures) {
+            if (mapRef.current?.getMap()?.getZoom() !== DEFAULT_ZOOM)
+                mapRef.current?.getMap().flyTo({
+                    center: e.lngLat,
+                    zoom: DEFAULT_ZOOM,
+                })
             setSelectedLocation({
                 longitude: e.lngLat.lng, latitude: e.lngLat.lat,
-                boundary: clickedFeatures[0]
+                boundary: clickedFeatures[0],
+                zoom: DEFAULT_ZOOM,
             })
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,6 +38,7 @@ const useMapFocus = ( @@
             if (location.description) {
                 pin.setPopup(new mapboxgl.Popup({ closeButton: false }).setLngLat([location.longitude!, location.latitude!]).setHTML(location.description || '<></>'))
             }
             setFocusPin(pin)
         }
@@ Expand Down @@