Merge branch 'develop' into feature/lod-vis

This commit is contained in:
Pieter Vander Vennet 2024-04-06 11:13:35 +02:00
commit 6771a62ef5
5 changed files with 9 additions and 9 deletions

View file

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

View file

@ -546,7 +546,7 @@ export class OsmConnection {
redirect_uri: Utils.runningFromConsole
? "https://mapcomplete.org/land.html"
: window.location.protocol + "//" + window.location.host + "/land.html",
singlepage: !standalone,
singlepage: true,
auto: true
})
}

View file

@ -30,7 +30,7 @@ export class GeoLocationState {
*/
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)