@abi-software/flatmapvuer 1.3.2-beta.1 → 1.3.2-isan.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "1.3.2-beta.1",
+  "version": "1.3.2-isan.0",
   "license": "Apache-2.0",
   "files": [
     "dist/*",
@@ -43,7 +43,7 @@
     "./src/*": "./src/*"
   },
   "dependencies": {
-    "@abi-software/flatmap-viewer": "2.9.5",
+    "@abi-software/flatmap-viewer": "^3.0.1",
     "@abi-software/map-utilities": "1.0.0",
     "@abi-software/sparc-annotation": "0.3.1",
     "@abi-software/svg-sprite": "1.0.0",

package/src/App.vue

@@ -265,6 +265,10 @@ export default {
           taxo: 'FunctionalConnectivity',
           displayWarning: true,
         },
+        "pmr:CardiovascularModelWithFeedback": {
+          flatmapId: "pmr:CardiovascularModelWithFeedback",
+          displayWarning: true,
+        }
       },
       tooltipContent: undefined,
       tStyle: {
@@ -283,7 +287,8 @@ export default {
       //flatmapAPI: "https://mapcore-demo.org/current/flatmap/v2/"
       //flatmapAPI: "https://mapcore-demo.org/devel/flatmap/v3/"
       //flatmapAPI: "https://mapcoe-demo.org/current/flatmap/v3/",
-      flatmapAPI: 'https://mapcore-demo.org/devel/flatmap/v4/',
+      //flatmapAPI: 'https://mapcore-demo.org/devel/flatmap/v4/',
+      flatmapAPI: 'https://mapcore-demo.org/isan/flatmap/',
       //flatmapAPI: "https://mapcore-demo.org/fccb/flatmap/"
       //flatmapAPI: "https://mapcore-demo.org/staging/flatmap/v1/"
       // flatmapAPI: "https://mapcore-demo.org/devel/flatmap/v1/",

package/src/components/FlatmapVuer.vue

@@ -1617,6 +1617,7 @@ export default {
             const label = data.label
             const resource = [data.models]
             const taxonomy = this.entry
+            const flatmapId = this.flatmapId
             const biologicalSex = this.biologicalSex
             let taxons = undefined
             if (data.taxons) {
@@ -1630,6 +1631,7 @@ export default {
             const payload = {
               dataset: data.dataset,
               biologicalSex: biologicalSex,
+              flatmapId: flatmapId,
               taxonomy: taxonomy,
               resource: resource,
               label: label,
@@ -2127,6 +2129,7 @@ export default {
       if (this.mapImp) {
         let state = {
           entry: this.entry,
+          flatmapId: this.flatmapId,
           viewport: this.mapImp.getState(),
         }
         const identifier = this.mapImp.getIdentifier()
@@ -2147,8 +2150,8 @@ export default {
       if (state) {
         if (
           this.mapImp &&
-          state.entry &&
-          this.entry == state.entry &&
+          ((state.entry && this.entry == state.entry) ||
+          (state.flatmapId && this.flatmapId == state.flatmapId)) &&
           (!state.biologicalSex || state.biologicalSex === this.biologicalSex)
         ) {
           if (state.viewport) {
@@ -2218,16 +2221,26 @@ export default {
         // @arg identifier.uuid {string} The unique uuid the flatmap. If given then this exact map will
         //  be loaded, overriding ``taxon`` and ``biologicalSex``.
 
-        let identifier = { taxon: this.entry }
+        let identifier = {}
+        if (this.entry) {
+          identifier.taxon = this.entry
+        } else if (this.flatmapId) {
+          identifier.id = this.flatmapId
+        }
         if (this.uuid) {
           identifier.uuid = this.uuid
         }
-        //This now handle the uses of uuid when resuming states
+        //This now handles the uses of uuid when resuming states
         if (state) {
           if (state.uuid) {
             identifier = { uuid: state.uuid }
-          } else if (state.entry) {
-            identifier.taxon = state.entry
+          } else if (state.entry || state.flatmapId) {
+            if (state.entry) {
+              identifier.taxon = state.entry
+            } else if (state.flatmapId) {
+              identifier.id = state.flatmapId
+            }
+            
             if (state.biologicalSex) {
               identifier['biologicalSex'] = state.biologicalSex
             } else if (identifier.taxon === 'NCBITaxon:9606') {
@@ -2242,6 +2255,9 @@ export default {
             identifier['biologicalSex'] = this.biologicalSex
           }
         }
+        if (!identifier.taxon && !identifier.uuid) {
+          identifier = identifier.id;
+        }
 
         let promise1 = this.mapManager.loadMap(
           identifier,
@@ -2326,7 +2342,9 @@ export default {
       //Disable layers for now
       //this.layers = this.mapImp.getLayers();
       this.processSystems(this.mapImp.getSystems())
-      this.processTaxon(this.flatmapAPI, this.mapImp.taxonIdentifiers)
+      if (this.mapImp.taxonIdentifiers) {
+        this.processTaxon(this.flatmapAPI, this.mapImp.taxonIdentifiers)
+      }
       this.containsAlert = "alert" in this.mapImp.featureFilterRanges()
       this.addResizeButtonToMinimap()
       this.loading = false
@@ -2433,10 +2451,13 @@ export default {
     /**
      * The taxon identifier of the species represented by the map.
      */
-    entry: {
-      type: String,
-      required: true,
-    },
+    entry: String,
+    /**
+     * The ``id`` of the flatmap.
+     * If given then this exact map will be loaded,
+     * overriding ``taxon`` and ``biologicalSex``.
+     */
+    flatmapId: String,
     /**
      * The unique ``uuid`` of the flatmap.
      * If given then this exact map will be loaded,

package/src/components/MultiFlatmapVuer.vue

@@ -43,6 +43,7 @@
       :key="key"
       v-show="activeSpecies == key"
       :entry="item.taxo"
+      :flatmapId="item.flatmapId"
       :uuid="item.uuid"
       :biologicalSex="item.biologicalSex"
       :displayWarning="item.displayWarning"
@@ -157,13 +158,15 @@ export default {
             .then((data) => {
               //Check each key in the provided availableSpecies against the one
               Object.keys(this.availableSpecies).forEach((key) => {
-                // FIrst look through the uuid
+                // First look through the uuid
                 const uuid = this.availableSpecies[key].uuid
                 if (uuid && data.map((e) => e.uuid).indexOf(uuid) > 0) {
                   this.speciesList[key] = reactive(this.availableSpecies[key])
                 } else {
                   for (let i = 0; i < data.length; i++) {
-                    if (this.availableSpecies[key].taxo === data[i].taxon) {
+                    if ((this.availableSpecies[key].taxo && this.availableSpecies[key].taxo === data[i].taxon) ||
+                    (this.availableSpecies[key].flatmapId && this.availableSpecies[key].flatmapId === data[i].id))
+                    {
                       if (this.availableSpecies[key].biologicalSex) {
                         if (
                           data[i].biologicalSex &&