@panoramax/web-viewer 3.1.0-develop-537ffe27 → 3.1.0-develop-6577bde8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panoramax/web-viewer",
-  "version": "3.1.0-develop-537ffe27",
+  "version": "3.1.0-develop-6577bde8",
   "description": "Panoramax web viewer for geolocated pictures",
   "main": "build/index.js",
   "author": "Panoramax team",
@@ -96,8 +96,8 @@
     "@photo-sphere-viewer/markers-plugin": "5.10.1",
     "@photo-sphere-viewer/virtual-tour-plugin": "5.10.1",
     "documentation": "^14.0.1",
-    "maplibre-gl": "^3.6.2",
-    "pmtiles": "^2.11.0"
+    "maplibre-gl": "^4.7.1",
+    "pmtiles": "^3.2.0"
   },
   "eslintConfig": {
     "env": {

package/src/components/Map.js

@@ -96,6 +96,13 @@ export default class Map extends maplibregl.Map {
 		// Parent selection
 		this._parent.addEventListener("select", this.reloadLayersStyles.bind(this));
 
+		// Timeout for initial loading
+		setTimeout(() => {
+			if(!this.loaded() && this._parent._loader.isVisible()) {
+				this._parent._loader.dismiss({}, this._parent._t.map.slow_loading, () => {});
+			}
+		}, 15000);
+
 		this.on("load", async () => {
 			await this.setVisibleUsers(this._parent._options.users);
 			this.reloadLayersStyles();
@@ -291,10 +298,10 @@ export default class Map extends maplibregl.Map {
 	filterUserLayersContent(dataType, filter) {
 		[...this._userLayers].forEach(l => {
 			this.setFilter(getUserLayerId(l, dataType), filter);
-			if(dataType === "sequences") {
+			if(dataType === "sequences" && this.getLayer(getUserLayerId(l, "sequences_plus"))) {
 				this.setFilter(getUserLayerId(l, "sequences_plus"), filter);
 			}
-			if(dataType === "pictures") {
+			if(dataType === "pictures" && this.getLayer(getUserLayerId(l, "pictures_symbols"))) {
 				this.setFilter(getUserLayerId(l, "pictures_symbols"), filter);
 			}
 		});
@@ -362,7 +369,7 @@ export default class Map extends maplibregl.Map {
 			Object.entries(style.sources).forEach(([sId, s]) => this.addSource(sId, s));
 			style.layers = style.layers || [];
 			const layers = style.layers.concat(getMissingLayerStyles(style.sources, style.layers));
-			layers.forEach(l => this.addLayer(l, firstLabelLayerId?.id));
+			layers.filter(l => Object.keys(l).length > 0).forEach(l => this.addLayer(l, firstLabelLayerId?.id));
 		}
 
 		// Map interaction events
@@ -609,7 +616,7 @@ export default class Map extends maplibregl.Map {
 				if(thumbUrl) {
 					let content = document.createElement("img");
 					content.classList.add("gvs-map-thumb");
-					content.alt = this._parent._t.thumbnail;
+					content.alt = this._parent._t.map.thumbnail;
 					let img = new Image();
 					img.src = thumbUrl;
 
@@ -634,7 +641,7 @@ export default class Map extends maplibregl.Map {
 					}
 				}
 				else {
-					this._picPopup.setHTML(`<i>${this._parent._t.no_thumbnail}</i>`);
+					this._picPopup.setHTML(`<i>${this._parent._t.map.no_thumbnail}</i>`);
 				}
 			}
 		};

package/src/translations/en.json

@@ -161,6 +161,7 @@
         "loading": "Loading…",
         "thumbnail": "Thumbnail of hovered picture",
         "no_thumbnail": "No thumbnail",
-        "not_public": "Not publicly visible"
+        "not_public": "Not publicly visible",
+        "slow_loading": "Map is slow to load and could appear broken"
     }
 }

package/src/translations/fr.json

@@ -161,6 +161,7 @@
         "loading": "Chargement…",
         "thumbnail": "Miniature de la photo survolée",
         "no_thumbnail": "Pas de miniature",
-        "not_public": "Masqué au public"
+        "not_public": "Masqué au public",
+        "slow_loading": "La carte est longue à charger et pourrait apparaître cassée"
     }
 }

package/src/utils/API.js

@@ -285,7 +285,9 @@ export default class API {
 	 * @returns {object} The fetch options
 	 */
 	_getFetchOptions() {
-		return Object.assign({}, this._fetchOpts);
+		return Object.assign({
+			signal: AbortSignal.timeout(15000)
+		}, this._fetchOpts);
 	}
 
 	/**
@@ -295,8 +297,10 @@ export default class API {
 	 * @returns {function} The RequestTransformFunction
 	 */
 	_getMapRequestTransform() {
+		const fetchOpts = this._getFetchOptions();
+		delete fetchOpts.signal;
 		// Only if tiles endpoint is enabled and fetch options set
-		if(Object.keys(this._getFetchOptions()).length > 0) {
+		if(Object.keys(fetchOpts).length > 0) {
 			return (url) => {
 				// As MapLibre will use this function for all its calls
 				// We must make sure fetch options are sent only for
@@ -304,7 +308,7 @@ export default class API {
 				if(url.startsWith(this._endpoint)) {
 					return {
 						url,
-						...this._getFetchOptions()
+						...fetchOpts
 					};
 				}
 			};

package/src/utils/Utils.js

@@ -338,7 +338,7 @@ export function apiFeatureToPSVNode(f, t, fastInternet=false, customLinkFilter=n
 	let panorama;
 
 	// Cropped panorama
-	if(Object.keys(croppedPanoData).length > 0) {
+	if(!tileUrl && Object.keys(croppedPanoData).length > 0) {
 		panorama = {
 			baseUrl: fastInternet ? hdUrl : baseUrl,
 			origBaseUrl: fastInternet ? hdUrl : baseUrl,

package/src/viewer/URLHash.js

@@ -57,11 +57,11 @@ export default class URLHash extends EventTarget {
 	}
 
 	/**
-	 * Get the hash string with current map/psv parameters
-	 * @return {string} The hash, starting with #
+	 * Compute next hash parts
+	 * @returns {object} Hash parameters
+	 * @private
 	 */
-	getHashString() {
-		let hash = "";
+	_getHashParts() {
 		let hashParts = {};
 
 		if(typeof this._viewer.psv.getTransitionDuration() == "number") {
@@ -103,8 +103,17 @@ export default class URLHash extends EventTarget {
 		else {
 			hashParts.map = "none";
 		}
+		return hashParts;
+	}
+
+	/**
+	 * Get the hash string with current map/psv parameters
+	 * @return {string} The hash, starting with #
+	 */
+	getHashString() {
+		let hash = "";
 
-		Object.entries(hashParts)
+		Object.entries(this._getHashParts())
 			.sort((a,b) => a[0].localeCompare(b[0]))
 			.forEach(entry => {
 				let [ hashName, value ] = entry;
@@ -144,6 +153,63 @@ export default class URLHash extends EventTarget {
 			.forEach(part => {
 				keyvals[part[0]] = part[1];
 			});
+		
+		// If hash is compressed
+		if(keyvals.s) {
+			const shortVals = Object.fromEntries(
+				keyvals.s
+					.split("|")
+					.map(kv => [kv[0], kv.substring(1)])
+			);
+
+			keyvals = {};
+
+			// Used letters: b c d e f k m n p s t u v
+			// Focus
+			if(shortVals.f === "m") { keyvals.focus = "map"; }
+			else if(shortVals.f === "p") { keyvals.focus = "pic"; }
+			else if(shortVals.f === "t") { keyvals.focus = "meta"; }
+
+			// Speed
+			if(shortVals.s !== "") { keyvals.speed = parseFloat(shortVals.s) * 100; }
+
+			// Nav
+			if(shortVals.n === "a") { keyvals.nav = "any"; }
+			else if(shortVals.n === "s") { keyvals.nav = "seq"; }
+			if(shortVals.n === "n") { keyvals.nav = "none"; }
+
+			// Pic
+			if(shortVals.p !== "") { keyvals.pic = shortVals.p; }
+
+			// XYZ
+			if(shortVals.c !== "") { keyvals.xyz = shortVals.c; }
+
+			// Map
+			if(shortVals.m !== "") { keyvals.map = shortVals.m; }
+
+			// Date
+			if(shortVals.d !== "") { keyvals.date_from = shortVals.d; }
+			if(shortVals.e !== "") { keyvals.date_to = shortVals.e; }
+
+			// Pic type
+			if(shortVals.t === "f") { keyvals.pic_type = "flat"; }
+			else if(shortVals.t === "e") { keyvals.pic_type = "equirectangular"; }
+
+			// Camera
+			if(shortVals.k !== "") { keyvals.camera = shortVals.k; }
+
+			// Theme
+			if(shortVals.v === "d") { keyvals.theme = "default"; }
+			else if(shortVals.v === "a") { keyvals.theme = "age"; }
+			else if(shortVals.v === "t") { keyvals.theme = "type"; }
+
+			// Background
+			if(shortVals.b === "s") { keyvals.background = "streets"; }
+			else if(shortVals.b === "a") { keyvals.background = "aerial"; }
+
+			// Users
+			if(shortVals.u !== "") { keyvals.users = shortVals.u; }
+		}
 
 		return keyvals;
 	}
@@ -189,7 +255,7 @@ export default class URLHash extends EventTarget {
 	 * @private
 	 */
 	_onHashChange() {
-		const vals = this._getCurrentHash();
+		let vals = this._getCurrentHash();
 
 		// Restore selected picture
 		if(vals.pic) {
@@ -245,6 +311,36 @@ export default class URLHash extends EventTarget {
 		}
 	}
 
+	/**
+	 * Get short link URL (hash replaced by Base64)
+	 * @returns {str} The short link URL
+	 */
+	getShortLink(baseUrl) {
+		const url = new URL(baseUrl);
+		const hashParts = this._getHashParts();
+		const shortVals = {
+			f: (hashParts.focus || "").substring(0, 1),
+			s: !isNaN(parseInt(hashParts.speed)) ? Math.floor(parseInt(hashParts.speed)/100) : undefined,
+			n: (hashParts.nav || "").substring(0, 1),
+			p: hashParts.pic,
+			c: hashParts.xyz,
+			m: hashParts.map,
+			d: hashParts.date_from,
+			e: hashParts.date_to,
+			t: (hashParts.pic_type || "").substring(0, 1),
+			k: hashParts.camera,
+			v: (hashParts.theme || "").substring(0, 1),
+			b: (hashParts.background || "").substring(0, 1),
+			u: hashParts.users,
+		};
+		const short = Object.entries(shortVals)
+			.filter(([,v]) => v != undefined && v != "")
+			.map(([k,v]) => `${k}${v}`)
+			.join("|");
+		url.hash = `s=${short}`;
+		return url;
+	}
+
 	/**
 	 * Extracts from hash parsed keys all map filters values
 	 * @param {*} vals Hash keys

package/src/viewer/Widgets.js

@@ -1172,7 +1172,7 @@ export default class Widgets {
 			const btnId = pnlShare.querySelector("#gvs-edit-id");
 			const btnRss = pnlShare.querySelector("#gvs-share-rss");
 
-			fUrl.setAttribute("data-copy", baseUrl);
+			fUrl.setAttribute("data-copy", this._viewer?._hash?.getShortLink(baseUrl) || baseUrl);
 			fIframe.innerText = `<iframe src="${iframeBaseUrl}" style="border: none; width: 500px; height: 300px"></iframe>`;
 
 			const meta = this._viewer.psv.getPictureMetadata();
@@ -1192,6 +1192,7 @@ export default class Widgets {
 		};
 		
 		updateLinks();
+		this._viewer.addEventListener("ready", updateLinks, { once: true });
 		this._viewer?._hash?.addEventListener("url-changed", updateLinks);
 
 		// Copy to clipboard on button click

package/tests/Editor.test.js

@@ -18,6 +18,7 @@ jest.mock("../src/components/Photo", () => class {
 });
 
 jest.mock("../src/components/Map", () => class {});
+global.AbortSignal = { timeout: jest.fn() };
 
 const API_URL = "http://localhost:5000/api/search";
 

package/tests/StandaloneMap.test.js

@@ -5,6 +5,7 @@ jest.mock("maplibre-gl", () => ({
 }));
 
 jest.mock("../src/components/Map", () => class {});
+global.AbortSignal = { timeout: jest.fn() };
 
 const API_URL = "http://localhost:5000/api/search";
 

package/tests/Viewer.test.js

@@ -19,6 +19,8 @@ jest.mock("maplibre-gl", () => ({
 	Map: class {},
 }));
 
+global.AbortSignal = { timeout: jest.fn() };
+
 const API_URL = "http://localhost:5000/api/search";
 
 

package/tests/components/CoreView.test.js

@@ -7,6 +7,7 @@ jest.mock("maplibre-gl", () => ({
 }));
 
 global.console = { info: jest.fn() };
+global.AbortSignal = { timeout: jest.fn() };
 
 describe("constructor", () => {
 	it("works with JS element", () => {

package/tests/components/Map.test.js

@@ -206,6 +206,7 @@ describe("filterUserLayersContent", () => {
 		const m = new Map(p, c);
 		m.getSource = () => true;
 		m.setPaintProperty = jest.fn();
+		m.getLayer = () => true;
 		m._fire("load");
 		m.setFilter = jest.fn();
 		m.filterUserLayersContent("pictures", [["test", "true"]]);

package/tests/utils/API.test.js

@@ -3,6 +3,7 @@ import API from "../../src/utils/API";
 jest.mock("maplibre-gl", () => ({
 	addProtocol: jest.fn(),
 }));
+global.AbortSignal = { timeout: jest.fn() };
 
 const ENDPOINT = "https://panoramax.ign.fr/api";
 const VALID_LANDING = {