@panoramax/web-viewer 5.3.0-develop-4143eb17 → 5.3.0-develop-921335ef

package/build/esm/components/core/Basic.js

@@ -9,7 +9,7 @@ import BasicStyles from "./Basic.css" with { type: "css" };
 document.adoptedStyleSheets.push(AtkinsonStyles);
 document.adoptedStyleSheets.push(BasicStyles);
 
-const __COMMIT_HASH__ = "4143eb1";
+const __COMMIT_HASH__ = "921335e";
 const __PACKAGE_VERSION__ = "5.3.0";
 const __PACKAGE_ISSUES_URL__ = "https://gitlab.com/panoramax/clients/web-viewer/-/work_items";
 

package/build/esm/components/ui/Map.js

@@ -471,7 +471,7 @@ export default class Map extends MapLibre {
 				if(f.properties.best_item) {
 					this._parent.select(null, f.properties.best_item);
 					this._parent._setFocus?.("pic");
-				} else {
+				} else if(this._parent.mapStyleComposer._getPanoramaxStyleVersion() !== 2) {
 					this.flyTo({ center: e.lngLat, zoom: TILES_PICTURES_ZOOM-6 });
 				}
 			});
@@ -487,17 +487,18 @@ export default class Map extends MapLibre {
 	 */
 	_attachPreviewToPictures(e, from) {
 		let f = e.features.pop();
+		const picId = f.properties.best_item_relevance ? f.properties.best_item : f.properties.id;
 		if(!f) {
 			this._picPinMarker?.remove?.();
 			return;
 		}
 		// eslint-disable-next-line eqeqeq
-		else if(!f || (f.properties.id || f.properties.best_item) == this._picPopup._picId) { return; }
+		else if(!f || picId == this._picPopup._picId) { return; }
 
 		clearTimeout(this._picPreviewTimer);
 		clearTimeout(this._picDropPreviewTimer);
-		this._picPopup._loading = f.properties.id;
-		this._picPopup._picId = f.properties.id;
+		this._picPopup._loading = picId;
+		this._picPopup._picId = picId;
 		delete this._picPopup._seqId;
 
 		if(!e.lngLat) { e.lngLat = this.getCenter(); }
@@ -513,7 +514,7 @@ export default class Map extends MapLibre {
 		if(from.includes("_pictures") && f.geometry.type === "Point") { // From picture hover
 			picPreview = f;
 		}
-		else if(from.includes("_grid") && f.geometry.type === "Polygon") { // From Grid v2 hover
+		else if(from.includes("_grid") && f.geometry.type === "Polygon" && f.properties.best_item) { // From Grid v2 hover
 			picPreview = {
 				type: "Feature",
 				geometry: { type: "Point", coordinates: f.geometry.coordinates[0][0] },
@@ -579,14 +580,14 @@ export default class Map extends MapLibre {
 		}
 
 		// Only show GIF loader if thumbnail is not in browser cache
-		if(!picPreview && !this._picThumbUrl[f.properties.id]) {
+		if(!picPreview && !this._picThumbUrl[picId]) {
 			this._picPopup.setDOMContent(getThumbGif(this._parent._t));
 		}
 
 		const displayThumb = thumbUrl => {
 			if(this._options.preview !== "thumb") { return; }
 
-			if(this._picPopup._loading === f.properties.id) {
+			if(this._picPopup._loading === picId) {
 				if(thumbUrl) {
 					let content = document.createElement("img");
 					content.classList.add("pnx-map-thumb");
@@ -595,7 +596,7 @@ export default class Map extends MapLibre {
 					img.src = thumbUrl;
 
 					img.addEventListener("load", () => {
-						if(this._picPopup._loading !== f.properties.id) { return; }
+						if(this._picPopup._loading !== picId) { return; }
 
 						if(f.properties.hidden) {
 							content.children[0].src = img.src;
@@ -623,17 +624,17 @@ export default class Map extends MapLibre {
 			}
 		};
 
-		if(this._picPopup._loading !== f.properties.id) { return; }
+		if(this._picPopup._loading !== picId) { return; }
 
 		// Hover on cached thumbnail
-		if(this._picThumbUrl[picPreview?.properties?.id || f.properties.id]) {
-			displayThumb(this._picThumbUrl[picPreview?.properties?.id || f.properties.id]);
+		if(this._picThumbUrl[picPreview?.properties?.id || picId]) {
+			displayThumb(this._picThumbUrl[picPreview?.properties?.id || picId]);
 		}
 		// Throttled call to API
 		else {
 			clearTimeout(this._picPreviewTimer);
 			this._picPreviewTimer = setTimeout(() => {
-				if(this._picPopup._loading !== f.properties.id) { return; }
+				if(this._picPopup._loading !== picId) { return; }
 				if(this._options.preview !== "thumb") { return; }
 				this._picPopup.setDOMContent(getThumbGif(this._parent._t));
 
@@ -652,7 +653,7 @@ export default class Map extends MapLibre {
 				}
 				// Hover on a sequence
 				else if(from.includes("_sequences")) {
-					this._getSequenceThumbURL(f.properties.id, thumbCoords).then(displayThumb);
+					this._getSequenceThumbURL(picId, thumbCoords).then(displayThumb);
 				}
 			}, 100);
 		}

package/build/esm/translations/br.json

@@ -20,10 +20,10 @@
             null,
             "📡 O pellgargañ an hizivadennoù"
         ],
-        "map_theme_age_4": "< 6 miz",
-        "map_theme_age_3": "< 1 bloaz",
-        "map_theme_age_2": "< 3 vloaz",
-        "map_theme_age_1": "> 3 vloaz",
+        "map_theme_age_4": "- 6 miz",
+        "map_theme_age_3": "½ - 1 bloaz",
+        "map_theme_age_2": "1 - 3 vloaz",
+        "map_theme_age_1": "+ 3 vloaz",
         "error_click": "Kenderc'hel",
         "id": "iD",
         "josm": "JOSM",
@@ -50,7 +50,7 @@
         "share_page": "Liamm ar foto",
         "share_image": "Skeudenn HD",
         "panoramax": "Panoramax",
-        "map_background": "Kartenn werc'h",
+        "map_background": "Drekleur",
         "map_background_streets": "Straedoù",
         "error": "Ur gudenn zo ganeomp…",
         "picture_360": "360°",
@@ -69,7 +69,8 @@
         "filter_locked": "Sil diweredekaet",
         "map_background_default": "Dre ziouer",
         "filter_source_local": "Ar servijer-mañ",
-        "filter_source_world": "Bed a-bezh"
+        "filter_source_world": "Bed a-bezh",
+        "map_theme_default_3": "Mat"
     },
     "map": {
         "more_panoramax": "Gouzout hiroc'h diwar-benn Panoramax",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panoramax/web-viewer",
-  "version": "5.3.0-develop-4143eb17",
+  "version": "5.3.0-develop-921335ef",
   "description": "Panoramax web viewer for geolocated pictures",
   "main": "./build/cjs/index.js",
   "module": "./build/esm/index.js",