@panoramax/web-viewer 5.0.0-develop-c36ee660 → 5.0.0-develop-f7d7cc8f

package/build/esm/components/core/Basic.js

@@ -9,7 +9,7 @@ import BasicStyles from "./Basic.css" with { type: "css" };
 document.adoptedStyleSheets.push(AtkinsonStyles);
 document.adoptedStyleSheets.push(BasicStyles);
 
-const __COMMIT_HASH__ = "c36ee66";
+const __COMMIT_HASH__ = "f7d7cc8";
 const __PACKAGE_VERSION__ = "5.0.0";
 const __PACKAGE_ISSUES_URL__ = "https://gitlab.com/panoramax/clients/web-viewer/-/work_items";
 

package/build/esm/components/ui/Photo.js

@@ -1370,28 +1370,21 @@ export default class Photo extends PSViewer {
 			// Send valid rectangle through event
 			if(sendRectEvent) {
 				// Get texture coordinates (corresponding to a full 360° sphere)
-				const minxy = this.dataHelper.sphericalCoordsToTextureCoords(this._drawingAnnotation[0]);
-				const maxxy = this.dataHelper.sphericalCoordsToTextureCoords(this._drawingAnnotation[1]);
-				let shape = [
-					minxy.textureX,
-					minxy.textureY,
-					maxxy.textureX,
-					maxxy.textureY
-				];
+				let shape = this._myMarkers.markers[DRAW_ANNOT_RECT].config.polygon
+					.map(c => {
+						const t = this.dataHelper.sphericalCoordsToTextureCoords(c);
+						return [t.textureX, t.textureY];
+					});
 
 				// Re-compute original texture coordinates (flat or cropped images)
 				const crop = this.getPictureMetadata()?.panorama?.cropData;
 				if(crop) {
-					shape[0] -= crop.croppedX;
-					shape[1] -= crop.croppedY;
-					shape[2] -= crop.croppedX;
-					shape[3] -= crop.croppedY;
+					shape = shape.map(([x,y]) => [x - crop.croppedX, y - crop.croppedY]);
 
 					// Check if annotations doesn't go outside of picture
-					if(shape[0] < 0 || shape[0] > crop.croppedWidth) { shape = null; }
-					else if(shape[1] < 0 || shape[1] > crop.croppedHeight) { shape = null; }
-					else if(shape[2] < 0 || shape[2] > crop.croppedWidth) { shape = null; }
-					else if(shape[3] < 0 || shape[3] > crop.croppedHeight) { shape = null; }
+					if(shape.find(([x,y]) => x < 0 || x > crop.croppedWidth || y < 0 || y > crop.croppedHeight)) {
+						shape = null;
+					}
 
 					// Alert user if shape is invalid
 					if(!shape) {
@@ -1401,13 +1394,9 @@ export default class Photo extends PSViewer {
 					}
 				}
 
-				// Check coordinates order
-				if(shape && shape[0] >= shape[2] && shape[1] >= shape[3]) {
-					let maxx = shape[0];
-					let minx = shape[2];
-					let maxy = shape[1];
-					let miny = shape[3];
-					shape = [minx, miny, maxx, maxy];
+				// Add back last coordinate
+				if(shape[0][0] !== shape[shape.length-1][0] || shape[0][1] !== shape[shape.length-1][1]) {
+					shape.push(shape[0]);
 				}
 
 				/**
@@ -1415,7 +1404,7 @@ export default class Photo extends PSViewer {
 				 *
 				 * @event Panoramax.components.ui.Photo#annotation-drawn
 				 * @type {CustomEvent}
-				 * @property {string} detail.shape The annotation geometry, or null if latest draw is invalid
+				 * @property {number[][]} detail.shape The annotation geometry, or null if latest draw is invalid
 				 */
 				const event = new CustomEvent("annotation-drawn", {
 					detail: { shape }

package/build/esm/utils/API.js

@@ -741,16 +741,10 @@ export default class API extends EventTarget {
 	 */
 	createPictureAnnotation(picMeta, shape, semanticsDiff) {
 		// Fake send version
-		// Return Promise.resolve({
+		// return Promise.resolve({
 		// 	"id": "fe298d59-a9c6-4680-8e76-6efe82d97f48",
 		// 	"semantics": semanticsDiff,
-		// 	"shape": { "type": "Polygon", "coordinates": [[
-		// 		[shape[0], shape[1]],
-		// 		[shape[0], shape[3]],
-		// 		[shape[2], shape[3]],
-		// 		[shape[2], shape[1]],
-		// 		[shape[0], shape[1]],
-		// 	]] }
+		// 	"shape": { "type": "Polygon", "coordinates": [shape] }
 		// });
 
 		if(!this.isReady()) { throw new Error("API is not ready to use"); }
@@ -767,7 +761,7 @@ export default class API extends EventTarget {
 			method: "POST",
 			body: JSON.stringify({
 				semantics: semanticsDiff,
-				shape: shape
+				shape: { type: "Polygon", coordinates: [shape] }
 			}),
 			headers: { "Content-Type": "application/json" },
 		};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panoramax/web-viewer",
-  "version": "5.0.0-develop-c36ee660",
+  "version": "5.0.0-develop-f7d7cc8f",
   "description": "Panoramax web viewer for geolocated pictures",
   "main": "./build/cjs/index.js",
   "module": "./build/esm/index.js",