@panoramax/web-viewer 4.3.1-develop-2767771b → 4.3.1-develop-2084d822

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panoramax/web-viewer",
-  "version": "4.3.1-develop-2767771b",
+  "version": "4.3.1-develop-2084d822",
   "description": "Panoramax web viewer for geolocated pictures",
   "main": "build/index.js",
   "author": "Panoramax team",

package/src/components/menus/SemanticsFilters.js

@@ -2,7 +2,7 @@ import { LitElement, html, css } from "lit";
 import { fa } from "../../utils/widgets";
 import { faInfoCircle } from "@fortawesome/free-solid-svg-icons/faInfoCircle";
 import { faDownload } from "@fortawesome/free-solid-svg-icons/faDownload";
-import { SEMANTICS_OVERLAY_ZOOM } from "../../utils/SemanticsMapProtocol";
+import { SEMANTICS_OVERLAY_MINZOOM } from "../../utils/SemanticsMapProtocol";
 import { onceParentAvailable } from "../../utils/widgets";
 
 /**
@@ -104,7 +104,7 @@ export default class SemanticsFilters extends LitElement {
 	 * @private
 	 */
 	_onMapZoom() {
-		this._showZoomIn = this._parent.map.getZoom() < SEMANTICS_OVERLAY_ZOOM;
+		this._showZoomIn = this._parent.map.getZoom() < SEMANTICS_OVERLAY_MINZOOM;
 	}
 	
 	/** @private */

package/src/components/ui/Map.js

@@ -495,17 +495,31 @@ export default class Map extends maplibregl.Map {
 		});
 	}
 
+	/**
+	 * Get the ID of the first Panoramax sequence/picture layer.
+	 * Useful for addLayer's beforeId parameter.
+	 * @returns {string} First Panoramax sequence layer ID
+	 */
+	getFirstPictureLayerID() {
+		return this.getLayersOrder().find(l => l.startsWith("geovisio_") || l.endsWith("_sequences"));
+	}
+
 	/**
 	 * Adds a new map layer.
 	 * This is an override of MapLibre's addLayer function in order to make sure all layers without beforeId are put between map background and Panoramax data.
 	 */
-	addLayer(layer, beforeId) {
-		// If no beforeId defined, make sure to put this behind Panoramax own layers
-		beforeId = beforeId || (
-			this._options.raster ?
-				RASTER_LAYER_ID :
-				this.getLayersOrder().find(l => l.startsWith("geovisio_") || l.endsWith("_sequences"))
-		);
+	addLayer(layer, beforeId, beforeSequences = true) {
+		// Override beforeId to insert either before or after Panoramax own layers
+		if(!beforeId && beforeSequences) {
+			// Do not change for own Panoramax layers or semantics layers
+			if(
+				!layer.id.startsWith("geovisio_")
+				&& layer.id !== RASTER_LAYER_ID
+				&& !layer.source.startsWith("sem-")
+			) {
+				beforeId = this.getFirstPictureLayerID();
+			}
+		}
 
 		super.addLayer(layer, beforeId);
 	}

package/src/components/ui/MapMore.js

@@ -5,7 +5,7 @@ import {
 	mapFiltersToLayersFilters, MAP_EXPR_QUALITYSCORE_GPS
 } from "../../utils/map";
 import { SEMANTICS_OVERLAYS } from "../../utils/semantics";
-import { SEMANTICS_OVERLAY_ZOOM } from "../../utils/SemanticsMapProtocol";
+import { SEMANTICS_OVERLAY_MINZOOM, SEMANTICS_OVERLAY_MAXZOOM } from "../../utils/SemanticsMapProtocol";
 import { getUserAccount } from "../../utils/utils";
 
 export const MAP_FILTERS = [ "minDate", "maxDate", "pic_type", "camera", "theme", "qualityscore", "gps"];
@@ -358,8 +358,8 @@ export default class MapMore extends Map {
 		this.addSource(srcId, {
 			type: "vector",
 			tiles: [`sem:///${apiFilter}/{z}/{x}/{y}`],
-			minzoom: SEMANTICS_OVERLAY_ZOOM,
-			maxzoom: SEMANTICS_OVERLAY_ZOOM
+			minzoom: SEMANTICS_OVERLAY_MINZOOM,
+			maxzoom: SEMANTICS_OVERLAY_MAXZOOM
 		});
 		this.addLayer({
 			id,

package/src/components/ui/Photo.js

@@ -104,7 +104,7 @@ export default class Photo extends PSViewer {
 				showErrorTile: false,
 				baseBlur: false,
 				resolution: parent.isWidthSmall() ? 32 : 64,
-				shouldGoFast: options.shouldGoFast,
+				shouldGoFast: options?.shouldGoFast || (() => false),
 				useXmpData: false,
 			}],
 			withCredentials: parent.api._getPSVWithCredentials(),

package/src/utils/SemanticsMapProtocol.js

@@ -1,7 +1,9 @@
 import geojsonvt from "geojson-vt";
 import { fromGeojsonVt } from "@maplibre/vt-pbf";
 
-export const SEMANTICS_OVERLAY_ZOOM = 15;
+export const SEMANTICS_OVERLAY_MINZOOM = 15;
+export const SEMANTICS_OVERLAY_MAXZOOM = 19;
+const LIMIT_PER_ZOOM = { 15: 100, 16: 300, 17: 500, 18: 800, 19: 1000 };
 
 /**
  * Semantics Map Protocol adds a new URI scheme "sem://" to MapLibre.
@@ -86,7 +88,7 @@ export default class SemanticsMapProtocol {
 		
 			// Download from API
 			const bbox = this._tileToBbox(parseInt(x), parseInt(y), parseInt(z));
-			const url = `${this.api._endpoint}/search?bbox=${bbox.join(",")}&limit=1000&filter=${encodeURIComponent(f)}`;
+			const url = `${this.api._endpoint}/search?bbox=${bbox.join(",")}&limit=${LIMIT_PER_ZOOM[parseInt(z)]}&sortby=id&filter=${encodeURIComponent(f)}`;
 			return fetch(url, { signal: abort.signal })
 				.then(res => res.json())
 				.then(geojson => {
@@ -110,7 +112,7 @@ export default class SemanticsMapProtocol {
 					}
 
 					// Transform GeoJSON into MVT
-					const tileIndex = geojsonvt(geojson, {maxZoom: SEMANTICS_OVERLAY_ZOOM});
+					const tileIndex = geojsonvt(geojson, {minZoom: SEMANTICS_OVERLAY_MINZOOM, maxZoom: SEMANTICS_OVERLAY_MAXZOOM});
 					const tile = tileIndex.getTile(z, x, y);
 					if(!tile) { throw new Error("Can't create tile"); }
 					const mvt = fromGeojsonVt({ layer: tile }, { version: 2 });