Merge pull request #5 from v-ken/master

Ability to pick searched location without results
zhuorantan · May 8, 2016 · e94b4b6 · e94b4b6
2 parents 16b133e + 3ed0afc
commit e94b4b6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/LocationPicker/LocationItem.swift b/LocationPicker/LocationItem.swift
@@ -94,7 +94,11 @@ public class LocationItem: NSObject, NSCoding {
 
     public override var hashValue: Int {
         get {
-            return "\(coordinate.latitude), \(coordinate.longitude)".hashValue
+            if CLLocationCoordinate2DIsValid(coordinateObjectFromTuple(coordinate)) {
+                return "\(coordinate.latitude), \(coordinate.longitude)".hashValue
+            } else {
+                return mapItem.name?.hashValue ?? "".hashValue
+            }
         }
     }
 

diff --git a/LocationPicker/LocationPicker.swift b/LocationPicker/LocationPicker.swift
@@ -756,9 +756,16 @@ public class LocationPicker: UIViewController, UISearchBarDelegate, UITableViewD
                 localSearchRequest.region = MKCoordinateRegionMakeWithDistance(currentCoordinate, searchDistance, searchDistance)
             }
             MKLocalSearch(request: localSearchRequest).startWithCompletionHandler({ (localSearchResponse, error) -> Void in
-                guard error == nil else { return }
-                guard let localSearchResponse = localSearchResponse else { return }
-                guard localSearchResponse.mapItems.count > 0 else { return }
+                guard error == nil,
+                    let localSearchResponse = localSearchResponse where localSearchResponse.mapItems.count > 0 else {
+                    // Create map item with name and invalid placemark coordinate (since placemark is not optional in MKMapItem)
+                    let placemark = MKPlacemark(coordinate: kCLLocationCoordinate2DInvalid, addressDictionary: nil)
+                    let mapItem = MKMapItem(placemark: placemark)
+                    mapItem.name = searchText
+                    self.searchResultLocations = [LocationItem(mapItem: mapItem)]
+                    self.tableView.reloadData()
+                    return
+                }
 
                 self.searchResultLocations = localSearchResponse.mapItems.map({ LocationItem(mapItem: $0) })
                 self.tableView.reloadData()
@@ -942,7 +949,11 @@ public class LocationPicker: UIViewController, UISearchBarDelegate, UITableViewD
         selectedLocationItem = locationItem
         searchBar.text = locationItem.name
         let coordinate = coordinateObjectFromTuple(locationItem.coordinate)
-        showMapViewWithCenterCoordinate(coordinate, WithDistance: longitudinalDistance)
+        if CLLocationCoordinate2DIsValid(coordinate) {
+            showMapViewWithCenterCoordinate(coordinate, WithDistance: longitudinalDistance)
+        } else {
+            closeMapView()
+        }
 
         doneButtonItem?.enabled = true
         locationDidSelect(locationItem)