@panoramax/web-viewer 3.2.3-develop-db697921 → 3.2.3-develop-96e558a1

package/docs/05_Compatibility.md

@@ -29,8 +29,8 @@ Individual pictures should follow [STAC item specification](https://github.com/r
     - `collection`
     - `id`
     - `links`
-        - [`rel`](https://github.com/radiantearth/stac-spec/blob/master/item-spec/item-spec.md#link-object): `prev`, `next`, `related`
-        - `type`: `application/geo+json`
+        - [`rel`](https://github.com/radiantearth/stac-spec/blob/master/item-spec/item-spec.md#link-object): `prev`, `next`, `related`, `via`
+        - `type`: `application/geo+json` or `application/json`
         - `id`
         - `geometry`
         - `datetime`

package/package.json

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

package/src/components/menus/PictureMetadata.js

@@ -274,6 +274,12 @@ export default class PictureMetadata extends LitElement {
 						${fa(faImages)} ${this._parent?._t.pnx.metadata_general_seqid}
 					</pnx-copy-button>
 				`
+			},
+			this._meta?.origInstance && {
+				title: this._parent?._t.pnx.metadata_general_instance,
+				content: html`<strong><a href=${this._meta.origInstance.href+window.location.search} target="_blank">
+					${this._meta.origInstance.instance_name || this._meta.origInstance.href.replace(/^http.?:\/\//, "")}
+				</a></strong>`
 			}
 		];
 

package/src/translations/en.json

@@ -65,7 +65,10 @@
             "🏘️ 3D rendering",
             "📷 Initializing 360° pictures",
             "🟠 Colour balancing",
-            "💯 Computing Quality Score ©"
+            "💯 Computing Quality Score ©",
+            "📡 Downloading updates",
+            "🌍 Fetching map tiles",
+            "📸 Processing shadows"
         ],
         "loading_labels_fun": [
             "🦌 Detecting deer crossing signs",
@@ -85,7 +88,13 @@
             "👥 Writing personas",
             "🐟 Locating chip shops",
             "🧑‍💻 Debugging interface",
-            "📈 Incrementing statistics"
+            "📈 Incrementing statistics",
+            "🤖 Learning semantics",
+            "🎨 Interface redesign",
+            "📅 Planning photo-mapping-parties",
+            "🧀 Maturing cheddars",
+            "🌄 Calculating Cornish sunshine",
+            "🌊 Measuring the high tides"
         ],
         "error_psv": "Photo Sphere Viewer is not loading properly",
         "error_pic": "Requested picture wasn't found",
@@ -137,6 +146,7 @@
         "metadata_general_license": "License",
         "metadata_general_license_link": "See the full licence description",
         "metadata_general_date": "Capture date",
+        "metadata_general_instance": "Origin instance",
         "metadata_camera": "Camera",
         "metadata_camera_make": "Make",
         "metadata_camera_model": "Model",

package/src/translations/fr.json

@@ -65,7 +65,10 @@
             "🏘️ Création du rendu 3D",
             "📷 Initialisation des vues 360°",
             "🟠 Équilibrage des couleurs",
-            "💯 Calcul du score qualité ©"
+            "💯 Calcul du score qualité ©",
+            "📡 Téléchargement des mises à jour",
+            "🌍 Récupération des tuiles",
+            "📸 Traitement des ombres"
         ],
         "loading_labels_fun": [
             "🦌 Détection des panneaux biche",
@@ -85,7 +88,13 @@
             "👥 Écriture des personas",
             "🥞 Localisation des crêperies",
             "🧑‍💻 Déboguage de l'interface",
-            "📈 Incrémentation des statistiques"
+            "📈 Incrémentation des statistiques",
+            "🤖 Apprentissage de la sémantique",
+            "🎨 Redesign de l'interface",
+            "📅 Planification des photos-carto-parties",
+            "🧀 Affinage des fromages",
+            "🌄 Calcul de l'ensoleillement corse",
+            "🌊 Mesure des grandes marées"
         ],
         "error_psv": "Photo Sphere Viewer ne s'est pas chargé correctement",
         "error_pic": "La photo demandée est introuvable",
@@ -137,6 +146,7 @@
         "metadata_general_license": "Licence",
         "metadata_general_license_link": "Voir la description complète de la licence",
         "metadata_general_date": "Date de prise de vue",
+        "metadata_general_instance": "Instance d'origine",
         "metadata_camera": "Appareil",
         "metadata_camera_make": "Fabricant",
         "metadata_camera_model": "Modèle",

package/src/utils/picture.js

@@ -294,14 +294,15 @@ export function apiFeatureToPSVNode(f, t, fastInternet=false, customLinkFilter=n
 
 	const hdUrl = (Object.values(f.assets).find(a => a?.roles?.includes("data")) || {}).href;
 	const matrix = f?.properties?.["tiles:tile_matrix_sets"]?.geovisio;
-	const prev = f.links.find(l => l?.rel === "prev" && l?.type === "application/geo+json");
-	const next = f.links.find(l => l?.rel === "next" && l?.type === "application/geo+json");
+	const prev = f.links?.find?.(l => l?.rel === "prev" && l?.type === "application/geo+json");
+	const next = f.links?.find?.(l => l?.rel === "next" && l?.type === "application/geo+json");
 	const baseUrlWebp = Object.values(f.assets).find(a => a.roles?.includes("visual") && a.type === "image/webp");
 	const baseUrlJpeg = Object.values(f.assets).find(a => a.roles?.includes("visual") && a.type === "image/jpeg");
 	const baseUrl = (baseUrlWebp || baseUrlJpeg).href;
 	const thumbUrl = (Object.values(f.assets).find(a => a.roles?.includes("thumbnail") && a.type === "image/jpeg"))?.href;
 	const tileUrl = f?.asset_templates?.tiles_webp || f?.asset_templates?.tiles;
 	const croppedPanoData = getCroppedPanoData(f);
+	const origInstance = f.links?.find?.(l => l?.rel === "via" && l?.type === "application/json");
 
 	let panorama;
 
@@ -376,6 +377,7 @@ export function apiFeatureToPSVNode(f, t, fastInternet=false, customLinkFilter=n
 		},
 		sphereCorrection: getSphereCorrection(f),
 		horizontalFov,
+		origInstance,
 		properties: f.properties,
 	};
 	

package/tests/components/ui/__snapshots__/Photo.test.js.snap

@@ -59,6 +59,7 @@ Object {
       "nodeId": "127d9282-d082-46ca-bc09-4b0d8569dd2c",
     },
   ],
+  "origInstance": undefined,
   "panorama": Object {
     "basePanoData": [Function],
     "baseUrl": "https://geovisio.fr/api/pictures/0005086d-65eb-4a90-9764-86b3661aaa77/sd.webp",
@@ -171,6 +172,7 @@ Object {
       "nodeId": "127d9282-d082-46ca-bc09-4b0d8569dd2c",
     },
   ],
+  "origInstance": undefined,
   "panorama": Object {
     "basePanoData": [Function],
     "baseUrl": "https://geovisio.fr/api/pictures/0005086d-65eb-4a90-9764-86b3661aaa77/sd.webp",

package/tests/utils/__snapshots__/picture.test.js.snap

@@ -57,6 +57,7 @@ Object {
       "nodeId": "5fb8e767-6fe3-4bcb-b19f-7031d9a64fc8",
     },
   ],
+  "origInstance": undefined,
   "panorama": Object {
     "basePanoData": [Function],
     "baseUrl": "https://panoramax.openstreetmap.fr/api/pictures/00000000-76a0-4bec-b19e-a56f51ef997d/sd.jpg",