restore

kaheetonaa · Oct 17, 2024 · c25daa4 · c25daa4
1 parent da56391
commit c25daa4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/dist/iD.js b/dist/iD.js
@@ -42418,6 +42418,10 @@
           if (i3.annotation) x2.annotation = i3.annotation;
           if (i3.transform) x2.transform = i3.transform;
           if (i3.selectedIDs) x2.selectedIDs = i3.selectedIDs;
+          if (typeof __team_selected != "undefined") {
+            x2.team_selcted = __team_selected;
+          }
+          ;
           return x2;
         });
         return JSON.stringify({
@@ -42516,7 +42520,8 @@
               imageryUsed: d2.imageryUsed,
               photoOverlaysUsed: d2.photoOverlaysUsed,
               transform: d2.transform,
-              selectedIDs: d2.selectedIDs
+              selectedIDs: d2.selectedIDs,
+              __team_selected: d2.team_selcted
             };
           });
         } else {
@@ -42561,7 +42566,7 @@
           _hasUnresolvedRestorableChanges = false;
           corePreferences(getKey("saved_history"), null);
           corePreferences("comment", null);
-          corePreferences("hashtags", __team_selected);
+          corePreferences("hashtags", null);
           corePreferences("source", null);
         }
         return history;
@@ -74066,7 +74071,12 @@
         corePreferences("commentDate", Date.now());
       }
       if (context.defaultChangesetHashtags()) {
-        corePreferences("hashtags", __team_selected);
+        if (typeof __team_selected != "undefined") {
+          corePreferences("hashtags", __team_selected);
+        } else {
+          context.defaultChangesetHashtags();
+        }
+        ;
         corePreferences("commentDate", Date.now());
       }
       var detected = utilDetect();

diff --git a/dist/iD.js.map b/dist/iD.js.map
diff --git a/modules/core/history.js b/modules/core/history.js
@@ -500,6 +500,7 @@ export function coreHistory(context) {
                 if (i.annotation) x.annotation = i.annotation;
                 if (i.transform) x.transform = i.transform;
                 if (i.selectedIDs) x.selectedIDs = i.selectedIDs;
+                if (typeof __team_selected!= "undefined"){x.team_selcted=__team_selected;};
 
                 return x;
             });
@@ -613,7 +614,8 @@ export function coreHistory(context) {
                         imageryUsed: d.imageryUsed,
                         photoOverlaysUsed: d.photoOverlaysUsed,
                         transform: d.transform,
-                        selectedIDs: d.selectedIDs
+                        selectedIDs: d.selectedIDs,
+                        __team_selected: d.team_selcted
                     };
                 });
 
@@ -676,7 +678,7 @@ export function coreHistory(context) {
 
                 // clear the changeset metadata associated with the saved history
                 prefs('comment', null);
-                prefs('hashtags', __team_selected);
+                prefs('hashtags', null);
                 prefs('source', null);
             }
             return history;

diff --git a/modules/ui/commit.js b/modules/ui/commit.js
@@ -82,7 +82,7 @@ export function uiCommit(context) {
             prefs('commentDate', Date.now());
         }
         if (context.defaultChangesetHashtags()) {
-            prefs('hashtags', __team_selected);//context.defaultChangesetHashtags(__team_selected)
+            if(typeof __team_selected!= "undefined"){prefs('hashtags', __team_selected)}else{context.defaultChangesetHashtags()};//context.defaultChangesetHashtags(__team_selected)
             prefs('commentDate', Date.now());
         }