Merge pull request #240 from ddjnw1yu/fc-map-markers

Bring back FC map markers
ABI-Software · Aug 14, 2024 · a3ca6ea · a3ca6ea
2 parents f36d430 + fa52932
commit a3ca6ea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/components/viewers/Flatmap.vue b/src/components/viewers/Flatmap.vue
@@ -100,9 +100,7 @@ export default {
       let provClone = {id: this.entry.id, prov: this.getFlatmapImp().provenance}; //create clone of provenance and add id
       EventBus.emit("mapImpProv", provClone); // send clone to context card
       this.$emit("flatmap-provenance-ready", provClone);
-      if (this.entry.resource !== "FunctionalConnectivity"){
-        this.flatmapReadyForMarkerUpdates(flatmap);
-      }
+      this.flatmapReadyForMarkerUpdates(flatmap);
       EventBus.emit("mapLoaded", flatmap);
     },
     onPathwaySelectionChanged: function (data) {

diff --git a/src/mixins/DynamicMarkerMixin.js b/src/mixins/DynamicMarkerMixin.js
@@ -47,7 +47,15 @@ export default {
         let fmMarkers = this.removeMarkersNotOnFlatmap(flatmapImp, markers);
         flatmapImp.clearMarkers();
         flatmapImp.clearDatasetMarkers();
-        flatmapImp.addDatasetMarkers(fmMarkers);
+        if (this.entry.resource === "FunctionalConnectivity") {
+          let FCMapMarkers = [];
+          for (let i = 0; i < fmMarkers.length; i++) {
+            FCMapMarkers = FCMapMarkers.concat(fmMarkers[i].terms);
+          }
+          flatmapImp.addMarkers(Array.from(new Set(FCMapMarkers)), { className: "standard-marker", cluster: false });
+        } else {
+          flatmapImp.addDatasetMarkers(fmMarkers);
+        }
 
         // Set the featured markers
         if (this.entry.type === "MultiFlatmap") {