Merge pull request #18 from dblock/refactored-map-kit

Use released versions of FBSnapshotTestCase, added delegate support and cleaned up deprecations.

CHANGELOG.md

@@ -1,6 +1,7 @@
 #### [3.0](https://github.com/neilang/NAMapKit/tree/version-3.0) (Next)
 
 * [#16](https://github.com/neilang/NAMapKit/pull/16) - Extracted `NAPinAnnotationMapView` out of a, now mimimal, `NAMapView` - [@dblock](github.com/dblock).
+* [#18](https://github.com/neilang/NAMapKit/pull/18) - Added `NAMapViewDelegate` for easier handling of taps and zoom events - [@dblock](github.com/dblock).
 
 #### [HEAD](https://github.com/neilang/NAMapKit) (Stable)
 

Demo/Demo/NAAnnotationDemoViewController.h

@@ -7,7 +7,8 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "NAMapViewDelegate.h"
 
-@interface NAAnnotationDemoViewController : UIViewController
+@interface NAAnnotationDemoViewController : UIViewController<NAMapViewDelegate>
 
 @end

Demo/Demo/NAAnnotationDemoViewController.m

@@ -16,7 +16,8 @@ - (void)viewDidLoad
     [super viewDidLoad];
 
     NAMapView *mapView = [[NAMapView alloc] initWithFrame:self.view.bounds];
-
+
+    mapView.mapViewDelegate = self;
     mapView.backgroundColor  = [UIColor colorWithRed:0.000f green:0.475f blue:0.761f alpha:1.000f];
     mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
 
@@ -42,4 +43,14 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interface
     return (interfaceOrientation == UIInterfaceOrientationPortrait);
 }
 
+- (void)mapView:(NAMapView *)mapView tappedOnAnnotation:(NAAnnotation *)annotation
+{
+    NSLog(@"tapped: %@", annotation);
+}
+
+- (void)mapView:(NAMapView *)mapView hasChangedZoomLevel:(CGFloat)level
+{
+    NSLog(@"zoom: %@", @(level));
+}
+
 @end

Demo/Demo/NAInteractiveDemoViewController.h

@@ -10,7 +10,7 @@
 #import "NAMapView.h"
 #import "NAPinAnnotation.h"
 
-@interface NAInteractiveDemoViewController : UIViewController
+@interface NAInteractiveDemoViewController : UIViewController<NAMapViewDelegate>
 
 @property (nonatomic, weak) IBOutlet NAMapView *mapView;
 

Demo/Demo/NAInteractiveDemoViewController.m

@@ -15,12 +15,13 @@ @interface NAInteractiveDemoViewController (){
 }
 @property (nonatomic, strong) NSMutableArray *annotations;
 @property (nonatomic, assign) CGSize size;
-
+@property (weak, nonatomic) IBOutlet UILabel *zoomLevelLabel;
+@property (weak, nonatomic) IBOutlet UILabel *selectedPinLabel;
 @end
 
 @implementation NAInteractiveDemoViewController
 
-- (void)viewDidLoad
+-(void)viewDidLoad
 {
     [super viewDidLoad];
 
@@ -29,9 +30,13 @@ - (void)viewDidLoad
     UIImage *image = [UIImage imageNamed:@"australia"];
 
     self.mapView.backgroundColor = [UIColor colorWithRed:0.000f green:0.475f blue:0.761f alpha:1.000f];
-
+    self.mapView.mapViewDelegate = self;
+
     [self.mapView displayMap:image];
 
+    [self mapView:self.mapView hasChangedZoomLevel:self.mapView.zoomLevel];
+    self.selectedPinLabel.text = @"";
+
     self.size = image.size;
 
     _count = 0;
@@ -88,10 +93,22 @@ -(IBAction)selectRandom:(id)sender{
 
 -(void)selectPinAt:(NSInteger)index{
     NAPinAnnotation *annotation = [self.annotations objectAtIndex:index];
-
+
+    self.selectedPinLabel.text = [NSString stringWithFormat:@"%@", annotation.title];
+
     [self.mapView selectAnnotation:annotation animated:YES];
 
     _lastFocused = annotation;
 }
 
+- (void)mapView:(NAMapView *)mapView tappedOnAnnotation:(NAPinAnnotation *)annotation
+{
+    self.selectedPinLabel.text = [NSString stringWithFormat:@"%@", annotation.title];
+}
+
+- (void)mapView:(NAMapView *)mapView hasChangedZoomLevel:(CGFloat)level
+{
+    self.zoomLevelLabel.text = [NSString stringWithFormat:@"%.2f", level];
+}
+
 @end