Merge master

Logic/FeatureSource/FeatureSourceMerger.ts

@@ -27,7 +27,7 @@ export default class FeatureSourceMerger implements FeatureSource {
         // We seed the dictionary with the previously loaded features
         const oldValues = this.features.data ?? [];
         for (const oldValue of oldValues) {
-            all.set(oldValue.feature.id, oldValue)
+            all.set(oldValue.feature.id + oldValue.feature._matching_layer_id, oldValue)
         }
 
         for (const source of this._sources) {
@@ -35,7 +35,7 @@ export default class FeatureSourceMerger implements FeatureSource {
                 continue;
             }
             for (const f of source.features.data) {
-                const id = f.feature.properties.id;
+                const id = f.feature.properties.id + f.feature._matching_layer_id;
                 if (!all.has(id)) {
                     // This is a new feature
                     somethingChanged = true;

Logic/FeatureSource/RememberingSource.ts

@@ -20,9 +20,9 @@ export default class RememberingSource implements FeatureSource {
             }
            
             // Then new ids
-            const ids = new Set<string>(features.map(f => f.feature.properties.id + f.feature.geometry.type));
+            const ids = new Set<string>(features.map(f => f.feature.properties.id + f.feature.geometry.type + f.feature._matching_layer_id));
             // the old data
-            const oldData = oldFeatures.filter(old => !ids.has(old.feature.properties.id + old.feature.geometry.type))
+            const oldData = oldFeatures.filter(old => !ids.has(old.feature.properties.id + old.feature.geometry.type + old.feature._matching_layer_id))
             return [...features, ...oldData];
         })
     }

Logic/Osm/OsmConnection.ts

@@ -7,6 +7,7 @@ import {ElementStorage} from "../ElementStorage";
 import Svg from "../../Svg";
 import LayoutConfig from "../../Customizations/JSON/LayoutConfig";
 import Img from "../../UI/Base/Img";
+import {Utils} from "../../Utils";
 
 export default class UserDetails {
 
@@ -22,30 +23,51 @@ export default class UserDetails {
 
 export class OsmConnection {
 
+    public static readonly _oauth_configs = {
+        "osm": {
+            oauth_consumer_key: 'hivV7ec2o49Two8g9h8Is1VIiVOgxQ1iYexCbvem',
+            oauth_secret: 'wDBRTCem0vxD7txrg1y6p5r8nvmz8tAhET7zDASI',
+            url: "https://www.openstreetmap.org"
+        },
+        "osm-test": {
+            oauth_consumer_key: 'Zgr7EoKb93uwPv2EOFkIlf3n9NLwj5wbyfjZMhz2',
+            oauth_secret: '3am1i1sykHDMZ66SGq4wI2Z7cJMKgzneCHp3nctn',
+            url: "https://master.apis.dev.openstreetmap.org"
+        }
+
+
+    }
     public auth;
     public userDetails: UIEventSource<UserDetails>;
     public isLoggedIn: UIEventSource<boolean>
     _dryRun: boolean;
-
     public preferencesHandler: OsmPreferences;
     public changesetHandler: ChangesetHandler;
-
     private _onLoggedIn: ((userDetails: UserDetails) => void)[] = [];
     private readonly _iframeMode: Boolean | boolean;
     private readonly _singlePage: boolean;
+    private readonly _oauth_config: {
+        oauth_consumer_key: string,
+        oauth_secret: string,
+        url: string
+    };
 
     constructor(dryRun: boolean, oauth_token: UIEventSource<string>,
                 // Used to keep multiple changesets open and to write to the correct changeset
                 layoutName: string,
-                singlePage: boolean = true) {
+                singlePage: boolean = true,
+                osmConfiguration: "osm" | "osm-test" = 'osm'
+    ) {
         this._singlePage = singlePage;
-        this._iframeMode = window !== window.top;
+        this._oauth_config = OsmConnection._oauth_configs[osmConfiguration] ?? OsmConnection._oauth_configs.osm;
+        console.debug("Using backend", this._oauth_config.url)
+        this._iframeMode = Utils.runningFromConsole ? false : window !== window.top;
 
         this.userDetails = new UIEventSource<UserDetails>(new UserDetails(), "userDetails");
         this.userDetails.data.dryRun = dryRun;
         this.isLoggedIn = this.userDetails.map(user => user.loggedIn)
         this._dryRun = dryRun;
-        
+
         this.updateAuthObject();
 
         this.preferencesHandler = new OsmPreferences(this.auth, this);
@@ -69,37 +91,6 @@ export class OsmConnection {
             console.log("Not authenticated");
         }
     }
-    
-    private updateAuthObject(){
-        let pwaStandAloneMode = false;
-        try {
-            if (window.matchMedia('(display-mode: standalone)').matches || window.matchMedia('(display-mode: fullscreen)').matches) {
-                pwaStandAloneMode = true;
-            }
-        } catch (e) {
-            console.warn("Detecting standalone mode failed", e, ". Assuming in browser and not worrying furhter")
-        }
-        if (this._iframeMode || pwaStandAloneMode || !this._singlePage) {
-            // In standalone mode, we DON'T use single page login, as 'redirecting' opens a new window anyway...
-            // Same for an iframe...
-            this.auth = new osmAuth({
-                oauth_consumer_key: 'hivV7ec2o49Two8g9h8Is1VIiVOgxQ1iYexCbvem',
-                oauth_secret: 'wDBRTCem0vxD7txrg1y6p5r8nvmz8tAhET7zDASI',
-                singlepage: false,
-                auto: true,
-            });
-        } else {
-
-            this.auth = new osmAuth({
-                oauth_consumer_key: 'hivV7ec2o49Two8g9h8Is1VIiVOgxQ1iYexCbvem',
-                oauth_secret: 'wDBRTCem0vxD7txrg1y6p5r8nvmz8tAhET7zDASI',
-                singlepage: true,
-                landing: window.location.href,
-                auto: true,
-            });
-        }
-    }
-
 
     public UploadChangeset(
         layout: LayoutConfig,
@@ -146,7 +137,7 @@ export class OsmConnection {
                     // Not authorized - our token probably got revoked
                     // Reset all the tokens
                     const tokens = [
-                        "https://www.openstreetmap.orgoauth_request_token_secret", 
+                        "https://www.openstreetmap.orgoauth_request_token_secret",
                         "https://www.openstreetmap.orgoauth_token",
                         "https://www.openstreetmap.orgoauth_token_secret"]
                     tokens.forEach(token => localStorage.removeItem(token))
@@ -198,6 +189,33 @@ export class OsmConnection {
         });
     }
 
+    private updateAuthObject() {
+        let pwaStandAloneMode = false;
+        try {
+            if (Utils.runningFromConsole) {
+                pwaStandAloneMode = true
+            } else if (window.matchMedia('(display-mode: standalone)').matches || window.matchMedia('(display-mode: fullscreen)').matches) {
+                pwaStandAloneMode = true;
+            }
+        } catch (e) {
+            console.warn("Detecting standalone mode failed", e, ". Assuming in browser and not worrying furhter")
+        }
+        const standalone = this._iframeMode || pwaStandAloneMode || !this._singlePage;
+
+        // In standalone mode, we DON'T use single page login, as 'redirecting' opens a new window anyway...
+        // Same for an iframe...
+
+
+        this.auth = new osmAuth({
+            oauth_consumer_key: this._oauth_config.oauth_consumer_key,
+            oauth_secret: this._oauth_config.oauth_secret,
+            url: this._oauth_config.url,
+            landing: standalone ? undefined : window.location.href,
+            singlepage: !standalone,
+            auto: true,
+
+        });
+    }
 
     private CheckForMessagesContinuously() {
         const self = this;

Logic/Osm/OsmPreferences.ts

@@ -97,6 +97,7 @@ export class OsmPreferences {
 
     public GetPreference(key: string, prefix: string = "mapcomplete-"): UIEventSource<string> {
         key = prefix + key;
+        key = key.replace(/[:\\\/"' {}.%_]/g, '')
         if (key.length >= 255) {
             throw "Preferences: key length to big";
         }