made the properties optional so it won't throw an error if they are n…

…ot complete
LulububuSoftwareGmbH · Aug 23, 2024 · 7e4b2ad · 7e4b2ad
1 parent 111b6b3
commit 7e4b2ad
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 19 deletions.
diff --git a/ios/ExifModifier.swift b/ios/ExifModifier.swift
@@ -62,21 +62,25 @@ class ExifModifier: NSObject {
 
 
     @objc func saveImageWithProperties(_ base64ImageData: String, properties: NSDictionary, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-        let mappedProperties: NSDictionary = [
-            kCGImagePropertyExifDictionary as String: [
-                kCGImagePropertyExifUserComment as String: properties["UserComment"] as! String
-            ],
-            kCGImagePropertyGPSDictionary as String: [
-                kCGImagePropertyGPSLatitude as String: properties["GPSLatitude"] as! String,
-                kCGImagePropertyGPSLatitudeRef as String: properties["GPSLatitudeRef"] as! String,
-                kCGImagePropertyGPSLongitude as String: properties["GPSLongitude"] as! String,
-                kCGImagePropertyGPSLongitudeRef as String: properties["GPSLongitudeRef"] as! String,
-                kCGImagePropertyGPSAltitude as String: properties["GPSAltitude"] as! String,
-                kCGImagePropertyGPSAltitudeRef as String: properties["GPSAltitudeRef"] as! String,
-                kCGImagePropertyGPSTimeStamp as String: properties["GPSTimeStamp"] as! String,
-                kCGImagePropertyGPSDateStamp as String: properties["GPSDateStamp"] as! String,
-            ]
-        ]
+          let exifProperties: [String: Any] = [
+              kCGImagePropertyExifUserComment as String: properties["UserComment"]
+          ].compactMapValues { $0 }
+
+          let gpsProperties: [String: Any] = [
+              kCGImagePropertyGPSLatitude as String: properties["GPSLatitude"],
+              kCGImagePropertyGPSLatitudeRef as String: properties["GPSLatitudeRef"],
+              kCGImagePropertyGPSLongitude as String: properties["GPSLongitude"],
+              kCGImagePropertyGPSLongitudeRef as String: properties["GPSLongitudeRef"],
+              kCGImagePropertyGPSAltitude as String: properties["GPSAltitude"],
+              kCGImagePropertyGPSAltitudeRef as String: properties["GPSAltitudeRef"],
+              kCGImagePropertyGPSTimeStamp as String: properties["GPSTimeStamp"],
+              kCGImagePropertyGPSDateStamp as String: properties["GPSDateStamp"]
+          ].compactMapValues { $0 }
+
+          let mappedProperties: NSDictionary = [
+              kCGImagePropertyExifDictionary as String: exifProperties,
+              kCGImagePropertyGPSDictionary as String: gpsProperties
+          ]
 
         saveImageAndModifyProperties(base64ImageData, properties: mappedProperties, resolve: resolve, reject: reject)
     }

diff --git a/src/interfaces/ImageProperties.ts b/src/interfaces/ImageProperties.ts
@@ -11,12 +11,12 @@
 
 export interface ImageProperties {
   UserComment?: string;
-  GPSLatitude?: number;
+  GPSLatitude?: string;
   GPSLatitudeRef?: string;
-  GPSLongitude?: number;
+  GPSLongitude?: string;
   GPSLongitudeRef?: string;
-  GPSAltitude?: number;
+  GPSAltitude?: string;
   GPSAltitudeRef?: string;
   GPSTimeStamp?: string;
   GPSDateStamp?: string;
-}
+}