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

Don't zoom in automatically if the location is locked around the GPS-location

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-04-03 23:24:11 +02:00
parent 36663f97ad
commit 183740d6c6
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Logic/Actors/GeoLocationHandler.ts
View file

@ -95,7 +95,7 @@ export default class GeoLocationHandler {
if (!this.geolocationState.allowMoving.data) { if (!this.geolocationState.allowMoving.data) {
// Jup, the map is locked to the bound location: move automatically // Jup, the map is locked to the bound location: move automatically
self.MoveMapToCurrentLocation() self.MoveMapToCurrentLocation(0)
return return
} }
}) })
@ -113,7 +113,7 @@ export default class GeoLocationHandler {
* - The GPS-location iss NULL-island * - The GPS-location iss NULL-island
* @constructor * @constructor
*/ */
public MoveMapToCurrentLocation() { public MoveMapToCurrentLocation(zoomToAtLeast: number = 14 ) {
const newLocation = this.geolocationState.currentGPSLocation.data const newLocation = this.geolocationState.currentGPSLocation.data
const mapLocation = this.mapProperties.location const mapLocation = this.mapProperties.location
// We got a new location. // We got a new location.
@ -143,7 +143,7 @@ export default class GeoLocationHandler {
lat: newLocation.latitude, lat: newLocation.latitude,
}) })
const zoom = this.mapProperties.zoom const zoom = this.mapProperties.zoom
zoom.setData(Math.min(Math.max(zoom.data, 14), 18)) zoom.setData(Math.min(Math.max(zoom.data, zoomToAtLeast), 18))
this.mapHasMoved.setData(new Date()) this.mapHasMoved.setData(new Date())
this.geolocationState.requestMoment.setData(undefined) this.geolocationState.requestMoment.setData(undefined)

2
src/Logic/State/GeoLocationState.ts
View file

@ -30,7 +30,7 @@ export class GeoLocationState {
*/ */
public readonly requestMoment: UIEventSource<Date | undefined> = new UIEventSource(undefined) public readonly requestMoment: UIEventSource<Date | undefined> = new UIEventSource(undefined)
/** /**
* If true: the map will center (and re-center) to this location * If true: the map will center (and re-center) to the current GPS-location
*/ */
public readonly allowMoving: UIEventSource<boolean> = new UIEventSource<boolean>(true) public readonly allowMoving: UIEventSource<boolean> = new UIEventSource<boolean>(true)