exif view

iOSClient/Viewer/NCViewerImage/NCViewerImage.storyboard

@@ -114,16 +114,25 @@
                                             <mapView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" mapType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="Typ-A8-XIO">
                                                 <rect key="frame" x="0.0" y="30" width="384" height="140"/>
                                             </mapView>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oov-9f-Oeu">
+                                                <rect key="frame" x="0.0" y="170" width="384" height="29"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                <state key="normal" title="location"/>
+                                            </button>
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
+                                            <constraint firstItem="oov-9f-Oeu" firstAttribute="top" secondItem="Typ-A8-XIO" secondAttribute="bottom" id="7yi-XC-FQ1"/>
                                             <constraint firstItem="Typ-A8-XIO" firstAttribute="leading" secondItem="P8R-4f-zAl" secondAttribute="leading" id="Cbn-gO-P9h"/>
                                             <constraint firstItem="Typ-A8-XIO" firstAttribute="top" secondItem="P8R-4f-zAl" secondAttribute="top" constant="30" id="bjV-ga-4qI"/>
+                                            <constraint firstItem="oov-9f-Oeu" firstAttribute="leading" secondItem="P8R-4f-zAl" secondAttribute="leading" id="mvC-vW-cYi"/>
+                                            <constraint firstAttribute="trailing" secondItem="oov-9f-Oeu" secondAttribute="trailing" id="o8T-A0-GBE"/>
                                             <constraint firstAttribute="bottom" secondItem="Typ-A8-XIO" secondAttribute="bottom" constant="30" id="y8c-iL-fAs"/>
                                             <constraint firstAttribute="trailing" secondItem="Typ-A8-XIO" secondAttribute="trailing" id="yaK-cw-jqm"/>
                                             <constraint firstAttribute="height" constant="200" id="z82-KD-lOv"/>
                                         </constraints>
                                         <connections>
+                                            <outlet property="locationButton" destination="oov-9f-Oeu" id="cGg-Gb-m5S"/>
                                             <outlet property="mapView" destination="Typ-A8-XIO" id="XCg-a6-NUq"/>
                                         </connections>
                                     </view>

iOSClient/Viewer/NCViewerImage/NCViewerImageDetailView.swift

@@ -12,7 +12,11 @@ import MapKit
 class NCViewerImageDetailView: UIView {
     
     @IBOutlet weak var mapView: MKMapView!
+    @IBOutlet weak var locationButton: UIButton!
+
     var annotation = MKPointAnnotation()
+    var latitude: Double = 0
+    var longitude: Double = 0
     
     override func awakeFromNib() {
         super.awakeFromNib()
@@ -27,11 +31,19 @@ class NCViewerImageDetailView: UIView {
         
         if let localFile = NCManageDatabase.sharedInstance.getTableLocalFile(predicate: NSPredicate(format: "ocId == %@", metadata.ocId)) {
             
-            let latitude = Double(localFile.exifLatitude) ?? 0
-            let longitude = Double(localFile.exifLongitude) ?? 0
+            latitude = Double(localFile.exifLatitude) ?? 0
+            longitude = Double(localFile.exifLongitude) ?? 0
+            
+            if latitude > 0 && longitude > 0 {
             
-            annotation.coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
-            mapView.addAnnotation(annotation)
+                annotation.coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
+                mapView.addAnnotation(annotation)
+                mapView.setRegion(MKCoordinateRegion(center: annotation.coordinate, latitudinalMeters: 500, longitudinalMeters: 500), animated: false)
+                
+                if let location = NCManageDatabase.sharedInstance.getLocationFromGeoLatitude(localFile.exifLatitude, longitude: localFile.exifLongitude) {
+                    locationButton.setTitle(location, for: .normal)
+                }
+            }
         }
     }
 }

iOSClient/Viewer/NCViewerImage/NCViewerImageZoom.swift

@@ -165,7 +165,8 @@ class NCViewerImageZoom: UIViewController {
         case .changed:
             
             let dy = currentLocation.y - startPanLocation.y
-            
+            print(dy)
+
             imageViewTopConstraint.constant = tempImageViewTopConstraint + dy
             imageViewBottomConstraint.constant = tempImageViewBottomConstraint - dy
             
@@ -188,7 +189,6 @@ class NCViewerImageZoom: UIViewController {
                 openDetailView = false
             }
             
-            print(dy)
         default:
             break
         }