github/openhaystack
1
0
Fork 0
mirror of https://github.com/seemoo-lab/openhaystack.git synced 2026-08-19 11:36:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Map fits all accessories by default

Browse Source
This commit is contained in:
Milan Stute
2021-03-11 08:57:44 +01:00
parent c3a4610b87
commit 0c9997993d
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenHaystack/OpenHaystack/MapViewController.swift
+20 -12
View File
@@ -21,12 +21,7 @@ final class MapViewController: NSViewController, MKMapViewDelegate {
func zoom(on accessory: Accessory?) {
self.focusedAccessory = accessory
guard let location = accessory?.lastLocation else { return }
let span = MKCoordinateSpan(latitudeDelta: 0.005, longitudeDelta: 0.005)
let region = MKCoordinateRegion(center: location.coordinate, span: span)
DispatchQueue.main.async {
self.mapView.setRegion(region, animated: true)
}
self.zoomInOnSelection()
}
func addLastLocations(from accessories: [Accessory]) {
@@ -37,15 +32,28 @@ final class MapViewController: NSViewController, MKMapViewDelegate {
let annotation = AccessoryAnnotation(accessory: accessory)
self.mapView.addAnnotation(annotation)
}
self.zoomInOnSelection()
}
// Zoom to first location
if focusedAccessory == nil, let location = accessories.first(where: { $0.lastLocation != nil })?.lastLocation {
let span = MKCoordinateSpan(latitudeDelta: 0.005, longitudeDelta: 0.005)
let region = MKCoordinateRegion(center: location.coordinate, span: span)
DispatchQueue.main.async {
self.mapView.setRegion(region, animated: true)
func zoomInOnSelection() {
var annotations = [MKAnnotation]()
if focusedAccessory == nil {
// Show all locations
annotations = self.mapView.annotations
} else {
// Show focused accessory
let focusedAnnotation: MKAnnotation? = self.mapView.annotations.first(where: { annotation in
let accessoryAnnotation = annotation as! AccessoryAnnotation
return accessoryAnnotation.accessory == self.focusedAccessory
})
if let annotation = focusedAnnotation {
annotations = [annotation]
}
}
DispatchQueue.main.async {
self.mapView.showAnnotations(annotations, animated: true)
}
}
func changeMapType(_ mapType: MKMapType) {