@abi-software/flatmapvuer 0.3.13-beta-2 → 0.3.13-beta-3

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "0.3.11",
+  "version": "0.3.13-beta-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "0.3.13-beta-2",
+  "version": "0.3.13-beta-3",
   "main": "./dist/flatmapvuer.common.js",
   "files": [
     "dist/*",

package/src/components/FlatmapVuer.vue

@@ -702,11 +702,9 @@ export default {
           }
         });
       } else if (state) {
-        if (this.entry == state.entry) {
-          this._stateToBeSet = { viewport: state.viewport, searchTerm: state.searchTerm };
-          if (this.mapImp && !this.loading)
-            this.restoreMapState(this._stateToBeSet);
-        }
+        this._stateToBeSet = { viewport: state.viewport, searchTerm: state.searchTerm };
+        if (this.mapImp && !this.loading)
+          this.restoreMapState(this._stateToBeSet);
       }
     },
     showMinimap: function(flag) {

package/src/components/MultiFlatmapVuer.vue

@@ -86,6 +86,8 @@ export default {
     FlatmapVuer
   },
   beforeMount() {
+    //List for resolving the promise in initialise
+    //if initialise is called multiple times
     this._resolveList = [];
     this._initialised = false;
   },
@@ -104,7 +106,6 @@ export default {
           fetch(this.flatmapAPI)
           .then(response => response.json())
           .then(data => {
-            this._initialised = true;
             //Check each key in the provided availableSpecies against the one 
             //on the server, add them to the Select if the key is found
             Object.keys(this.availableSpecies).forEach(key => {
@@ -141,14 +142,16 @@ export default {
               }
               this.setSpecies(this.activeSpecies, this.state ? this.state.state : undefined, 5);
             }
+            this._initialised = true;
             resolve();
+            //Resolve all other promises resolve in the list
             this._resolveList.forEach(other => { other(); });
           });
         } else if (this._initialised) {
           //resolve as it has been initialised
           resolve();
         } else {
-          //resolve when the list request has been resolved
+          //resolve when the async initialisation is finished 
           this._resolveList.push(resolve);
         }
       })