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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "1.2.0-beta.2",
+  "version": "1.2.0-beta.4",
   "license": "Apache-2.0",
   "files": [
     "dist/*",

package/src/components/FlatmapVuer.vue

@@ -1983,7 +1983,6 @@ export default {
      * @arg feature
      */
     displayTooltip: function (feature, geometry = undefined) {
-      this.tooltipDisplay = true
       let featureId = undefined
       let options = { className: 'flatmapvuer-popover' }
       if (geometry) {
@@ -1999,8 +1998,9 @@ export default {
       // Connectivity info will show in sidebar
       if (this.connectivityInfoSidebar && this.viewingMode !== 'Annotation') {
         // move the map center to highlighted area
-        const featureIds = [feature];
-        this.moveMap(featureIds);
+        // this method is moved to sidebar connectivity info
+        // const featureIds = [feature];
+        // this.moveMap(featureIds);
         this.$emit('connectivity-info-open', this.tooltipEntry);
       }
       // If UI is not disabled,
@@ -2008,6 +2008,7 @@ export default {
       // Provenance popup will be shown on map
       // Tooltip will be shown for Annotation view
       if (!this.disableUI && (!this.connectivityInfoSidebar || this.viewingMode === 'Annotation')) {
+        this.tooltipDisplay = true;
         this.$nextTick(() => {
           this.mapImp.showPopup(featureId, this.$refs.tooltip.$el, options)
           this.popUpCssHacks()
@@ -2020,11 +2021,11 @@ export default {
      * because the sidebar is opened
      * @arg featureIds
      */
-     moveMap: function (featureIds) {
+     moveMap: function (featureIds, options = {}) {
       if (this.mapImp) {
+        const { offsetX = 0, offsetY = 0, zoom = 4 } = options;
         const Map = this.mapImp._map;
         const bbox = this.mapImp._bounds.toArray();
-        const sidebarWidth = 500; // actual width is 600
 
         // Zoom the map to features first
         this.mapImp.zoomToFeatures(featureIds, { noZoomIn: true });
@@ -2038,9 +2039,8 @@ export default {
         if (bbox?.length) {
           setTimeout(() => {
             Map.fitBounds(bbox, {
-              padding: {
-                right: sidebarWidth
-              },
+              offset: [offsetX, offsetY],
+              zoom: zoom,
               animate: true
             });
           });

package/src/services/flatmapQueries.js

@@ -222,7 +222,7 @@ let FlatmapQueries = function () {
     this.origins = []
     this.components = []
     if (!keastIds || keastIds.length == 0) return
-    
+
     let prom1 = this.queryForConnectivity(keastIds, signal) // This on returns a promise so dont need 'await'
     let prom2 = await this.pubmedQueryOnIds(eventData)
     let results = await Promise.all([prom1, prom2])
@@ -281,10 +281,10 @@ let FlatmapQueries = function () {
     if (node.length === 1) { // If the node is in the form [id]
       console.error("Server returns a single node", node)
       return node[0]
-    } else {  
+    } else {
       if (node.length === 2 && node[1].length === 0) { // If the node is in the form [id, []]
         return node[0]
-      } else {  
+      } else {
         return false // If the node is in the form [id, [id1, id2]]
       }
     }
@@ -294,7 +294,7 @@ let FlatmapQueries = function () {
 
     // Check if the node is a single node or a node with multiple children
     let nodeIsSingle = this.findIfNodeIsSingle(node)
-   
+
     // Case where node is in the form [id]
     if (nodeIsSingle) {
       return lookUp[nodeIsSingle]
@@ -467,7 +467,8 @@ let FlatmapQueries = function () {
   this.pubmedSearchUrl = function (ids) {
     let url = 'https://pubmed.ncbi.nlm.nih.gov/?'
     let params = new URLSearchParams()
-    params.append('term', ids)
+    const decodedIDs = ids.map((id) => decodeURIComponent(id));
+    params.append('term', decodedIDs);
     return url + params.toString()
   }
 }