@abi-software/mapintegratedvuer 1.2.0-beta.2 → 1.2.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/mapintegratedvuer",
-  "version": "1.2.0-beta.2",
+  "version": "1.2.0-beta.4",
   "license": "Apache-2.0",
   "scripts": {
     "serve": "vite --host --force",
@@ -48,10 +48,10 @@
     "*.js"
   ],
   "dependencies": {
-    "@abi-software/flatmapvuer": "^1.1.2-alpha-3",
+    "@abi-software/flatmapvuer": "^1.1.2-alpha-7",
     "@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/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";
       }

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) {

package/src/mixins/DynamicMarkerMixin.js

@@ -44,9 +44,10 @@ export default {
         // Set the dataset markers
         let markers = this.settingsStore.markers;
         markers = removeDuplicates(markers);
+        let fmMarkers = this.removeMarkersNotOnFlatmap(flatmapImp, markers);
         flatmapImp.clearMarkers();
         flatmapImp.clearDatasetMarkers();
-        flatmapImp.addDatasetMarkers(markers);
+        flatmapImp.addDatasetMarkers(fmMarkers);
       
         // Set the hovered markers
         let hoveredMarkers = this.settingsStore.hoveredMarkers
@@ -70,6 +71,28 @@ export default {
         }
       }
     },
+    // removeMarkersNotOnFlatmap: rewrites the dataset marker list to only include markers that are on the flatmap
+    removeMarkersNotOnFlatmap(flatmapImp, datasets) {
+
+      // dataset markers are in the form [{id: "discoverId", terms: ["term1", "term2"]}, {id:....}]
+      let fma = flatmapImp.anatomicalIdentifiers;
+      let markersOnFlatmap = []
+
+      // the block below steps through each dataset and checks each term to see if it is in the flatmap
+      for (let i = 0; i < datasets.length; i++) {
+        let dataset = datasets[i];
+        let datasetAdjusted = {id: dataset.id, terms: []};
+        for (let j = 0; j < dataset.terms.length; j++) {
+          if (fma.includes(dataset.terms[j])) {
+            datasetAdjusted.terms.push(dataset.terms[j]);
+
+            
+          }
+        }
+        markersOnFlatmap.push(datasetAdjusted);
+      }
+      return markersOnFlatmap;
+    },
     flatmapReadyForMarkerUpdates: function (flatmap) {
       if (flatmap) {
         flatmap.enablePanZoomEvents(true); // Use zoom events for dynamic markers