@panoramax/web-viewer 4.0.3 → 4.1.0

package/src/components/ui/Photo.js

@@ -94,7 +94,7 @@ export default class Photo extends PSViewer {
 				resolution: parent.isWidthSmall() ? 32 : 64,
 				shouldGoFast: options.shouldGoFast,
 			}],
-			withCredentials: parent?.fetchOptions?.credentials == "include",
+			withCredentials: parent.api._getPSVWithCredentials(),
 			requestHeaders: parent?.fetchOptions?.headers,
 			panorama: BASE_PANORAMA,
 			lang: parent._t.psv,
@@ -803,6 +803,7 @@ export default class Photo extends PSViewer {
 	 */
 	playSequence() {
 		this._sequencePlaying = true;
+		this.container.classList.add("pnx-psv-playing");
 
 		/**
 		 * Event for sequence starting to play
@@ -841,6 +842,7 @@ export default class Photo extends PSViewer {
 	 */
 	stopSequence() {
 		this._sequencePlaying = false;
+		this.container.classList.remove("pnx-psv-playing");
 
 		// Next picture timer is pending
 		if(this._playTimer) {
@@ -952,8 +954,8 @@ export default class Photo extends PSViewer {
 
 		if(!visible) { this._myMarkers.clearMarkers(); }
 		else {
-			let annotations = meta.properties.annotations;
-			if(annotations.length === 0) { console.warn("No annotation available on picture", meta.id); }
+			let annotations = meta.properties.annotations || [];
+			if(annotations?.length === 0) { console.warn("No annotation available on picture", meta.id); }
 
 			const picBData = this.state.textureData.panoData?.baseData;
 
@@ -990,6 +992,7 @@ export default class Photo extends PSViewer {
 					id: `annotation-${a.id}`,
 					polygon: shape,
 					data: { id: a.id },
+					className: "pnx-psv-annotation",
 					svgStyle: {
 						stroke: "var(--orange)",
 						strokeWidth: "3px",

package/src/components/ui/SemanticsEditor.js

@@ -0,0 +1,157 @@
+import { LitElement, html, css } from "lit";
+import Basic from "../core/Basic";
+import { parseSemanticsString, computeDiffTags } from "../../utils/semantics";
+import { textarea } from "../styles";
+import JSON5 from "json5";
+
+/**
+ * Semantics Editor offer an easy-to-use input for adding or editing semantics tags.
+ * 
+ * It manipulates list of `{key: "mypanokey", value: "myvalue"}` entries through `semantics` attribute.
+ * 
+ * @class Panoramax.components.ui.SemanticsEditor
+ * @element pnx-semantics-editor
+ * @extends [lit.LitElement](https://lit.dev/docs/api/LitElement/)
+ * @fires Panoramax.components.ui.SemanticsEditor#change
+ * @example
+ * ```html
+ * <!-- Basic example -->
+ * <pnx-semantics-editor
+ *    id="editor"
+ *    semantics=${mypic.semantics}
+ *    ._t=${viewer._t}
+ *    onchange=${e => console.log(e.detail.semantics)}
+ * />
+ * 
+ * <!-- You can access editor and check its validity through native web browser functions -->
+ * <script>
+ *    const editor = document.getElementById("editor");
+ *    console.log(editor.checkValidity()); // True if input is valid
+ * </script>
+ * 
+ * <!-- You can change specifically style of textarea -->
+ * <style>
+ *   pnx-semantics-editor::part(text) {
+ *      color: blue;
+ *   }
+ * </style>
+ * ```
+ */
+export default class SemanticsEditor extends LitElement {
+	static styles = [textarea, css`
+		textarea:invalid {
+			border: 2px solid var(--red);
+			background-color:var(--beige);
+		}
+	`];
+
+	/**
+	 * Component properties.
+	 * @memberof Panoramax.components.ui.SemanticsEditor#
+	 * @type {Object}
+	 * @property {object} [semantics] The `semantics` field of a picture or annotation feature. It is updated when field changes, but reflect the whole list of new tags (not delta needed by API). If you want delta, please use getDiff function.
+	 * @property {number} [rows=3] The amount of rows shown for textarea
+	 */
+	static properties = {
+		semantics: {converter: Basic.GetJSONConverter(), reflect: true},
+		rows: {type: Number},
+		_valid: {state: true},
+		_t: {converter: Basic.GetJSONConverter()},
+		_firstSemantics: {state: true},
+	};
+
+	constructor() {
+		super();
+		this.semantics = null;
+		this._valid = true;
+		this._firstSemantics = null;
+		this.rows = 3;
+	}
+
+	/** @private */
+	connectedCallback() {
+		super.connectedCallback();
+		this._firstSemantics = this.semantics === null ? [] : JSON5.parse(JSON5.stringify(this.semantics));
+	}
+
+	/**
+	 * Get current delta between initial tags and user changes.
+	 * @memberof Panoramax.components.ui.SemanticsEditor#
+	 * @returns {object[]} The list of tag changes (in API format)
+	 */
+	getDiff() {
+		return computeDiffTags(this._firstSemantics || [], this.semantics);
+	}
+
+	/**
+	 * Check if input is having a valid value.
+	 * @memberof Panoramax.components.ui.SemanticsEditor#
+	 * @returns {boolean} True if it's valid
+	 */
+	checkValidity() {
+		return this._valid;
+	}
+	
+	/** @private */
+	_onInput(e) {
+		const tarea = e.target;
+		try {
+			this.semantics = parseSemanticsString(tarea.value) || [];
+			this._valid = true;
+		} catch (err) {
+			if(err.message !== "Invalid tags") { console.error(err); }
+			this._valid = false;
+		}
+	}
+	
+	/** @private */
+	_onBlur(e) {
+		const prevValidity = e.target.checkValidity();
+
+		if(this._valid) {
+			e.target.setCustomValidity("");
+
+			/**
+			 * Event for value change.
+			 * 
+			 * Note that this event is launched only on valid input.
+			 *
+			 * @event Panoramax.components.ui.SemanticsEditor#change
+			 * @type {CustomEvent}
+			 * @property {object[]} detail.semantics The new tags list (in API semantics property format)
+			 * @property {object[]} detail.delta The delta between old and current tags (expected by API)
+			 */
+			this.dispatchEvent(new CustomEvent("change", {
+				detail: {
+					semantics: this.semantics || [],
+					delta: computeDiffTags(this._firstSemantics || [], this.semantics),
+				}
+			}));
+		}
+		else if(prevValidity) { // Do not call again if already shows up, to fix Chrome issue
+			e.target.setCustomValidity(this._t?.pnx.semantics_editor_error || "Invalid syntax");
+			e.target.reportValidity();
+		}
+	}
+	
+	/** @private */
+	render() {
+		/* eslint-disable indent */
+		return html`
+			<textarea
+				part="text"
+				autocomplete="off"
+				autocorrect="off"
+				autocapitalize="off"
+				spellcheck="false"
+				placeholder="key1=value1\nprefix|key2=value2"
+				@input=${this._onInput}
+  				@blur=${this._onBlur}
+				rows=${this.rows}
+				.value=${(this.semantics || []).map(s => `${s.key}=${s.value}`).join("\n")}
+			></textarea>
+		`;
+	}
+}
+
+customElements.define("pnx-semantics-editor", SemanticsEditor);

package/src/components/ui/index.js

@@ -7,7 +7,7 @@ export {default as ButtonGroup} from "./ButtonGroup";
 export {default as Button} from "./Button";
 export {default as CopyButton} from "./CopyButton";
 export {default as Grade} from "./Grade";
-export {default as HashTags} from "./HashTags";
+export {default as AnnotationsSwitch} from "./AnnotationsSwitch";
 export {default as LinkButton} from "./LinkButton";
 export {default as ListGroup} from "./ListGroup";
 export {default as ListItem} from "./ListItem";
@@ -19,6 +19,7 @@ export {default as Popup} from "./Popup";
 export {default as ProgressBar} from "./ProgressBar";
 export {default as QualityScore} from "./QualityScore";
 export {default as SearchBar} from "./SearchBar";
+export {default as SemanticsEditor} from "./SemanticsEditor";
 export {default as SemanticsTable} from "./SemanticsTable";
 export {default as TogglableGroup} from "./TogglableGroup";
 import * as widgets from "./widgets";

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

@@ -3,6 +3,7 @@ import maplibregl from "!maplibre-gl";
 
 import { LitElement, html } from "lit";
 import { forwardGeocodingBAN, forwardGeocodingStandard, forwardGeocodingNominatim } from "../../../utils/geocoder";
+import { onceParentAvailable } from "../../../utils/widgets";
 import "./GeoSearch.css";
 
 const GEOCODER_ENGINES = {
@@ -63,10 +64,10 @@ export default class GeoSearch extends LitElement {
 		super.connectedCallback();
 
 		this._geocoderEngine = GEOCODER_ENGINES[this.geocoder] || (config => GEOCODER_ENGINES.standard(config, this.geocoder));
-		this._parent?.onceMapReady?.().then(() => {
+		onceParentAvailable(this).then(() => this._parent?.onceMapReady?.().then(() => {
 			this._geolocate = this._geolocateCtrl.onAdd(this._parent.map);
 			this._geolocate.setAttribute("slot", "pre");
-		});
+		}));
 	}
 
 	/** @private */

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

@@ -1,9 +1,10 @@
-import {LitElement, html, css} from "lit";
+import { LitElement, html, css, nothing } from "lit";
 import { panel } from "../../styles";
 import { fa } from "../../../utils/widgets";
 import { faInfoCircle } from "@fortawesome/free-solid-svg-icons/faInfoCircle";
 import PanoramaxImg from "../../../img/panoramax.svg";
 import { classMap } from "lit/directives/class-map.js";
+import { PanoramaxWebsiteURL } from "../../../utils/services";
 
 /**
  * Legend widget, handling switch between map and photo components.
@@ -37,7 +38,7 @@ export default class Legend extends LitElement {
 		.pnx-panel[part="panel"] {
 			border-radius: 10px;
 			position: relative;
-			max-width: 80vw;
+			max-width: 450px;
 			z-index: 121; /* To appear above mini component */
 			min-width: unset;
 		}
@@ -46,7 +47,8 @@ export default class Legend extends LitElement {
 			width: 250px;
 		}
 		.presentation {
-			font-size: 0.9em;
+			font-size: 0.85em;
+			line-height: 1em;
 			display: flex;
 			gap: 5px;
 			align-items: center;
@@ -54,6 +56,40 @@ export default class Legend extends LitElement {
 		.logo {
 			width: 45px;
 		}
+		pnx-map-legend {
+			display: block;
+			margin-top: 5px;
+		}
+
+		/* Lighter/smaller version */
+		.pnx-panel[part="panel"].pnx-legend-light {
+			display: flex;
+			gap: 3px;
+			padding: 3px 8px 3px 3px;
+			width: unset;
+			min-width: unset;
+			align-items: center;
+			font-size: 10px;
+			margin-right: -10px;
+			margin-bottom: -10px;
+			border-radius: 0;
+			border-top-left-radius: 5px;
+			border-right: none;
+  			border-bottom: none;
+		}
+		.pnx-legend-light a,
+		.pnx-legend-light .presentation {
+			font-size: 10px;
+		}
+		.pnx-legend-light .logo {
+			width: 15px;
+		}
+
+		.pnx-legend-light pnx-map-legend {
+			width: max-content;
+			margin-top: unset;
+			font-size: 10px;
+		}
 	`];
 
 	/**
@@ -62,41 +98,59 @@ export default class Legend extends LitElement {
 	 * @type {Object}
 	 * @property {string} [focus] The focused main component (map, pic)
 	 * @property {string} [picture] The picture ID
+	 * @property {boolean} [light=false] Lighter version (for iframes)
 	 */
 	static properties = {
 		focus: {type: String},
 		picture: {type: String},
+		light: {type: Boolean},
 	};
 
+	constructor() {
+		super();
+		this.light = false;
+	}
+
 	render() {
 		const classes = {
 			"pnx-panel": true,
 			"pnx-padded": this.focus == "map",
+			"pnx-legend-light": this.light,
 		};
 
 		return html`<div class=${classMap(classes)} part="panel">
 			<div
 				class="presentation"
-				style=${this.focus != "map" && this.picture ? "display: none": ""}
+				style=${!this.light && this.focus != "map" && this.picture ? "display: none": ""}
 			>
 				<img class="logo" src=${PanoramaxImg} alt="" />
-				<div>
-					${this._parent?._t.pnx.whats_panoramax}
-					<pnx-link-button
+
+				${this.light ? html`
+					&copy; <a
+						href=${PanoramaxWebsiteURL()}
 						title=${this._parent?._t.map.more_panoramax}
-						kind="superinline"
-						href="https://panoramax.fr"
 						target="_blank"
-						size="sm"
-					>
-						${fa(faInfoCircle)}
-					</pnx-link-button>
-				</div>
+					>${this._parent?._t.pnx.panoramax}</a> |
+				` : html`
+					<div>
+						${this._parent?._t.pnx.whats_panoramax}
+						<pnx-link-button
+							title=${this._parent?._t.map.more_panoramax}
+							kind="superinline"
+							href=${PanoramaxWebsiteURL()}
+							target="_blank"
+							size="sm"
+						>
+							${fa(faInfoCircle)}
+						</pnx-link-button>
+					</div>
+				`}
 			</div>
 			<pnx-picture-legend
 				._parent=${this._parent}
 				style=${this.focus == "map" ? "display: none": ""}
 				collapsable
+				light=${this.light || nothing}
 			>
 				<slot slot="editors" name="editors">
 					<pnx-widget-osmeditors ._parent=${this._parent} />
@@ -105,6 +159,7 @@ export default class Legend extends LitElement {
 			<pnx-map-legend
 				._parent=${this._parent}
 				style=${this.focus != "map" ? "display: none": ""}
+				light=${this.light || nothing}
 			></pnx-map-legend>
 		</div>`;
 	}

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

@@ -1,5 +1,5 @@
 import { LitElement, html, nothing } from "lit";
-import { fa } from "../../../utils/widgets";
+import { fa, onceParentAvailable } from "../../../utils/widgets";
 import { faSliders } from "@fortawesome/free-solid-svg-icons/faSliders";
 import { faChevronDown } from "@fortawesome/free-solid-svg-icons/faChevronDown";
 import { faXmark } from "@fortawesome/free-solid-svg-icons/faXmark";
@@ -45,7 +45,7 @@ export default class MapFiltersButton extends LitElement {
 		super.connectedCallback();
 
 		// Listen to user visibility changes to switch the filter active icon
-		this._parent?.onceMapReady?.().then(() => {
+		onceParentAvailable(this).then(() => this._parent?.onceMapReady?.().then(() => {
 			this._active = (
 				Object.keys(this._parent.map._mapFilters).filter(d => d && d !== "theme").length > 0
 				|| this._parent.map.getVisibleUsers().filter(u => u !== "geovisio").length > 0
@@ -64,7 +64,7 @@ export default class MapFiltersButton extends LitElement {
 					|| e.usersIds.filter(u => u !== "geovisio").length > 0
 				);
 			});
-		});
+		}));
 	}
 
 	/** @private */

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

@@ -1,5 +1,5 @@
 import { LitElement, html, nothing } from "lit";
-import { fa } from "../../../utils/widgets";
+import { fa, onceParentAvailable } from "../../../utils/widgets";
 import { faLayerGroup } from "@fortawesome/free-solid-svg-icons/faLayerGroup";
 import { faChevronDown } from "@fortawesome/free-solid-svg-icons/faChevronDown";
 import { faXmark } from "@fortawesome/free-solid-svg-icons/faXmark";
@@ -35,12 +35,12 @@ export default class MapLayersButton extends LitElement {
 
 		const nullThemes = [undefined, null, "", "default"];
 
-		this._parent?.onceMapReady?.().then(() => {
+		onceParentAvailable(this).then(() => this._parent?.onceMapReady?.().then(() => {
 			this._active = !nullThemes.includes(this._parent.map._mapFilters.theme);
 			this._parent.map.on("filters-changed", e => {
 				this._active = !nullThemes.includes(e.theme);
 			});
-		});
+		}));
 	}
 
 	/** @private */

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

@@ -1,5 +1,5 @@
 import { LitElement, html, nothing, css } from "lit";
-import { fa } from "../../../utils/widgets";
+import { fa, onceParentAvailable } from "../../../utils/widgets";
 import { josmBboxParameters } from "../../../utils/utils";
 import { IdEditorURL } from "../../../utils/services";
 import { faLocationDot } from "@fortawesome/free-solid-svg-icons/faLocationDot";
@@ -40,7 +40,7 @@ export default class OSMEditors extends LitElement {
 	/** @private */
 	connectedCallback() {
 		super.connectedCallback();
-		this._parent?.onceReady().then(() => {
+		onceParentAvailable(this).then(() => this._parent.onceReady()).then(() => {
 			this._parent.onceFirstPicLoaded().then(this._onPictureLoad.bind(this));
 			this._parent.psv.addEventListener("picture-loaded", this._onPictureLoad.bind(this));
 		});

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

@@ -1,5 +1,5 @@
 import { LitElement, html, nothing, css } from "lit";
-import { fa } from "../../../utils/widgets";
+import { fa, onceParentAvailable } from "../../../utils/widgets";
 import { faEllipsisV } from "@fortawesome/free-solid-svg-icons/faEllipsisV";
 import { noprint } from "../../styles";
 
@@ -42,7 +42,7 @@ export default class PictureLegendActions extends LitElement {
 	connectedCallback() {
 		super.connectedCallback();
 
-		this._parent?.onceReady().then(() => {
+		onceParentAvailable(this).then(() => this._parent.onceReady()).then(() => {
 			this._meta = this._parent.psv.getPictureMetadata();
 			this._parent.psv.addEventListener("picture-loaded", () => {
 				this._meta = this._parent.psv.getPictureMetadata();
@@ -61,54 +61,36 @@ export default class PictureLegendActions extends LitElement {
 		this.renderRoot.querySelector("#pic-legend-headline-menu").close();
 	}
 
-	/** @private */
-	_onShareClick() {
-		this._closeGroup();
-		this._parent._showShareOptions();
-	}
-
-	/** @private */
-	_onReportClick() {
-		this._closeGroup();
-		this._parent._showReportForm();
-	}
-
 	/** @private */
 	render() {
 		return html`<pnx-togglable-group padded="false" id="pic-legend-headline-menu" ._parent=${this._parent}>
 			<pnx-button slot="button" kind="inline">${fa(faEllipsisV)}</pnx-button>
 			<pnx-list-group class="pnx-print-hidden" @click=${this._closeMenu}>
-				${this.full ? html`
+				${this._meta ? html`<pnx-copy-button ._t=${this._parent?._t} text=${this._meta.id} unstyled>
+					${this._parent?._t.pnx.metadata_general_copy_picid}
+				</pnx-copy-button>` : nothing}
+
+				<a
+					download
+					target="_blank"
+					href=${this._meta?.panorama?.hdUrl}
+					@click=${this._closeGroup}
+				>${this._parent?._t.pnx.share_image}</a>
+
+				${this._parent.isWidthSmall() ? nothing : html`<button @click=${this._onPrint}>
+					${this._parent?._t.pnx.share_print}
+				</button>`}
+
+				${this._parent?.api?.getRSSURL() && html`
 					<a
-						download
 						target="_blank"
-						href=${this._meta?.panorama?.hdUrl}
+						href=${this._parent?.api.getRSSURL(this._parent?.map?.getBounds?.())}
+						title=${this._parent?._t.pnx.share_rss_title}
 						@click=${this._closeGroup}
-					>${this._parent?._t.pnx.share_image}</a>
-					${this._parent.isWidthSmall() ? nothing : html`<button @click=${this._onPrint}>
-						${this._parent?._t.pnx.share_print}
-					</button>`}
-					${this._parent?.api?.getRSSURL() && html`
-						<a
-							target="_blank"
-							href=${this._parent?.api.getRSSURL(this._parent?.map?.getBounds?.())}
-							title=${this._parent?._t.pnx.share_rss_title}
-							@click=${this._closeGroup}
-						>
-							${this._parent?._t.pnx.share_rss}
-						</a>
-					`}
-				` : html`
-					<button @click=${this._onReportClick}>
-						${this._parent?._t.pnx.report}
-					</button>
-					<button @click=${this._onShareClick}>
-						${this._parent?._t.pnx.share}
-					</button>
-					${this._meta ? html`<pnx-copy-button ._t=${this._parent?._t} text=${this._meta.id} unstyled>
-						${this._parent?._t.pnx.metadata_general_copy_picid}
-					</pnx-copy-button>` : nothing}
-				` }
+					>
+						${this._parent?._t.pnx.share_rss}
+					</a>
+				`}
 			</pnx-list-group>
 		</pnx-togglable-group>`;
 	}

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

@@ -1,5 +1,5 @@
 import { LitElement, html, nothing } from "lit";
-import { fa } from "../../../utils/widgets";
+import { fa, onceParentAvailable } from "../../../utils/widgets";
 import { faBackward } from "@fortawesome/free-solid-svg-icons/faBackward";
 import { faPlay } from "@fortawesome/free-solid-svg-icons/faPlay";
 import { faPause } from "@fortawesome/free-solid-svg-icons/faPause";
@@ -52,13 +52,13 @@ export default class Player extends LitElement {
 	connectedCallback() {
 		super.connectedCallback();
 
-		this._parent?.oncePSVReady?.().then(() => {
+		onceParentAvailable(this).then(() => this._parent?.oncePSVReady?.().then(() => {
 			this._parent.psv.addEventListener("sequence-playing", () => this.playing = true);
 			this._parent.psv.addEventListener("sequence-stopped", () => this.playing = false);
 			this._parent.psv.addEventListener("picture-loaded", this._changeActiveStates.bind(this));
 			this._parent.addEventListener("pictures-navigation-changed", this._changeActiveStates.bind(this));
 			this._changeActiveStates();
-		});
+		}));
 	}
 
 	/** @private */

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

@@ -1,7 +1,7 @@
 import { LitElement, html } from "lit";
 import { PSV_DEFAULT_ZOOM, PSV_ANIM_DURATION } from "../Photo";
 import { PSV_ZOOM_DELTA } from "../../core/Viewer";
-import { fa } from "../../../utils/widgets";
+import { fa, onceParentAvailable } from "../../../utils/widgets";
 import { faPlus } from "@fortawesome/free-solid-svg-icons/faPlus";
 import { faMinus } from "@fortawesome/free-solid-svg-icons/faMinus";
 import "../ButtonGroup.css";
@@ -30,7 +30,9 @@ export default class Zoom extends LitElement {
 	/** @private */
 	connectedCallback() {
 		super.connectedCallback();
-		this._parent?.oncePSVReady?.().then(() => this._lastWantedZoom = this._parent?.psv?.getZoomLevel() || PSV_DEFAULT_ZOOM);
+		onceParentAvailable(this).then(() => this._parent?.oncePSVReady?.().then(() => {
+			this._lastWantedZoom = this._parent?.psv?.getZoomLevel() || PSV_DEFAULT_ZOOM;
+		}));
 	}
 
 	/** @private */

package/src/translations/ar.json

@@ -0,0 +1 @@
+{}

package/src/translations/da.json

@@ -187,7 +187,8 @@
         "metadata_general_copy_id": "Kopi-ID",
         "metadata_general_copy_picid": "Kopi billed-ID",
         "filter_date_6months": "6 måneder",
-        "picture_all": "Alle"
+        "picture_all": "Alle",
+        "panoramax": "Panoramax"
     },
     "psv": {
         "loadError": "Panoramaet kan ikke indlæses",
@@ -199,7 +200,7 @@
         "thumbnail": "Miniature af billedet, der holdes",
         "not_public": "Ikke offentligt synlig",
         "slow_loading": "Kortet indlæses langsomt og kan virke defekt",
-        "map_data": "Kortdata:",
+        "map_data": "Kortdata: {m}",
         "more_panoramax": "Få mere at vide om Panoramax"
     }
 }