@abi-software/mapintegratedvuer 0.7.0-vue3.8 → 0.7.1-demo.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/mapintegratedvuer",
-  "version": "0.7.0-vue3.8",
+  "version": "0.7.1-demo.0",
   "license": "Apache-2.0",
   "scripts": {
     "serve": "vite --host --force",
@@ -42,12 +42,12 @@
     "*.js"
   ],
   "dependencies": {
-    "@abi-software/flatmapvuer": "^0.6.0-vue3.8",
+    "@abi-software/flatmapvuer": "0.6.1-demo-0",
     "@abi-software/map-side-bar": "^1.7.0-vue3.4",
     "@abi-software/plotvuer": "^0.4.0-vue-3-alpha.10",
     "@abi-software/scaffoldvuer": "^0.4.0-vue3.6",
     "@abi-software/simulationvuer": "^0.7.0-vue-3-alpha.5",
-    "@abi-software/svg-sprite": "^0.4.0-vue3-beta.0",
+    "@abi-software/svg-sprite": "0.4.0-vue3.3",
     "@cypress/vite-dev-server": "^5.0.7",
     "@element-plus/icons-vue": "^2.3.1",
     "@pinia/testing": "^0.1.3",
@@ -126,6 +126,9 @@
       }
     ]
   },
+  "overrides": {
+    "@abi-software/flatmapvuer": "$@abi-software/flatmapvuer"
+  },
   "browserslist": [
     "> 1%",
     "last 2 versions"

package/src/App.vue

@@ -240,6 +240,6 @@ body {
 }
 
 .map-icon {
-  color: $app-primary-color!important;
+  color: $app-primary-color;
 }
 </style>

package/src/components/viewers/MultiFlatmap.vue

@@ -98,7 +98,7 @@ export default {
         } else if ((this.activeSpecies === "Human Male") || (this.activeSpecies === "Human Female")) {
           //Dynamically construct the whole body scaffold for human and store it
           if (!("human" in this.scaffoldResource)) {
-            this.scaffoldResource["human"] = await getBodyScaffoldInfo(storeeSettings.sparcApi, "human");
+            this.scaffoldResource["human"] = await getBodyScaffoldInfo(this.apiLocation, "human");
           }
           action = {
             contextCardUrl: this.scaffoldResource["human"].datasetInfo.contextCardUrl,
@@ -305,13 +305,17 @@ export default {
       }
 
       if (flatmapImp) {
+        // create the star marker
         let wrapperElement = document.createElement("div");
         wrapperElement.innerHTML = YellowStar;
 
+        // add it to the flatmap
         const markerIdentifier = flatmapImp.addMarker(marker, {
           element: wrapperElement,
           className: "highlight-marker"
         });
+
+        // update the store with the marker identifier
         this.settingsStore.updateFeaturedMarkerIdentifier({
           index,
           markerIdentifier,
@@ -362,9 +366,12 @@ export default {
 
 :deep(.maplibregl-marker) {
   &.standard-marker {
+    cursor: pointer !important;
     z-index: 2;
   }
   &.highlight-marker {
+    visibility: visible !important;
+    cursor: pointer !important;
     z-index: 1;
     div {
       scale: 0.5;

package/src/mixins/ContentMixin.js

@@ -278,6 +278,7 @@ export default {
           } catch (error) {
             markerSpecies = undefined;
           }
+          this.updateFeatureMarkers([markerCurie], undefined)
           this.settingsStore.updateFeaturedMarker({
             identifier,
             marker: markerCurie,
@@ -286,19 +287,45 @@ export default {
           });
         });
     },
+    // Check if the old featured dataset api has any info
+    oldFeaturedDatasetApiHasInfo: async function () {
+      let response = await fetch(`${this.apiLocation}get_featured_datasets_identifiers`)
+      let data = await response.json()
+      if (!data.identifiers || data.identifiers.length == 0) {
+        return false;
+      } else {
+        return data.identifiers;
+      }
+    },
+    // Check if the new featured dataset api has any info
+    newFeaturedDatasetApiHasInfo: async function () {
+      let response = await fetch(`${this.apiLocation}get_featured_dataset`)
+      let data = await response.json()
+      if (!data.datasets || data.datasets.length == 0) {
+        return false;
+      } else {
+        return data.datasets.map(d => d.id);
+      }
+    },
+
     /**
      * Get a list of featured datasets to display.
      */
-    getFeaturedDatasets: function () {
-      const local_this = this;
-      fetch(`${this.apiLocation}get_featured_datasets_identifiers`)
-        .then(response => response.json())
-        .then(data => {
-          this.settingsStore.updateFeatured(data.identifiers);
-          data.identifiers.forEach(element => {
-            local_this.getDatasetAnatomyInfo(element);
-          });
-        });
+    getFeaturedDatasets: async function () {
+      let datasetIds = [];
+
+      // Check the two api endpoints for featured datasets, old one first
+      let oldInfo = await this.oldFeaturedDatasetApiHasInfo();
+      if (oldInfo) datasetIds = oldInfo;
+      else {
+        let newInfo = await this.newFeaturedDatasetApiHasInfo();
+        if (newInfo) datasetIds = newInfo;
+      }
+      // Update the store with the new list of featured datasets
+      this.settingsStore.updateFeatured(datasetIds);
+      datasetIds.forEach(element => {
+        this.getDatasetAnatomyInfo(element)
+      });
     },
     zoomToFeatures: function () {
       return;

package/vite.config.js

@@ -11,7 +11,7 @@ export default defineConfig(({ command, mode }) => {
     css: {
         preprocessorOptions: {
           scss: {
-            additionalData: `@use '${pathSrc}/assets/styles' as *;`
+            additionalData: `@use './src/assets/styles' as *;`
           },
         },
     },