@panoramax/web-viewer 3.2.3-develop-6e69906d → 3.2.3-develop-8b82a4e5

package/src/utils/picture.js

@@ -48,7 +48,7 @@ export function getExifFloat(val) {
  * @private
  */
 export function getGPSPrecision(picture) {
-	let quality = "❓";
+	let quality = null;
 	const gpsHPosError = picture?.properties?.["quality:horizontal_accuracy"] || getExifFloat(picture?.properties?.exif?.["Exif.GPSInfo.GPSHPositioningError"]);
 	const gpsDop = getExifFloat(picture?.properties?.exif?.["Exif.GPSInfo.GPSDOP"]);
 	
@@ -259,7 +259,6 @@ export function getNodeCaption(metadata, t) {
 				const better = pv.find(v => v.toLowerCase() != v);
 				caption.producer.push(better || deflt);
 			});
-			caption.producer = caption.producer.join(", ");
 		}
 	}
 

package/src/utils/widgets.js

@@ -13,49 +13,6 @@ export function fa(i, o) {
 	return icon(i, o).node[0];
 }
 
-/**
- * Table cell with a copy link
- * @private
- */
-export function createLinkCell(id, url, title, _t) {
-	const link = document.createElement("a");
-	link.href = url;
-	link.target = "_blank";
-	link.title = title;
-	link.textContent = id;
-
-	const buttonContainer = createWebComp("pnx-copy-button", {text: id, _t});
-	return [link, buttonContainer];
-}
-
-/**
- * Create a light table
- * @private 
- */
-export function createTable(className, rows) {
-	const table = document.createElement("table");
-	table.className = className;
-
-	rows.forEach(({ section, value, values, classes }) => {
-		const tr = document.createElement("tr");
-		const th = document.createElement("th");
-		th.scope = "row";
-		th.textContent = section;
-		tr.appendChild(th);
-
-		const td = document.createElement("td");
-		if(classes) { td.classList.add(...classes); }
-		if(values) { values.forEach(v => td.appendChild(v)); }
-		else if(value instanceof HTMLElement) { td.appendChild(value); }
-		else { td.innerHTML = value; }
-		tr.appendChild(td);
-
-		table.appendChild(tr);
-	});
-
-	return table;
-}
-
 /**
  * Create a web component with its initial properties
  * @private
@@ -90,4 +47,9 @@ export function listenForMenuClosure(me, callback) {
 	me._parent?.oncePSVReady?.().then(() => {
 		me._parent.psv.addEventListener("click", () => callback());
 	});
+
+	// Legend click
+	me._parent?.onceReady?.().then(() => {
+		me._parent.legend?.addEventListener("click", () => callback());
+	});
 }

package/tests/components/core/__snapshots__/PhotoViewer.test.js.snap

@@ -4,13 +4,14 @@ exports[`_initWidgets should handle widgets if width is not small 1`] = `
 [MockFunction] {
   "calls": Array [
     Array [
-      <pnx-widget-zoom
-        class="pnx-print-hidden"
-        slot="bottom-right"
+      <pnx-widget-player
+        class="pnx-only-psv pnx-print-hidden"
+        size="xl"
+        slot="top"
       />,
     ],
     Array [
-      <pnx-widget-share
+      <pnx-widget-zoom
         class="pnx-print-hidden"
         slot="bottom-right"
       />,
@@ -22,13 +23,6 @@ exports[`_initWidgets should handle widgets if width is not small 1`] = `
         slot="top-left"
       />,
     ],
-    Array [
-      <pnx-widget-player
-        class="pnx-only-psv pnx-print-hidden"
-        size="xl"
-        slot="top"
-      />,
-    ],
   ],
   "results": Array [
     Object {
@@ -43,10 +37,6 @@ exports[`_initWidgets should handle widgets if width is not small 1`] = `
       "type": "return",
       "value": undefined,
     },
-    Object {
-      "type": "return",
-      "value": undefined,
-    },
   ],
 }
 `;
@@ -54,19 +44,6 @@ exports[`_initWidgets should handle widgets if width is not small 1`] = `
 exports[`_initWidgets should handle widgets if width is small 1`] = `
 [MockFunction] {
   "calls": Array [
-    Array [
-      <pnx-widget-share
-        class="pnx-print-hidden"
-        slot="bottom-right"
-      />,
-    ],
-    Array [
-      <pnx-widget-legend
-        focus="pic"
-        picture="somePicture"
-        slot="top"
-      />,
-    ],
     Array [
       <pnx-widget-player
         class="pnx-only-psv pnx-print-hidden"
@@ -74,6 +51,13 @@ exports[`_initWidgets should handle widgets if width is small 1`] = `
         slot="top"
       />,
     ],
+    Array [
+      <pnx-bottom-drawer
+        slot="bottom"
+      >
+        <pnx-picture-legend />
+      </pnx-bottom-drawer>,
+    ],
   ],
   "results": Array [
     Object {
@@ -84,10 +68,6 @@ exports[`_initWidgets should handle widgets if width is small 1`] = `
       "type": "return",
       "value": undefined,
     },
-    Object {
-      "type": "return",
-      "value": undefined,
-    },
   ],
 }
 `;

package/tests/components/core/__snapshots__/Viewer.test.js.snap

@@ -9,12 +9,6 @@ exports[`_initWidgets should handle widgets if width is not small 1`] = `
         slot="bottom-right"
       />,
     ],
-    Array [
-      <pnx-widget-share
-        class="pnx-print-hidden"
-        slot="bottom-right"
-      />,
-    ],
     Array [
       <pnx-widget-legend
         focus="pic"
@@ -74,10 +68,6 @@ exports[`_initWidgets should handle widgets if width is not small 1`] = `
       "type": "return",
       "value": undefined,
     },
-    Object {
-      "type": "return",
-      "value": undefined,
-    },
   ],
 }
 `;
@@ -92,17 +82,11 @@ exports[`_initWidgets should handle widgets if width is small 1`] = `
       />,
     ],
     Array [
-      <pnx-widget-share
-        class="pnx-print-hidden"
-        slot="bottom-right"
-      />,
-    ],
-    Array [
-      <pnx-widget-legend
-        focus="pic"
-        picture="somePicture"
-        slot="top"
-      />,
+      <pnx-bottom-drawer
+        slot="bottom"
+      >
+        <pnx-picture-legend />
+      </pnx-bottom-drawer>,
     ],
     Array [
       <pnx-widget-player
@@ -156,10 +140,6 @@ exports[`_initWidgets should handle widgets if width is small 1`] = `
       "type": "return",
       "value": undefined,
     },
-    Object {
-      "type": "return",
-      "value": undefined,
-    },
   ],
 }
 `;

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

@@ -7,7 +7,9 @@ Object {
       "toLocaleDateString": [Function],
     },
     "license": "proprietary",
-    "producer": "User",
+    "producer": Array [
+      "User",
+    ],
   },
   "gps": Array [
     2.1822941,
@@ -117,7 +119,9 @@ Object {
       "toLocaleDateString": [Function],
     },
     "license": "proprietary",
-    "producer": "User",
+    "producer": Array [
+      "User",
+    ],
   },
   "gps": Array [
     2.1822941,

package/tests/utils/InitParameters.test.js

@@ -442,7 +442,6 @@ describe("alterViewerState", () => {
 			select: jest.fn(),
 			setPopup: jest.fn(),
 			_setFocus: jest.fn(),
-			_showPictureMetadata: jest.fn(),
 			mini: {},
 		};
 	});
@@ -462,14 +461,13 @@ describe("alterViewerState", () => {
 		expect(viewer.select).toHaveBeenCalledWith();
 	});
 
-	it("should show picture metadata when focus is meta and picture is loaded", () => {
-		const params = { picture: "pic1", focus: "meta" };
-		alterViewerState(viewer, params);
-		expect(viewer.psv.addEventListener).toHaveBeenCalledWith("picture-loaded", expect.any(Function), { once: true });
-		const listener = viewer.psv.addEventListener.mock.calls[0][1];
-		listener();
-		expect(viewer._showPictureMetadata).toHaveBeenCalled();
-	});
+	// it("should show picture metadata when focus is meta and picture is loaded", () => {
+	// 	const params = { picture: "pic1", focus: "meta" };
+	// 	alterViewerState(viewer, params);
+	// 	expect(viewer.psv.addEventListener).toHaveBeenCalledWith("picture-loaded", expect.any(Function), { once: true });
+	// 	const listener = viewer.psv.addEventListener.mock.calls[0][1];
+	// 	listener();
+	// });
 
 	it("should set focus to map when focus param is map and map exists", () => {
 		const params = { focus: "map", forceFocus: true };

package/tests/utils/__snapshots__/picture.test.js.snap

@@ -5,7 +5,9 @@ Object {
   "caption": Object {
     "date": mockConstructor {},
     "license": "<a href=\\"https://spdx.org/licenses/CC-BY-SA-4.0.html\\" title=\\"\\" target=\\"_blank\\">CC-BY-SA-4.0</a>",
-    "producer": "Hopen111",
+    "producer": Array [
+      "Hopen111",
+    ],
   },
   "gps": Array [
     -92.70188245,
@@ -263,7 +265,10 @@ Object {
   "date": Object {
     "toLocaleDateString": [Function],
   },
-  "producer": "GeoVisio Corp., PanierAvide",
+  "producer": Array [
+    "GeoVisio Corp.",
+    "PanierAvide",
+  ],
 }
 `;
 
@@ -272,7 +277,9 @@ Object {
   "date": Object {
     "toLocaleDateString": [Function],
   },
-  "producer": "PanierAvide",
+  "producer": Array [
+    "PanierAvide",
+  ],
 }
 `;
 
@@ -294,7 +301,9 @@ Object {
 
 exports[`getNodeCaption works with producer 1`] = `
 Object {
-  "producer": "PanierAvide",
+  "producer": Array [
+    "PanierAvide",
+  ],
 }
 `;
 

package/tests/utils/picture.test.js

@@ -19,7 +19,7 @@ describe("getExifFloat", () => {
 
 describe("getGPSPrecision", () => {
 	it.each([
-		[undefined, "❓"],
+		[undefined, null],
 		[0.4, "0.4 m"],
 		[0.9, "0.9 m"],
 		[2.9, "2.9 m"],
@@ -34,7 +34,7 @@ describe("getGPSPrecision", () => {
 	});
 
 	it.each([
-		[undefined, "❓"],
+		[undefined, null],
 		[0.9, "ideal"],
 		[1.9, "excellent"],
 		[4.9, "good"],

package/tests/utils/widgets.test.js

@@ -8,65 +8,6 @@ describe("fa", () => {
 	});
 });
 
-describe("createLinkCell", () => {
-	it("works", () => {
-		const id = "123";
-		const url = "https://example.com/";
-		const title = "Example Title";
-		const _t = {pnx: {}};
-
-		const [link, buttonContainer] = widgets.createLinkCell(id, url, title, _t);
-
-		expect(link).toBeInstanceOf(HTMLAnchorElement);
-		expect(link.href).toBe(url);
-		expect(link.target).toBe("_blank");
-		expect(link.title).toBe(title);
-		expect(link.textContent).toBe(id);
-
-		expect(buttonContainer).toBeInstanceOf(HTMLElement);
-		expect(buttonContainer.tagName.toLowerCase()).toBe("pnx-copy-button");
-		expect(buttonContainer.getAttribute("text")).toBe(id);
-		expect(buttonContainer._t).toBe(_t);
-	});
-});
-
-describe("createTable", () => {
-	it("works", () => {
-		const className = "test-table";
-		const rows = [
-			{ section: "Nom", value: "Alice" },
-			{ section: "Âge", value: 30 },
-			{ section: "Adresse", values: [document.createElement("span")] },
-		];
-
-		const table = widgets.createTable(className, rows);
-
-		expect(table).toBeInstanceOf(HTMLTableElement);
-		expect(table.className).toBe(className);
-		expect(table.rows.length).toBe(rows.length);
-
-		rows.forEach((row, index) => {
-			const tr = table.rows[index];
-			const th = tr.cells[0];
-			const td = tr.cells[1];
-
-			expect(th).toBeInstanceOf(HTMLTableCellElement);
-			expect(th.textContent).toBe(row.section);
-			expect(th.scope).toBe("row");
-			expect(td).toBeInstanceOf(HTMLTableCellElement);
-
-			if (row.values) {
-				expect(td.children.length).toBe(row.values.length);
-			} else if (row.value instanceof HTMLElement) {
-				expect(td.children.length).toBe(1);
-				expect(td.firstChild).toBe(row.value);
-			} else {
-				expect(td.innerHTML).toBe(String(row.value));
-			}
-		});
-	});
-});
-
 describe("createWebComp", () => {
 	it("works", () => {
 		const tag = "custom-element";

package/docs/reference/components/ui/widgets/Share.md

@@ -1,15 +0,0 @@
-<a name="Panoramax.components.ui.widgets.Share"></a>
-
-## Panoramax.components.ui.widgets.Share ⇐ <code>[lit.LitElement](https://lit.dev/docs/api/LitElement/)</code>
-**Kind**: static class of <code>Panoramax.components.ui.widgets</code>  
-**Extends**: <code>[lit.LitElement](https://lit.dev/docs/api/LitElement/)</code>  
-**Element**: pnx-widget-share  
-<a name="new_Panoramax.components.ui.widgets.Share_new"></a>
-
-### new Share()
-Share button handles showing/hiding share menu.
-
-**Example**  
-```html
-<pnx-widget-share _parent=${viewer} />
-```

package/src/components/ui/widgets/Share.js

@@ -1,30 +0,0 @@
-import { LitElement, html } from "lit";
-import { fa } from "../../../utils/widgets";
-import { faShareNodes } from "@fortawesome/free-solid-svg-icons/faShareNodes";
-
-/**
- * Share button handles showing/hiding share menu.
- * @class Panoramax.components.ui.widgets.Share
- * @element pnx-widget-share
- * @extends [lit.LitElement](https://lit.dev/docs/api/LitElement/)
- * @example
- * ```html
- * <pnx-widget-share _parent=${viewer} />
- * ```
- */
-export default class Share extends LitElement {
-	/** @private */
-	render() {
-		return html`<pnx-togglable-group ._parent=${this._parent}>
-			<pnx-button
-				slot="button"
-				kind="flat"
-				size="xxl"
-				title=${this._parent?._t.pnx.share}
-			>${fa(faShareNodes)}</pnx-button>
-			<pnx-share-menu ._parent=${this._parent}></pnx-share-menu>
-		</pnx-togglable-group>`;
-	}
-}
-
-customElements.define("pnx-widget-share", Share);