Attempt to fix #422

Logic/Osm/Changes.ts

@@ -29,10 +29,11 @@ export class Changes implements FeatureSource {
 
     /**
      * All the pending new objects to upload
-     * @private
      */
     private readonly newObjects = LocalStorageSource.GetParsed<{ id: number, lat: number, lon: number }[]>("newObjects", [])
 
+    private readonly isUploading = new UIEventSource(false);
+
     /**
      * Adds a change to the pending changes
      */
@@ -190,6 +191,12 @@ export class Changes implements FeatureSource {
             console.log("No changes in any object");
             return;
         }
+        const self = this;
+
+        if (this.isUploading.data) {
+            return;
+        }
+        this.isUploading.setData(true)
 
         console.log("Beginning upload...");
         // At last, we build the changeset and upload
@@ -235,9 +242,12 @@ export class Changes implements FeatureSource {
             },
             () => {
                 console.log("Upload successfull!")
-                this.newObjects.setData([])
-                this.pending.setData([]);
-            });
+                self.newObjects.setData([])
+                self.pending.setData([]);
+                self.isUploading.setData(false)
+            },
+            () => self.isUploading.setData(false)
+        );
     };
 
 

Logic/Osm/ChangesetHandler.ts

@@ -27,7 +27,7 @@ export class ChangesetHandler {
         }
     }
 
-    private static parseUploadChangesetResponse(response: XMLDocument, allElements: ElementStorage) : void{
+    private static parseUploadChangesetResponse(response: XMLDocument, allElements: ElementStorage): void {
         const nodes = response.getElementsByTagName("node");
         // @ts-ignore
         for (const node of nodes) {
@@ -70,7 +70,8 @@ export class ChangesetHandler {
         layout: LayoutConfig,
         allElements: ElementStorage,
         generateChangeXML: (csid: string) => string,
-        whenDone : (csId: string) => void) {
+        whenDone: (csId: string) => void,
+        onFail: () => void) {
 
         if (this.userDetails.data.csCount == 0) {
             // The user became a contributor!
@@ -98,8 +99,11 @@ export class ChangesetHandler {
                     whenDone,
                     (e) => {
                         console.error("UPLOADING FAILED!", e)
+                        onFail()
                     }
                 )
+            }, {
+                onFail: onFail
             })
         } else {
             // There still exists an open changeset (or at least we hope so)
@@ -114,8 +118,7 @@ export class ChangesetHandler {
                     // Mark the CS as closed...
                     this.currentChangeset.setData("");
                     // ... and try again. As the cs is closed, no recursive loop can exist  
-                    self.UploadChangeset(layout, allElements, generateChangeXML, whenDone);
-
+                    self.UploadChangeset(layout, allElements, generateChangeXML, whenDone, onFail);
                 }
             )
 
@@ -172,7 +175,11 @@ export class ChangesetHandler {
                     // FAILED
                     self.CloseChangeset(csId, continuation)
                 })
-        }, true, reason)
+            }, {
+                isDeletionCS: true,
+                deletionReason: reason
+            }
+        )
     }
 
     private CloseChangeset(changesetId: string = undefined, continuation: (() => void) = () => {
@@ -204,15 +211,20 @@ export class ChangesetHandler {
     private OpenChangeset(
         layout: LayoutConfig,
         continuation: (changesetId: string) => void,
-        isDeletionCS: boolean = false,
-        deletionReason: string = undefined) {
-
+        options?: {
+            isDeletionCS?: boolean,
+            deletionReason?: string,
+            onFail?: () => void
+        }
+    ) {
+        options = options ?? {}
+        options.isDeletionCS = options.isDeletionCS ?? false
         const commentExtra = layout.changesetmessage !== undefined ? " - " + layout.changesetmessage : "";
         let comment = `Adding data with #MapComplete for theme #${layout.id}${commentExtra}`
-        if (isDeletionCS) {
+        if (options.isDeletionCS) {
             comment = `Deleting a point with #MapComplete for theme #${layout.id}${commentExtra}`
-            if (deletionReason) {
-                comment += ": " + deletionReason;
+            if (options.deletionReason) {
+                comment += ": " + options.deletionReason;
             }
         }
 
@@ -221,7 +233,7 @@ export class ChangesetHandler {
         const metadata = [
             ["created_by", `MapComplete ${Constants.vNumber}`],
             ["comment", comment],
-            ["deletion", isDeletionCS ? "yes" : undefined],
+            ["deletion", options.isDeletionCS ? "yes" : undefined],
             ["theme", layout.id],
             ["language", Locale.language.data],
             ["host", window.location.host],
@@ -244,6 +256,9 @@ export class ChangesetHandler {
         }, function (err, response) {
             if (response === undefined) {
                 console.log("err", err);
+                if(options.onFail){
+                    options.onFail()
+                }
                 return;
             } else {
                 continuation(response);

Logic/Osm/OsmConnection.ts

@@ -111,8 +111,9 @@ export class OsmConnection {
         layout: LayoutConfig,
         allElements: ElementStorage,
         generateChangeXML: (csid: string) => string,
-        whenDone: (csId: string) => void) {
-        this.changesetHandler.UploadChangeset(layout, allElements, generateChangeXML, whenDone);
+        whenDone: (csId: string) => void,
+        onFail: () => {}) {
+        this.changesetHandler.UploadChangeset(layout, allElements, generateChangeXML, whenDone, onFail);
     }
 
     public GetPreference(key: string, prefix: string = "mapcomplete-"): UIEventSource<string> {

Models/Constants.ts

@@ -2,7 +2,7 @@ import { Utils } from "../Utils";
 
 export default class Constants {
     
-    public static vNumber = "0.8.4-rc1";
+    public static vNumber = "0.8.4-rc2";
 
     // The user journey states thresholds when a new feature gets unlocked
     public static userJourney = {