@panoramax/web-viewer 5.3.0-develop-e555dbf8 → 5.3.0-develop-9164b4a5

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__ = "e555dbf";
+const __COMMIT_HASH__ = "9164b4a";
 const __PACKAGE_VERSION__ = "5.3.0";
 const __PACKAGE_ISSUES_URL__ = "https://gitlab.com/panoramax/clients/web-viewer/-/work_items";
 

package/build/esm/utils/InitParameters.js

@@ -398,35 +398,6 @@ export function paramsToMapFilters(vals) {
  * @param {object} params The parameters to apply.
  */
 export function alterPSVState(psv, params) {
-	// Change xyz position
-	if(params.xyz) {
-		psv.addEventListener("picture-loaded", () => {
-			const coords = xyzParamToPSVPosition(params.xyz);
-			psv.setXYZ(coords.x, coords.y, coords.z);
-		}, {once: true});
-	}
-
-	// Change xywh position
-	if(params.xywh) {
-		psv.addEventListener("picture-loaded", () => {
-			const coords = xywhParamToPSVPosition(params.xywh, psv.getPictureMetadata());
-			psv.rotate(coords);
-			psv.zoom(coords.z);
-		}, {once: true});
-	}
-
-	// Select focused annotation
-	if(params.annotation) {
-		if(psv.getPictureMetadata()) {
-			psv.focusOnAnnotation(params.annotation);
-		}
-		else {
-			psv.addEventListener("picture-loaded", () => {
-				psv.focusOnAnnotation(params.annotation);
-			}, {once: true});
-		}
-	}
-
 	// Change transitionDuration
 	let td = params.transitionDuration || params.speed;
 	if(td !== undefined) {
@@ -438,6 +409,30 @@ export function alterPSVState(psv, params) {
 	if(["none", "pic", "any", "seq"].includes(nav)) {
 		psv.setPicturesNavigation(nav);
 	}
+
+	// Params depending on picture loading state
+	const oncePicReady = () => {
+		// Change xyz position
+		if(params.xyz) {
+			const coords = xyzParamToPSVPosition(params.xyz);
+			psv.setXYZ(coords.x, coords.y, coords.z);
+		}
+
+		// Change xywh position
+		if(params.xywh) {
+			const coords = xywhParamToPSVPosition(params.xywh, psv.getPictureMetadata());
+			psv.rotate(coords);
+			psv.zoom(coords.z);
+		}
+
+		// Select focused annotation
+		if(params.annotation) {
+			psv.focusOnAnnotation(params.annotation);
+		}
+	};
+
+	if(psv.getPictureMetadata()) { oncePicReady(); }
+	else { psv.addEventListener("picture-loaded", oncePicReady, {once: true}); }
 }
 
 /**

package/package.json

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