@abi-software/mapintegratedvuer 1.2.0-beta.0 → 1.2.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/mapintegratedvuer",
-  "version": "1.2.0-beta.0",
+  "version": "1.2.0-beta.3",
   "license": "Apache-2.0",
   "scripts": {
     "serve": "vite --host --force",
@@ -48,10 +48,10 @@
     "*.js"
   ],
   "dependencies": {
-    "@abi-software/flatmapvuer": "^1.1.2-alpha",
-    "@abi-software/map-side-bar": "^2.2.1-alpha-1",
+    "@abi-software/flatmapvuer": "^1.1.2-alpha-5",
+    "@abi-software/map-side-bar": "^2.2.1-alpha-3",
     "@abi-software/plotvuer": "1.0.0",
-    "@abi-software/scaffoldvuer": "^1.1.0",
+    "@abi-software/scaffoldvuer": "^1.2.0-beta.0",
     "@abi-software/simulationvuer": "1.0.0",
     "@abi-software/svg-sprite": "1.0.0",
     "@element-plus/icons-vue": "^2.3.1",

package/src/components/SplitFlow.vue

@@ -29,6 +29,7 @@
           @tabClicked="tabClicked"
           @search-changed="searchChanged($event)"
           @anatomy-in-datasets="updateMarkers($event)"
+          @number-of-datasets-for-anatomies="updateScaffoldMarkers($event)"
           @hover-changed="hoverChanged($event)"
           @contextUpdate="contextUpdate($event)"
           @datalink-clicked="datalinkClicked($event)"
@@ -262,7 +263,7 @@ export default {
       if (!hoverEntries.length) {
         this.hoveredMarkerDelay = setTimeout(() => {
           EventBus.emit("markerUpdate");
-        }, 3000)
+        }, 500)
       } else {
         clearTimeout(this.hoveredMarkerDelay)
         EventBus.emit("markerUpdate");
@@ -310,6 +311,9 @@ export default {
       this.settingsStore.updateMarkers(data);
       EventBus.emit("markerUpdate");
     },
+    updateScaffoldMarkers: function (data) {
+      this.settingsStore.updateNumberOfDatasetsForFacets(data);
+    },
     getNewEntryId: function() {
       if (this.entries.length) {
         return (this.entries[this.entries.length - 1]).id + 1;

package/src/components/viewers/MultiFlatmap.vue

@@ -342,10 +342,12 @@ export default {
       EventBus.emit("PopoverActionClick", returnedAction);
     },
     restoreFeaturedMarkers: function (flatmap) {
+
       this.settingsStore.resetFeaturedMarkerIdentifier();
       const markers = this.settingsStore.featuredMarkers;
       this.updateFeaturedMarkers(markers, flatmap);
     },
+    // updateFeaturedMarkers will step through the featured markers and add them to the map
     updateFeaturedMarkers: function (markers, flatmap) {
       this.showStarInLegend = false; // will show if we have a featured marker
       for (let index = 0; index < markers.length; ++index) {
@@ -362,6 +364,7 @@ export default {
         }
       }
     },
+    // addFeaturedMarker: add a featured marker to the map at the specified uberon location
     addFeaturedMarker: function (marker, index, flatmap) {
       const markerSpecies =
         this.settingsStore.featuredMarkerSpecies[index];
@@ -421,7 +424,9 @@ export default {
     this.getFeaturedDatasets();
 
     EventBus.on("markerUpdate", () => {
-      this.flatmapMarkerUpdate(this.$refs.multiflatmap.getCurrentFlatmap().mapImp);
+      if (this.flatmapReady) {
+        this.flatmapMarkerUpdate(this.$refs.multiflatmap.getCurrentFlatmap().mapImp);
+      }
     });
   },
 };

package/src/components/viewers/Scaffold.vue

@@ -25,6 +25,7 @@
       :display-markers="false"
       :enableOpenMapUI="true"
       :view-u-r-l="entry.viewUrl"
+      :markerCluster="true"
       :markerLabels="markerLabels"
       :flatmapAPI="flatmapAPI"
     />
@@ -155,6 +156,9 @@ export default {
         internalName: undefined,
       };
       if (resource && resource[0]) {
+        if (resource[0].data?.id === undefined || resource[0].data?.id === "") {
+          resource[0].data.id = resource[0].data?.group;
+        }
         result.internalName = resource[0].data.id;
         result.eventType = "highlighted";
       }
@@ -187,7 +191,7 @@ export default {
       }
     },
     markerLabels: function () {
-      return this.settingsStore.facetLabels;
+      return this.settingsStore.numberOfDatasetsForFacets;
     },
   },
   data: function () {

package/src/mixins/ContentMixin.js

@@ -175,6 +175,9 @@ export default {
         }
       } else if (type == "Scaffold") {
         if (resource && resource[0]) {
+          if (resource[0].data?.id === undefined || resource[0].data?.id === "") {
+            resource[0].data.id = resource[0].data?.group;
+          }
           result.internalName = resource[0].data.id;
           // Facet search if marker is clicked
           if (resource[0].data.lastActionOnMarker === true) {
@@ -268,6 +271,7 @@ export default {
       }
       return { id, name };
     },
+    // Get the species and andaotmy info for the featured datasets
     getDatasetAnatomyInfo: function (identifier) {
       fetch(`${this.apiLocation}dataset_info/anatomy?identifier=${identifier}`)
         .then(response => response.json())
@@ -300,7 +304,8 @@ export default {
           } catch (error) {
             markerSpecies = undefined;
           }
-          this.updateFeaturedMarkers([markerCurie], undefined)
+          // can test the featured marker by uncommenting the line below:
+          // markerSpecies = "Rat"
           this.settingsStore.updateFeaturedMarker({
             identifier,
             marker: markerCurie,

package/src/mixins/DynamicMarkerMixin.js

@@ -45,16 +45,24 @@ export default {
         let markers = this.settingsStore.markers;
         markers = removeDuplicates(markers);
         flatmapImp.clearMarkers();
+        flatmapImp.clearDatasetMarkers();
         flatmapImp.addDatasetMarkers(markers);
       
         // Set the hovered markers
         let hoveredMarkers = this.settingsStore.hoveredMarkers
-        hoveredMarkers = removeDuplicates(hoveredMarkers);
+        let previousHoveredMarkers = this.settingsStore.previousHoveredMarkers
         hoveredMarkers.forEach(id => {
           let markerClass = "standard-marker" + " hovered" // Space-separated CSS class names
           let markerCluster = false // Disable cluster when related dataset is hovered
           flatmapImp.addMarker(id, { className: markerClass, cluster: markerCluster })
         })
+        if (previousHoveredMarkers !== null && previousHoveredMarkers.length >= 0) {
+          previousHoveredMarkers.forEach(id => {
+            let markerClass = "standard-marker"
+            let markerCluster = true
+            flatmapImp.addMarker(id, { className: markerClass, cluster: markerCluster })
+          })
+        } 
 
         // Set the featured markers
         if (this.entry.type === "MultiFlatmap") {

package/src/stores/settings.js

@@ -15,9 +15,10 @@ export const useSettingsStore = defineStore('settings', {
       nlLinkPrefix: undefined,
       rootUrl: undefined,
       facets: { species: [], gender: [], organ: [] },
-      facetLabels: [],
+      numberOfDatasetsForFacets: [],
       markers: [],
       hoveredMarkers: [],
+      previousHoveredMarkers: null,
       featuredMarkers: [],
       featuredMarkerIdentifiers: [],
       featuredMarkerDois: [],
@@ -70,6 +71,7 @@ export const useSettingsStore = defineStore('settings', {
       this.markers = markers;
     },
     updateHoveredMarkers(markers) {
+      this.previousHoveredMarkers = this.hoveredMarkers;
       this.hoveredMarkers = markers;
     },
     updateFeatured(datasetIdentifiers) {
@@ -142,8 +144,8 @@ export const useSettingsStore = defineStore('settings', {
         }
       }
     },
-    updateFacetLabels(facetLabels) {
-      this.facetLabels = facetLabels;
+    updateNumberOfDatasetsForFacets(numberOfDatasetsForFacets) {
+      this.numberOfDatasetsForFacets = numberOfDatasetsForFacets;
     },
     updateUseHelpModeDialog(helpModeOption) {
       this.useHelpModeDialog = helpModeOption;

package/dist/style-8EUTEKFl.js

@@ -1,51 +0,0 @@
-import { mapStores as i } from "pinia";
-import { u as o } from "./index-CB15HPC-.js";
-const s = function(t) {
-  return t ? [...new Set(t.map((e) => JSON.stringify(e)))].map(
-    (e) => JSON.parse(e)
-  ) : [];
-}, f = {
-  computed: {
-    ...i(o)
-  },
-  methods: {
-    flatmapPanZoomCallback: function(t) {
-      if (this.mouseHovered) {
-        const e = {
-          paneIndex: this.entry.id,
-          eventType: "panZoom",
-          payload: t,
-          type: this.entry.type
-        };
-        this.$emit("resource-selected", e);
-      }
-    },
-    /**
-    * Function used for updating the flatmap markers.
-    * We set the markers based on what was searched and the flatmap clusters them.
-    */
-    flatmapMarkerUpdate(t) {
-      if (!this.flatmapReady)
-        return;
-      let e = t;
-      if (e || (e = this.getFlatmapImp()), e) {
-        let r = this.settingsStore.markers;
-        r = s(r), e.clearMarkers(), e.addDatasetMarkers(r);
-        let a = this.settingsStore.hoveredMarkers;
-        a = s(a), a.forEach((m) => {
-          e.addMarker(m, { className: "standard-marker hovered", cluster: !1 });
-        }), this.entry.type === "MultiFlatmap" && this.restoreFeaturedMarkers(e);
-      }
-    },
-    flatmapReadyForMarkerUpdates: function(t) {
-      if (t) {
-        t.enablePanZoomEvents(!0), this.flatmapReady = !0;
-        const e = t.mapImp;
-        this.flatmapMarkerUpdate(e);
-      }
-    }
-  }
-};
-export {
-  f as D
-};