@abi-software/scaffoldvuer 1.4.2 → 1.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/scaffoldvuer",
-  "version": "1.4.2",
+  "version": "1.5.1",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

package/src/components/ScaffoldTooltip.vue

@@ -153,9 +153,9 @@ export default {
         if (this.annotationDisplay) {
           const region = this.region ? this.region +"/" : "";
           this.annotationEntry = {
-            "featureId": encodeURIComponent(region + this.label),
-            "resourceId": encodeURIComponent(this.scaffoldUrl),
-            "resource": encodeURIComponent(this.scaffoldUrl),
+            "featureId": region + this.label,
+            "resourceId": this.scaffoldUrl,
+            "resource": this.scaffoldUrl,
           };
         }
       }

package/src/components/ScaffoldVuer.vue

@@ -942,7 +942,7 @@ export default {
     ...mapState(useMainStore,  ['userToken']),
     annotationDisplay: function() {
       return this.viewingMode === 'Annotation' && this.tData.active === true &&
-        (this.activeDrawMode === 'Edit' || this.activeDrawMode === 'Delete');
+        (this.activeDrawMode !== "Point" && this.activeDrawMode !== 'LineString');
     }
   },
   methods: {
@@ -1351,10 +1351,14 @@ export default {
         }
       }
     },
-    createEditTemporaryLines: function(worldCoords) {
+    createEditTemporaryLines: function(identifiers) {
+      const worldCoords = identifiers[0].extraData.worldCoords;
       if (worldCoords) {
         if (this.createData.shape === "LineString" || this.createData.editingIndex > -1) {
           if (this.createData.points.length === 1)  {
+            this.showRegionTooltipWithAnnotations(identifiers, true, false);
+            this.tData.x = 50;
+            this.tData.y = 200;
             if (this._tempLine) {
               const positionAttribute = this._tempLine.geometry.getAttribute( 'position' );
               positionAttribute.setXYZ(1, worldCoords[0], worldCoords[1], worldCoords[2]);
@@ -1457,10 +1461,8 @@ export default {
               this._editingZincObject = zincObject;
             }
           }
-          if (this.activeDrawMode === "Edit" || this.activeDrawMode === "Delete") {
+          if (this.activeDrawMode !== "Point" && this.activeDrawMode !== "LineString") {
             this.showRegionTooltipWithAnnotations(event.identifiers, true, false);
-            this.tData.x = 50;
-            this.tData.y = 200;
           } else {
             this.showRegionTooltipWithAnnotations(event.identifiers, true, true);
           }
@@ -1548,7 +1550,7 @@ export default {
                 }
                 this.tData.x = event.identifiers[0].coords.x;
                 this.tData.y = event.identifiers[0].coords.y;
-                this.createEditTemporaryLines(event.identifiers[0].extraData.worldCoords);
+                this.createEditTemporaryLines(event.identifiers);
               }
             }
             /**
@@ -1565,9 +1567,8 @@ export default {
                 this.$refs.scaffoldContainer.getBoundingClientRect();
               this.tData.x = event.identifiers[0].coords.x - offsets.left;
               this.tData.y = event.identifiers[0].coords.y - offsets.top;
-              this.createEditTemporaryLines(event.identifiers[0].extraData.worldCoords);
             }
-            this.createEditTemporaryLines(event.identifiers[0].extraData.worldCoords);
+            this.createEditTemporaryLines(event.identifiers);
           }
         }
       }
@@ -1917,6 +1918,12 @@ export default {
                     annotationFeaturesToPrimitives(this.$module.scene, payload.features);
                   }
                 });
+                //Support previously supported encoded resource
+                getDrawnAnnotations(this.annotator, this.userToken, encodeURIComponent(this.url)).then((payload) => {
+                  if (payload && payload.features) {
+                    annotationFeaturesToPrimitives(this.$module.scene, payload.features);
+                  }
+                });
               }
             }
           });
@@ -2222,7 +2229,7 @@ export default {
           const noSlash = fullName.slice(0, -1);
           annotation.region = noSlash;
           fullName = fullName + group;
-          const featureID = encodeURIComponent(fullName);
+          const featureID = fullName;
           annotation.item.id = featureID;
           annotation.feature.id = featureID;
         });

package/src/scripts/Utilities.js

@@ -301,9 +301,9 @@ const createNewAnnotationsWithFeatures = (zincObject, region, group, scaffoldUrl
     //Check if region ends with a slash
     let fullName = region.slice(-1) === "/" ? region : region + "/";
     fullName = fullName + group;
-    const featureID = encodeURIComponent(fullName);
+    const featureID = fullName;
     const userAnnotation = {
-      resource: encodeURIComponent(scaffoldUrl),
+      resource: scaffoldUrl,
       item: {
         "id": featureID,
       },
@@ -359,7 +359,7 @@ export const addUserAnnotationWithFeature = (service, userToken, zincObject,
  * Get the drawn annotation stored on the annotation server
  */
 export const getDrawnAnnotations = async (service, userToken, scaffoldUrl) => {
-  const resource = encodeURIComponent(scaffoldUrl);
+  const resource = scaffoldUrl;
   return await service.drawnFeatures(userToken, resource);
 }