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

chore: automated housekeeping...

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-09-02 12:48:15 +02:00
parent c10fecb7e8
commit f5d7686c98
234 changed files with 3493 additions and 2482 deletions
Download patch file Download diff file Expand all files Collapse all files

86
src/Logic/Osm/Changes.ts
View file

@ -53,7 +53,7 @@ export class Changes {
featureSwitches?: FeatureSwitchState
},
leftRightSensitive: boolean = false,
reportError?: (string: string | Error, extramessage?: string) => void,
reportError?: (string: string | Error, extramessage?: string) => void
) {
this._leftRightSensitive = leftRightSensitive
// We keep track of all changes just as well
@ -68,7 +68,7 @@ export class Changes {
state.osmConnection,
state.featurePropertiesStore,
this,
(e, extramessage: string) => this._reportError(e, extramessage),
(e, extramessage: string) => this._reportError(e, extramessage)
)
this.historicalUserLocations = state.historicalUserLocations
@ -82,7 +82,7 @@ export class Changes {
modifiedObjects: OsmObject[]
newObjects: OsmObject[]
deletedObjects: OsmObject[]
},
}
): string {
const changedElements = allChanges.modifiedObjects ?? []
const newElements = allChanges.newObjects ?? []
@ -172,7 +172,7 @@ export class Changes {
docs: "The identifier of the used background layer, this will probably be an identifier from the [editor layer index](https://github.com/osmlab/editor-layer-index)",
},
],
"default",
"default"
),
...addSource(ChangeTagAction.metatags, "ChangeTag"),
...addSource(ChangeLocationAction.metatags, "ChangeLocation"),
@ -201,7 +201,7 @@ export class Changes {
: "",
].join("\n"),
source,
]),
])
),
].join("\n\n")
}
@ -217,7 +217,11 @@ export class Changes {
// See #2082. We check for previous rewritings, as a remapping might be from a previous session
do {
this._nextId--
} while (this._changesetHandler._remappings.has("node/" + this._nextId) || this._changesetHandler._remappings.has("way/" + this._nextId) || this._changesetHandler._remappings.has("relation/" + this._nextId))
} while (
this._changesetHandler._remappings.has("node/" + this._nextId) ||
this._changesetHandler._remappings.has("way/" + this._nextId) ||
this._changesetHandler._remappings.has("relation/" + this._nextId)
)
return this._nextId
}
@ -254,7 +258,7 @@ export class Changes {
const changeDescriptions = await action.Perform(this)
const remapped = ChangeDescriptionTools.rewriteAllIds(
changeDescriptions,
this._changesetHandler._remappings,
this._changesetHandler._remappings
)
remapped[0].meta.distanceToObject = this.calculateDistanceToChanges(action, remapped)
@ -319,7 +323,7 @@ export class Changes {
}
if (change.changes === undefined) {
// This object is a change to a newly created object. However, we have not seen the creation changedescription yet!
if(ignoreNoCreate){
if (ignoreNoCreate) {
continue
}
throw "Not a creation of the object: " + JSON.stringify(change)
@ -462,7 +466,7 @@ export class Changes {
result.modifiedObjects.length,
"modified;",
result.deletedObjects.length,
"deleted",
"deleted"
)
}
return result
@ -470,7 +474,7 @@ export class Changes {
private calculateDistanceToChanges(
change: OsmChangeAction,
changeDescriptions: ChangeDescription[],
changeDescriptions: ChangeDescription[]
) {
const locations = this.historicalUserLocations?.features?.data
if (locations === undefined) {
@ -490,7 +494,7 @@ export class Changes {
.filter((feat) => feat.geometry.type === "Point")
.filter((feat) => {
const visitTime = new Date(
(<GeoLocationPointProperties>(<any>feat.properties)).date,
(<GeoLocationPointProperties>(<any>feat.properties)).date
)
// In seconds
const diff = (now.getTime() - visitTime.getTime()) / 1000
@ -537,9 +541,9 @@ export class Changes {
...recentLocationPoints.map((gpsPoint) => {
const otherCoor = GeoOperations.centerpointCoordinates(gpsPoint)
return GeoOperations.distanceBetween(coor, otherCoor)
}),
),
),
})
)
)
)
}
@ -575,7 +579,7 @@ export class Changes {
public fragmentChanges(
pending: ChangeDescription[],
objects: OsmObject[],
objects: OsmObject[]
): {
refused: ChangeDescription[]
toUpload: ChangeDescription[]
@ -585,7 +589,7 @@ export class Changes {
// All ids which have an 'update'
const createdIds = new Set(
pending.filter((cd) => cd.changes !== undefined).map((cd) => cd.id),
pending.filter((cd) => cd.changes !== undefined).map((cd) => cd.id)
)
pending.forEach((c) => {
if (c.id < 0) {
@ -594,7 +598,7 @@ export class Changes {
} else {
this._reportError(
`Got an orphaned change. The 'creation'-change description for ${c.type}/${c.id} got lost. Permanently dropping this change:` +
JSON.stringify(c),
JSON.stringify(c)
)
}
return
@ -605,10 +609,10 @@ export class Changes {
} else {
console.log(
"Refusing change about " +
c.type +
"/" +
c.id +
" as not in the objects. No internet?",
c.type +
"/" +
c.id +
" as not in the objects. No internet?"
)
refused.push(c)
}
@ -623,16 +627,18 @@ export class Changes {
*/
private async flushSelectChanges(
pending: ChangeDescription[],
openChangeset: UIEventSource<number>,
openChangeset: UIEventSource<number>
): Promise<ChangeDescription[]> {
const neededIds = Changes.GetNeededIds(pending)
/* Download the latest version of the OSM-objects
* We _do not_ pass in the Changes object itself - we want the data from OSM directly in order to apply the changes
*/
* 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)
const osmObjects = Utils.NoNull(await Promise.all<{ id: string; osmObj: OsmObject | "deleted" }>(
neededIds.map((id) => this.getOsmObject(id, downloader)),
))
const osmObjects = Utils.NoNull(
await Promise.all<{ id: string; osmObj: OsmObject | "deleted" }>(
neededIds.map((id) => this.getOsmObject(id, downloader))
)
)
// Drop changes to deleted items
for (const { osmObj, id } of osmObjects) {
@ -665,7 +671,7 @@ export class Changes {
(csId, remappings) => {
if (remappings.size > 0) {
toUpload = toUpload.map((ch) =>
ChangeDescriptionTools.rewriteIds(ch, remappings),
ChangeDescriptionTools.rewriteIds(ch, remappings)
)
}
@ -678,7 +684,7 @@ export class Changes {
return Changes.buildChangesetXML("" + csId, changes)
},
metatags,
openChangeset,
openChangeset
)
console.log("Upload successful! Refused changes are", refused)
@ -695,15 +701,15 @@ export class Changes {
pending
.filter(
(descr) =>
descr.meta.changeType !== undefined && descr.meta.changeType !== null,
descr.meta.changeType !== undefined && descr.meta.changeType !== null
)
.map((descr) => descr.meta.changeType),
.map((descr) => descr.meta.changeType)
),
([key, count]) => ({
key: key,
value: count,
aggregate: true,
}),
})
)
const motivations = pending
.filter((descr) => descr.meta.specialMotivation !== undefined)
@ -742,7 +748,7 @@ export class Changes {
value: count,
aggregate: true,
}
}),
})
)
// This method is only called with changedescriptions for this theme
@ -788,14 +794,14 @@ export class Changes {
try {
const openChangeset = UIEventSource.asInt(
this.state.osmConnection.GetPreference(
"current-open-changeset-" + theme,
),
"current-open-changeset-" + theme
)
)
console.log(
"Using current-open-changeset-" +
theme +
" from the preferences, got " +
openChangeset.data,
theme +
" from the preferences, got " +
openChangeset.data
)
const refused = await self.flushSelectChanges(pendingChanges, openChangeset)
@ -810,7 +816,7 @@ export class Changes {
this.errors.ping()
return pendingChanges
}
}),
})
)
// We keep all the refused changes to try them again
@ -818,7 +824,7 @@ export class Changes {
} catch (e) {
console.error(
"Could not handle changes - probably an old, pending changeset in localstorage with an invalid format; erasing those",
e,
e
)
this.errors.data.push(e)
this.errors.ping()