Merge pull request #22 from codeformiyazaki/issue/21

fix #21 初回起動時にも現在地にジャンプできるようにした

Author: yosei

iosapp/06-earthquake/MapViewController.swift

@@ -13,7 +13,7 @@ class TolietAnnotation : MKPointAnnotation {}
 class BuildingAnnotation : MKPointAnnotation {}
 class WebcamAnnotation : MKPointAnnotation {}
 
-class MapViewController: UIViewController,MKMapViewDelegate {
+class MapViewController: UIViewController, MKMapViewDelegate, CLLocationManagerDelegate {
     @IBOutlet weak var mapView: MKMapView!
     var buildings = [String]()
     var toilets = [String]()
@@ -29,8 +29,7 @@ class MapViewController: UIViewController,MKMapViewDelegate {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        lm.requestWhenInUseAuthorization()
-        lm.startUpdatingLocation()
+        lm.delegate = self
         buildings = loadCSV(name: "buildings_locations")
         toilets = loadCSV(name: "toilets_locations")
         webcams = loadCSV(name: "webcams_locations")
@@ -76,13 +75,6 @@ class MapViewController: UIViewController,MKMapViewDelegate {
         }
     }
 
-    override func viewDidAppear(_ animated: Bool) {
-        if needResetRegion {
-            resetRegion()
-            needResetRegion = false
-        }
-    }
-
     @IBAction func didTapCurrentButton(_ sender: Any) {
         resetRegion()
     }
@@ -173,6 +165,24 @@ class MapViewController: UIViewController,MKMapViewDelegate {
         }
     }
 
+    // 位置情報取得の許可状況が変わると呼ばれる
+    func locationManager(_ manager: CLLocationManager, didChangeAuthorization status: CLAuthorizationStatus) {
+        switch status {
+        case .authorizedWhenInUse:
+            lm.startUpdatingLocation()
+        default:
+            lm.requestWhenInUseAuthorization()
+        }
+    }
+
+    // 位置情報が変更するたびに呼ばれる
+    func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
+        if needResetRegion {
+            resetRegion()
+            needResetRegion = false
+        }
+    }
+
     private func loadCSV(name:String) -> [String]{
         let path = Bundle.main.path(forResource:name, ofType:"csv")!
         let csvString = try! String(contentsOfFile: path, encoding: String.Encoding.utf8)