diff --git a/src/components/ImageGallery.svelte b/src/components/ImageGallery.svelte index 599ff39..f2e3fec 100644 --- a/src/components/ImageGallery.svelte +++ b/src/components/ImageGallery.svelte @@ -145,12 +145,21 @@ console.log("Error loading", image); }); - let exif = null; + let exif = []; try { - let rawExif = image.getAttribute("data-exif"); - exif = JSON.parse(rawExif); - console.log(exif); + const rawExif = image.getAttribute("data-exif"); + const exifData = JSON.parse(rawExif); + if (exifData) { + exif = [ + "Model" in exifData ? exifData.Model : "", + "FocalLength" in exifData + ? exifData.FocalLength.replace(" mm", "mm") + : "", + "FNumber" in exifData ? exifData.FNumber : "", + "ExposureTime" in exifData ? exifData.ExposureTime : "", + ]; + } } catch (error) { // No biggie } @@ -229,22 +238,8 @@ {#if images[currentIndex].exif} {@const exif = images[currentIndex].exif} -
console.log(exif)}> - {#if "FocalLength" in exif} - {exif.FocalLength} | - {/if} - - {#if "FNumber" in exif} - f{exif.FNumber} | - {/if} - - {#if "ExposureTime" in exif} - {exif.ExposureTime.replace(" s", "s")} | - {/if} - - {#if "Date" in exif} - {exif.Date} - {/if} +
+ {exif.join(" | ")}
{/if} {/if} diff --git a/src/content/photos/peaks-of-the-balkans/images/MAX_9861.jpg b/src/content/photos/peaks-of-the-balkans/images/MAX_9861.jpg index 32f7c8f..cf8d51c 100644 --- a/src/content/photos/peaks-of-the-balkans/images/MAX_9861.jpg +++ b/src/content/photos/peaks-of-the-balkans/images/MAX_9861.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a139cab966620ff9bb742c1c9ccde82d3189b9553b45dc5ec295cff024e46de7 -size 9855599 +oid sha256:13675c8b985fffc12429daf3cbcb7c319fb0cbab5de082809b8b110a73134e0e +size 6033389 diff --git a/src/helpers/image.ts b/src/helpers/image.ts index d4cd669..7645377 100644 --- a/src/helpers/image.ts +++ b/src/helpers/image.ts @@ -34,6 +34,7 @@ export async function generateThumbHash(image: { width: number, height: number } const allowedExif = [ "ApertureValue", "DateTimeOriginal", + "ShutterSpeedValue", "ExposureTime", "ApertureValue", "FNumber", @@ -42,6 +43,8 @@ const allowedExif = [ "GPSLongitude", "GPSAltitude", "IsoSpeedRatings", + "Make", + "Model", ]; export async function getExifData(image: ImageMetadata) { @@ -56,7 +59,7 @@ export async function getExifData(image: ImageMetadata) { for (const key of allowedExif) { if (!tags[key]) continue; hasExif = true; - out[key] = tags[key].description; + out[key] = tags[key]?.description; } return hasExif ? out : undefined;