diff --git a/src/Logic/Osm/Changes.ts b/src/Logic/Osm/Changes.ts index 81306a8446..f7ece74bfc 100644 --- a/src/Logic/Osm/Changes.ts +++ b/src/Logic/Osm/Changes.ts @@ -237,9 +237,9 @@ export class Changes { console.log("Uploading changes due to: ", flushreason) this.isUploading.setData(true) try { - const csNumber = await this.flushChangesAsync() + await this.flushChangesAsync() this.isUploading.setData(false) - console.log("Changes flushed. Your changeset is " + csNumber) + console.log("Changes flushed") this.errors.setData([]) } catch (e) { this._reportError(e) diff --git a/src/Logic/Osm/ChangesetHandler.ts b/src/Logic/Osm/ChangesetHandler.ts index 92bc4bba63..90e87e1ef6 100644 --- a/src/Logic/Osm/ChangesetHandler.ts +++ b/src/Logic/Osm/ChangesetHandler.ts @@ -14,10 +14,10 @@ export interface ChangesetTag { } export type ChangesetMetadata = { - type: "changeset" id: number created_at: string open: boolean + closed_at?: string uid: number user: string changes_count: number @@ -164,10 +164,12 @@ export class ChangesetHandler { return } + console.log("Trying to reuse changeset", openChangeset.data) if (openChangeset.data) { try { const csId = openChangeset.data const oldChangesetMeta = await this.GetChangesetMeta(csId) + console.log("Got metadata:", oldChangesetMeta, "isopen", oldChangesetMeta?.open) if (oldChangesetMeta.open) { // We can hopefully reuse the changeset @@ -357,8 +359,8 @@ export class ChangesetHandler { private async GetChangesetMeta(csId: number): Promise { const url = `${this.backend}/api/0.6/changeset/${csId}` - const csData = await Utils.downloadJson<{ elements: ChangesetMetadata[] }>(url) - return csData.elements[0] + const csData = await Utils.downloadJson<{ changeset: ChangesetMetadata }>(url) + return csData.changeset } /**