Skip to content

fix(heremap): preserve integer zoom when focusing on markers #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KhaledSakr merged 2 commits into from
Feb 12, 2025
Merged

fix(heremap): preserve integer zoom when focusing on markers #20

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5879db8
fix(heremap): preserve integer zoom when focusing on markers
KhaledSakr Feb 12, 2025
f1f5bb1
feat(heremap): allow specifying zoom speed
KhaledSakr Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/HEREMap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
setCenter: (point: H.geo.IPoint) => void,
setZoom: (zoom: number) => void,
screenToGeo: (x: number, y: number) => H.geo.Point,
zoomOnMarkers: (animate?: boolean, group?: string) => void,
zoomOnMarkersSet: (markersSet: H.map.DomMarker[], animate?: boolean) => void,
zoomOnMarkers: (animate?: number | boolean, group?: string) => void,
zoomOnMarkersSet: (markersSet: H.map.DomMarker[], animate?: number | boolean) => void,
addToMarkerGroup: (marker: H.map.Marker, group: string) => void,
removeFromMarkerGroup: (marker: H.map.Marker, group: string) => void,
}
Expand Down Expand Up @@ -123,7 +123,7 @@
return map.screenToGeo(x, y)
}

const zoomOnMarkersGroup = (markersGroup: H.map.Group, animate: boolean = true) => {
const zoomOnMarkersGroup = (markersGroup: H.map.Group, animate: number | boolean = true) => {
const DISTANCE_FACTOR = 0.1
const BEARING_TOP_LEFT = 315
const BEARING_BOTTOM_RIGHT = 135
Expand All @@ -135,17 +135,17 @@
topLeft.walk(BEARING_TOP_LEFT, distance),
bottomRight.walk(BEARING_BOTTOM_RIGHT, distance),
)
if (viewBounds) { map.getViewModel().setLookAtData({ bounds: viewBounds }, animate) }
if (viewBounds) { map.getViewModel().setLookAtData({ bounds: viewBounds }, animate, true) }
}

const zoomOnMarkers = (animate: boolean = true, group: string = 'default') => {
const zoomOnMarkers = (animate: number | boolean = true, group: string = 'default') => {
if (map) {
if (!markersGroupsRef.current[group]) { return }
zoomOnMarkersGroup(markersGroupsRef.current[group], animate)
}
}

const zoomOnMarkersSet = (markersSet: H.map.DomMarker[], animate: boolean = true) => {
const zoomOnMarkersSet = (markersSet: H.map.DomMarker[], animate: number | boolean = true) => {
const markersGroupSet = new H.map.Group()
markersSet.map((m) => markersGroupSet.addObject(m))
zoomOnMarkersGroup(markersGroupSet, animate)
Expand Down Expand Up @@ -187,7 +187,7 @@
zoomOnMarkers,
zoomOnMarkersSet,
}
}, [map])

Check warning on line 190 in src/HEREMap.tsx

View workflow job for this annotation

GitHub Actions / lint 

React Hook useImperativeHandle has missing dependencies: 'addToMarkerGroup', 'animateCenter', 'animateZoom', 'removeFromMarkerGroup', 'screenToGeo', 'zoomOnMarkers', and 'zoomOnMarkersSet'. Either include them or remove the dependency array

useEffect(() => {
if (unmountedRef.current) {
Expand Down Expand Up @@ -258,7 +258,7 @@
unmountedRef.current = true
map?.dispose()
}
}, [])

Check warning on line 261 in src/HEREMap.tsx

View workflow job for this annotation

GitHub Actions / lint 

React Hook useEffect has missing dependencies: 'apiKey', 'center', 'disableMapSettings', 'hidpi', 'interactive', 'language', 'map', 'onMapAvailable', 'trafficLayer', 'useVectorTiles', and 'zoom'. Either include them or remove the dependency array. If 'onMapAvailable' changes too often, find the parent component that defines it and wrap that definition in useCallback

useEffect(() => {
if (map) {
Expand Down
Loading