midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Fix: don't move the map after we jumped to the current GPS location

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-05-07 23:25:28 +02:00
parent 14927497bd
commit f31b025b8d
1 changed files with 12 additions and 5 deletions

17
Logic/Actors/GeoLocationHandler.ts
View file

@ -35,7 +35,11 @@ export default class GeoLocationHandler {
* Note that this featureSource is _derived_ from 'historicalUserLocations' * Note that this featureSource is _derived_ from 'historicalUserLocations'
*/ */
public readonly historicalUserLocationsTrack: FeatureSource public readonly historicalUserLocationsTrack: FeatureSource
public readonly mapHasMoved: UIEventSource<boolean> = new UIEventSource<boolean>(false)
/**
* The last moment that the map has moved
*/
public readonly mapHasMoved: UIEventSource<Date | undefined> = new UIEventSource<Date | undefined>(undefined)
private readonly selectedElement: UIEventSource<any> private readonly selectedElement: UIEventSource<any>
private readonly mapProperties?: MapProperties private readonly mapProperties?: MapProperties
private readonly gpsLocationHistoryRetentionTime?: UIEventSource<number> private readonly gpsLocationHistoryRetentionTime?: UIEventSource<number>
@ -58,7 +62,7 @@ export default class GeoLocationHandler {
if (new Date().getTime() - initTime.getTime() < 250) { if (new Date().getTime() - initTime.getTime() < 250) {
return return
} }
self.mapHasMoved.setData(true) self.mapHasMoved.setData(new Date())
return true // Unsubscribe return true // Unsubscribe
}) })
@ -66,7 +70,7 @@ export default class GeoLocationHandler {
QueryParameters.wasInitialized("lat") || QueryParameters.wasInitialized("lon") QueryParameters.wasInitialized("lat") || QueryParameters.wasInitialized("lon")
if (latLonGivenViaUrl) { if (latLonGivenViaUrl) {
// The URL counts as a 'user interaction' // The URL counts as a 'user interaction'
this.mapHasMoved.setData(true) this.mapHasMoved.setData(new Date())
} }
this.geolocationState.currentGPSLocation.addCallbackAndRunD((_) => { this.geolocationState.currentGPSLocation.addCallbackAndRunD((_) => {
@ -76,7 +80,10 @@ export default class GeoLocationHandler {
// The map hasn't moved yet; we received our first coordinates, so let's move there! // The map hasn't moved yet; we received our first coordinates, so let's move there!
self.MoveMapToCurrentLocation() self.MoveMapToCurrentLocation()
} }
if (timeSinceLastRequest < Constants.zoomToLocationTimeout) { if (timeSinceLastRequest < Constants.zoomToLocationTimeout &&
(this.mapHasMoved.data === undefined || this.mapHasMoved.data.getTime() < geolocationState.requestMoment.data?.getTime() )
) {
// still within request time and the map hasn't moved since requesting to jump to the current location
self.MoveMapToCurrentLocation() self.MoveMapToCurrentLocation()
} }
@ -132,7 +139,7 @@ export default class GeoLocationHandler {
}) })
const zoom = this.mapProperties.zoom const zoom = this.mapProperties.zoom
zoom.setData(Math.max(zoom.data, 16)) zoom.setData(Math.max(zoom.data, 16))
this.mapHasMoved.setData(true) this.mapHasMoved.setData(new Date())
this.geolocationState.requestMoment.setData(undefined) this.geolocationState.requestMoment.setData(undefined)
} }