@panoramax/web-viewer 4.0.2-develop-682e2a36 → 4.0.2-develop-0a728dda

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panoramax/web-viewer",
-  "version": "4.0.2-develop-682e2a36",
+  "version": "4.0.2-develop-0a728dda",
   "description": "Panoramax web viewer for geolocated pictures",
   "main": "build/index.js",
   "author": "Panoramax team",

package/src/components/ui/Photo.js

@@ -996,6 +996,7 @@ export default class Photo extends PSViewer {
 						fill: "var(--orange-transparent)",
 						cursor: "pointer",
 					},
+					tooltip: this._parent._t.pnx.semantics_annotation_tooltip,
 				};
 			});
 			this._myMarkers.setMarkers(annotations);
@@ -1022,7 +1023,7 @@ export default class Photo extends PSViewer {
 	 */
 	focusOnAnnotation(id) {
 		if(!this.areAnnotationsVisible()) { this.toggleAllAnnotations(true); }
-		this.unfocusAnnotation();
+		this.unfocusAnnotation(true);
 
 		const annotationId = `annotation-${id}`;
 		this._myMarkers.updateMarker({
@@ -1043,8 +1044,9 @@ export default class Photo extends PSViewer {
 	/**
 	 * Remove focus styling on annotations.
 	 * @memberof Panoramax.components.ui.Photo#
+	 * @param {boolean} [skipEvent=false] Set to true to avoid launching annotations-unfocused event
 	 */
-	unfocusAnnotation() {
+	unfocusAnnotation(skipEvent = false) {
 		const selectedAnnotations = Object.keys(this._myMarkers.markers)
 			.filter(id => id.startsWith("annotation-") && this._myMarkers.markers[id]?.config?.data?.selected);
 		
@@ -1063,12 +1065,14 @@ export default class Photo extends PSViewer {
 				});
 			});
 
-			/**
-			 * Event for pictures annotation unfocus
-			 * @event Panoramax.components.ui.Photo#annotations-unfocused
-			 * @type {Event}
-			 */
-			this.dispatchEvent(new Event("annotations-unfocused"));
+			if(!skipEvent) {
+				/**
+				 * Event for pictures annotation unfocus
+				 * @event Panoramax.components.ui.Photo#annotations-unfocused
+				 * @type {Event}
+				 */
+				this.dispatchEvent(new Event("annotations-unfocused"));
+			}
 		}
 	}
 

package/src/translations/en.json

@@ -179,6 +179,7 @@
         "semantics_features_none": "No feature has been detected or annotated in this picture yet.",
         "semantics_features_default_title": "Feature #{nb}",
         "semantics_features_subtitle": "{nb} associated properties",
+        "semantics_annotation_tooltip": "Click to see details",
         "semantics_show_all_tags": "Show all tags",
         "semantics_hide_all_tags": "Hide all tags",
         "semantics_key": "Key",

package/src/translations/fr.json

@@ -179,6 +179,7 @@
         "semantics_features_none": "Aucun objet n'a été détecté ou annoté dans cette photo pour l'instant.",
         "semantics_features_default_title": "Objet #{nb}",
         "semantics_features_subtitle": "{nb} attributs associés",
+        "semantics_annotation_tooltip": "Cliquez pour voir les détails",
         "semantics_show_all_tags": "Voir tous les attributs",
         "semantics_hide_all_tags": "Masquer les attributs",
         "semantics_key": "Clé",

package/src/utils/URLHandler.js

@@ -150,7 +150,7 @@ export default class URLHandler extends EventTarget {
 		// If hash is compressed
 		if(keyvals.s) {
 			const shortVals = Object.fromEntries(
-				keyvals.s
+				decodeURIComponent(keyvals.s)
 					.split(";")
 					.map(kv => [kv[0], kv.substring(1)])
 			);

package/tests/utils/URLHandler.test.js

@@ -243,6 +243,48 @@ describe("currentURLParams", () => {
 		const uh = new URLHandler(v);
 		expect(uh.currentURLParams()).toStrictEqual({});
 	});
+
+	it("works with shortlinks", () => {
+		delete window.location;
+		window.location = { search: "?s=fp;s2;pa0270208-d79d-49a9-85c7-a352bb96962e;c282.09/9.34/30;m17/43.107492/5.868459;va;bs" };
+		const v = { addEventListener: jest.fn() };
+		const uh = new URLHandler(v);
+		expect(uh.currentURLParams()).toStrictEqual({
+			"focus": "pic",
+			"speed": 200,
+			"pic": "a0270208-d79d-49a9-85c7-a352bb96962e",
+			"xyz": "282.09/9.34/30",
+			"map": "17/43.107492/5.868459",
+			"theme": "age",
+			"background": "streets",
+			"camera": undefined,
+			"date_from": undefined,
+			"date_to": undefined,
+			"pic_score": undefined,
+			"users": undefined
+		});
+	});
+
+	it("works with shortlinks urlEncoded", () => {
+		delete window.location;
+		window.location = { search: "?s=fp%3Bs2%3Bpa0270208-d79d-49a9-85c7-a352bb96962e%3Bc282.09/9.34/30%3Bm17/43.107492/5.868459%3Bva%3Bbs" };
+		const v = { addEventListener: jest.fn() };
+		const uh = new URLHandler(v);
+		expect(uh.currentURLParams()).toStrictEqual({
+			"focus": "pic",
+			"speed": 200,
+			"pic": "a0270208-d79d-49a9-85c7-a352bb96962e",
+			"xyz": "282.09/9.34/30",
+			"map": "17/43.107492/5.868459",
+			"theme": "age",
+			"background": "streets",
+			"camera": undefined,
+			"date_from": undefined,
+			"date_to": undefined,
+			"pic_score": undefined,
+			"users": undefined
+		});
+	});
 });
 
 describe("currentMapString", () => {