update to 6.1 final, remove MKMapRectMake workaround; restore Objective-C MKAnnotation, as Swift version is mysteriously faulty
mild code improvement