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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "1.6.2-beta.2",
+  "version": "1.6.2-beta.4",
   "license": "Apache-2.0",
   "files": [
     "dist/*",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@abi-software/flatmap-viewer": "^3.2.8",
-    "@abi-software/map-utilities": "^1.2.2-beta.1",
+    "@abi-software/map-utilities": "^1.2.2-beta.3",
     "@abi-software/sparc-annotation": "0.3.2",
     "@abi-software/svg-sprite": "^1.0.1",
     "@element-plus/icons-vue": "^2.3.1",

package/src/components/FlatmapVuer.vue

@@ -830,19 +830,19 @@ export default {
      * @arg {String} `name`
      */
     toolbarEvent: function (type, name) {
+      if (this.isValidDrawnCreated) return;
       this.manualAbortedOnClose()
       this.doubleClickedFeature = false
+      // Deselect any feature when draw mode/tool is changed
+      this.changeAnnotationDrawMode({ mode: 'simple_select' })
       if (type === 'mode') {
-        // Deselect any feature when draw mode is changed
-        this.changeAnnotationDrawMode({ mode: 'simple_select' })
         this.activeDrawMode = name
       } else if (type === 'tool') {
+        // Remove any unsubmitted drawn
+        this.cancelDrawnFeature()
         if (name) {
           const tool = name.replace(/[A-Z]/g, letter => `_${letter.toLowerCase()}`)
           this.changeAnnotationDrawMode({ mode: `draw${tool}` })
-        } else {
-          this.changeAnnotationDrawMode({ mode: 'simple_select' })
-          this.cancelDrawnFeature()
         }
         this.activeDrawTool = name
       }
@@ -951,7 +951,9 @@ export default {
       ) {
         this.featureAnnotationSubmitted = true
         this.mapImp.commitAnnotationEvent(this.annotationEntry)
-        if (this.annotationEntry.type === 'deleted') {
+        if (annotation.body.comment === "Position Updated") {
+          this.annotationEntry.positionUpdated = false
+        } else if (this.annotationEntry.type === 'deleted') {
           if (this.annotationSidebar) this.$emit("annotation-close")
           this.closeTooltip()
           // Only delete need, keep the annotation tooltip/sidebar open if created/updated
@@ -1003,8 +1005,10 @@ export default {
      */
     addAnnotationFeature: async function () {
       if (this.mapImp) {
-        if (!this.featureAnnotationSubmitted) this.clearAnnotationFeature()
-        if (!this.featureAnnotationSubmitted) this.loading = true
+        if (!this.featureAnnotationSubmitted) {
+          this.clearAnnotationFeature()
+          this.loading = true
+        }
         const userId = this.annotationFrom === 'Anyone' ?
           undefined : this.userInformation.orcid ?
             this.userInformation.orcid : '0000-0000-0000-0000'