@abi-software/mapintegratedvuer 1.17.3-simulation.2 → 1.17.4

package/src/mixins/DynamicMarkerMixin.js

@@ -1,8 +1,6 @@
 
 import { mapStores } from 'pinia';
 import { useSettingsStore } from '../stores/settings';
-import { retrieveProtocolData } from '../services/testData.js';
-import { markRaw } from 'vue'
 
 // remove duplicates by stringifying the objects
 const removeDuplicates = function (arrayOfAnything) {
@@ -11,18 +9,12 @@ const removeDuplicates = function (arrayOfAnything) {
     JSON.parse(e)
   )
 }
-
+  
 /* eslint-disable no-alert, no-console */
 export default {
   computed: {
     ...mapStores(useSettingsStore),
   },
-  data: function () {
-    return {
-      protocolData: undefined,
-      markerToUberonID: {},
-    }
-  },
   methods: {
     flatmapPanZoomCallback: function (payload) {
       if (this.mouseHovered) {
@@ -41,23 +33,22 @@ export default {
      */
     flatmapMarkerUpdate(flatmap) {
       if (!this.flatmapReady) return;
-      if (!this.protocolData) {
-        let flatmapImp = flatmap;
-        if (!flatmapImp)
-          flatmapImp = this.getFlatmapImp();
 
-        if (flatmapImp) {
-          // Set the dataset markers
-          let markers = this.settingsStore.globalSettings.displayMarkers ? this.settingsStore.markers : [];
-          markers = removeDuplicates(markers);
-          flatmapImp.clearMarkers();
-          flatmapImp.clearDatasetMarkers();
-          flatmapImp.addDatasetMarkers(markers);
+      let flatmapImp = flatmap;
+      if (!flatmapImp)
+        flatmapImp = this.getFlatmapImp();
 
-          // Set the featured markers
-          if (this.entry.type === "MultiFlatmap") {
-            this.restoreFeaturedMarkers(flatmapImp);
-          }
+      if (flatmapImp) {
+        // Set the dataset markers
+        let markers = this.settingsStore.globalSettings.displayMarkers ? this.settingsStore.markers : [];
+        markers = removeDuplicates(markers);
+        flatmapImp.clearMarkers();
+        flatmapImp.clearDatasetMarkers();
+        flatmapImp.addDatasetMarkers(markers);
+
+        // Set the featured markers
+        if (this.entry.type === "MultiFlatmap") {
+          this.restoreFeaturedMarkers(flatmapImp);
         }
       }
     },
@@ -81,36 +72,12 @@ export default {
       }
       return markersOnFlatmap;
     },
-    updateProtocolMarkers: function (flatmapImp, ids) {
-      flatmapImp.clearMarkers()
-      if (ids.length > 0) {
-        ids.forEach((id) => {
-          const terms = flatmapImp.sparqlQuery(`
-            prefix bgf: <https://bg-rdf.org/ontologies/bondgraph-framework#>
-            prefix UBERON: <http://purl.obolibrary.org/obo/UBERON_>
-            select ?featureUri where {
-                ?featureUri bgf:hasLocation ?region
-                filter (?region in (${id}))
-            }`)
-            const result = terms[0]
-            const featureUri = result.get('featureUri').value
-            const fID = flatmapImp.addMarkerByFeatureUri(featureUri)
-            this.markerToUberonID[fID] = id
-        })
-      }
-    },
-    flatmapReadyForMarkerUpdates: async function (flatmap) {
+    flatmapReadyForMarkerUpdates: function (flatmap) {
       if (flatmap) {
         flatmap.enablePanZoomEvents(true); // Use zoom events for dynamic markers
         this.flatmapReady = true;
         const flatmapImp = flatmap.mapImp;
-        if (flatmapImp) {
-          const flatmapUUID = flatmapImp.mapMetadata.uuid;
-          this.protocolData = markRaw(await retrieveProtocolData(this.settingsStore.testDataLocation, flatmapUUID));
-          if (!this.protocolData) {
-            this.flatmapMarkerUpdate(flatmapImp);
-          }
-        }
+        this.flatmapMarkerUpdate(flatmapImp);
       }
     },
   }

package/src/stores/connectivities.js

@@ -8,6 +8,7 @@ export const useConnectivitiesStore = defineStore('connectivities', {
       globalConnectivities: {},
       filterOptions: {},
       filterSources: {},
+      connectivitiesUpdated: true,
     };
   },
   getters: {
@@ -74,11 +75,19 @@ export const useConnectivitiesStore = defineStore('connectivities', {
       if (!listsAreEqual(this.activeConnectivityKeys, activeConnectivityKeys)) {
         this.activeConnectivityKeys = activeConnectivityKeys;
         return true;
+      } else if (this.connectivitiesUpdated) {
+        this.connectivitiesUpdated = !activeConnectivityKeys.every(ele => ele in this.globalConnectivities);
+        return true;
       }
       return false;
     },
     updateGlobalConnectivities(globalConnectivities) {
-      this.globalConnectivities = globalConnectivities;
+      if (globalConnectivities) {
+        if (JSON.stringify(globalConnectivities) !== JSON.stringify(this.globalConnectivities)) {
+          this.globalConnectivities = globalConnectivities;
+          this.connectivitiesUpdated = true;
+        }
+      }
     },
     updateFilterOptions(filterOptions) {
       this.filterOptions = filterOptions;

package/src/stores/entries.js

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
 import { initialDefaultState } from "../components/scripts/utilities";
-import { getKnowledgeSourceFromProvenance } from '@abi-software/flatmapvuer';
+import { getKnowledgeSourceFromProvenance } from '@abi-software/flatmapvuer/src/services/flatmapKnowledge.js';
 
 /* eslint-disable no-alert, no-console */
 

package/src/stores/settings.js

@@ -14,7 +14,6 @@ export const useSettingsStore = defineStore('settings', {
       flatmapAPI: undefined,
       mapManager: undefined,
       rootUrl: undefined,
-      testDataLocation: undefined,
       facets: { species: [], gender: [], organ: [] },
       appliedFacets: [],
       numberOfDatasetsForFacets: [],
@@ -117,9 +116,6 @@ export const useSettingsStore = defineStore('settings', {
     updateRootUrl(rootUrl) {
       this.rootUrl = rootUrl;
     },
-    updateTestDataLocation(testDataLocation) {
-      this.testDataLocation = testDataLocation;
-    },
     updateMarkers(markers) {
       this.markers = markers;
     },