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

Fix: snapping now also works if the building it snaps to is a multipolygon/relation

Browse source
This commit is contained in:
Pieter Vander Vennet 2025-03-07 00:32:20 +01:00
parent d224f1fd39
commit fc940c8a7e
4 changed files with 123 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

74
src/Logic/FeatureSource/Sources/SnappingFeatureSource.ts
View file

@ -3,6 +3,8 @@ import { Store, UIEventSource } from "../../UIEventSource"
import { Feature, Point } from "geojson"
import { GeoOperations } from "../../GeoOperations"
import { BBox } from "../../BBox"
import { RelationId } from "../../../Models/OsmFeature"
import OsmObjectDownloader from "../../Osm/OsmObjectDownloader"
export interface SnappingOptions {
/**
@ -33,13 +35,15 @@ export interface SnappingOptions {
}
export default class SnappingFeatureSource
implements FeatureSource<Feature<Point, { "snapped-to": string; dist: number }>>
{
implements FeatureSource<Feature<Point, { "snapped-to": string; dist: number }>> {
public readonly features: Store<[Feature<Point, { "snapped-to": string; dist: number }>]>
/*Contains the id of the way it snapped to*/
public readonly snappedTo: Store<string>
private readonly _snappedTo: UIEventSource<string>
// private static readonly downloadedRelations: UIEventSource<Map<RelationId, OsmRelation>> = new UIEventSource(new Map())
private static readonly downloadedRelationMembers: UIEventSource<Feature[]> = new UIEventSource([])
constructor(
snapTo: FeatureSource,
location: Store<{ lon: number; lat: number }>,
@ -50,9 +54,9 @@ export default class SnappingFeatureSource
this.snappedTo = this._snappedTo
const simplifiedFeatures = snapTo.features
.mapD((features) =>
features
[].concat(...features
.filter((feature) => feature.geometry.type !== "Point")
.map((f) => GeoOperations.forceLineString(<any>f))
.map((f) => GeoOperations.forceLineString(<any>f)))
)
.map(
(features) => {
@ -63,9 +67,10 @@ export default class SnappingFeatureSource
[location]
)
this.features = location.mapD(
({ lon, lat }) => {
const features = simplifiedFeatures.data
const features = simplifiedFeatures.data.concat(...SnappingFeatureSource.downloadedRelationMembers.data)
const loc: [number, number] = [lon, lat]
const maxDistance = (options?.maxDistance ?? 1000) / 1000
let bestSnap: Feature<Point, { "snapped-to": string; dist: number }> = undefined
@ -74,7 +79,12 @@ export default class SnappingFeatureSource
// TODO handle Polygons with holes
continue
}
const snapped = GeoOperations.nearestPoint(<any>feature, loc)
const snapped: Feature<Point, {
dist: number;
index: number;
multiFeatureIndex: number;
location: number
}> = GeoOperations.nearestPoint(feature, loc)
if (snapped.properties.dist > maxDistance) {
continue
}
@ -82,8 +92,20 @@ export default class SnappingFeatureSource
bestSnap === undefined ||
bestSnap.properties.dist > snapped.properties.dist
) {
snapped.properties["snapped-to"] = feature.properties.id
bestSnap = <any>snapped
const id = feature.properties.id
if (id.startsWith("relation/")) {
/**
* This is a bit of dirty code:
* if we find a relation, we'll start to download it and the members.
* The downloaded members will then be used to snap against as well upon a following iteration
*/
SnappingFeatureSource.download(id)
continue
}
bestSnap = {
...snapped,
properties: { ...snapped.properties, "snapped-to": id }
}
}
}
this._snappedTo.setData(bestSnap?.properties?.["snapped-to"])
@ -92,19 +114,47 @@ export default class SnappingFeatureSource
type: "Feature",
geometry: {
type: "Point",
coordinates: [lon, lat],
coordinates: [lon, lat]
},
properties: {
"snapped-to": undefined,
dist: -1,
},
dist: -1
}
}
}
const c = bestSnap.geometry.coordinates
options?.snapLocation?.setData({ lon: c[0], lat: c[1] })
return [bestSnap]
},
[snapTo.features]
[snapTo.features, SnappingFeatureSource.downloadedRelationMembers]
)
}
private static _downloader = new OsmObjectDownloader()
private static _downloadedRelations = new Set<string>()
private static async download(id: RelationId) {
if (SnappingFeatureSource._downloadedRelations.has(id)) {
return
}
SnappingFeatureSource._downloadedRelations.add(id)
const rel = await SnappingFeatureSource._downloader.DownloadObjectAsync(id, 60 * 24)
if (rel === "deleted") {
return
}
for (const member of rel.members) {
if (member.type !== "way") {
continue
}
if (member.role !== "outer" && member.role !== "inner") {
continue
}
const way = await SnappingFeatureSource._downloader.DownloadObjectAsync(member.type + "/" + member.ref)
if (way === "deleted") {
continue
}
SnappingFeatureSource.downloadedRelationMembers.data.push(...GeoOperations.forceLineString(way.asGeoJson()))
}
SnappingFeatureSource.downloadedRelationMembers.ping()
}
}