From 87f50767aeb5670b2070e6daf5cc26cba7303eb8 Mon Sep 17 00:00:00 2001
From: Vanitha K <kvanitha780@gmail.com>
Date: Mon, 17 Oct 2022 00:52:07 +0530
Subject: [PATCH 01/18] detect key from longer URL

---
 examples/archive.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/examples/archive.html b/examples/archive.html
index c1607f63f..dbe5edf80 100644
--- a/examples/archive.html
+++ b/examples/archive.html
@@ -95,6 +95,9 @@ <h3 id="offcanvasRightLabel">Images</h3>
     form.addEventListener('submit', (event) => {
       event.preventDefault();
       const url = input.value.replace('details', 'metadata');
+      let splitUrl = url.split('/');
+      let detectKey = splitUrl[splitUrl.length - 2];
+      console.log(detectKey);
       axios.get(url)
         .then((response) => {
           if (response.data.files && response.data.files.length != 0) {

From 7cbcb80b30553762c3ebf126028d07350cbfbfec Mon Sep 17 00:00:00 2001
From: Vanitha K <kvanitha780@gmail.com>
Date: Thu, 20 Oct 2022 22:04:20 +0530
Subject: [PATCH 02/18] fixes

---
 examples/listeners.html                        |  2 +-
 src/edit/handles/LockHandle.js                 | 16 ++++++++--------
 src/edit/toolbars/DistortableImage.PopupBar.js |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/examples/listeners.html b/examples/listeners.html
index 92cc46ae3..59da15279 100644
--- a/examples/listeners.html
+++ b/examples/listeners.html
@@ -23,7 +23,7 @@
   <div id="map" style="width:100%; height:100%; position:absolute; top:0;"></div>
 
   <script>
-    var map;
+    let map;
 
     (function(){
       map = L.map('map').setView([51.505, -0.09], 13);
diff --git a/src/edit/handles/LockHandle.js b/src/edit/handles/LockHandle.js
index f47949e23..158587eab 100644
--- a/src/edit/handles/LockHandle.js
+++ b/src/edit/handles/LockHandle.js
@@ -16,7 +16,7 @@ L.LockHandle = L.EditHandle.extend({
   },
 
   _bindListeners() {
-    var icon = this.getElement();
+    const icon = this.getElement();
 
     L.EditHandle.prototype._bindListeners.call(this);
 
@@ -29,7 +29,7 @@ L.LockHandle = L.EditHandle.extend({
   },
 
   _unbindListeners() {
-    var icon = this.getElement();
+    const icon = this.getElement();
 
     L.EditHandle.prototype._bindListeners.call(this);
 
@@ -50,15 +50,15 @@ L.LockHandle = L.EditHandle.extend({
   },
 
   _tooltipOn(e) {
-    var eP = this._handled.parentGroup;
-    var edit = eP ? eP.editing : this._handled.editing;
+    const eP = this._handled.parentGroup;
+    const edit = eP ? eP.editing : this._handled.editing;
 
     if (e.shiftKey) { return; }
     if (!this._handled.isSelected() && (eP && !eP.isCollected(this._handled))) {
       return;
     }
 
-    var handlesArr = edit._lockHandles;
+    const handlesArr = edit._lockHandles;
 
     this._timer = setTimeout(L.bind(function() {
       if (this._timeout) { clearTimeout(this._timeout); }
@@ -76,15 +76,15 @@ L.LockHandle = L.EditHandle.extend({
   },
 
   _tooltipOff(e) {
-    var eP = this._handled.parentGroup;
-    var edit = eP ? eP.editing : this._handled.editing;
+    const eP = this._handled.parentGroup;
+    const edit = eP ? eP.editing : this._handled.editing;
 
     if (e.shiftKey) { return; }
     if (!this._handled.isSelected() && (eP && !eP.isCollected(this._handled))) {
       return;
     }
 
-    var handlesArr = edit._lockHandles;
+    const handlesArr = edit._lockHandles;
 
     if (e.currentTarget === document) {
       handlesArr.eachLayer(function(handle) {
diff --git a/src/edit/toolbars/DistortableImage.PopupBar.js b/src/edit/toolbars/DistortableImage.PopupBar.js
index 8231232a7..998c36ff5 100644
--- a/src/edit/toolbars/DistortableImage.PopupBar.js
+++ b/src/edit/toolbars/DistortableImage.PopupBar.js
@@ -25,9 +25,9 @@ L.DistortableImage.PopupBar = L.Toolbar2.Popup.extend({
   },
 
   clickTool(name) {
-    var tools = this.tools();
-    for (var i = 0; i < tools.length; i++) {
-      var tool = tools.item(i).children[0];
+    const tools = this.tools();
+    for (let i = 0; i < tools.length; i++) {
+      let tool = tools.item(i).children[0];
       if (L.DomUtil.hasClass(tool, name)) {
         tool.click();
         return tool;
@@ -66,7 +66,7 @@ L.DistortableImageOverlay.addInitHook(function() {
     lock: L.LockAction,
   };
 
-  var a = this.options.actions ? this.options.actions : this.ACTIONS;
+  const a = this.options.actions ? this.options.actions : this.ACTIONS;
 
   this.editing = L.distortableImage.edit(this, {actions: a});
 });

From 67b2862156546f85a6a4baf9f98f15a7e375824c Mon Sep 17 00:00:00 2001
From: Vanitha K <59090053+vanithaak@users.noreply.github.com>
Date: Sun, 23 Oct 2022 21:05:28 +0530
Subject: [PATCH 03/18] updates

---
 examples/archive.html | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/examples/archive.html b/examples/archive.html
index 251a45658..de037b455 100644
--- a/examples/archive.html
+++ b/examples/archive.html
@@ -95,13 +95,7 @@ <h3 id="offcanvasRightLabel">Images</h3>
     form.addEventListener('submit', (event) => {
       event.preventDefault();
       const url = input.value.replace('details', 'metadata');
-      let splitUrl = url.split('/');
-      let detectKey = splitUrl[splitUrl.length - 2];
-      console.log("detected key", detectKey);
       let fetchedFrom
-      let splitUrl = url.split('/');
-      let detectKey = splitUrl[splitUrl.length - 2];
-      console.log(detectKey);
       axios.get(url)
         .then((response) => {
           if (response.data.files && response.data.files.length != 0) {

From 8407d0f005348fda683a25740ba26d242f049009 Mon Sep 17 00:00:00 2001
From: Vanitha K <kvanitha780@gmail.com>
Date: Sat, 22 Oct 2022 23:20:24 +0530
Subject: [PATCH 04/18] save map coordinates in local storage

---
 dist/leaflet.distortableimage.js | 13 ++++++++-----
 src/DistortableCollection.js     |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js
index 74f79597c..ece197e93 100644
--- a/dist/leaflet.distortableimage.js
+++ b/dist/leaflet.distortableimage.js
@@ -428,6 +428,9 @@ L.DistortableCollection = L.FeatureGroup.extend({
     }, this);
     json.images = json.images.reverse();
     json.avg_cm_per_pixel = this._getAvgCmPerPixel(json.images);
+    json.images.map(function (each) {
+      return localStorage.setItem('locations', JSON.stringify(each.nodes));
+    });
     return json;
   }
 });
@@ -489,7 +492,7 @@ L.DistortableImageOverlay = L.ImageOverlay.extend({
       _this._initImageDimensions();
 
       if (_this.options.rotation) {
-        var units = _this.options.rotation.deg ? 'deg' : 'rad';
+        var units = _this.options.rotation.deg >= 0 ? 'deg' : 'rad';
 
         _this.setAngle(_this.options.rotation[units], units);
       } else {
@@ -3898,9 +3901,9 @@ L.Map.DoubleClickZoom.include({
       } else {
         // manually fire doubleclick event only for touch screens that don't natively fire it
         if (L.Browser.touch && oe && oe.sourceCapabilities.firesTouchEvents) {
-          // in `DoubleClickLabels.js`, we just do map.fire('dblclick') bc `_onDoublClick` doesn't use the
-          // passed "e" (for now). To generate a 'real' DOM event that will have all of its corresponding core
-          // properties (originalEvent, latlng, etc.), use Leaflet's `#map._fireDOMEvent` (Leaflet 1.5.1 source)
+          /*  in `DoubleClickLabels.js`, we just do map.fire('dblclick') bc `_onDoublClick` doesn't use the
+          passed "e" (for now). To generate a 'real' DOM event that will have all of its corresponding core
+          properties (originalEvent, latlng, etc.), use Leaflet's `#map._fireDOMEvent` (Leaflet 1.5.1 source) */
           map._fireDOMEvent(oe, 'dblclick', [map]);
         }
       }
@@ -7257,7 +7260,7 @@ module.exports.formatError = function (err) {
 /******/ 	
 /******/ 	/* webpack/runtime/getFullHash */
 /******/ 	!function() {
-/******/ 		__webpack_require__.h = function() { return "91cb9924f808c37e539c"; }
+/******/ 		__webpack_require__.h = function() { return "e3dae76ac59e8bb79340"; }
 /******/ 	}();
 /******/ 	
 /******/ 	/* webpack/runtime/hasOwnProperty shorthand */
diff --git a/src/DistortableCollection.js b/src/DistortableCollection.js
index 60f91e733..7ae6fe713 100644
--- a/src/DistortableCollection.js
+++ b/src/DistortableCollection.js
@@ -218,7 +218,7 @@ L.DistortableCollection = L.FeatureGroup.extend({
 
     json.images = json.images.reverse();
     json.avg_cm_per_pixel = this._getAvgCmPerPixel(json.images);
-
+    json.images.map(each=> localStorage.setItem('locations', JSON.stringify(each.nodes)))
     return json;
   },
 });

From 4a1339abb7c0b822cdb3f8ecee64017c4cf3166d Mon Sep 17 00:00:00 2001
From: Vanitha K <kvanitha780@gmail.com>
Date: Sat, 22 Oct 2022 23:33:43 +0530
Subject: [PATCH 05/18] error fixes

---
 dist/leaflet.distortableimage.js | 2 +-
 src/DistortableCollection.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js
index ece197e93..a49de1631 100644
--- a/dist/leaflet.distortableimage.js
+++ b/dist/leaflet.distortableimage.js
@@ -7260,7 +7260,7 @@ module.exports.formatError = function (err) {
 /******/ 	
 /******/ 	/* webpack/runtime/getFullHash */
 /******/ 	!function() {
-/******/ 		__webpack_require__.h = function() { return "e3dae76ac59e8bb79340"; }
+/******/ 		__webpack_require__.h = function() { return "6fc05bf64e32380618da"; }
 /******/ 	}();
 /******/ 	
 /******/ 	/* webpack/runtime/hasOwnProperty shorthand */
diff --git a/src/DistortableCollection.js b/src/DistortableCollection.js
index 7ae6fe713..2aced4fb2 100644
--- a/src/DistortableCollection.js
+++ b/src/DistortableCollection.js
@@ -218,7 +218,7 @@ L.DistortableCollection = L.FeatureGroup.extend({
 
     json.images = json.images.reverse();
     json.avg_cm_per_pixel = this._getAvgCmPerPixel(json.images);
-    json.images.map(each=> localStorage.setItem('locations', JSON.stringify(each.nodes)))
+    json.images.map(each=> localStorage.setItem('locations', JSON.stringify(each.nodes)));
     return json;
   },
 });

From a03c45c12415ab9f9a666a0db3e827113ef0005c Mon Sep 17 00:00:00 2001
From: Vanitha K <kvanitha780@gmail.com>
Date: Sun, 23 Oct 2022 20:45:15 +0530
Subject: [PATCH 06/18] made a new method to save map in localStorage

---
 src/DistortableCollection.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/DistortableCollection.js b/src/DistortableCollection.js
index 2aced4fb2..580d176f8 100644
--- a/src/DistortableCollection.js
+++ b/src/DistortableCollection.js
@@ -218,7 +218,7 @@ L.DistortableCollection = L.FeatureGroup.extend({
 
     json.images = json.images.reverse();
     json.avg_cm_per_pixel = this._getAvgCmPerPixel(json.images);
-    json.images.map(each=> localStorage.setItem('locations', JSON.stringify(each.nodes)));
+    var jsonImages = json.images
     return json;
   },
 });
@@ -226,3 +226,7 @@ L.DistortableCollection = L.FeatureGroup.extend({
 L.distortableCollection = function(id, options) {
   return new L.DistortableCollection(id, options);
 };
+
+function savetoLocalStorage(jsonImages){
+  json.images.map(each=> localStorage.setItem('locations', JSON.stringify(each.nodes)));
+}

From e409e6937fd4e89f5a922557b340fceafb524071 Mon Sep 17 00:00:00 2001
From: Vanitha K <kvanitha780@gmail.com>
Date: Sun, 23 Oct 2022 21:42:18 +0530
Subject: [PATCH 07/18] error fixes

---
 src/DistortableCollection.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DistortableCollection.js b/src/DistortableCollection.js
index 580d176f8..79d307bbc 100644
--- a/src/DistortableCollection.js
+++ b/src/DistortableCollection.js
@@ -218,7 +218,7 @@ L.DistortableCollection = L.FeatureGroup.extend({
 
     json.images = json.images.reverse();
     json.avg_cm_per_pixel = this._getAvgCmPerPixel(json.images);
-    var jsonImages = json.images
+    var jsonImages = json.images;
     return json;
   },
 });

From 415f0daed77322a6187e0408b99c40f0f17f5429 Mon Sep 17 00:00:00 2001
From: Vanitha K <kvanitha780@gmail.com>
Date: Sun, 23 Oct 2022 21:45:00 +0530
Subject: [PATCH 08/18] error fixes X2

---
 src/DistortableCollection.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DistortableCollection.js b/src/DistortableCollection.js
index 79d307bbc..5a8374b95 100644
--- a/src/DistortableCollection.js
+++ b/src/DistortableCollection.js
@@ -227,6 +227,6 @@ L.distortableCollection = function(id, options) {
   return new L.DistortableCollection(id, options);
 };
 
-function savetoLocalStorage(jsonImages){
+function savetoLocalStorage(jsonImages) {
   json.images.map(each=> localStorage.setItem('locations', JSON.stringify(each.nodes)));
 }

From 44d3a4b81c7f072dac57f8bd0d2d39ea2873a5cc Mon Sep 17 00:00:00 2001
From: Vanitha K <kvanitha780@gmail.com>
Date: Sun, 23 Oct 2022 21:48:04 +0530
Subject: [PATCH 09/18] error fixes X3

---
 src/DistortableCollection.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/DistortableCollection.js b/src/DistortableCollection.js
index 5a8374b95..5f3b408be 100644
--- a/src/DistortableCollection.js
+++ b/src/DistortableCollection.js
@@ -219,6 +219,7 @@ L.DistortableCollection = L.FeatureGroup.extend({
     json.images = json.images.reverse();
     json.avg_cm_per_pixel = this._getAvgCmPerPixel(json.images);
     var jsonImages = json.images;
+    savetoLocalStorage(jsonImages);
     return json;
   },
 });

From 57613e67338d93c64f2c035840487094c78e6d83 Mon Sep 17 00:00:00 2001
From: Vanitha K <kvanitha780@gmail.com>
Date: Tue, 25 Oct 2022 22:55:38 +0530
Subject: [PATCH 10/18] removed overwriting of coordinates

---
 dist/leaflet.distortableimage.js | 16 ++++++++++++----
 src/DistortableCollection.js     |  3 ++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js
index a49de1631..46ff9cce2 100644
--- a/dist/leaflet.distortableimage.js
+++ b/dist/leaflet.distortableimage.js
@@ -428,9 +428,8 @@ L.DistortableCollection = L.FeatureGroup.extend({
     }, this);
     json.images = json.images.reverse();
     json.avg_cm_per_pixel = this._getAvgCmPerPixel(json.images);
-    json.images.map(function (each) {
-      return localStorage.setItem('locations', JSON.stringify(each.nodes));
-    });
+    var jsonImages = json.images;
+    savetoLocalStorage(jsonImages);
     return json;
   }
 });
@@ -439,6 +438,15 @@ L.distortableCollection = function (id, options) {
   return new L.DistortableCollection(id, options);
 };
 
+function savetoLocalStorage(jsonImages) {
+  var result = jsonImages.map(function (img) {
+    return {
+      value: img.nodes
+    };
+  });
+  localStorage.setItem('locations', JSON.stringify(result));
+}
+
 /***/ }),
 
 /***/ "./src/DistortableImageOverlay.js":
@@ -7260,7 +7268,7 @@ module.exports.formatError = function (err) {
 /******/ 	
 /******/ 	/* webpack/runtime/getFullHash */
 /******/ 	!function() {
-/******/ 		__webpack_require__.h = function() { return "6fc05bf64e32380618da"; }
+/******/ 		__webpack_require__.h = function() { return "3ed6493ff558afe3d9e0"; }
 /******/ 	}();
 /******/ 	
 /******/ 	/* webpack/runtime/hasOwnProperty shorthand */
diff --git a/src/DistortableCollection.js b/src/DistortableCollection.js
index 5f3b408be..7c58cd78d 100644
--- a/src/DistortableCollection.js
+++ b/src/DistortableCollection.js
@@ -229,5 +229,6 @@ L.distortableCollection = function(id, options) {
 };
 
 function savetoLocalStorage(jsonImages) {
-  json.images.map(each=> localStorage.setItem('locations', JSON.stringify(each.nodes)));
+  var result = jsonImages.map(img => ({ value: img.nodes }));
+ localStorage.setItem('locations', JSON.stringify(result));
 }

From 5f3e111fe878e167fa901c7e6d29e9063ff285da Mon Sep 17 00:00:00 2001
From: Vanitha K <kvanitha780@gmail.com>
Date: Tue, 25 Oct 2022 23:01:26 +0530
Subject: [PATCH 11/18] removed overwriting of coordinates

---
 dist/leaflet.distortableimage.js | 2 +-
 src/DistortableCollection.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js
index 46ff9cce2..0bb5137b2 100644
--- a/dist/leaflet.distortableimage.js
+++ b/dist/leaflet.distortableimage.js
@@ -7268,7 +7268,7 @@ module.exports.formatError = function (err) {
 /******/ 	
 /******/ 	/* webpack/runtime/getFullHash */
 /******/ 	!function() {
-/******/ 		__webpack_require__.h = function() { return "3ed6493ff558afe3d9e0"; }
+/******/ 		__webpack_require__.h = function() { return "323ca7fac454bb5122e2"; }
 /******/ 	}();
 /******/ 	
 /******/ 	/* webpack/runtime/hasOwnProperty shorthand */
diff --git a/src/DistortableCollection.js b/src/DistortableCollection.js
index 7c58cd78d..320e80c5a 100644
--- a/src/DistortableCollection.js
+++ b/src/DistortableCollection.js
@@ -230,5 +230,5 @@ L.distortableCollection = function(id, options) {
 
 function savetoLocalStorage(jsonImages) {
   var result = jsonImages.map(img => ({ value: img.nodes }));
- localStorage.setItem('locations', JSON.stringify(result));
+  localStorage.setItem('locations', JSON.stringify(result));
 }

From a798be5654333661b8e96027a0b666aed757cb80 Mon Sep 17 00:00:00 2001
From: Vanitha K <kvanitha780@gmail.com>
Date: Tue, 25 Oct 2022 23:04:00 +0530
Subject: [PATCH 12/18] error fixes

---
 dist/leaflet.distortableimage.js | 2 +-
 src/DistortableCollection.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js
index 0bb5137b2..b8eab576f 100644
--- a/dist/leaflet.distortableimage.js
+++ b/dist/leaflet.distortableimage.js
@@ -7268,7 +7268,7 @@ module.exports.formatError = function (err) {
 /******/ 	
 /******/ 	/* webpack/runtime/getFullHash */
 /******/ 	!function() {
-/******/ 		__webpack_require__.h = function() { return "323ca7fac454bb5122e2"; }
+/******/ 		__webpack_require__.h = function() { return "8248f1eca38195f7540d"; }
 /******/ 	}();
 /******/ 	
 /******/ 	/* webpack/runtime/hasOwnProperty shorthand */
diff --git a/src/DistortableCollection.js b/src/DistortableCollection.js
index 320e80c5a..c4cf3adc5 100644
--- a/src/DistortableCollection.js
+++ b/src/DistortableCollection.js
@@ -229,6 +229,6 @@ L.distortableCollection = function(id, options) {
 };
 
 function savetoLocalStorage(jsonImages) {
-  var result = jsonImages.map(img => ({ value: img.nodes }));
+  var result = jsonImages.map(img => ({value: img.nodes}));
   localStorage.setItem('locations', JSON.stringify(result));
 }

From 8e680cb9824182f67126e0b01a5d73df6e0ad19c Mon Sep 17 00:00:00 2001
From: Vanitha K <kvanitha780@gmail.com>
Date: Wed, 26 Oct 2022 01:30:34 +0530
Subject: [PATCH 13/18] allowing download of the positions as a JSON file:
 mapknitter.json

---
 dist/leaflet.distortableimage.js | 22 ++++++++++++++++++++--
 src/DistortableCollection.js     | 20 +++++++++++++++++++-
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js
index b8eab576f..50225ef67 100644
--- a/dist/leaflet.distortableimage.js
+++ b/dist/leaflet.distortableimage.js
@@ -444,7 +444,25 @@ function savetoLocalStorage(jsonImages) {
       value: img.nodes
     };
   });
-  localStorage.setItem('locations', JSON.stringify(result));
+  var getImages = localStorage.setItem('locations', JSON.stringify(result));
+  downloadFromLocalStorage(getImages);
+}
+
+function downloadFromLocalStorage(getImages) {
+  var obj = localStorage.getItem('locations');
+  var data = "text/json;charset=utf-8," + encodeURIComponent(JSON.stringify(obj, prettyJson));
+  var a = document.createElement('a');
+  a.href = 'data:' + data;
+  a.download = 'mapknitter.json'; // a.innerHTML = 'download JSON';
+  // console.log(a);
+
+  a.click();
+}
+
+function prettyJson(key, value) {
+  // return value.replace(/[^\w\s]/gi, '\n');
+  // (/\n/g, "\r\n")
+  return value.replace(/\n/g, "\\\\n").replace(/\r/g, "\\\\r").replace(/\t/g, "\\\\t");
 }
 
 /***/ }),
@@ -7268,7 +7286,7 @@ module.exports.formatError = function (err) {
 /******/ 	
 /******/ 	/* webpack/runtime/getFullHash */
 /******/ 	!function() {
-/******/ 		__webpack_require__.h = function() { return "8248f1eca38195f7540d"; }
+/******/ 		__webpack_require__.h = function() { return "ab57f7623533f6402f38"; }
 /******/ 	}();
 /******/ 	
 /******/ 	/* webpack/runtime/hasOwnProperty shorthand */
diff --git a/src/DistortableCollection.js b/src/DistortableCollection.js
index c4cf3adc5..4dbba83e6 100644
--- a/src/DistortableCollection.js
+++ b/src/DistortableCollection.js
@@ -230,5 +230,23 @@ L.distortableCollection = function(id, options) {
 
 function savetoLocalStorage(jsonImages) {
   var result = jsonImages.map(img => ({value: img.nodes}));
-  localStorage.setItem('locations', JSON.stringify(result));
+  var getImages = localStorage.setItem('locations', JSON.stringify(result));
+  downloadFromLocalStorage(getImages);
+}
+
+function downloadFromLocalStorage(getImages){
+  var obj = localStorage.getItem('locations');
+  var data = "text/json;charset=utf-8," + encodeURIComponent(JSON.stringify(obj, prettyJson));
+  var a = document.createElement('a');
+  a.href = 'data:' + data;
+  a.download = 'mapknitter.json';
+  // a.innerHTML = 'download JSON';
+  // console.log(a);
+  a.click();
+}
+
+function prettyJson(key, value) {
+  // return value.replace(/[^\w\s]/gi, '\n');
+  // (/\n/g, "\r\n")
+  return value.replace(/\n/g, "\\\\n").replace(/\r/g, "\\\\r").replace(/\t/g, "\\\\t");
 }

From e3b8b1faef779f9b491a6fbd0064515fdf7ceb03 Mon Sep 17 00:00:00 2001
From: Vanitha K <kvanitha780@gmail.com>
Date: Wed, 26 Oct 2022 01:45:15 +0530
Subject: [PATCH 14/18] error fixes

---
 dist/leaflet.distortableimage.js | 6 +++---
 src/DistortableCollection.js     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js
index 50225ef67..fe2a68584 100644
--- a/dist/leaflet.distortableimage.js
+++ b/dist/leaflet.distortableimage.js
@@ -450,7 +450,7 @@ function savetoLocalStorage(jsonImages) {
 
 function downloadFromLocalStorage(getImages) {
   var obj = localStorage.getItem('locations');
-  var data = "text/json;charset=utf-8," + encodeURIComponent(JSON.stringify(obj, prettyJson));
+  var data = 'text/json;charset=utf-8,' + encodeURIComponent(JSON.stringify(obj, prettyJson));
   var a = document.createElement('a');
   a.href = 'data:' + data;
   a.download = 'mapknitter.json'; // a.innerHTML = 'download JSON';
@@ -462,7 +462,7 @@ function downloadFromLocalStorage(getImages) {
 function prettyJson(key, value) {
   // return value.replace(/[^\w\s]/gi, '\n');
   // (/\n/g, "\r\n")
-  return value.replace(/\n/g, "\\\\n").replace(/\r/g, "\\\\r").replace(/\t/g, "\\\\t");
+  return value.replace(/\n/g, '\\\\n').replace(/\r/g, '\\\\r').replace(/\t/g, '\\\\t');
 }
 
 /***/ }),
@@ -7286,7 +7286,7 @@ module.exports.formatError = function (err) {
 /******/ 	
 /******/ 	/* webpack/runtime/getFullHash */
 /******/ 	!function() {
-/******/ 		__webpack_require__.h = function() { return "ab57f7623533f6402f38"; }
+/******/ 		__webpack_require__.h = function() { return "9e810f114482d5a79099"; }
 /******/ 	}();
 /******/ 	
 /******/ 	/* webpack/runtime/hasOwnProperty shorthand */
diff --git a/src/DistortableCollection.js b/src/DistortableCollection.js
index 4dbba83e6..e93aaf39a 100644
--- a/src/DistortableCollection.js
+++ b/src/DistortableCollection.js
@@ -234,9 +234,9 @@ function savetoLocalStorage(jsonImages) {
   downloadFromLocalStorage(getImages);
 }
 
-function downloadFromLocalStorage(getImages){
+function downloadFromLocalStorage(getImages) {
   var obj = localStorage.getItem('locations');
-  var data = "text/json;charset=utf-8," + encodeURIComponent(JSON.stringify(obj, prettyJson));
+  var data = 'text/json;charset=utf-8,' + encodeURIComponent(JSON.stringify(obj, prettyJson));
   var a = document.createElement('a');
   a.href = 'data:' + data;
   a.download = 'mapknitter.json';
@@ -248,5 +248,5 @@ function downloadFromLocalStorage(getImages){
 function prettyJson(key, value) {
   // return value.replace(/[^\w\s]/gi, '\n');
   // (/\n/g, "\r\n")
-  return value.replace(/\n/g, "\\\\n").replace(/\r/g, "\\\\r").replace(/\t/g, "\\\\t");
+  return value.replace(/\n/g, '\\\\n').replace(/\r/g, '\\\\r').replace(/\t/g, '\\\\t');
 }

From 55c57e1e01867897de956aed910bde7c374e68f0 Mon Sep 17 00:00:00 2001
From: 7malikk <7malikk@gmail.com>
Date: Tue, 24 Jan 2023 15:57:52 +0100
Subject: [PATCH 15/18] downloadJSON

---
 dist/leaflet.distortableimage.js       | 74 +++++++++++++-------------
 examples/archive.html                  |  2 +-
 examples/js/archive.js                 | 15 +++++-
 src/DistortableCollection.js           | 43 ++++++---------
 src/edit/DistortableCollection.Edit.js | 14 ++---
 src/edit/actions/ExportAction.js       |  7 ++-
 6 files changed, 80 insertions(+), 75 deletions(-)

diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js
index 27191cfcd..fd02fe87c 100644
--- a/dist/leaflet.distortableimage.js
+++ b/dist/leaflet.distortableimage.js
@@ -405,11 +405,25 @@ L.DistortableCollection = L.FeatureGroup.extend({
     }, 0);
     return reduce / imgs.length;
   },
+  isJsonDetected: function isJsonDetected(currentURL) {
+    if (currentURL.includes('?json=')) {
+      startIndex = currentURL.lastIndexOf('.');
+      fileExtension = currentURL.slice(startIndex + 1);
+
+      if (fileExtension === 'json') {
+        console.log('JSON found in map shareable link');
+        return true;
+      }
+    }
+
+    return false;
+  },
   generateExportJson: function generateExportJson() {
+    var allImages = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     var json = {};
     json.images = [];
     this.eachLayer(function (layer) {
-      if (this.isCollected(layer)) {
+      if (allImages || this.isCollected(layer)) {
         var sections = layer._image.src.split('/');
 
         var filename = sections[sections.length - 1];
@@ -440,9 +454,19 @@ L.DistortableCollection = L.FeatureGroup.extend({
     }, this);
     json.images = json.images.reverse();
     json.avg_cm_per_pixel = this._getAvgCmPerPixel(json.images);
-    var jsonImages = json.images;
-    savetoLocalStorage(jsonImages);
     return json;
+  },
+  downloadJson: function downloadJson() {
+    var jsonImages = this.generateExportJson(true).images; // a check to prevent download of empty file
+
+    if (jsonImages.length) {
+      var encodedFile = 'text/json;charset=utf-8,' + encodeURIComponent(JSON.stringify(jsonImages));
+      var a = document.createElement('a');
+      a.href = 'data:' + encodedFile;
+      var fileName = prompt("Input filename");
+      a.download = fileName + '.json';
+      a.click();
+    }
   }
 });
 
@@ -450,33 +474,6 @@ L.distortableCollection = function (id, options) {
   return new L.DistortableCollection(id, options);
 };
 
-function savetoLocalStorage(jsonImages) {
-  var result = jsonImages.map(function (img) {
-    return {
-      value: img.nodes
-    };
-  });
-  var getImages = localStorage.setItem('locations', JSON.stringify(result));
-  downloadFromLocalStorage(getImages);
-}
-
-function downloadFromLocalStorage(getImages) {
-  var obj = localStorage.getItem('locations');
-  var data = 'text/json;charset=utf-8,' + encodeURIComponent(JSON.stringify(obj, prettyJson));
-  var a = document.createElement('a');
-  a.href = 'data:' + data;
-  a.download = 'mapknitter.json'; // a.innerHTML = 'download JSON';
-  // console.log(a);
-
-  a.click();
-}
-
-function prettyJson(key, value) {
-  // return value.replace(/[^\w\s]/gi, '\n');
-  // (/\n/g, "\r\n")
-  return value.replace(/\n/g, '\\\\n').replace(/\r/g, '\\\\r').replace(/\t/g, '\\\\t');
-}
-
 /***/ }),
 
 /***/ "./src/DistortableImageOverlay.js":
@@ -1390,18 +1387,19 @@ L.DistortableCollection.Edit = L.Handler.extend({
 
     if (group.options.suppressToolbar || this.toolbar) {
       return;
-    }
+    } // this is redundant as the controlbar is initialized in archive.js
+    // this.toolbar = L.distortableImage.controlBar({
+    //   actions: this.editActions,
+    //   position: 'topleft',
+    // }).addTo(map, group);
 
-    this.toolbar = L.distortableImage.controlBar({
-      actions: this.editActions,
-      position: 'topleft'
-    }).addTo(map, group);
   },
   _removeToolbar: function _removeToolbar() {
     var map = this._group._map;
 
     if (this.toolbar) {
-      map.removeLayer(this.toolbar);
+      // if uncommented removes the toolbar when image is deselected
+      // map.removeLayer(this.toolbar);
       this.toolbar = false;
     } else {
       return false;
@@ -2611,6 +2609,7 @@ L.ExportAction = L.EditAction.extend({
       tooltip: tooltip
     };
     L.EditAction.prototype.initialize.call(this, map, overlay, options);
+    this.map = map;
   },
   addHooks: function addHooks() {
     var edit = this._overlay.editing;
@@ -2633,6 +2632,7 @@ L.ExportAction = L.EditAction.extend({
     this.mouseLeaveHandler = this.handleMouseLeave.bind(this);
     L.DomEvent.on(exportTool, 'click', function () {
       if (!this.isExporting) {
+        this.map.imgGroup.downloadJson();
         this.isExporting = true;
         this.renderExportIcon();
         setTimeout(this.attachMouseEventListeners.bind(this, exportTool), 100);
@@ -7315,7 +7315,7 @@ module.exports.formatError = function (err) {
 /******/ 	
 /******/ 	/* webpack/runtime/getFullHash */
 /******/ 	!function() {
-/******/ 		__webpack_require__.h = function() { return "400e667cbaf175eb687b"; }
+/******/ 		__webpack_require__.h = function() { return "c657838d5b709a0690a2"; }
 /******/ 	}();
 /******/ 	
 /******/ 	/* webpack/runtime/hasOwnProperty shorthand */
diff --git a/examples/archive.html b/examples/archive.html
index ee5fb9d31..2da2d6b0d 100644
--- a/examples/archive.html
+++ b/examples/archive.html
@@ -79,7 +79,7 @@ <h3 id="offcanvasRightLabel">Images</h3>
        <button title="Previous" id="prevBtn" style="all: unset; cursor: pointer;">
         <i class=" fa fa-regular fa-chevron-left"></i>
        </button>
-        <p style="margin: 5px;" id="range">1-50 of 200</p>
+        <p style="margin: 5px;" id="range">0-0 of 0</p>
        <button title="Next" id="nextBtn" style="all: unset; cursor: pointer;">
         <i  class=" fa fa-regular fa-chevron-right"></i>
        </button>
diff --git a/examples/js/archive.js b/examples/js/archive.js
index 5514cbbd5..f094c03f6 100644
--- a/examples/js/archive.js
+++ b/examples/js/archive.js
@@ -171,8 +171,8 @@ tileMap.addEventListener('click', (event) => {
 });
 
 function getImageName(imageURL) {
-  startIndex = imageURL.lastIndexOf('/') + 1;
-  endIndex = imageURL.lastIndexOf('.');
+  const startIndex = imageURL.lastIndexOf('/') + 1;
+  const endIndex = imageURL.lastIndexOf('.');
   const imageName = imageURL.substring(startIndex, endIndex);
 
   return imageName;
@@ -190,3 +190,14 @@ document.addEventListener('click', (event) => {
     map.imgGroup.addLayer(image);
   }
 });
+
+// adds toolbar to map
+L.distortableImage.controlBar({
+      actions:  [
+    L.ExportAction,
+    L.DeleteAction,
+    L.LockAction,
+    L.UnlockAction,
+  ],
+      position: 'topleft',
+    }).addTo(map, map.imgGroup);
\ No newline at end of file
diff --git a/src/DistortableCollection.js b/src/DistortableCollection.js
index dc46427d3..ab2db29b2 100644
--- a/src/DistortableCollection.js
+++ b/src/DistortableCollection.js
@@ -212,12 +212,12 @@ L.DistortableCollection = L.FeatureGroup.extend({
     return false;
   },
 
-  generateExportJson() {
+  generateExportJson(allImages = false) {
     const json = {};
     json.images = [];
 
     this.eachLayer(function(layer) {
-      if (this.isCollected(layer)) {
+      if (allImages || this.isCollected(layer)) {
         const sections = layer._image.src.split('/');
         const filename = sections[sections.length-1];
         const zc = layer.getCorners();
@@ -241,35 +241,24 @@ L.DistortableCollection = L.FeatureGroup.extend({
 
     json.images = json.images.reverse();
     json.avg_cm_per_pixel = this._getAvgCmPerPixel(json.images);
-    var jsonImages = json.images;
-    savetoLocalStorage(jsonImages);
+    
     return json;
   },
+
+  downloadJson() {
+    const jsonImages = this.generateExportJson(true).images
+   // a check to prevent download of empty file
+    if (jsonImages.length) { 
+       const encodedFile = 'text/json;charset=utf-8,' + encodeURIComponent(JSON.stringify(jsonImages));
+       const a = document.createElement('a');
+      a.href = 'data:' + encodedFile;
+      const fileName = prompt("Input filename")
+       a.download = fileName + '.json';
+       a.click();
+    }
+  }
 });
 
 L.distortableCollection = function(id, options) {
   return new L.DistortableCollection(id, options);
 };
-
-function savetoLocalStorage(jsonImages) {
-  var result = jsonImages.map(img => ({value: img.nodes}));
-  var getImages = localStorage.setItem('locations', JSON.stringify(result));
-  downloadFromLocalStorage(getImages);
-}
-
-function downloadFromLocalStorage(getImages) {
-  var obj = localStorage.getItem('locations');
-  var data = 'text/json;charset=utf-8,' + encodeURIComponent(JSON.stringify(obj, prettyJson));
-  var a = document.createElement('a');
-  a.href = 'data:' + data;
-  a.download = 'mapknitter.json';
-  // a.innerHTML = 'download JSON';
-  // console.log(a);
-  a.click();
-}
-
-function prettyJson(key, value) {
-  // return value.replace(/[^\w\s]/gi, '\n');
-  // (/\n/g, "\r\n")
-  return value.replace(/\n/g, '\\\\n').replace(/\r/g, '\\\\r').replace(/\t/g, '\\\\t');
-}
diff --git a/src/edit/DistortableCollection.Edit.js b/src/edit/DistortableCollection.Edit.js
index d3daee13a..113b8d0b7 100644
--- a/src/edit/DistortableCollection.Edit.js
+++ b/src/edit/DistortableCollection.Edit.js
@@ -207,17 +207,19 @@ L.DistortableCollection.Edit = L.Handler.extend({
     const map = group._map;
 
     if (group.options.suppressToolbar || this.toolbar) { return; }
-
-    this.toolbar = L.distortableImage.controlBar({
-      actions: this.editActions,
-      position: 'topleft',
-    }).addTo(map, group);
+    
+    // this is redundant as the controlbar is initialized in archive.js
+    // this.toolbar = L.distortableImage.controlBar({
+    //   actions: this.editActions,
+    //   position: 'topleft',
+    // }).addTo(map, group);
   },
 
   _removeToolbar() {
     const map = this._group._map;
     if (this.toolbar) {
-      map.removeLayer(this.toolbar);
+      // if uncommented removes the toolbar when image is deselected
+      // map.removeLayer(this.toolbar);
       this.toolbar = false;
     } else {
       return false;
diff --git a/src/edit/actions/ExportAction.js b/src/edit/actions/ExportAction.js
index 1421dce2b..5c8bac7a5 100644
--- a/src/edit/actions/ExportAction.js
+++ b/src/edit/actions/ExportAction.js
@@ -13,7 +13,7 @@ L.ExportAction = L.EditAction.extend({
       tooltip = overlay.options.translation.exportImage;
     } else {
       L.DistortableImage.group_action_map.e = 'runExporter';
-      tooltip = overlay.options.translation.exportImages;
+      tooltip =  overlay.options.translation.exportImages;
     }
 
     options = options || {};
@@ -24,6 +24,7 @@ L.ExportAction = L.EditAction.extend({
     };
 
     L.EditAction.prototype.initialize.call(this, map, overlay, options);
+    this.map = map
   },
 
   addHooks() {
@@ -46,8 +47,10 @@ L.ExportAction = L.EditAction.extend({
     this.mouseEnterHandler = this.handleMouseEnter.bind(this);
     this.mouseLeaveHandler = this.handleMouseLeave.bind(this);
 
-    L.DomEvent.on(exportTool, 'click', function() {
+    L.DomEvent.on(exportTool, 'click', function () {
+    
       if (!this.isExporting) {
+        this.map.imgGroup.downloadJson()
         this.isExporting = true;
         this.renderExportIcon();
 

From b8984377845f11ebbb99bd268715a0b3ae96bdbb Mon Sep 17 00:00:00 2001
From: 7malikk <7malikk@gmail.com>
Date: Tue, 24 Jan 2023 16:06:22 +0100
Subject: [PATCH 16/18] hot fix

---
 dist/leaflet.distortableimage.js       | 8 +++-----
 src/edit/DistortableCollection.Edit.js | 5 ++---
 src/edit/actions/ExportAction.js       | 9 ++++-----
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js
index fd02fe87c..655437810 100644
--- a/dist/leaflet.distortableimage.js
+++ b/dist/leaflet.distortableimage.js
@@ -1382,8 +1382,7 @@ L.DistortableCollection.Edit = L.Handler.extend({
     clearInterval(this.updateInterval);
   },
   _addToolbar: function _addToolbar() {
-    var group = this._group;
-    var map = group._map;
+    var group = this._group; // const map = group._map;
 
     if (group.options.suppressToolbar || this.toolbar) {
       return;
@@ -1395,8 +1394,7 @@ L.DistortableCollection.Edit = L.Handler.extend({
 
   },
   _removeToolbar: function _removeToolbar() {
-    var map = this._group._map;
-
+    // const map = this._group._map;
     if (this.toolbar) {
       // if uncommented removes the toolbar when image is deselected
       // map.removeLayer(this.toolbar);
@@ -7315,7 +7313,7 @@ module.exports.formatError = function (err) {
 /******/ 	
 /******/ 	/* webpack/runtime/getFullHash */
 /******/ 	!function() {
-/******/ 		__webpack_require__.h = function() { return "c657838d5b709a0690a2"; }
+/******/ 		__webpack_require__.h = function() { return "4cda7a6ab438af5c681b"; }
 /******/ 	}();
 /******/ 	
 /******/ 	/* webpack/runtime/hasOwnProperty shorthand */
diff --git a/src/edit/DistortableCollection.Edit.js b/src/edit/DistortableCollection.Edit.js
index 113b8d0b7..2b9c67f7c 100644
--- a/src/edit/DistortableCollection.Edit.js
+++ b/src/edit/DistortableCollection.Edit.js
@@ -204,10 +204,9 @@ L.DistortableCollection.Edit = L.Handler.extend({
 
   _addToolbar() {
     const group = this._group;
-    const map = group._map;
+    // const map = group._map;
 
     if (group.options.suppressToolbar || this.toolbar) { return; }
-    
     // this is redundant as the controlbar is initialized in archive.js
     // this.toolbar = L.distortableImage.controlBar({
     //   actions: this.editActions,
@@ -216,7 +215,7 @@ L.DistortableCollection.Edit = L.Handler.extend({
   },
 
   _removeToolbar() {
-    const map = this._group._map;
+    // const map = this._group._map;
     if (this.toolbar) {
       // if uncommented removes the toolbar when image is deselected
       // map.removeLayer(this.toolbar);
diff --git a/src/edit/actions/ExportAction.js b/src/edit/actions/ExportAction.js
index 5c8bac7a5..d777cc50e 100644
--- a/src/edit/actions/ExportAction.js
+++ b/src/edit/actions/ExportAction.js
@@ -13,7 +13,7 @@ L.ExportAction = L.EditAction.extend({
       tooltip = overlay.options.translation.exportImage;
     } else {
       L.DistortableImage.group_action_map.e = 'runExporter';
-      tooltip =  overlay.options.translation.exportImages;
+      tooltip = overlay.options.translation.exportImages;
     }
 
     options = options || {};
@@ -24,7 +24,7 @@ L.ExportAction = L.EditAction.extend({
     };
 
     L.EditAction.prototype.initialize.call(this, map, overlay, options);
-    this.map = map
+    this.map = map;
   },
 
   addHooks() {
@@ -47,10 +47,9 @@ L.ExportAction = L.EditAction.extend({
     this.mouseEnterHandler = this.handleMouseEnter.bind(this);
     this.mouseLeaveHandler = this.handleMouseLeave.bind(this);
 
-    L.DomEvent.on(exportTool, 'click', function () {
-    
+    L.DomEvent.on(exportTool, 'click', function() {
       if (!this.isExporting) {
-        this.map.imgGroup.downloadJson()
+        this.map.imgGroup.downloadJson();
         this.isExporting = true;
         this.renderExportIcon();
 

From fd381b2ca45f2db0cdf6177917909212743cba02 Mon Sep 17 00:00:00 2001
From: 7malikk <7malikk@gmail.com>
Date: Tue, 24 Jan 2023 16:16:00 +0100
Subject: [PATCH 17/18] final fix

---
 dist/leaflet.distortableimage.js |  4 ++--
 src/DistortableCollection.js     | 19 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js
index 655437810..9f3d2883a 100644
--- a/dist/leaflet.distortableimage.js
+++ b/dist/leaflet.distortableimage.js
@@ -463,7 +463,7 @@ L.DistortableCollection = L.FeatureGroup.extend({
       var encodedFile = 'text/json;charset=utf-8,' + encodeURIComponent(JSON.stringify(jsonImages));
       var a = document.createElement('a');
       a.href = 'data:' + encodedFile;
-      var fileName = prompt("Input filename");
+      var fileName = prompt('Input filename');
       a.download = fileName + '.json';
       a.click();
     }
@@ -7313,7 +7313,7 @@ module.exports.formatError = function (err) {
 /******/ 	
 /******/ 	/* webpack/runtime/getFullHash */
 /******/ 	!function() {
-/******/ 		__webpack_require__.h = function() { return "4cda7a6ab438af5c681b"; }
+/******/ 		__webpack_require__.h = function() { return "2fcc8de8296c6cd7948d"; }
 /******/ 	}();
 /******/ 	
 /******/ 	/* webpack/runtime/hasOwnProperty shorthand */
diff --git a/src/DistortableCollection.js b/src/DistortableCollection.js
index ab2db29b2..bd620098d 100644
--- a/src/DistortableCollection.js
+++ b/src/DistortableCollection.js
@@ -241,22 +241,21 @@ L.DistortableCollection = L.FeatureGroup.extend({
 
     json.images = json.images.reverse();
     json.avg_cm_per_pixel = this._getAvgCmPerPixel(json.images);
-    
     return json;
   },
 
   downloadJson() {
-    const jsonImages = this.generateExportJson(true).images
-   // a check to prevent download of empty file
-    if (jsonImages.length) { 
-       const encodedFile = 'text/json;charset=utf-8,' + encodeURIComponent(JSON.stringify(jsonImages));
-       const a = document.createElement('a');
+    const jsonImages = this.generateExportJson(true).images;
+    // a check to prevent download of empty file
+    if (jsonImages.length) {
+      const encodedFile = 'text/json;charset=utf-8,' + encodeURIComponent(JSON.stringify(jsonImages));
+      const a = document.createElement('a');
       a.href = 'data:' + encodedFile;
-      const fileName = prompt("Input filename")
-       a.download = fileName + '.json';
-       a.click();
+      const fileName = prompt('Input filename');
+      a.download = fileName + '.json';
+      a.click();
     }
-  }
+  },
 });
 
 L.distortableCollection = function(id, options) {

From 54f35af7e2eef4e7f5a70d2146f19f42af131ef6 Mon Sep 17 00:00:00 2001
From: 7malikk <7malikk@gmail.com>
Date: Wed, 25 Jan 2023 13:52:53 +0100
Subject: [PATCH 18/18] refactor downloadJSON

---
 dist/leaflet.distortableimage.js       | 35 ++++++++------------------
 examples/archive.html                  |  9 ++++---
 examples/js/archive.js                 | 23 +++++++++--------
 src/DistortableCollection.js           | 13 ----------
 src/edit/DistortableCollection.Edit.js | 16 ++++++------
 src/edit/actions/ExportAction.js       |  2 --
 6 files changed, 37 insertions(+), 61 deletions(-)

diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js
index 9f3d2883a..16bc00087 100644
--- a/dist/leaflet.distortableimage.js
+++ b/dist/leaflet.distortableimage.js
@@ -455,18 +455,6 @@ L.DistortableCollection = L.FeatureGroup.extend({
     json.images = json.images.reverse();
     json.avg_cm_per_pixel = this._getAvgCmPerPixel(json.images);
     return json;
-  },
-  downloadJson: function downloadJson() {
-    var jsonImages = this.generateExportJson(true).images; // a check to prevent download of empty file
-
-    if (jsonImages.length) {
-      var encodedFile = 'text/json;charset=utf-8,' + encodeURIComponent(JSON.stringify(jsonImages));
-      var a = document.createElement('a');
-      a.href = 'data:' + encodedFile;
-      var fileName = prompt('Input filename');
-      a.download = fileName + '.json';
-      a.click();
-    }
   }
 });
 
@@ -1382,22 +1370,23 @@ L.DistortableCollection.Edit = L.Handler.extend({
     clearInterval(this.updateInterval);
   },
   _addToolbar: function _addToolbar() {
-    var group = this._group; // const map = group._map;
+    var group = this._group;
+    var map = group._map;
 
     if (group.options.suppressToolbar || this.toolbar) {
       return;
-    } // this is redundant as the controlbar is initialized in archive.js
-    // this.toolbar = L.distortableImage.controlBar({
-    //   actions: this.editActions,
-    //   position: 'topleft',
-    // }).addTo(map, group);
+    }
 
+    this.toolbar = L.distortableImage.controlBar({
+      actions: this.editActions,
+      position: 'topleft'
+    }).addTo(map, group);
   },
   _removeToolbar: function _removeToolbar() {
-    // const map = this._group._map;
+    var map = this._group._map;
+
     if (this.toolbar) {
-      // if uncommented removes the toolbar when image is deselected
-      // map.removeLayer(this.toolbar);
+      map.removeLayer(this.toolbar);
       this.toolbar = false;
     } else {
       return false;
@@ -2607,7 +2596,6 @@ L.ExportAction = L.EditAction.extend({
       tooltip: tooltip
     };
     L.EditAction.prototype.initialize.call(this, map, overlay, options);
-    this.map = map;
   },
   addHooks: function addHooks() {
     var edit = this._overlay.editing;
@@ -2630,7 +2618,6 @@ L.ExportAction = L.EditAction.extend({
     this.mouseLeaveHandler = this.handleMouseLeave.bind(this);
     L.DomEvent.on(exportTool, 'click', function () {
       if (!this.isExporting) {
-        this.map.imgGroup.downloadJson();
         this.isExporting = true;
         this.renderExportIcon();
         setTimeout(this.attachMouseEventListeners.bind(this, exportTool), 100);
@@ -7313,7 +7300,7 @@ module.exports.formatError = function (err) {
 /******/ 	
 /******/ 	/* webpack/runtime/getFullHash */
 /******/ 	!function() {
-/******/ 		__webpack_require__.h = function() { return "2fcc8de8296c6cd7948d"; }
+/******/ 		__webpack_require__.h = function() { return "e25f8be8eeb066dddf26"; }
 /******/ 	}();
 /******/ 	
 /******/ 	/* webpack/runtime/hasOwnProperty shorthand */
diff --git a/examples/archive.html b/examples/archive.html
index 2da2d6b0d..8dad92e53 100644
--- a/examples/archive.html
+++ b/examples/archive.html
@@ -65,9 +65,11 @@ <h2 class="modal-title">Welcome to MapKnitter Lite</h2>
 
   <div class="offcanvas offcanvas-end" data-bs-backdrop="false" data-bs-keyboard="false" tabindex="1" id="offcanvasRight" aria-labelledby="offcanvasRightLabel">
       <div class="offcanvas-header">
-        <h3 id="offcanvasRightLabel">Images</h3>
-        <button type="button" id="restoreWelcomeModalBtn" class="btn btn-primary btn-sm" data-bs-dismiss="offcanvas" aria-label="Close">Get Image</button>
-        <button type="button" class="btn btn-primary btn-sm" data-bs-dismiss="offcanvas" aria-label="Close">View Map</button>
+        <button type="button" id="restoreWelcomeModalBtn" class="btn btn-primary btn-md" data-bs-dismiss="offcanvas" aria-label="Close" title="Import images from collection URL">Import</button>
+        <button id="saveMap" type="button" class="btn btn-sm" aria-label="Save map" title="Save map in JSON format" >
+          <i class="fa fa-save fa-" style="font-size:24px" ></i>
+        </button>
+       <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close" title="Close Sidebar" ></button>
       </div>
       <hr>
       <div class="offcanvas-body">
@@ -76,6 +78,7 @@ <h3 id="offcanvasRightLabel">Images</h3>
       </div>
         <hr>
       <div class="offcanvas-footer d-flex justify-content-evenly align-items-center">
+        <h3 id="offcanvasRightLabel">Images</h3>
        <button title="Previous" id="prevBtn" style="all: unset; cursor: pointer;">
         <i class=" fa fa-regular fa-chevron-left"></i>
        </button>
diff --git a/examples/js/archive.js b/examples/js/archive.js
index f094c03f6..b211e4574 100644
--- a/examples/js/archive.js
+++ b/examples/js/archive.js
@@ -191,13 +191,16 @@ document.addEventListener('click', (event) => {
   }
 });
 
-// adds toolbar to map
-L.distortableImage.controlBar({
-      actions:  [
-    L.ExportAction,
-    L.DeleteAction,
-    L.LockAction,
-    L.UnlockAction,
-  ],
-      position: 'topleft',
-    }).addTo(map, map.imgGroup);
\ No newline at end of file
+// download JSON
+saveMap.addEventListener('click', () => {
+  const jsonImages = map.imgGroup.generateExportJson(true).images;
+    // a check to prevent download of empty file
+    if (jsonImages.length) {
+      const encodedFile = 'text/json;charset=utf-8,' + encodeURIComponent(JSON.stringify(jsonImages));
+      const a = document.createElement('a');
+      a.href = 'data:' + encodedFile;
+      const fileName = prompt('Use this file to recover your map’s saved state. Enter filename:');
+      a.download = fileName ? fileName + '.json' : 'MapknitterLite.json';
+      a.click();
+    }
+})
diff --git a/src/DistortableCollection.js b/src/DistortableCollection.js
index bd620098d..66d279f10 100644
--- a/src/DistortableCollection.js
+++ b/src/DistortableCollection.js
@@ -243,19 +243,6 @@ L.DistortableCollection = L.FeatureGroup.extend({
     json.avg_cm_per_pixel = this._getAvgCmPerPixel(json.images);
     return json;
   },
-
-  downloadJson() {
-    const jsonImages = this.generateExportJson(true).images;
-    // a check to prevent download of empty file
-    if (jsonImages.length) {
-      const encodedFile = 'text/json;charset=utf-8,' + encodeURIComponent(JSON.stringify(jsonImages));
-      const a = document.createElement('a');
-      a.href = 'data:' + encodedFile;
-      const fileName = prompt('Input filename');
-      a.download = fileName + '.json';
-      a.click();
-    }
-  },
 });
 
 L.distortableCollection = function(id, options) {
diff --git a/src/edit/DistortableCollection.Edit.js b/src/edit/DistortableCollection.Edit.js
index 2b9c67f7c..775eb2195 100644
--- a/src/edit/DistortableCollection.Edit.js
+++ b/src/edit/DistortableCollection.Edit.js
@@ -204,21 +204,19 @@ L.DistortableCollection.Edit = L.Handler.extend({
 
   _addToolbar() {
     const group = this._group;
-    // const map = group._map;
+    const map = group._map;
 
     if (group.options.suppressToolbar || this.toolbar) { return; }
-    // this is redundant as the controlbar is initialized in archive.js
-    // this.toolbar = L.distortableImage.controlBar({
-    //   actions: this.editActions,
-    //   position: 'topleft',
-    // }).addTo(map, group);
+    this.toolbar = L.distortableImage.controlBar({
+      actions: this.editActions,
+      position: 'topleft',
+    }).addTo(map, group);
   },
 
   _removeToolbar() {
-    // const map = this._group._map;
+    const map = this._group._map;
     if (this.toolbar) {
-      // if uncommented removes the toolbar when image is deselected
-      // map.removeLayer(this.toolbar);
+      map.removeLayer(this.toolbar);
       this.toolbar = false;
     } else {
       return false;
diff --git a/src/edit/actions/ExportAction.js b/src/edit/actions/ExportAction.js
index d777cc50e..1421dce2b 100644
--- a/src/edit/actions/ExportAction.js
+++ b/src/edit/actions/ExportAction.js
@@ -24,7 +24,6 @@ L.ExportAction = L.EditAction.extend({
     };
 
     L.EditAction.prototype.initialize.call(this, map, overlay, options);
-    this.map = map;
   },
 
   addHooks() {
@@ -49,7 +48,6 @@ L.ExportAction = L.EditAction.extend({
 
     L.DomEvent.on(exportTool, 'click', function() {
       if (!this.isExporting) {
-        this.map.imgGroup.downloadJson();
         this.isExporting = true;
         this.renderExportIcon();