@abi-software/flatmapvuer 1.2.0-beta.1 → 1.2.0-beta.3

package/package.json

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

package/src/App.vue

@@ -74,6 +74,7 @@
       @help-mode-last-item="onHelpModeLastItem"
       @shown-tooltip="onTooltipShown"
       @shown-map-tooltip="onMapTooltipShown"
+      :connectivityInfoSidebar="true"
       :displayMinimap="true"
       :enableOpenMapUI="true"
       :flatmapAPI="flatmapAPI"

package/src/components/FlatmapVuer.vue

@@ -601,7 +601,7 @@ Please use `const` to assign meaningful names to them...
       <Tooltip
         ref="tooltip"
         class="tooltip"
-        v-show="tooltipDisplay && !connectivityInfoSidebar"
+        v-show="tooltipDisplay"
         :annotationEntry="annotationEntry"
         :tooltipEntry="tooltipEntry"
         :annotationDisplay="viewingMode === 'Annotation'"
@@ -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) {
@@ -1997,15 +1996,19 @@ export default {
       }
       // If connectivityInfoSidebar is set to `true`
       // Connectivity info will show in sidebar
-      if (this.connectivityInfoSidebar) {
+      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 connectivityInfoSidebar is not set (default) or set to `false`
-      // Connectivity info (Provenance info) tooltip will show on map
-      if (!this.disableUI && !this.connectivityInfoSidebar) {
+      // If UI is not disabled,
+      // And connectivityInfoSidebar is not set (default) or set to `false`
+      // 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()
@@ -2018,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 });
@@ -2036,9 +2039,8 @@ export default {
         if (bbox?.length) {
           setTimeout(() => {
             Map.fitBounds(bbox, {
-              padding: {
-                right: sidebarWidth
-              },
+              offset: [offsetX, offsetY],
+              zoom: zoom,
               animate: true
             });
           });