@abi-software/flatmapvuer 0.3.12-beta-0 → 0.3.12-fixes-0

package/package.json

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

package/src/components/FlatmapVuer.vue

@@ -639,6 +639,7 @@ export default {
         //  be loaded, overriding ``taxon`` and ``biologicalSex``.
 
         let identifier = { taxon: this.entry };
+        //This now handle the uses of uuid when resuming states
         if (state) {
           if (state.uuid) {
             identifier = { uuid: state.uuid };
@@ -988,13 +989,15 @@ export default {
 .svg-legends-container {
   width:70%;
   height:auto;
+  position:relative;
+  max-height:140px;
 }
 
 .pathway-container {
   float: left;
   padding-left: 16px;
   padding-right: 18px;
-  max-height: calc(100% - 184px);
+  max-height: calc(100% - 140px);
   text-align: left;
   overflow: auto;
   border: 1px solid rgb(220, 223, 230);

package/src/components/MultiFlatmapVuer.vue

@@ -94,42 +94,45 @@ export default {
   methods: {
     initialise: function() {
       return new Promise(resolve => {
-        fetch(this.flatmapAPI)
-        .then(response => response.json())
-        .then(data => {
-          this.speciesList= {};
-          //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 => {
-            for (let i = 0; i < data.length; i++) {
-              if (this.availableSpecies[key].taxo === data[i].taxon) {
-                if (this.availableSpecies[key].biologicalSex) {
-                  if (data[i].biologicalSex && 
-                    data[i].biologicalSex === this.availableSpecies[key].biologicalSex) {
-                      this.speciesList[key] = this.availableSpecies[key];
-                      break;
-                    }
-                } else {
-                  this.speciesList[key] = this.availableSpecies[key];
-                  break;
+        if (this.requireInitialisation) {
+          //It has not been initialised yet
+          this.requireInitialisation = false;
+          fetch(this.flatmapAPI)
+          .then(response => response.json())
+          .then(data => {
+            //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 => {
+              for (let i = 0; i < data.length; i++) {
+                if (this.availableSpecies[key].taxo === data[i].taxon) {
+                  if (this.availableSpecies[key].biologicalSex) {
+                    if (data[i].biologicalSex && 
+                      data[i].biologicalSex === this.availableSpecies[key].biologicalSex) {
+                        this.$set(this.speciesList, key, this.availableSpecies[key]);
+                        break;
+                      }
+                  } else {
+                    this.$set(this.speciesList, key, this.availableSpecies[key]);
+                    break;
+                  }
                 }
               }
+            });
+            if (!this.state) {
+              //No state resuming, set the current flatmap to {this.initial}
+              if (this.initial && this.speciesList[this.initial] !== undefined) {
+                this.activeSpecies = this.initial;
+              } else {
+                this.activeSpecies = Object.keys(this.speciesList)[0];
+              }
+              Vue.nextTick(() => {
+                if (this.$refs[this.activeSpecies])
+                  this.$refs[this.activeSpecies][0].createFlatmap();
+              });
             }
           });
-          if (!this.state) {
-            //No state resuming, set the current flatmap to {this.initial}
-            if (this.initial && this.speciesList[this.initial] !== undefined) {
-              this.activeSpecies = this.initial;
-            } else {
-              this.activeSpecies = Object.keys(this.speciesList)[0];
-            }
-            Vue.nextTick(() => {
-              if (this.$refs[this.activeSpecies])
-                this.$refs[this.activeSpecies][0].createFlatmap();
-            });
-          }
-          resolve();
-        });
+        }
+        resolve();
       })
     },
     FlatmapSelected: function(resource) {
@@ -183,6 +186,11 @@ export default {
         }
       }
     },
+    /**
+     * Create a legacy entry with the provided information
+     * 
+     * @private
+     */
     createLegacyEntry: function(state, taxo, uuid) {
       if (uuid && taxo) {
         let name = "Legacy";
@@ -192,18 +200,22 @@ export default {
           else
             name = name + ` ${state.species}`;
         }
-        this.speciesList[name] = {
-          taxo: taxo,
-          isLegacy: true,
-          displayWarning: true
-        };
+        this.$set(
+          this.speciesList,
+          name, 
+          {
+            taxo: taxo,
+            isLegacy: true,
+            displayWarning: true
+          }
+        );
         return {
           species: name,
           state: {
             entry: taxo,
-            uuid: uuid
+            uuid: uuid,
+            viewport: state.state.viewport,
           },
-          viewport: state.state.viewport,
         }
       }
     },
@@ -230,7 +242,10 @@ export default {
             return new Promise(() => {
               const mapManager = new (require("@abi-software/flatmap-viewer")).MapManager(this.flatmapAPI);
               //mapManager.findMap_ is an async function so we need to wrap this with a promise
-              mapManager.findMap_({taxon: mapState.entry}).then(map => {
+              const identifier = { taxon: mapState.entry };
+              if (mapState.biologicalSex)
+                identifier['biologicalSex'] = mapState.biologicalSex;
+              mapManager.findMap_(identifier).then(map => {
                 if (map.uuid !== mapState.uuid) {
                   return this.createLegacyEntry(state, mapState.entry, mapState.uuid);
                 }
@@ -377,7 +392,8 @@ export default {
     return {
       activeSpecies: undefined,
       appendToBody: false,
-      speciesList: {}
+      speciesList: {},
+      requireInitialisation: true,
     };
   },
   watch: {

package/src/components/legends/Legends.vue

@@ -29,7 +29,7 @@ export default {
 <style scoped lang="scss">
 .legends-container {
   pointer-events: none;
-  transform: translate(0px, -20px);
+  transform: translate(0px, -35px);
 }
 
 .st0-translate {