2023-06-01 02:52:21 +02:00
|
|
|
import {OsmNode, OsmObject, OsmRelation, OsmWay} from "./OsmObject"
|
|
|
|
import {Store, UIEventSource} from "../UIEventSource"
|
2021-01-02 19:09:49 +01:00
|
|
|
import Constants from "../../Models/Constants"
|
2021-07-15 20:47:28 +02:00
|
|
|
import OsmChangeAction from "./Actions/OsmChangeAction"
|
2023-06-01 02:52:21 +02:00
|
|
|
import {ChangeDescription, ChangeDescriptionTools} from "./Actions/ChangeDescription"
|
|
|
|
import {Utils} from "../../Utils"
|
|
|
|
import {LocalStorageSource} from "../Web/LocalStorageSource"
|
2021-10-22 14:01:40 +02:00
|
|
|
import SimpleMetaTagger from "../SimpleMetaTagger"
|
2023-06-01 02:52:21 +02:00
|
|
|
import {FeatureSource, IndexedFeatureSource} from "../FeatureSource/FeatureSource"
|
|
|
|
import {GeoLocationPointProperties} from "../State/GeoLocationState"
|
|
|
|
import {GeoOperations} from "../GeoOperations"
|
|
|
|
import {ChangesetHandler, ChangesetTag} from "./ChangesetHandler"
|
|
|
|
import {OsmConnection} from "./OsmConnection"
|
2023-03-26 05:58:28 +02:00
|
|
|
import FeaturePropertiesStore from "../FeatureSource/Actors/FeaturePropertiesStore"
|
2023-04-20 03:58:31 +02:00
|
|
|
import OsmObjectDownloader from "./OsmObjectDownloader"
|
2020-06-24 00:35:19 +02:00
|
|
|
|
2021-01-03 03:09:52 +01:00
|
|
|
/**
|
|
|
|
* Handles all changes made to OSM.
|
|
|
|
* Needs an authenticator via OsmConnection
|
|
|
|
*/
|
2021-07-15 20:47:28 +02:00
|
|
|
export class Changes {
|
2021-09-22 05:02:09 +02:00
|
|
|
public readonly pendingChanges: UIEventSource<ChangeDescription[]> =
|
|
|
|
LocalStorageSource.GetParsed<ChangeDescription[]>("pending-changes", [])
|
|
|
|
public readonly allChanges = new UIEventSource<ChangeDescription[]>(undefined)
|
2023-04-13 20:58:49 +02:00
|
|
|
public readonly state: { allElements?: IndexedFeatureSource; osmConnection: OsmConnection }
|
2022-01-26 21:40:38 +01:00
|
|
|
public readonly extraComment: UIEventSource<string> = new UIEventSource(undefined)
|
2023-04-20 03:58:31 +02:00
|
|
|
public readonly backend: string
|
2023-06-01 02:52:21 +02:00
|
|
|
public readonly isUploading = new UIEventSource(false)
|
2023-04-13 20:58:49 +02:00
|
|
|
private readonly historicalUserLocations?: FeatureSource
|
2021-10-29 16:38:33 +02:00
|
|
|
private _nextId: number = -1 // Newly assigned ID's are negative
|
2021-09-09 00:05:51 +02:00
|
|
|
private readonly previouslyCreated: OsmObject[] = []
|
2021-10-22 14:01:40 +02:00
|
|
|
private readonly _leftRightSensitive: boolean
|
2023-03-24 19:21:15 +01:00
|
|
|
private readonly _changesetHandler: ChangesetHandler
|
2021-12-05 05:19:59 +01:00
|
|
|
|
2021-12-13 02:05:34 +01:00
|
|
|
constructor(
|
2023-04-13 20:58:49 +02:00
|
|
|
state: {
|
|
|
|
dryRun: Store<boolean>
|
|
|
|
allElements?: IndexedFeatureSource
|
|
|
|
featurePropertiesStore?: FeaturePropertiesStore
|
2021-12-13 02:05:34 +01:00
|
|
|
osmConnection: OsmConnection
|
2023-04-13 20:58:49 +02:00
|
|
|
historicalUserLocations?: FeatureSource
|
2021-12-13 02:05:34 +01:00
|
|
|
},
|
|
|
|
leftRightSensitive: boolean = false
|
|
|
|
) {
|
2021-10-22 14:01:40 +02:00
|
|
|
this._leftRightSensitive = leftRightSensitive
|
2021-09-22 05:02:09 +02:00
|
|
|
// We keep track of all changes just as well
|
|
|
|
this.allChanges.setData([...this.pendingChanges.data])
|
2021-09-22 16:07:56 +02:00
|
|
|
// If a pending change contains a negative ID, we save that
|
2021-09-26 23:35:26 +02:00
|
|
|
this._nextId = Math.min(-1, ...(this.pendingChanges.data?.map((pch) => pch.id) ?? []))
|
2021-12-13 02:05:34 +01:00
|
|
|
this.state = state
|
2023-04-20 03:58:31 +02:00
|
|
|
this.backend = state.osmConnection.Backend()
|
2023-03-26 05:58:28 +02:00
|
|
|
this._changesetHandler = new ChangesetHandler(
|
|
|
|
state.dryRun,
|
|
|
|
state.osmConnection,
|
|
|
|
state.featurePropertiesStore,
|
2022-02-16 00:14:22 +01:00
|
|
|
this
|
|
|
|
)
|
2023-03-24 19:21:15 +01:00
|
|
|
this.historicalUserLocations = state.historicalUserLocations
|
2021-09-26 23:35:26 +02:00
|
|
|
|
|
|
|
// Note: a changeset might be reused which was opened just before and might have already used some ids
|
|
|
|
// This doesn't matter however, as the '-1' is per piecewise upload, not global per changeset
|
2021-07-15 20:47:28 +02:00
|
|
|
}
|
|
|
|
|
2022-02-22 14:13:41 +01:00
|
|
|
static createChangesetFor(
|
|
|
|
csId: string,
|
|
|
|
allChanges: {
|
2021-09-09 00:05:51 +02:00
|
|
|
modifiedObjects: OsmObject[]
|
|
|
|
newObjects: OsmObject[]
|
|
|
|
deletedObjects: OsmObject[]
|
|
|
|
}
|
|
|
|
): string {
|
2021-07-15 20:47:28 +02:00
|
|
|
const changedElements = allChanges.modifiedObjects ?? []
|
2021-07-18 14:52:09 +02:00
|
|
|
const newElements = allChanges.newObjects ?? []
|
|
|
|
const deletedElements = allChanges.deletedObjects ?? []
|
2021-07-15 20:47:28 +02:00
|
|
|
|
|
|
|
let changes = `<osmChange version='0.6' generator='Mapcomplete ${Constants.vNumber}'>`
|
|
|
|
if (newElements.length > 0) {
|
|
|
|
changes +=
|
|
|
|
"\n<create>\n" +
|
|
|
|
newElements.map((e) => e.ChangesetXML(csId)).join("\n") +
|
|
|
|
"</create>"
|
2020-06-24 00:35:19 +02:00
|
|
|
}
|
2021-07-15 20:47:28 +02:00
|
|
|
if (changedElements.length > 0) {
|
|
|
|
changes +=
|
|
|
|
"\n<modify>\n" +
|
|
|
|
changedElements.map((e) => e.ChangesetXML(csId)).join("\n") +
|
|
|
|
"\n</modify>"
|
2020-06-24 00:35:19 +02:00
|
|
|
}
|
2020-08-27 18:44:16 +02:00
|
|
|
|
2021-07-15 20:47:28 +02:00
|
|
|
if (deletedElements.length > 0) {
|
|
|
|
changes +=
|
2021-10-04 03:12:42 +02:00
|
|
|
"\n<delete>\n" +
|
2021-07-15 20:47:28 +02:00
|
|
|
deletedElements.map((e) => e.ChangesetXML(csId)).join("\n") +
|
2021-10-04 03:12:42 +02:00
|
|
|
"\n</delete>"
|
2020-08-06 19:42:10 +02:00
|
|
|
}
|
2020-08-27 11:11:20 +02:00
|
|
|
|
2021-07-15 20:47:28 +02:00
|
|
|
changes += "</osmChange>"
|
|
|
|
return changes
|
2020-06-24 00:35:19 +02:00
|
|
|
}
|
|
|
|
|
2021-07-15 20:47:28 +02:00
|
|
|
private static GetNeededIds(changes: ChangeDescription[]) {
|
|
|
|
return Utils.Dedup(changes.filter((c) => c.id >= 0).map((c) => c.type + "/" + c.id))
|
|
|
|
}
|
2021-07-10 13:47:53 +02:00
|
|
|
|
2021-09-09 00:05:51 +02:00
|
|
|
/**
|
|
|
|
* Returns a new ID and updates the value for the next ID
|
|
|
|
*/
|
|
|
|
public getNewID() {
|
2021-09-22 16:07:56 +02:00
|
|
|
return this._nextId--
|
2021-09-09 00:05:51 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Uploads all the pending changes in one go.
|
|
|
|
* Triggered by the 'PendingChangeUploader'-actor in Actors
|
|
|
|
*/
|
2022-02-14 02:50:21 +01:00
|
|
|
public async flushChanges(flushreason: string = undefined): Promise<void> {
|
2021-09-09 00:05:51 +02:00
|
|
|
if (this.pendingChanges.data.length === 0) {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if (this.isUploading.data) {
|
|
|
|
console.log("Is already uploading... Abort")
|
|
|
|
return
|
|
|
|
}
|
2021-12-17 19:28:05 +01:00
|
|
|
|
2021-10-20 00:09:40 +02:00
|
|
|
console.log("Uploading changes due to: ", flushreason)
|
2021-09-09 00:05:51 +02:00
|
|
|
this.isUploading.setData(true)
|
2021-12-12 02:59:24 +01:00
|
|
|
try {
|
2022-02-14 02:50:21 +01:00
|
|
|
const csNumber = await this.flushChangesAsync()
|
2021-12-12 02:59:24 +01:00
|
|
|
this.isUploading.setData(false)
|
2022-01-26 21:40:38 +01:00
|
|
|
console.log("Changes flushed. Your changeset is " + csNumber)
|
2021-12-12 02:59:24 +01:00
|
|
|
} catch (e) {
|
|
|
|
this.isUploading.setData(false)
|
|
|
|
console.error("Flushing changes failed due to", e)
|
|
|
|
}
|
2021-09-26 23:35:26 +02:00
|
|
|
}
|
|
|
|
|
2022-01-26 21:40:38 +01:00
|
|
|
public async applyAction(action: OsmChangeAction): Promise<void> {
|
|
|
|
const changeDescriptions = await action.Perform(this)
|
|
|
|
changeDescriptions[0].meta.distanceToObject = this.calculateDistanceToChanges(
|
|
|
|
action,
|
|
|
|
changeDescriptions
|
|
|
|
)
|
|
|
|
this.applyChanges(changeDescriptions)
|
|
|
|
}
|
|
|
|
|
|
|
|
public applyChanges(changes: ChangeDescription[]) {
|
|
|
|
console.log("Received changes:", changes)
|
|
|
|
this.pendingChanges.data.push(...changes)
|
|
|
|
this.pendingChanges.ping()
|
|
|
|
this.allChanges.data.push(...changes)
|
|
|
|
this.allChanges.ping()
|
|
|
|
}
|
2021-11-09 01:49:07 +01:00
|
|
|
|
2023-04-20 03:58:31 +02:00
|
|
|
public CreateChangesetObjects(
|
|
|
|
changes: ChangeDescription[],
|
|
|
|
downloadedOsmObjects: OsmObject[]
|
|
|
|
): {
|
|
|
|
newObjects: OsmObject[]
|
|
|
|
modifiedObjects: OsmObject[]
|
|
|
|
deletedObjects: OsmObject[]
|
|
|
|
} {
|
|
|
|
const objects: Map<string, OsmObject> = new Map<string, OsmObject>()
|
|
|
|
const states: Map<string, "unchanged" | "created" | "modified" | "deleted"> = new Map()
|
|
|
|
|
|
|
|
for (const o of downloadedOsmObjects) {
|
|
|
|
objects.set(o.type + "/" + o.id, o)
|
|
|
|
states.set(o.type + "/" + o.id, "unchanged")
|
|
|
|
}
|
|
|
|
|
|
|
|
for (const o of this.previouslyCreated) {
|
|
|
|
objects.set(o.type + "/" + o.id, o)
|
|
|
|
states.set(o.type + "/" + o.id, "unchanged")
|
|
|
|
}
|
|
|
|
|
|
|
|
for (const change of changes) {
|
|
|
|
let changed = false
|
|
|
|
const id = change.type + "/" + change.id
|
|
|
|
if (!objects.has(id)) {
|
|
|
|
// The object hasn't been seen before, so it doesn't exist yet and is newly created by its very definition
|
|
|
|
if (change.id >= 0) {
|
|
|
|
// Might be a failed fetch for simply this object
|
|
|
|
throw "Did not get an object that should be known: " + id
|
|
|
|
}
|
|
|
|
if (change.changes === undefined) {
|
|
|
|
// This object is a change to a newly created object. However, we have not seen the creation changedescription yet!
|
|
|
|
throw "Not a creation of the object"
|
|
|
|
}
|
|
|
|
// This is a new object that should be created
|
|
|
|
states.set(id, "created")
|
|
|
|
console.log("Creating object for changeDescription", change)
|
|
|
|
let osmObj: OsmObject = undefined
|
|
|
|
switch (change.type) {
|
|
|
|
case "node":
|
|
|
|
const n = new OsmNode(change.id)
|
|
|
|
n.lat = change.changes["lat"]
|
|
|
|
n.lon = change.changes["lon"]
|
|
|
|
osmObj = n
|
|
|
|
break
|
|
|
|
case "way":
|
|
|
|
const w = new OsmWay(change.id)
|
|
|
|
w.nodes = change.changes["nodes"]
|
|
|
|
osmObj = w
|
|
|
|
break
|
|
|
|
case "relation":
|
|
|
|
const r = new OsmRelation(change.id)
|
|
|
|
r.members = change.changes["members"]
|
|
|
|
osmObj = r
|
|
|
|
break
|
|
|
|
}
|
|
|
|
if (osmObj === undefined) {
|
|
|
|
throw "Hmm? This is a bug"
|
|
|
|
}
|
|
|
|
objects.set(id, osmObj)
|
|
|
|
this.previouslyCreated.push(osmObj)
|
|
|
|
}
|
|
|
|
|
|
|
|
const state = states.get(id)
|
|
|
|
if (change.doDelete) {
|
|
|
|
if (state === "created") {
|
|
|
|
states.set(id, "unchanged")
|
|
|
|
} else {
|
|
|
|
states.set(id, "deleted")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
const obj = objects.get(id)
|
|
|
|
// Apply tag changes
|
|
|
|
for (const kv of change.tags ?? []) {
|
|
|
|
const k = kv.k
|
|
|
|
let v = kv.v
|
|
|
|
|
|
|
|
if (v === "") {
|
|
|
|
v = undefined
|
|
|
|
}
|
|
|
|
|
|
|
|
const oldV = obj.tags[k]
|
|
|
|
if (oldV === v) {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
obj.tags[k] = v
|
|
|
|
changed = true
|
|
|
|
}
|
|
|
|
|
|
|
|
if (change.changes !== undefined) {
|
|
|
|
switch (change.type) {
|
|
|
|
case "node":
|
|
|
|
// @ts-ignore
|
2023-06-01 02:52:21 +02:00
|
|
|
const nlat = Utils.Round7(change.changes.lat)
|
2023-04-20 03:58:31 +02:00
|
|
|
// @ts-ignore
|
2023-06-01 02:52:21 +02:00
|
|
|
const nlon = Utils.Round7(change.changes.lon)
|
2023-04-20 03:58:31 +02:00
|
|
|
const n = <OsmNode>obj
|
|
|
|
if (n.lat !== nlat || n.lon !== nlon) {
|
2023-06-01 02:52:21 +02:00
|
|
|
console.log("Node moved:", n.lat, nlat, n.lon, nlon)
|
2023-04-20 03:58:31 +02:00
|
|
|
n.lat = nlat
|
|
|
|
n.lon = nlon
|
|
|
|
changed = true
|
|
|
|
}
|
|
|
|
break
|
|
|
|
case "way":
|
|
|
|
const nnodes = change.changes["nodes"]
|
|
|
|
const w = <OsmWay>obj
|
|
|
|
if (!Utils.Identical(nnodes, w.nodes)) {
|
|
|
|
w.nodes = nnodes
|
|
|
|
changed = true
|
|
|
|
}
|
|
|
|
break
|
|
|
|
case "relation":
|
|
|
|
const nmembers: {
|
|
|
|
type: "node" | "way" | "relation"
|
|
|
|
ref: number
|
|
|
|
role: string
|
|
|
|
}[] = change.changes["members"]
|
|
|
|
const r = <OsmRelation>obj
|
|
|
|
if (
|
|
|
|
!Utils.Identical(nmembers, r.members, (a, b) => {
|
|
|
|
return a.role === b.role && a.type === b.type && a.ref === b.ref
|
|
|
|
})
|
|
|
|
) {
|
|
|
|
r.members = nmembers
|
|
|
|
changed = true
|
|
|
|
}
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (changed && states.get(id) === "unchanged") {
|
|
|
|
states.set(id, "modified")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
const result = {
|
|
|
|
newObjects: [],
|
|
|
|
modifiedObjects: [],
|
|
|
|
deletedObjects: [],
|
|
|
|
}
|
|
|
|
|
|
|
|
objects.forEach((v, id) => {
|
|
|
|
const state = states.get(id)
|
|
|
|
if (state === "created") {
|
|
|
|
result.newObjects.push(v)
|
|
|
|
}
|
|
|
|
if (state === "modified") {
|
|
|
|
result.modifiedObjects.push(v)
|
|
|
|
}
|
|
|
|
if (state === "deleted") {
|
|
|
|
result.deletedObjects.push(v)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
console.debug(
|
|
|
|
"Calculated the pending changes: ",
|
|
|
|
result.newObjects.length,
|
|
|
|
"new; ",
|
|
|
|
result.modifiedObjects.length,
|
|
|
|
"modified;",
|
|
|
|
result.deletedObjects,
|
|
|
|
"deleted"
|
|
|
|
)
|
|
|
|
return result
|
|
|
|
}
|
|
|
|
|
2021-12-05 05:19:59 +01:00
|
|
|
private calculateDistanceToChanges(
|
|
|
|
change: OsmChangeAction,
|
|
|
|
changeDescriptions: ChangeDescription[]
|
2022-09-08 21:40:48 +02:00
|
|
|
) {
|
2022-02-16 01:46:55 +01:00
|
|
|
const locations = this.historicalUserLocations?.features?.data
|
2022-01-25 00:48:05 +01:00
|
|
|
if (locations === undefined) {
|
|
|
|
// No state loaded or no locations -> we can't calculate...
|
2021-11-09 01:49:07 +01:00
|
|
|
return
|
|
|
|
}
|
2021-12-05 05:19:59 +01:00
|
|
|
if (!change.trackStatistics) {
|
2021-11-09 01:49:07 +01:00
|
|
|
// Probably irrelevant, such as a new helper node
|
|
|
|
return
|
|
|
|
}
|
2022-01-26 21:40:38 +01:00
|
|
|
|
2021-11-09 01:49:07 +01:00
|
|
|
const now = new Date()
|
2022-01-25 00:48:05 +01:00
|
|
|
const recentLocationPoints = locations
|
2021-11-09 01:49:07 +01:00
|
|
|
.filter((feat) => feat.geometry.type === "Point")
|
|
|
|
.filter((feat) => {
|
2022-07-13 17:56:10 +02:00
|
|
|
const visitTime = new Date(
|
|
|
|
(<GeoLocationPointProperties>(<any>feat.properties)).date
|
|
|
|
)
|
2021-11-09 01:49:07 +01:00
|
|
|
// In seconds
|
|
|
|
const diff = (now.getTime() - visitTime.getTime()) / 1000
|
|
|
|
return diff < Constants.nearbyVisitTime
|
|
|
|
})
|
2021-12-05 05:19:59 +01:00
|
|
|
if (recentLocationPoints.length === 0) {
|
2021-11-09 01:49:07 +01:00
|
|
|
// Probably no GPS enabled/no fix
|
|
|
|
return
|
|
|
|
}
|
2021-12-05 05:19:59 +01:00
|
|
|
|
2021-11-09 01:49:07 +01:00
|
|
|
// The applicable points, contain information in their properties about location, time and GPS accuracy
|
|
|
|
// They are all GeoLocationPointProperties
|
|
|
|
// We walk every change and determine the closest distance possible
|
|
|
|
// Only if the change itself does _not_ contain any coordinates, we fall back and search the original feature in the state
|
2021-12-05 05:19:59 +01:00
|
|
|
|
|
|
|
const changedObjectCoordinates: [number, number][] = []
|
|
|
|
|
2023-04-13 20:58:49 +02:00
|
|
|
{
|
|
|
|
const feature = this.state.allElements?.featuresById?.data.get(change.mainObjectId)
|
|
|
|
if (feature !== undefined) {
|
|
|
|
changedObjectCoordinates.push(GeoOperations.centerpointCoordinates(feature))
|
|
|
|
}
|
2021-11-09 01:49:07 +01:00
|
|
|
}
|
2021-11-03 00:44:53 +01:00
|
|
|
|
2021-11-09 01:49:07 +01:00
|
|
|
for (const changeDescription of changeDescriptions) {
|
2021-12-05 05:19:59 +01:00
|
|
|
const chng:
|
|
|
|
| { lat: number; lon: number }
|
|
|
|
| { coordinates: [number, number][] }
|
|
|
|
| { members } = changeDescription.changes
|
|
|
|
if (chng === undefined) {
|
2021-11-09 01:49:07 +01:00
|
|
|
continue
|
|
|
|
}
|
2021-12-05 05:19:59 +01:00
|
|
|
if (chng["lat"] !== undefined) {
|
|
|
|
changedObjectCoordinates.push([chng["lat"], chng["lon"]])
|
|
|
|
}
|
|
|
|
if (chng["coordinates"] !== undefined) {
|
|
|
|
changedObjectCoordinates.push(...chng["coordinates"])
|
|
|
|
}
|
2021-11-03 00:44:53 +01:00
|
|
|
}
|
2021-11-09 02:03:32 +01:00
|
|
|
|
|
|
|
return Math.min(
|
|
|
|
...changedObjectCoordinates.map((coor) =>
|
2021-11-09 01:49:07 +01:00
|
|
|
Math.min(
|
|
|
|
...recentLocationPoints.map((gpsPoint) => {
|
|
|
|
const otherCoor = GeoOperations.centerpointCoordinates(gpsPoint)
|
2021-11-12 18:39:38 +01:00
|
|
|
return GeoOperations.distanceBetween(coor, otherCoor)
|
2021-11-09 01:49:07 +01:00
|
|
|
})
|
2022-09-08 21:40:48 +02:00
|
|
|
)
|
2021-11-09 01:49:07 +01:00
|
|
|
)
|
2022-09-08 21:40:48 +02:00
|
|
|
)
|
2021-11-09 01:49:07 +01:00
|
|
|
}
|
2021-12-05 05:19:59 +01:00
|
|
|
|
2021-10-04 03:12:42 +02:00
|
|
|
/**
|
2023-04-20 03:58:31 +02:00
|
|
|
* Upload the selected changes to OSM.
|
|
|
|
* Returns 'true' if successful and if they can be removed
|
2021-10-04 03:12:42 +02:00
|
|
|
*/
|
2021-12-17 19:28:05 +01:00
|
|
|
private async flushSelectChanges(
|
|
|
|
pending: ChangeDescription[],
|
|
|
|
openChangeset: UIEventSource<number>
|
|
|
|
): Promise<boolean> {
|
2021-10-04 03:12:42 +02:00
|
|
|
const self = this
|
|
|
|
const neededIds = Changes.GetNeededIds(pending)
|
2023-04-20 03:58:31 +02:00
|
|
|
// We _do not_ pass in the Changes object itself - we want the data from OSM directly in order to apply the changes
|
|
|
|
const downloader = new OsmObjectDownloader(this.backend, undefined)
|
|
|
|
let osmObjects = await Promise.all<{ id: string; osmObj: OsmObject | "deleted" }>(
|
|
|
|
neededIds.map(async (id) => {
|
|
|
|
try {
|
|
|
|
const osmObj = await downloader.DownloadObjectAsync(id)
|
2023-06-01 02:52:21 +02:00
|
|
|
return {id, osmObj}
|
2023-04-20 03:58:31 +02:00
|
|
|
} catch (e) {
|
|
|
|
console.error(
|
|
|
|
"Could not download OSM-object",
|
|
|
|
id,
|
|
|
|
" dropping it from the changes (" + e + ")"
|
|
|
|
)
|
|
|
|
return undefined
|
|
|
|
}
|
|
|
|
})
|
2022-09-08 21:40:48 +02:00
|
|
|
)
|
2021-10-29 16:38:33 +02:00
|
|
|
|
2023-04-20 03:58:31 +02:00
|
|
|
osmObjects = Utils.NoNull(osmObjects)
|
|
|
|
|
2023-06-01 02:52:21 +02:00
|
|
|
for (const {osmObj, id} of osmObjects) {
|
2023-04-20 03:58:31 +02:00
|
|
|
if (osmObj === "deleted") {
|
|
|
|
pending = pending.filter((ch) => ch.type + "/" + ch.id !== id)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
const objects = osmObjects
|
|
|
|
.filter((obj) => obj.osmObj !== "deleted")
|
|
|
|
.map((obj) => <OsmObject>obj.osmObj)
|
|
|
|
|
2021-10-29 16:38:33 +02:00
|
|
|
if (this._leftRightSensitive) {
|
2023-04-20 03:58:31 +02:00
|
|
|
objects.forEach((obj) => SimpleMetaTagger.removeBothTagging(obj.tags))
|
2021-10-22 14:01:40 +02:00
|
|
|
}
|
2021-10-29 16:38:33 +02:00
|
|
|
|
2023-04-20 03:58:31 +02:00
|
|
|
console.log("Got the fresh objects!", objects, "pending: ", pending)
|
2022-06-08 01:27:21 +02:00
|
|
|
if (pending.length == 0) {
|
|
|
|
console.log("No pending changes...")
|
|
|
|
return true
|
|
|
|
}
|
2022-09-08 21:40:48 +02:00
|
|
|
|
2021-10-29 16:38:33 +02:00
|
|
|
const perType = Array.from(
|
|
|
|
Utils.Hist(
|
|
|
|
pending
|
|
|
|
.filter(
|
|
|
|
(descr) =>
|
|
|
|
descr.meta.changeType !== undefined && descr.meta.changeType !== null
|
2022-09-08 21:40:48 +02:00
|
|
|
)
|
2021-10-29 16:38:33 +02:00
|
|
|
.map((descr) => descr.meta.changeType)
|
|
|
|
),
|
|
|
|
([key, count]) => ({
|
|
|
|
key: key,
|
|
|
|
value: count,
|
|
|
|
aggregate: true,
|
|
|
|
})
|
2022-09-08 21:40:48 +02:00
|
|
|
)
|
2021-10-04 03:12:42 +02:00
|
|
|
const motivations = pending
|
|
|
|
.filter((descr) => descr.meta.specialMotivation !== undefined)
|
|
|
|
.map((descr) => ({
|
2021-10-29 16:38:33 +02:00
|
|
|
key: descr.meta.changeType + ":" + descr.type + "/" + descr.id,
|
|
|
|
value: descr.meta.specialMotivation,
|
2021-10-04 03:12:42 +02:00
|
|
|
}))
|
2021-12-05 05:19:59 +01:00
|
|
|
|
2021-11-09 01:49:07 +01:00
|
|
|
const distances = Utils.NoNull(pending.map((descr) => descr.meta.distanceToObject))
|
|
|
|
distances.sort((a, b) => a - b)
|
|
|
|
const perBinCount = Constants.distanceToChangeObjectBins.map((_) => 0)
|
|
|
|
|
|
|
|
let j = 0
|
|
|
|
const maxDistances = Constants.distanceToChangeObjectBins
|
2021-12-05 05:19:59 +01:00
|
|
|
for (let i = 0; i < maxDistances.length; i++) {
|
2021-11-09 01:49:07 +01:00
|
|
|
const maxDistance = maxDistances[i]
|
|
|
|
// distances is sorted in ascending order, so as soon as one is to big, all the resting elements will be bigger too
|
2021-12-05 05:19:59 +01:00
|
|
|
while (j < distances.length && distances[j] < maxDistance) {
|
|
|
|
perBinCount[i]++
|
2021-11-09 01:49:07 +01:00
|
|
|
j++
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
const perBinMessage = Utils.NoNull(
|
|
|
|
perBinCount.map((count, i) => {
|
2021-12-05 05:19:59 +01:00
|
|
|
if (count === 0) {
|
2021-11-09 01:49:07 +01:00
|
|
|
return undefined
|
|
|
|
}
|
2021-12-05 05:19:59 +01:00
|
|
|
const maxD = maxDistances[i]
|
2021-11-12 18:41:13 +01:00
|
|
|
let key = `change_within_${maxD}m`
|
2021-12-05 05:19:59 +01:00
|
|
|
if (maxD === Number.MAX_VALUE) {
|
2021-11-12 18:41:13 +01:00
|
|
|
key = `change_over_${maxDistances[i - 1]}m`
|
|
|
|
}
|
2021-11-09 01:49:07 +01:00
|
|
|
return {
|
2021-12-05 05:19:59 +01:00
|
|
|
key,
|
2021-11-09 01:49:07 +01:00
|
|
|
value: count,
|
2021-12-05 05:19:59 +01:00
|
|
|
aggregate: true,
|
2021-11-09 01:49:07 +01:00
|
|
|
}
|
|
|
|
})
|
2022-09-08 21:40:48 +02:00
|
|
|
)
|
2021-12-05 05:19:59 +01:00
|
|
|
|
2021-11-09 01:49:07 +01:00
|
|
|
// This method is only called with changedescriptions for this theme
|
|
|
|
const theme = pending[0].meta.theme
|
2021-12-13 02:05:34 +01:00
|
|
|
let comment = "Adding data with #MapComplete for theme #" + theme
|
2022-01-26 21:40:38 +01:00
|
|
|
if (this.extraComment.data !== undefined) {
|
|
|
|
comment += "\n\n" + this.extraComment.data
|
2021-12-13 02:05:34 +01:00
|
|
|
}
|
2022-01-26 21:40:38 +01:00
|
|
|
|
2021-12-05 05:19:59 +01:00
|
|
|
const metatags: ChangesetTag[] = [
|
|
|
|
{
|
2021-10-04 03:12:42 +02:00
|
|
|
key: "comment",
|
2021-12-13 02:05:34 +01:00
|
|
|
value: comment,
|
2021-10-04 03:12:42 +02:00
|
|
|
},
|
|
|
|
{
|
2021-10-29 16:38:33 +02:00
|
|
|
key: "theme",
|
2021-11-09 01:49:07 +01:00
|
|
|
value: theme,
|
2021-10-04 03:12:42 +02:00
|
|
|
},
|
|
|
|
...perType,
|
2021-11-09 01:49:07 +01:00
|
|
|
...motivations,
|
|
|
|
...perBinMessage,
|
2021-10-04 03:12:42 +02:00
|
|
|
]
|
2021-10-29 16:38:33 +02:00
|
|
|
|
2022-02-15 23:44:16 +01:00
|
|
|
await this._changesetHandler.UploadChangeset(
|
2022-04-08 04:18:53 +02:00
|
|
|
(csId, remappings) => {
|
|
|
|
if (remappings.size > 0) {
|
|
|
|
console.log("Rewriting pending changes from", pending, "with", remappings)
|
|
|
|
pending = pending.map((ch) => ChangeDescriptionTools.rewriteIds(ch, remappings))
|
|
|
|
console.log("Result is", pending)
|
|
|
|
}
|
|
|
|
const changes: {
|
|
|
|
newObjects: OsmObject[]
|
|
|
|
modifiedObjects: OsmObject[]
|
|
|
|
deletedObjects: OsmObject[]
|
2023-04-20 03:58:31 +02:00
|
|
|
} = self.CreateChangesetObjects(pending, objects)
|
2022-04-08 04:18:53 +02:00
|
|
|
return Changes.createChangesetFor("" + csId, changes)
|
|
|
|
},
|
2021-12-17 19:28:05 +01:00
|
|
|
metatags,
|
|
|
|
openChangeset
|
2021-10-04 03:12:42 +02:00
|
|
|
)
|
|
|
|
|
|
|
|
console.log("Upload successfull!")
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
2022-02-14 02:50:21 +01:00
|
|
|
private async flushChangesAsync(): Promise<void> {
|
2021-09-09 00:05:51 +02:00
|
|
|
const self = this
|
2021-09-26 23:35:26 +02:00
|
|
|
try {
|
2021-10-03 21:53:31 +02:00
|
|
|
// At last, we build the changeset and upload
|
|
|
|
const pending = self.pendingChanges.data
|
2021-10-29 16:38:33 +02:00
|
|
|
|
2021-10-04 03:12:42 +02:00
|
|
|
const pendingPerTheme = new Map<string, ChangeDescription[]>()
|
|
|
|
for (const changeDescription of pending) {
|
|
|
|
const theme = changeDescription.meta.theme
|
2021-10-29 16:38:33 +02:00
|
|
|
if (!pendingPerTheme.has(theme)) {
|
2021-10-04 03:12:42 +02:00
|
|
|
pendingPerTheme.set(theme, [])
|
|
|
|
}
|
|
|
|
pendingPerTheme.get(theme).push(changeDescription)
|
|
|
|
}
|
2021-10-29 16:38:33 +02:00
|
|
|
|
2022-01-26 21:40:38 +01:00
|
|
|
const successes = await Promise.all(
|
|
|
|
Array.from(pendingPerTheme, async ([theme, pendingChanges]) => {
|
2021-10-29 16:38:33 +02:00
|
|
|
try {
|
2022-06-05 02:24:14 +02:00
|
|
|
const openChangeset = this.state.osmConnection
|
|
|
|
.GetPreference("current-open-changeset-" + theme)
|
|
|
|
.sync(
|
2022-02-14 02:50:21 +01:00
|
|
|
(str) => {
|
|
|
|
const n = Number(str)
|
|
|
|
if (isNaN(n)) {
|
|
|
|
return undefined
|
|
|
|
}
|
|
|
|
return n
|
|
|
|
},
|
|
|
|
[],
|
|
|
|
(n) => "" + n
|
|
|
|
)
|
|
|
|
console.log(
|
|
|
|
"Using current-open-changeset-" +
|
2023-06-01 02:52:21 +02:00
|
|
|
theme +
|
|
|
|
" from the preferences, got " +
|
|
|
|
openChangeset.data
|
2022-02-14 02:50:21 +01:00
|
|
|
)
|
2022-09-08 21:40:48 +02:00
|
|
|
|
2021-12-17 19:28:05 +01:00
|
|
|
return await self.flushSelectChanges(pendingChanges, openChangeset)
|
2021-10-29 16:38:33 +02:00
|
|
|
} catch (e) {
|
|
|
|
console.error("Could not upload some changes:", e)
|
2021-10-04 03:12:42 +02:00
|
|
|
return false
|
|
|
|
}
|
|
|
|
})
|
2022-09-08 21:40:48 +02:00
|
|
|
)
|
2021-10-29 16:38:33 +02:00
|
|
|
|
|
|
|
if (!successes.some((s) => s == false)) {
|
2021-10-04 03:12:42 +02:00
|
|
|
// All changes successfull, we clear the data!
|
|
|
|
this.pendingChanges.setData([])
|
2021-09-09 00:05:51 +02:00
|
|
|
}
|
2021-09-26 23:35:26 +02:00
|
|
|
} catch (e) {
|
|
|
|
console.error(
|
|
|
|
"Could not handle changes - probably an old, pending changeset in localstorage with an invalid format; erasing those",
|
|
|
|
e
|
|
|
|
)
|
|
|
|
self.pendingChanges.setData([])
|
2021-10-29 16:38:33 +02:00
|
|
|
} finally {
|
2021-09-26 23:35:26 +02:00
|
|
|
self.isUploading.setData(false)
|
|
|
|
}
|
2021-09-09 00:05:51 +02:00
|
|
|
}
|
2020-06-24 00:35:19 +02:00
|
|
|
}
|