@abi-software/flatmapvuer 1.8.2-beta.0 → 1.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "1.8.2-beta.0",
+  "version": "1.8.2",
   "license": "Apache-2.0",
   "files": [
     "dist/*",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@abi-software/flatmap-viewer": "3.2.13",
-    "@abi-software/map-utilities": "^1.4.0",
+    "@abi-software/map-utilities": "^1.4.2",
     "@abi-software/sparc-annotation": "0.3.2",
     "@abi-software/svg-sprite": "^1.0.1",
     "@element-plus/icons-vue": "^2.3.1",

package/src/App.vue

@@ -283,6 +283,10 @@ export default {
           taxo: 'FunctionalConnectivity',
           displayWarning: true,
         },
+        Test: {
+          "taxo": "NCBITaxon:1",
+          "displayWarning": true
+        },
       },
       tooltipContent: undefined,
       tStyle: {

package/src/services/flatmapQueries.js

@@ -207,7 +207,7 @@ let FlatmapQueries = function () {
     return found.flat()
   }
 
-  this.findComponents = function (connectivity, axons, dendrites) {
+  this.findComponents = function (connectivity, axons, dendrites, somas) {
     let dnodes = connectivity.connectivity.flat() // get nodes from edgelist
     let nodes = removeDuplicates(dnodes)
 
@@ -219,6 +219,9 @@ let FlatmapQueries = function () {
       if (inArray(axons, node)) {
         terminal = true
       }
+      if (somas && inArray(somas, node)) {
+        terminal = true
+      }
       if (inArray(dendrites, node)) {
         terminal = true
       }
@@ -399,23 +402,35 @@ let FlatmapQueries = function () {
   }
 
   this.processConnectivity = function (mapImp, connectivity) {
-    const sourceKey = ["ilxtr:hasSomaLocatedIn"]
-    const destinationKey = ["ilxtr:hasAxonPresynapticElementIn", "ilxtr:hasAxonSensorySubcellularElementIn"]
-
     return new Promise((resolve) => {
       let dendrites = []
       let axons = []
+      let somas = undefined
+      if (connectivity && connectivity["node-phenotypes"]) {
+        const sourceKey = ["ilxtr:hasSomaLocatedIn"]
+        const destinationKey = ["ilxtr:hasAxonPresynapticElementIn", "ilxtr:hasAxonSensorySubcellularElementIn"]
+        sourceKey.forEach((key)=>{
+          dendrites.push(...connectivity["node-phenotypes"][key])
+        })
+        dendrites = removeDuplicates(dendrites)
+        destinationKey.forEach((key)=>{
+          axons.push(...connectivity["node-phenotypes"][key])
+        })
+        axons = removeDuplicates(axons)
+      } else {
+        // Remove duplicates
+        axons = removeDuplicates(connectivity.axons)
+        //Somas will become part of origins, support this for future proof
+        if (connectivity.somas && connectivity.somas.length > 0) {
+          dendrites.push(...connectivity.somas)
+        }
+        if (connectivity.dendrites && connectivity.dendrites.length > 0) {
+          dendrites.push(...connectivity.dendrites)
+        }
+        somas = connectivity.somas
+      }
 
-      sourceKey.forEach((key)=>{
-        dendrites.push(...connectivity["node-phenotypes"][key])
-      })
-      dendrites = removeDuplicates(dendrites)
-      destinationKey.forEach((key)=>{
-        axons.push(...connectivity["node-phenotypes"][key])
-      })
-      axons = removeDuplicates(axons)
-      const components = this.findComponents(connectivity, axons, dendrites)
-
+      const components = this.findComponents(connectivity, axons, dendrites, somas)
       // Create list of ids to get labels for
       const conIds = this.findAllIdsFromConnectivity(connectivity)
       // Create readable labels from the nodes. Setting this to 'this.origins' updates the display