@panoramax/web-viewer 3.2.3-develop-367cb599 → 3.2.3-develop-33cd154c

package/docs/03_URL_settings.md

@@ -36,7 +36,7 @@ Choose the allowed navigation between pictures, to eventually restrict what is v
 
 - `nav=any` (or no value): no restriction in navigation (default)
 - `nav=seq`: can only see pictures in same sequence
-- `nav=none`: can only see current picture, no navigation to other picture allowed
+- `nav=none/pic`: can only see current picture, no navigation to other picture allowed
 
 ## :material-image: Picture settings
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panoramax/web-viewer",
-  "version": "3.2.3-develop-367cb599",
+  "version": "3.2.3-develop-33cd154c",
   "description": "Panoramax web viewer for geolocated pictures",
   "main": "build/index.js",
   "author": "Panoramax team",
@@ -89,17 +89,17 @@
     "workbox-webpack-plugin": "^6.5.4"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^6.6.0",
-    "@fortawesome/free-regular-svg-icons": "^6.6.0",
-    "@fortawesome/free-solid-svg-icons": "^6.6.0",
-    "@photo-sphere-viewer/core": "5.11.0-beta.1",
-    "@photo-sphere-viewer/equirectangular-tiles-adapter": "5.11.0-beta.1",
-    "@photo-sphere-viewer/gallery-plugin": "5.11.0-beta.1",
-    "@photo-sphere-viewer/markers-plugin": "5.11.0-beta.1",
-    "@photo-sphere-viewer/virtual-tour-plugin": "5.11.0-beta.1",
+    "@fortawesome/fontawesome-svg-core": "^6.7.2",
+    "@fortawesome/free-regular-svg-icons": "^6.7.2",
+    "@fortawesome/free-solid-svg-icons": "^6.7.2",
+    "@photo-sphere-viewer/core": "5.12.1",
+    "@photo-sphere-viewer/equirectangular-tiles-adapter": "5.12.1",
+    "@photo-sphere-viewer/gallery-plugin": "5.12.1",
+    "@photo-sphere-viewer/markers-plugin": "5.12.1",
+    "@photo-sphere-viewer/virtual-tour-plugin": "5.12.1",
     "lit": "^3.2.1",
-    "maplibre-gl": "^4.7.1",
-    "pmtiles": "^3.2.0",
+    "maplibre-gl": "^5.2.0",
+    "pmtiles": "^4.3.0",
     "query-selector-shadow-dom": "^1.0.1"
   },
   "eslintConfig": {

package/src/components/ui/Photo.js

@@ -205,8 +205,9 @@ export default class Photo extends PSViewer {
 		this.setOption("maxFov", Math.min(toNode.horizontalFov * 3/4, 90));
 
 		const centerNoAnim = {
+			showLoader: false,
+			effect: "none",
 			speed: 0,
-			fadeIn: false,
 			rotation: false,
 			rotateTo: { pitch: 0, yaw: 0 },
 			zoomTo: PSV_DEFAULT_ZOOM
@@ -228,7 +229,7 @@ export default class Photo extends PSViewer {
 				else {
 					nodeTransition = {
 						speed: animationDuration,
-						fadeIn: following && animated,
+						effect: following && animated ? "fade" : "none",
 						rotation: following && sameSequence && animated,
 						rotateTo: this.getPosition()
 					};
@@ -247,7 +248,7 @@ export default class Photo extends PSViewer {
 				const notTooMuchRotation = Math.abs(fromNodeHeading - toNodeHeading) <= Math.PI / 4;
 				nodeTransition = {
 					speed: animationDuration,
-					fadeIn: following && notTooMuchRotation && animated,
+					effect: following && notTooMuchRotation && animated ? "fade" : "none",
 					rotation: following && notTooMuchRotation && animated,
 					rotateTo: keepZoomPos ? this.getPosition() : { pitch: 0, yaw: 0 },
 					zoomTo: keepZoomPos ? this.getZoomLevel() :  PSV_DEFAULT_ZOOM,
@@ -259,7 +260,7 @@ export default class Photo extends PSViewer {
 			}
 		}
 
-		if(nodeTransition.fadeIn && nodeTransition.speed >= 150) {
+		if(nodeTransition.effect === "fade" && nodeTransition.speed >= 150) {
 			setTimeout(this._clearArrows, nodeTransition.speed-100);
 		}
 		else {
@@ -833,6 +834,7 @@ export default class Photo extends PSViewer {
 	 * @memberof Panoramax.components.ui.Photo#
 	 */
 	setPicturesNavigation(pn) {
+		if(pn === "none") { pn = "pic"; }
 		this._picturesNavigation = pn;
 
 		/**
@@ -856,6 +858,7 @@ export default class Photo extends PSViewer {
 		case "seq":
 			return ["next", "prev"].includes(link.rel);
 		case "pic":
+		case "none":
 			return false;
 		case "any":
 		default:

package/src/utils/InitParameters.js

@@ -284,7 +284,7 @@ export function alterPSVState(psv, params) {
 	}
 
 	// Change pictures navigation mode
-	if(["pic", "any", "seq"].includes(params.picturesNavigation)) {
+	if(["none", "pic", "any", "seq"].includes(params.picturesNavigation)) {
 		psv.setPicturesNavigation(params.picturesNavigation);
 	}
 }

package/tests/components/ui/Photo.test.js

@@ -362,6 +362,8 @@ describe("setPicturesNavigation", () => {
 		expect(ph.getPicturesNavigation()).toBe("seq");
 		ph.setPicturesNavigation("any");
 		expect(ph.getPicturesNavigation()).toBe("any");
+		ph.setPicturesNavigation("none");
+		expect(ph.getPicturesNavigation()).toBe("pic");
 		expect(eventWatcher.mock.calls).toMatchSnapshot();
 	});
 });

package/tests/components/ui/__snapshots__/Photo.test.js.snap

@@ -246,6 +246,11 @@ Array [
       "value": "any",
     },
   ],
+  Array [
+    Object {
+      "value": "pic",
+    },
+  ],
 ]
 `;
 

package/tests/utils/InitParameters.test.js

@@ -312,6 +312,12 @@ describe("alterPSVState", () => {
 		expect(psv.setPicturesNavigation).toHaveBeenCalledWith("pic");
 	});
 
+	it("should set pictures navigation mode when picturesNavigation=none", () => {
+		const params = { picturesNavigation: "none" };
+		alterPSVState(psv, params);
+		expect(psv.setPicturesNavigation).toHaveBeenCalledWith("none");
+	});
+
 	it("should not set pictures navigation mode when picturesNavigation param is invalid", () => {
 		const params = { picturesNavigation: "invalid" };
 		alterPSVState(psv, params);