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

Merge develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-09-02 12:08:22 +02:00
commit bcd53405c8
197 changed files with 5675 additions and 5188 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/Logic/FeatureSource/Sources/OverpassFeatureSource.ts
View file

@ -34,6 +34,8 @@ export default class OverpassFeatureSource implements UpdatableFeatureSource {
private readonly _isActive: Store<boolean>
private readonly padToZoomLevel?: Store<number>
private _lastQueryBBox: BBox
private _lastRequestedLayers: LayerConfig[]
private readonly _layersToDownload: Store<LayerConfig[]>
constructor(
state: {
@ -48,26 +50,21 @@ export default class OverpassFeatureSource implements UpdatableFeatureSource {
options?: {
padToTiles?: Store<number>
isActive?: Store<boolean>
}
},
) {
this.state = state
this._isActive = options?.isActive ?? new ImmutableStore(true)
this.padToZoomLevel = options?.padToTiles
const self = this
state.bounds.addCallbackD((_) => {
this._layersToDownload = state.zoom.map(zoom => this.layersToDownload(zoom))
state.bounds.mapD((_) => {
self.updateAsyncIfNeeded()
})
}, [this._layersToDownload])
}
/**
* Download the relevant data from overpass. Attempt to use a different server; only downloads the relevant layers
* @private
*/
public async updateAsync(): Promise<void> {
let data: any = undefined
let lastUsed = 0
const layersToDownload = []
private layersToDownload(zoom: number): LayerConfig[] {
const layersToDownload: LayerConfig[] = []
for (const layer of this.state.layers) {
if (typeof layer === "string") {
throw "A layer was not expanded!"
@ -75,7 +72,7 @@ export default class OverpassFeatureSource implements UpdatableFeatureSource {
if (layer.source === undefined) {
continue
}
if (this.state.zoom.data < layer.minzoom) {
if (zoom < layer.minzoom) {
continue
}
if (layer.doNotDownload) {
@ -85,7 +82,7 @@ export default class OverpassFeatureSource implements UpdatableFeatureSource {
// This is a special layer. Should not have been here
console.warn(
"OverpassFeatureSource received a layer for which the source is null:",
layer.id
layer.id,
)
continue
}
@ -96,6 +93,19 @@ export default class OverpassFeatureSource implements UpdatableFeatureSource {
layersToDownload.push(layer)
}
return layersToDownload
}
/**
* Download the relevant data from overpass. Attempt to use a different server if one fails; only downloads the relevant layers
* @private
*/
public async updateAsync(): Promise<void> {
let data: any = undefined
let lastUsed = 0
const start = new Date()
const layersToDownload = this._layersToDownload.data
if (layersToDownload.length == 0) {
return
}
@ -106,15 +116,14 @@ export default class OverpassFeatureSource implements UpdatableFeatureSource {
throw "Panic: overpassFeatureSource didn't receive any overpassUrls"
}
// Note: the bounds are updated between attempts, in case that the user zoomed around
let bounds: BBox
let bounds : BBox
do {
try {
bounds = this.state.bounds.data
?.pad(this.state.widenFactor)
?.expandToTileBounds(this.padToZoomLevel?.data)
if (bounds === undefined) {
return undefined
if (!bounds) {
return
}
const overpass = this.GetFilter(overpassUrls[lastUsed], layersToDownload)
@ -154,9 +163,12 @@ export default class OverpassFeatureSource implements UpdatableFeatureSource {
// Some metatags are delivered by overpass _without_ underscore-prefix; we fix them below
// TODO FIXME re-enable this data.features.forEach((f) => SimpleMetaTaggers.objectMetaInfo.applyMetaTagsOnFeature(f))
console.log("Overpass returned", data.features.length, "features")
const end = new Date()
const timeNeeded = (end.getTime() - start.getTime()) / 1000
console.log("Overpass returned", data.features.length, "features in", timeNeeded, "seconds")
self.features.setData(data.features)
this._lastQueryBBox = bounds
this._lastRequestedLayers= layersToDownload
} catch (e) {
console.error("Got the overpass response, but could not process it: ", e, e.stack)
} finally {
@ -201,6 +213,7 @@ export default class OverpassFeatureSource implements UpdatableFeatureSource {
const requestedBounds = this.state.bounds.data
if (
this._lastQueryBBox !== undefined &&
Utils.sameList(this._layersToDownload.data, this._lastRequestedLayers) &&
requestedBounds.isContainedIn(this._lastQueryBBox)
) {
return undefined

12
src/Logic/Web/ThemeViewStateHashActor.ts
View file

@ -27,7 +27,6 @@ export default class ThemeViewStateHashActor {
* Note that there is no "real" way to intercept the back button, we can only detect the removal of the hash.
* As such, we use a change in the hash to close the appropriate windows
*
* @param state
*/
constructor(state: ThemeViewState) {
this._state = state
@ -120,26 +119,25 @@ export default class ThemeViewStateHashActor {
* 1. Selected element ID
* 2. A selected 'page' from the menu
*
* returns 'true' if a hash was set
*/
private setHash(): boolean {
private setHash(): void {
// Important ! This function is called by 'addCallback' and might thus never return 'true' or it will be unregistered
this.isUpdatingHash = true
try {
const selectedElement = this._state.selectedElement.data
if (selectedElement) {
Hash.hash.set(selectedElement.properties.id)
return true
return
}
for (const page in this._state.guistate.pageStates) {
const toggle = this._state.guistate.pageStates[page]
if (toggle.data) {
Hash.hash.set(page)
return true
return
}
}
Hash.hash.set(undefined)
return false
return
} finally {
this.isUpdatingHash = false
}