From 920b4e6823b4a45fb920e95b4b2c6243cca12b45 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 7 Aug 2024 13:55:18 +0530
Subject: [PATCH] Unnull

---
 .../src/services/upload/uploadService.ts      | 21 ++++++++++++-------
 web/packages/media/file-metadata.ts           |  4 ++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/web/apps/photos/src/services/upload/uploadService.ts b/web/apps/photos/src/services/upload/uploadService.ts
index 787629aca3..4840db5834 100644
--- a/web/apps/photos/src/services/upload/uploadService.ts
+++ b/web/apps/photos/src/services/upload/uploadService.ts
@@ -3,7 +3,11 @@ import { basename } from "@/base/file";
 import log from "@/base/log";
 import { CustomErrorMessage } from "@/base/types/ipc";
 import { hasFileHash } from "@/media/file";
-import type { Metadata, ParsedMetadata, PublicMagicMetadata } from "@/media/file-metadata";
+import type {
+    Metadata,
+    ParsedMetadata,
+    PublicMagicMetadata,
+} from "@/media/file-metadata";
 import { FileType, type FileTypeInfo } from "@/media/file-type";
 import { encodeLivePhoto } from "@/media/live-photo";
 import { extractExif } from "@/new/photos/services/exif";
@@ -765,20 +769,23 @@ const extractImageOrVideoMetadata = async (
         tryParseEpochMicrosecondsFromFileName(fileName) ??
         modificationTime;
 
+    const { width: w, height: h, location } = parsedMetadata;
+
     const metadata: Metadata = {
         fileType,
         title: fileName,
         creationTime,
         modificationTime,
-        latitude: parsedMetadata.location.latitude,
-        longitude: parsedMetadata.location.longitude,
         hash,
     };
+    if (location) {
+        metadata.latitude = location.latitude;
+        metadata.longitude = location.longitude;
+    }
 
-    const publicMagicMetadata: PublicMagicMetadata = {
-        w: parsedMetadata.width,
-        h: parsedMetadata.height,
-    };
+    const publicMagicMetadata: PublicMagicMetadata = {};
+    if (w) publicMagicMetadata.w = w;
+    if (h) publicMagicMetadata.h = h;
 
     const takeoutMetadata = matchTakeoutMetadata(
         fileName,
diff --git a/web/packages/media/file-metadata.ts b/web/packages/media/file-metadata.ts
index 58149f070d..a58202819b 100644
--- a/web/packages/media/file-metadata.ts
+++ b/web/packages/media/file-metadata.ts
@@ -92,11 +92,11 @@ export interface Metadata {
     /**
      * The latitude where the file was taken.
      */
-    latitude: number;
+    latitude?: number;
     /**
      * The longitude where the file was taken.
      */
-    longitude: number;
+    longitude?: number;
     /**
      * A hash of the file's contents.
      *