@abi-software/flatmapvuer 1.11.3 → 1.11.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "1.11.3",
+  "version": "1.11.4",
   "license": "Apache-2.0",
   "files": [
     "dist/*",

package/src/components/FlatmapError.vue

@@ -0,0 +1,84 @@
+<template>
+  <!-- flatmap-error -->
+  <div class="flatmap-error">
+    <div class="flatmap-error-title">
+      <el-icon size="24">
+        <el-icon-document-delete />
+      </el-icon>
+      <div v-if="flatmapError.title">
+        {{ flatmapError.title }}
+      </div>
+    </div>
+    <div class="flatmap-error-message" v-if="flatmapError.messages">
+      <div v-for="(message, index) in flatmapError.messages" :key="index">
+        {{ message }}
+      </div>
+    </div>
+    <div v-if="flatmapError.button">
+      <el-button class="button" type="primary" @click="flatmapError.button.callback">
+        {{ flatmapError.button.text }}
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'FlatmapError',
+  // The flatmapError prop is an object that may have the following properties:
+  // 1. title: string
+  // 2. messages: string[]
+  // 3. button: { text: string, callback: Function }
+  props: {
+    flatmapError: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+  .flatmap-error {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    gap: 1rem;;
+  }
+
+  .flatmap-error-title {
+    font-size: 18px;
+    text-align: center;
+  }
+
+  .flatmap-error-message {
+    text-align: left;
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
+    padding: 1rem;
+    line-height: 20px;
+    border: 1px solid var(--el-border-color);
+    border-radius: var(--el-border-radius-base);
+    max-width: 500px;
+  }
+
+  .el-button--primary.button {
+    font-family: inherit;
+
+    &:hover,
+    &:active,
+    &:focus {
+      background: $app-primary-color;
+      border-color: $app-primary-color;
+      box-shadow: 0px 0px 2px 0px rgba(131, 0, 191, 0.5);
+      color: #fff;
+    }
+  }
+</style>

package/src/components/FlatmapVuer.vue

@@ -10,7 +10,11 @@
     <div
       style="height: 100%; width: 100%; position: relative; overflow-y: none"
     >
-      <div style="height: 100%; width: 100%" ref="display"></div>
+      <!-- flatmap-display -->
+      <div style="height: 100%; width: 100%" ref="display" class="flatmap-display"></div>
+      <!-- flatmap-error -->
+      <FlatmapError v-if="flatmapError" :flatmapError="flatmapError" />
+
       <div class="beta-popovers" v-show="!disableUI">
         <div>
           <el-popover
@@ -643,7 +647,7 @@ import {
 import { capitalise } from './utilities.js'
 import yellowstar from '../icons/yellowstar'
 import ResizeSensor from 'css-element-queries/src/ResizeSensor'
-import * as flatmap from 'https://cdn.jsdelivr.net/npm/@abi-software/flatmap-viewer@4.3.0/+esm'
+import * as flatmap from 'https://cdn.jsdelivr.net/npm/@abi-software/flatmap-viewer@4.3.5/+esm'
 import { AnnotationService } from '@abi-software/sparc-annotation'
 import { mapState } from 'pinia'
 import { useMainStore } from '@/store/index'
@@ -656,6 +660,7 @@ import {
 } from '@abi-software/map-utilities'
 import '@abi-software/map-utilities/dist/style.css'
 import EventBus from './EventBus.js'
+import FlatmapError from './FlatmapError.vue'
 
 const ERROR_MESSAGE = 'cannot be found on the map.';
 
@@ -735,7 +740,8 @@ export default {
     ElIconWarningFilled,
     ElIconArrowDown,
     ElIconArrowLeft,
-    DrawToolbar
+    DrawToolbar,
+    FlatmapError,
   },
   beforeCreate: function () {
     //The state watcher may triggered before
@@ -758,8 +764,13 @@ export default {
       }
     },
     /**
-     *
-     * @param filter format should follow #makeStyleFilter (flatmap-viewer)
+     * @public
+     * Function to set visibility filter for features and paths on the map.
+     * The param `filter` format should follow `#makeStyleFilter` (flatmap-viewer).
+     * If the param is `null` or `undefined`, the visibility filter will be cleared.
+     * Refer to [`setVisibilityFilter` in flatmap-viewer](https://anatomicmaps.github.io/flatmap-viewer/classes/index.FlatMap.html#setvisibilityfilter)
+     * for more details.
+     * @param {Object} `filter`
      */
     setVisibilityFilter: function (filter) {
       // More filter options -> this.mapImp.featureFilterRanges()
@@ -1629,6 +1640,8 @@ export default {
           this.connectionEntry = {}
           // For exist drawn annotation features
           if (this.selectedDrawnFeature) {
+            // The `id` here is GeoJSONId from AnnotatedFeature
+            // Ref: flatmap-viewer/src/flatmap-types.ts
             const drawnFeature = this.existDrawnFeatures.find(
               (feature) => feature.id === this.selectedDrawnFeature.id
             )
@@ -1666,6 +1679,18 @@ export default {
       if (data.type === 'deleted') this.previousDeletedEvent = data
       else this.previousDeletedEvent = {}
     },
+    getTaxons: function (data) {
+      let taxons = undefined
+      if (data.taxons) {
+        // check if data.taxons is string or array
+        if (typeof data.taxons !== 'object') {
+          taxons = JSON.parse(data.taxons)
+        } else {
+          taxons = data.taxons
+        }
+      }
+      return taxons
+    },
     /**
      * @public
      * A callback function, invoked when events occur with the map.
@@ -1681,118 +1706,98 @@ export default {
             eventType: eventType,
           }
           this.annotationEventCallback(payload, data)
+        } else if (eventType === 'pan-zoom') {
+          this.$emit('pan-zoom-callback', data)
         } else {
-          if (eventType !== 'pan-zoom') {
-            const label = data.label
-            const resource = [data.models]
-            const taxonomy = this.entry
-            const biologicalSex = this.biologicalSex
-            const featuresAlert = data.alert
-            let taxons = undefined
-            if (data.taxons) {
-              // check if data.taxons is string or array
-              if (typeof data.taxons !== 'object') {
-                taxons = JSON.parse(data.taxons)
-              } else {
-                taxons = data.taxons
-              }
-            }
-            let payload = [{
-              dataset: data.dataset,
-              biologicalSex: biologicalSex,
-              taxonomy: taxonomy,
-              resource: resource,
-              label: label,
-              feature: data,
-              userData: args,
-              eventType: eventType,
-              provenanceTaxonomy: taxons,
-              alert: featuresAlert
-            }]
-            if (eventType === 'click') {
-              const singleSelection = Object.keys(data).includes('id')
-              if (!singleSelection) {
-                payload = []
-                const mapuuid = data.mapUUID
-                const seenIds = new Set();
-                for (let [key, value] of Object.entries(data)) {
-                  if (key !== 'mapUUID') {
-                    const id = value.id
-                    const label = value.label
-                    const resource = [value.models]
-                    let taxons = undefined
-                    if (value.taxons) {
-                      // check if data.taxons is string or array
-                      if (typeof value.taxons !== 'object') {
-                        taxons = JSON.parse(value.taxons)
-                      } else {
-                        taxons = value.taxons
-                      }
-                    }
-                    if (seenIds.has(id)) continue;
-                    seenIds.add(id);
-                    payload.push({
-                      dataset: value.dataset,
-                      biologicalSex: biologicalSex,
-                      taxonomy: taxonomy,
-                      resource: resource,
-                      label: label,
-                      feature: value,
-                      userData: args,
-                      eventType: eventType,
-                      provenanceTaxonomy: taxons,
-                      alert: value.alert,
-                      mapUUID: mapuuid
-                    })
-                  }
+          const label = data.label
+          const resource = [data.models]
+          const taxonomy = this.entry
+          const biologicalSex = this.biologicalSex
+          const featuresAlert = data.alert
+          const taxons = this.getTaxons(data)
+          let payload = [{
+            dataset: data.dataset,
+            biologicalSex: biologicalSex,
+            taxonomy: taxonomy,
+            resource: resource,
+            label: label,
+            feature: data,
+            userData: args,
+            eventType: eventType,
+            provenanceTaxonomy: taxons,
+            alert: featuresAlert
+          }]
+          if (eventType === 'click') {
+            // If multiple paths overlap at the click location,
+            // `data` is an object with numeric keys for each feature (e.g., {0: {...}, 1: {...}, ..., mapUUID: '...'}).
+            // If only one feature or path is clicked,
+            // `data` is a single object (e.g., {featureId: '...', mapUUID: '...'}).
+            const singleSelection = !data[0];
+            if (!singleSelection) {
+              payload = []
+              const mapuuid = data.mapUUID
+              const seenIds = new Set();
+              for (let [key, value] of Object.entries(data)) {
+                if (key !== 'mapUUID') {
+                  const id = value.featureId
+                  const label = value.label
+                  const resource = [value.models]
+                  const taxons = this.getTaxons(value)
+                  if (seenIds.has(id)) continue;
+                  seenIds.add(id);
+                  payload.push({
+                    dataset: value.dataset,
+                    biologicalSex: biologicalSex,
+                    taxonomy: taxonomy,
+                    resource: resource,
+                    label: label,
+                    feature: value,
+                    userData: args,
+                    eventType: eventType,
+                    provenanceTaxonomy: taxons,
+                    alert: value.alert,
+                    mapUUID: mapuuid
+                  })
                 }
               }
-              const clickedItem = singleSelection ? data : data[0]
-              this.setConnectivityDataSource(this.viewingMode, clickedItem);
-              if (this.viewingMode === 'Neuron Connection') {
-                // do nothing here
-                // the method to highlight paths is moved to checkAndCreatePopups function
-              } else {
-                this.currentActive = clickedItem.models ? clickedItem.models : '' // This is for FC map
-                // This is for annotation mode - draw connectivity between features/paths
-                if (this.activeDrawTool && !this.isValidDrawnCreated) {
-                  // Check if flatmap features or existing drawn features
-                  const validDrawnFeature = clickedItem.featureId || this.existDrawnFeatures.find(
-                    (feature) => feature.id === clickedItem.id
-                  )
-                  // Only the linestring will have connection
-                  if (this.activeDrawTool === 'LineString' && validDrawnFeature) {
-                    const key = clickedItem.featureId ? clickedItem.featureId : clickedItem.id
-                    const nodeLabel = clickedItem.label ? clickedItem.label : `Feature ${clickedItem.id}`
-                    // Add space before key to make sure properties follows adding order
-                    this.connectionEntry[` ${key}`] = Object.assign(
-                      { label: nodeLabel },
-                      Object.fromEntries(
-                        Object.entries(clickedItem)
-                          .filter(([key]) => ['featureId', 'models'].includes(key))
-                          .map(([key, value]) => [(key === 'featureId') ? 'id' : key, value])))
-                  }
+            }
+            const clickedItem = singleSelection ? data : data[0]
+            this.setConnectivityDataSource(this.viewingMode, clickedItem);
+            if (this.viewingMode === 'Neuron Connection') {
+              // do nothing here
+              // the method to highlight paths is moved to checkAndCreatePopups function
+            } else {
+              this.currentActive = clickedItem.models ? clickedItem.models : '' // This is for FC map
+              // This is for annotation mode - draw connectivity between features/paths
+              if (this.activeDrawTool && !this.isValidDrawnCreated) {
+                // Check if flatmap features or existing drawn features
+                const validDrawnFeature = clickedItem.featureId || this.existDrawnFeatures.find(
+                  (feature) => feature.id === clickedItem.id
+                )
+                // Only the linestring will have connection
+                if (this.activeDrawTool === 'LineString' && validDrawnFeature) {
+                  const key = clickedItem.featureId ? clickedItem.featureId : clickedItem.id
+                  const nodeLabel = clickedItem.label ? clickedItem.label : `Feature ${clickedItem.id}`
+                  // Add space before key to make sure properties follows adding order
+                  this.connectionEntry[` ${key}`] = Object.assign(
+                    { label: nodeLabel },
+                    Object.fromEntries(
+                      Object.entries(clickedItem)
+                        .filter(([key]) => ['featureId', 'models'].includes(key))
+                        .map(([key, value]) => [(key === 'featureId') ? 'id' : key, value])))
                 }
               }
-            } else if (
-              eventType === 'mouseenter' &&
-              !(this.viewingMode === 'Neuron Connection')
-            ) {
-              this.currentHover = data.models ? data.models : ''
             }
-            if (
-              data &&
-              data.type !== 'marker' &&
-              eventType === 'click' &&
-              // Disable popup when drawing
-              !this.activeDrawTool
-            ) {
+
+            // Disable popup when drawing
+            if (data && data.type !== 'marker' && !this.activeDrawTool) {
               this.checkAndCreatePopups(payload)
             }
-            this.$emit('resource-selected', payload)
-          } else {
-            this.$emit('pan-zoom-callback', data)
+          } else if (eventType === 'mouseenter' && this.viewingMode !== 'Neuron Connection') {
+            this.currentHover = data.models ? data.models : ''
           }
+
+          this.$emit('resource-selected', payload)
         }
       }
     },
@@ -1806,11 +1811,13 @@ export default {
      * @param data
      */
     setConnectivityDataSource: function (viewingMode, data) {
-      // for Exploration mode, only path click will be used as data source
-      this.connectivityDataSource = data.source;
-      // for other modes, it can be feature or path
-      if (viewingMode === 'Neuron Connection' || viewingMode === 'Annotation') {
-        this.connectivityDataSource = data.featureId;
+      // Exploration mode, only path click will be used as data source
+      if (viewingMode === 'Exploration') {
+        this.connectivityDataSource = data.models.startsWith('ilxtr:') ? data.models : '';
+      } else {
+        // Other modes, it can be anything
+        // (annotation drawing doesn't have featureId or models)
+        this.connectivityDataSource = data.featureId || data.id;
       }
     },
     /**
@@ -2090,17 +2097,27 @@ export default {
             uniqueResource = [models, []];
           }
 
+          const knowledgeSource = this.mapImp.knowledgeSource;
           const terms = uniqueResource.flat(Infinity);
           const uniqueTerms = [...new Set(terms)];
           const fetchResults = await fetchLabels(this.flatmapAPI, uniqueTerms);
           const objectResults = fetchResults.reduce((arr, item) => {
             const id = item[0];
             const valObj = JSON.parse(item[1]);
-            if (valObj.source === this.mapImp.knowledgeSource) {
-              arr.push({ id, label: valObj.label });
-            }
+            arr.push({ id, label: valObj.label, source: valObj.source });
             return arr;
           }, []);
+
+          // sort matched knowledgeSource items for same id
+          objectResults.sort((a, b) => {
+            if (a.id === b.id) {
+              if (a.source === knowledgeSource && b.source !== knowledgeSource) return -1;
+              if (a.source !== knowledgeSource && b.source === knowledgeSource) return 1;
+              return 0;
+            }
+            return a.id.localeCompare(b.id);
+          });
+
           const labels = [];
           for (let i = 0; i < uniqueTerms.length; i++) {
             const foundObj = objectResults.find((obj) => obj.id === uniqueTerms[i])
@@ -2203,8 +2220,8 @@ export default {
         tooltip['featuresAlert'] = data.alert;
         tooltip['knowledgeSource'] = getKnowledgeSource(this.mapImp);
         // Map id and uuid to load connectivity information from the map
-        tooltip['mapId'] = this.mapImp.provenance.id;
-        tooltip['mapuuid'] = this.mapImp.provenance.uuid;
+        tooltip['mapId'] = this.mapImp.mapMetadata.id;
+        tooltip['mapuuid'] = this.mapImp.mapMetadata.uuid;
       // } else {
       //   tooltip = {
       //     ...tooltip,
@@ -2482,6 +2499,12 @@ export default {
       if (geometry) {
         featureId = feature
         options.annotationFeatureGeometry = geometry
+        if (this.annotationEntry.length) {
+          options['annotationEvent'] = {
+            type: this.annotationEntry[0].type,
+            feature: this.annotationEntry[0].feature
+          }
+        }
       } else {
         const entry = Array.isArray(feature) ? feature[0] : feature
         if (entry) {
@@ -2741,6 +2764,7 @@ export default {
     createFlatmap: function (state) {
       if (!this.mapImp && !this.loading) {
         this.loading = true
+        this.flatmapError = null
         let minimap = false
         if (this.displayMinimap) {
           minimap = { position: 'top-right' }
@@ -2809,6 +2833,36 @@ export default {
           const stateToSet = this._stateToBeSet ? this._stateToBeSet : state
           this.onFlatmapReady(stateToSet)
           this.$nextTick(() => this.restoreMapState(stateToSet))
+        }).catch((error) => {
+          console.error('Flatmap loading error:', error)
+          // prepare error object
+          this.flatmapError = {};
+          if (error.message && error.message.indexOf('Unknown map') !== -1) {
+            this.flatmapError['title'] = 'Unknown Map!';
+            this.flatmapError['messages'] = Object.keys(identifier).map(key => {
+              const keyName = key === 'uuid' ? 'UUID' : capitalise(key);
+              return `${keyName}: ${identifier[key]}`
+            });
+          } else {
+            this.flatmapError['title'] = 'Error Loading Map!';
+            this.flatmapError['messages'] = [
+              error.message ? error.message : error.toString(),
+              'Please try again later or contact support if the problem persists.'
+            ];
+          }
+          if (this.$parent?.$refs?.multiContainer) {
+            // if the flatmap is in a multiflatmapvuer
+            // show a button to load default map
+            const multiFlatmapVuer = this.$parent;
+            this.flatmapError['button'] = {
+              text: 'Load Default Map',
+              callback: () => {
+                const defaultSpecies = multiFlatmapVuer.initial;
+                multiFlatmapVuer.setSpecies(defaultSpecies, undefined, 3);
+              }
+            };
+          }
+          this.loading = false;
         })
       } else if (state) {
         this._stateToBeSet = {
@@ -3284,7 +3338,9 @@ export default {
      */
     externalLegends: {
       type: Array,
-      default: [],
+      default: function () {
+        return []
+      },
     },
   },
   provide() {
@@ -3296,6 +3352,7 @@ export default {
   },
   data: function () {
     return {
+      flatmapError: null,
       sensor: null,
       mapManagerRef: undefined,
       flatmapQueries: undefined,

package/src/components/MultiFlatmapVuer.vue

@@ -93,6 +93,9 @@
       :showPathwayFilter="showPathwayFilter"
       :externalLegends="externalLegends"
     />
+
+    <!-- multiflatmap-error -->
+    <FlatmapError v-if="multiflatmapError" :flatmapError="multiflatmapError" />
   </div>
 </template>
 
@@ -101,7 +104,7 @@
 import { markRaw } from 'vue'
 import EventBus from './EventBus'
 import FlatmapVuer from './FlatmapVuer.vue'
-import * as flatmap from 'https://cdn.jsdelivr.net/npm/@abi-software/flatmap-viewer@4.3.0/+esm'
+import * as flatmap from 'https://cdn.jsdelivr.net/npm/@abi-software/flatmap-viewer@4.3.5/+esm'
 import {
   ElCol as Col,
   ElOption as Option,
@@ -156,6 +159,7 @@ export default {
      * It returns a promise.
      */
     initialise: function () {
+      this.multiflatmapError = null;
       return new Promise((resolve) => {
         if (this.requireInitialisation) {
           //It has not been initialised yet
@@ -163,11 +167,21 @@ export default {
           fetch(this.flatmapAPI)
             .then((response) => response.json())
             .then((data) => {
+              if (data.status_code === 404) {
+                console.error('Flatmap API endpoint is incorrect', data);
+                this.multiflatmapError = {};
+                this.multiflatmapError['title'] = 'MultiFlatmap Error!';
+                this.multiflatmapError['messages'] = [
+                  `Sorry, the component could not be loaded because the specified
+                  flatmap API endpoint is incorrect. Please check the endpoint URL
+                  or contact support if the problem persists.`
+                ];
+              }
               //Check each key in the provided availableSpecies against the one
               Object.keys(this.availableSpecies).forEach((key) => {
                 // FIrst look through the uuid
                 const uuid = this.availableSpecies[key].uuid
-                if (uuid && data.map((e) => e.uuid).indexOf(uuid) > 0) {
+                if (uuid && data.length && data.map((e) => e.uuid).indexOf(uuid) > 0) {
                   this.speciesList[key] = this.availableSpecies[key]
                 } else {
                   for (let i = 0; i < data.length; i++) {
@@ -220,6 +234,21 @@ export default {
                 other()
               })
             })
+            .catch((error) => {
+              console.error('Error fetching flatmap:', error)
+              this.initialised = true;
+              this.multiflatmapError = {};
+              this.multiflatmapError['title'] = 'MultiFlatmap Error!';
+              this.multiflatmapError['messages'] = [
+                `Sorry, the component could not be loaded due to an unexpected error.
+                Please try again later or contact support if the problem persists.`
+              ];
+              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()
@@ -805,7 +834,9 @@ export default {
      */
     externalLegends: {
       type: Array,
-      default: [],
+      default: function () {
+        return []
+      },
     },
   },
   data: function () {
@@ -816,6 +847,7 @@ export default {
       resolveList: markRaw([]),
       initialised: false,
       mapManagerRef: undefined,
+      multiflatmapError: null,
     }
   },
   watch: {

package/src/components.d.ts

@@ -15,6 +15,7 @@ declare module 'vue' {
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElIconArrowDown: typeof import('@element-plus/icons-vue')['ArrowDown']
     ElIconArrowLeft: typeof import('@element-plus/icons-vue')['ArrowLeft']
+    ElIconDocumentDelete: typeof import('@element-plus/icons-vue')['DocumentDelete']
     ElIconWarning: typeof import('@element-plus/icons-vue')['Warning']
     ElIconWarningFilled: typeof import('@element-plus/icons-vue')['WarningFilled']
     ElOption: typeof import('element-plus/es')['ElOption']
@@ -23,6 +24,7 @@ declare module 'vue' {
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    FlatmapError: typeof import('./components/FlatmapError.vue')['default']
     FlatmapVuer: typeof import('./components/FlatmapVuer.vue')['default']
     MultiFlatmapVuer: typeof import('./components/MultiFlatmapVuer.vue')['default']
     SelectionsGroup: typeof import('./components/SelectionsGroup.vue')['default']

package/src/services/flatmapKnowledge.js

@@ -69,17 +69,17 @@ async function filterPathsByViaFromKnowledge(resource) {
 }
 
 function getKnowledgeSource(mapImp) {
-  return getKnowledgeSourceFromProvenance(mapImp.provenance);
+  return getKnowledgeSourceFromProvenance(mapImp.mapMetadata);
 }
 
-function getKnowledgeSourceFromProvenance(provenance) {
+function getKnowledgeSourceFromProvenance(mapMetadata) {
   let mapKnowledgeSource = '';
-  if (provenance?.connectivity) {
-    const sckanProvenance = provenance.connectivity;
-    if ('knowledge-source' in sckanProvenance) {
-      mapKnowledgeSource = sckanProvenance['knowledge-source'];
-    } else if ('npo' in sckanProvenance) {
-      mapKnowledgeSource = `${sckanProvenance.npo.release}-npo`;
+  if (mapMetadata?.connectivity) {
+    const mapMetadataConnectivity = mapMetadata.connectivity;
+    if ('knowledge-source' in mapMetadataConnectivity) {
+      mapKnowledgeSource = mapMetadataConnectivity['knowledge-source'];
+    } else if ('npo' in mapMetadataConnectivity) {
+      mapKnowledgeSource = `${mapMetadataConnectivity.npo.release}-npo`;
     }
   }
   return mapKnowledgeSource;

package/src/services/flatmapQueries.js

@@ -297,7 +297,7 @@ let FlatmapQueries = function () {
     this.connectivitySource = connectivitySource
     return new Promise((resolve) => {
       const queryAPI = connectivitySource === 'map'
-        ? this.queryMapConnectivity(mapImp.provenance.uuid, keastId)
+        ? this.queryMapConnectivity(mapImp.mapMetadata.uuid, keastId)
         : mapImp.queryKnowledge(keastId);
 
       queryAPI