detail photo

iOSClient/Networking/NCNetworking.swift

@@ -503,11 +503,6 @@ import Queuer
                         appDelegate.networkingAutoUpload.startProcess()
                     }
                 }
-                // EXIF
-                if metadata.typeFile == k_metadataTypeFile_image {
-                    let metadata = tableMetadata.init(value: metadata)
-                    CCExifGeo.sharedInstance()?.setExifLocalTable(metadata)
-                }
                 #endif                
                 
                 NCCommunicationCommon.shared.writeLog("Upload complete " + serverUrl + "/" + fileName + ", result: success(\(size) bytes)")

iOSClient/Utility/CCExifGeo.h

@@ -32,7 +32,7 @@
 
 + (CCExifGeo *)sharedInstance;
 
-- (void)setExifLocalTable:(tableMetadata *)metadata;
-- (void)setGeocoder:(NSString *)ocId exifDate:(NSDate *)exifDate latitude:(NSString*)latitude longitude:(NSString*)longitude;
+- (void)setExif:(tableMetadata *)metadata;
+//- (void)setGeocoder:(NSString *)ocId exifDate:(NSDate *)exifDate latitude:(NSString*)latitude longitude:(NSString*)longitude;
 
 @end

iOSClient/Utility/CCExifGeo.m

@@ -41,7 +41,7 @@
     }
 }
 
-- (void)setExifLocalTable:(tableMetadata *)metadata
+- (void)setExif:(tableMetadata *)metadata
 {
     NSString *dateTime;
     NSString *latitudeRef;
@@ -111,9 +111,12 @@
         }
     }
 
-    // Wite data EXIF in TableLocalFile
+    // Wite data EXIF in DB
     if (tiff || gps) {
         [[NCManageDatabase sharedInstance] setLocalFileWithOcId:metadata.ocId exifDate:date exifLatitude:stringLatitude exifLongitude:stringLongitude];
+        if ([stringLatitude doubleValue] != 0 || [stringLongitude doubleValue] != 0) {
+            [self setGeocoder:metadata.ocId exifDate:date latitude:stringLatitude longitude:stringLongitude];
+        }
     }
        
     CFRelease(originalSource);

iOSClient/Viewer/NCViewerImage/NCViewerImageDetailView.swift

@@ -12,6 +12,7 @@ import MapKit
 class NCViewerImageDetailView: UIView {
     
     @IBOutlet weak var mapView: MKMapView!
+    var annotation = MKPointAnnotation()
     
     override func awakeFromNib() {
         super.awakeFromNib()
@@ -21,8 +22,16 @@ class NCViewerImageDetailView: UIView {
     
     func updateExifLocal(metadata: tableMetadata) {
         if metadata.typeFile == k_metadataTypeFile_image {
-            let metadata = tableMetadata.init(value: metadata)
-            CCExifGeo.sharedInstance()?.setExifLocalTable(metadata)
+            CCExifGeo.sharedInstance()?.setExif(metadata)
+        }
+        
+        if let localFile = NCManageDatabase.sharedInstance.getTableLocalFile(predicate: NSPredicate(format: "ocId == %@", metadata.ocId)) {
+            
+            let latitude = Double(localFile.exifLatitude) ?? 0
+            let longitude = Double(localFile.exifLongitude) ?? 0
+            
+            annotation.coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
+            mapView.addAnnotation(annotation)
         }
     }
 }