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

refactoring: more fixes, first attempt at tagRenderingAnswer

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-03-30 04:51:56 +02:00
parent aaaaf1948d
commit 29372c465e
24 changed files with 278 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Logic/FeatureSource/PerLayerFeatureSourceSplitter.ts
View file

@ -4,6 +4,7 @@ import SimpleFeatureSource from "./Sources/SimpleFeatureSource"
import { Feature } from "geojson"
import { Utils } from "../../Utils"
import { UIEventSource } from "../UIEventSource"
import { feature } from "@turf/turf"
/**
* In some rare cases, some elements are shown on multiple layers (when 'passthrough' is enabled)
@ -19,7 +20,7 @@ export default class PerLayerFeatureSourceSplitter<
upstream: FeatureSource,
options?: {
constructStore?: (features: UIEventSource<Feature[]>, layer: FilteredLayer) => T
handleLeftovers?: (featuresWithoutLayer: any[]) => void
handleLeftovers?: (featuresWithoutLayer: Feature[]) => void
}
) {
const knownLayers = new Map<string, T>()
@ -35,9 +36,6 @@ export default class PerLayerFeatureSourceSplitter<
}
upstream.features.addCallbackAndRunD((features) => {
if (features === undefined) {
return
}
if (layers === undefined) {
return
}
@ -82,7 +80,7 @@ export default class PerLayerFeatureSourceSplitter<
const src = layerSources.get(id)
if (Utils.sameList(src.data, features)) {
return
continue
}
src.setData(features)
}

11
Logic/FeatureSource/Sources/FeatureSourceMerger.ts
View file

@ -1,6 +1,7 @@
import { Store, UIEventSource } from "../../UIEventSource"
import FeatureSource, { IndexedFeatureSource } from "../FeatureSource"
import { Feature } from "geojson"
import { Utils } from "../../../Utils"
/**
*
@ -35,20 +36,21 @@ export default class FeatureSourceMerger implements IndexedFeatureSource {
}
protected addData(featuress: Feature[][]) {
featuress = Utils.NoNull(featuress)
let somethingChanged = false
const all: Map<string, Feature> = new Map()
const unseen = new Set<string>()
// We seed the dictionary with the previously loaded features
const oldValues = this.features.data ?? []
for (const oldValue of oldValues) {
all.set(oldValue.properties.id, oldValue)
unseen.add(oldValue.properties.id)
}
for (const features of featuress) {
if (features === undefined) {
continue
}
for (const f of features) {
const id = f.properties.id
unseen.delete(id)
if (!all.has(id)) {
// This is a new feature
somethingChanged = true
@ -67,6 +69,9 @@ export default class FeatureSourceMerger implements IndexedFeatureSource {
}
}
somethingChanged ||= unseen.size > 0
unseen.forEach((id) => all.delete(id))
if (!somethingChanged) {
// We don't bother triggering an update
return

5
Logic/FeatureSource/Sources/LayoutSource.ts
View file

@ -27,7 +27,7 @@ export default class LayoutSource extends FeatureSourceMerger {
) {
const { bounds, zoom } = mapProperties
// remove all 'special' layers
layers = layers.filter((flayer) => flayer.source !== null)
layers = layers.filter((layer) => layer.source !== null && layer.source !== undefined)
const geojsonlayers = layers.filter((layer) => layer.source.geojsonSource !== undefined)
const osmLayers = layers.filter((layer) => layer.source.geojsonSource === undefined)
@ -122,7 +122,8 @@ export default class LayoutSource extends FeatureSourceMerger {
{
zoom,
bounds,
layoutToUse: featureSwitches.layoutToUse,
layers: osmLayers,
widenFactor: featureSwitches.layoutToUse.widenFactor,
overpassUrl: featureSwitches.overpassUrl,
overpassTimeout: featureSwitches.overpassTimeout,
overpassMaxZoom: featureSwitches.overpassMaxZoom,

20
Logic/FeatureSource/Sources/OverpassFeatureSource.ts
View file

@ -3,7 +3,6 @@ import FeatureSource from "../FeatureSource"
import { ImmutableStore, Store, UIEventSource } from "../../UIEventSource"
import LayerConfig from "../../../Models/ThemeConfig/LayerConfig"
import { Or } from "../../Tags/Or"
import LayoutConfig from "../../../Models/ThemeConfig/LayoutConfig"
import { Overpass } from "../../Osm/Overpass"
import { Utils } from "../../../Utils"
import { TagsFilter } from "../../Tags/TagsFilter"
@ -26,7 +25,8 @@ export default class OverpassFeatureSource implements FeatureSource {
private readonly state: {
readonly zoom: Store<number>
readonly layoutToUse: LayoutConfig
readonly layers: LayerConfig[]
readonly widenFactor: number
readonly overpassUrl: Store<string[]>
readonly overpassTimeout: Store<number>
readonly bounds: Store<BBox>
@ -37,7 +37,8 @@ export default class OverpassFeatureSource implements FeatureSource {
constructor(
state: {
readonly layoutToUse: LayoutConfig
readonly layers: LayerConfig[]
readonly widenFactor: number
readonly zoom: Store<number>
readonly overpassUrl: Store<string[]>
readonly overpassTimeout: Store<number>
@ -117,7 +118,7 @@ export default class OverpassFeatureSource implements FeatureSource {
let lastUsed = 0
const layersToDownload = []
for (const layer of this.state.layoutToUse.layers) {
for (const layer of this.state.layers) {
if (typeof layer === "string") {
throw "A layer was not expanded!"
}
@ -130,6 +131,14 @@ export default class OverpassFeatureSource implements FeatureSource {
if (layer.doNotDownload) {
continue
}
if (layer.source === null) {
// This is a special layer. Should not have been here
console.warn(
"OverpassFeatureSource received a layer for which the source is null:",
layer.id
)
continue
}
if (layer.source.geojsonSource !== undefined) {
// Not our responsibility to download this layer!
continue
@ -151,7 +160,7 @@ export default class OverpassFeatureSource implements FeatureSource {
do {
try {
bounds = this.state.bounds.data
?.pad(this.state.layoutToUse.widenFactor)
?.pad(this.state.widenFactor)
?.expandToTileBounds(this.padToZoomLevel?.data)
if (bounds === undefined) {
@ -195,6 +204,7 @@ export default class OverpassFeatureSource implements FeatureSource {
// 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")
self.features.setData(data.features)
return [bounds, date, layersToDownload]
} catch (e) {