@panoramax/web-viewer 3.2.3-develop-efc61aeb → 3.2.3-develop-78cd3228

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panoramax/web-viewer",
-  "version": "3.2.3-develop-efc61aeb",
+  "version": "3.2.3-develop-78cd3228",
   "description": "Panoramax web viewer for geolocated pictures",
   "main": "build/index.js",
   "author": "Panoramax team",

package/src/components/core/Basic.js

@@ -60,8 +60,8 @@ export default class Basic extends LitElement {
 		this.mapstyle = this.getAttribute("mapstyle") || DEFAULT_TILES;
 		this.lang = this.getAttribute("lang") || null;
 		this.endpoint = this.getAttribute("endpoint") || null; // No default
-		this.picture = null;
-		this.sequence = null;
+		this.picture = this.getAttribute("picture") || null;
+		this.sequence = this.getAttribute("sequence") || null;
 
 		// Display version in logs
 		console.info(`📷 Panoramax ${this.getClassName()} - Version ${PACKAGE_JSON.version} (${__COMMIT_HASH__})

package/src/components/menus/PictureLegend.js

@@ -2,6 +2,7 @@ import { LitElement, html, nothing, css } from "lit";
 import { classMap } from "lit/directives/class-map.js";
 import { fa } from "../../utils/widgets";
 import { faArrowLeft } from "@fortawesome/free-solid-svg-icons/faArrowLeft";
+import { faChevronUp } from "@fortawesome/free-solid-svg-icons/faChevronUp";
 import { faChevronDown } from "@fortawesome/free-solid-svg-icons/faChevronDown";
 import { faUser } from "@fortawesome/free-solid-svg-icons/faUser";
 import { faCalendarAlt } from "@fortawesome/free-solid-svg-icons/faCalendarAlt";
@@ -151,7 +152,7 @@ export default class PictureLegend extends LitElement {
 	_onPicChange(picMeta) {
 		clearTimeout(this._addrTimer1);
 		this._caption = picMeta?.caption;
-		this._expanded = !this.collapsable;
+		this._expanded = this._expanded && this.collapsable;
 		
 		if(picMeta) {
 			const coordsHash = `${picMeta.gps[0]}/${picMeta.gps[1]}`;
@@ -177,8 +178,7 @@ export default class PictureLegend extends LitElement {
 
 	/** @private */
 	_onBackClick() {
-		if(this._expanded && this.collapsable) { this._expanded = false; }
-		else { this._parent.select(); }
+		this._parent._setFocus?.("map");
 	}
 
 	/** @private */
@@ -190,12 +190,14 @@ export default class PictureLegend extends LitElement {
 
 		return html`
 			<div class="headline">
-				<pnx-button
-					kind="superinline"
-					@click=${this._onBackClick}
-				>
-					${fa(faArrowLeft)}
-				</pnx-button>
+				${this._parent._setFocus ? html`
+					<pnx-button
+						kind="superinline"
+						@click=${this._onBackClick}
+					>
+						${fa(faArrowLeft)}
+					</pnx-button>
+				` : nothing}
 
 				<div id="pic-legend-addr">
 					${this._addr?.length > 0 ? this._addr : html`<span class="pnx-placeholder-loading">&nbsp;</span>`}
@@ -236,14 +238,14 @@ export default class PictureLegend extends LitElement {
 				</slot>
 			</div>
 
+			<pnx-picture-metadata class=${shownExpanded} ._parent=${this._parent}></pnx-picture-metadata>
+
 			${this.collapsable ? html`<pnx-button
-				kind="full"
+				kind="inline"
+				size="sm"
 				id="pic-legend-expand"
-				class=${hiddenExpanded}
-				@click=${() => this._expanded = true}
-			>${fa(faChevronDown)}</pnx-button>` : nothing}
-
-			<pnx-picture-metadata class=${shownExpanded} ._parent=${this._parent}></pnx-picture-metadata>
+				@click=${() => this._expanded = !this._expanded}
+			>${this._expanded ? fa(faChevronUp) : fa(faChevronDown)}</pnx-button>` : nothing}
 		`;
 	}
 }

package/src/utils/InitParameters.js

@@ -358,7 +358,7 @@ export function alterPhotoViewerState(viewer, params) {
 			console.warn("Multiple picture IDs passed in URL, only first one kept");
 		}
 
-		viewer.select(null, picIds[0]);
+		viewer.select(null, picIds[0], true);
 	}
 	else {
 		viewer.select();

package/tests/utils/InitParameters.test.js

@@ -451,7 +451,7 @@ describe("alterViewerState", () => {
 	it("should select the first picture ID when picture param is provided", () => {
 		const params = { picture: "pic1;pic2" };
 		alterViewerState(viewer, params);
-		expect(viewer.select).toHaveBeenCalledWith(null, "pic1");
+		expect(viewer.select).toHaveBeenCalledWith(null, "pic1", true);
 		expect(console.warn).toHaveBeenCalledWith("Multiple picture IDs passed in URL, only first one kept");
 	});
 
@@ -492,7 +492,7 @@ describe("alterViewerState", () => {
 		const params = { picture: "pic1", focus: "map", forceFocus: true };
 		viewer.map = {};
 		alterViewerState(viewer, params);
-		expect(viewer.select).toHaveBeenCalledWith(null, "pic1");
+		expect(viewer.select).toHaveBeenCalledWith(null, "pic1", true);
 		expect(viewer.setPopup).toHaveBeenCalledWith(false);
 		expect(viewer._setFocus).toHaveBeenCalledWith("map", null, true);
 	});