Merge pull request #19 from dblock/tiled-map-view

Tiled map view

Demo/Demo.xcodeproj/project.pbxproj

@@ -9,6 +9,8 @@
 /* Begin PBXBuildFile section */
 		07DDEB3EBEEC4C6FAF715BF1 /* libPods-DemoTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 98DB4ADA533041DD9D9E7647 /* libPods-DemoTests.a */; };
 		273E9EE865984F44A8AF2A9D /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D2957D8BD1FB4630AD6F922F /* libPods.a */; };
+		3C7F86CD18CE609200F7091A /* NATiledImageDemoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C7F86CC18CE609200F7091A /* NATiledImageDemoViewController.m */; };
+		3C990C8518CF60FB00BF4C44 /* NATiledImageMapViewControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C990C8418CF60FB00BF4C44 /* NATiledImageMapViewControllerTests.m */; };
 		3C9F354518CA838600EA1F22 /* NAMasterViewControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C9F354418CA838600EA1F22 /* NAMasterViewControllerTests.m */; };
 		3C9F354718CA862100EA1F22 /* NAPinAnnotationsDemoViewControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C9F354618CA862100EA1F22 /* NAPinAnnotationsDemoViewControllerTests.m */; };
 		3C9F354918CA86D600EA1F22 /* NAInteractiveDemoViewControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C9F354818CA86D600EA1F22 /* NAInteractiveDemoViewControllerTests.m */; };
@@ -49,6 +51,9 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		3C7F86CB18CE609200F7091A /* NATiledImageDemoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NATiledImageDemoViewController.h; sourceTree = "<group>"; };
+		3C7F86CC18CE609200F7091A /* NATiledImageDemoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NATiledImageDemoViewController.m; sourceTree = "<group>"; };
+		3C990C8418CF60FB00BF4C44 /* NATiledImageMapViewControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NATiledImageMapViewControllerTests.m; sourceTree = "<group>"; };
 		3C9F354418CA838600EA1F22 /* NAMasterViewControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NAMasterViewControllerTests.m; sourceTree = "<group>"; };
 		3C9F354618CA862100EA1F22 /* NAPinAnnotationsDemoViewControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NAPinAnnotationsDemoViewControllerTests.m; sourceTree = "<group>"; };
 		3C9F354818CA86D600EA1F22 /* NAInteractiveDemoViewControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NAInteractiveDemoViewControllerTests.m; sourceTree = "<group>"; };
@@ -176,6 +181,8 @@
 				3CB0E6DD18C8B9E2009CE8DB /* Supporting Files */,
 				3C9F354C18CA922C00EA1F22 /* NAAnnotationDemoViewController.h */,
 				3C9F354D18CA922C00EA1F22 /* NAAnnotationDemoViewController.m */,
+				3C7F86CB18CE609200F7091A /* NATiledImageDemoViewController.h */,
+				3C7F86CC18CE609200F7091A /* NATiledImageDemoViewController.m */,
 			);
 			path = Demo;
 			sourceTree = "<group>";
@@ -201,6 +208,7 @@
 				3C9F354818CA86D600EA1F22 /* NAInteractiveDemoViewControllerTests.m */,
 				3C9F354A18CA876700EA1F22 /* NALoadViaNIBDemoViewControllerTests.m */,
 				3C9F354F18CB8B6000EA1F22 /* NAAnnotationDemoViewControllerTests.m */,
+				3C990C8418CF60FB00BF4C44 /* NATiledImageMapViewControllerTests.m */,
 			);
 			path = DemoTests;
 			sourceTree = "<group>";
@@ -389,6 +397,7 @@
 				3CB0E71C18C8BB08009CE8DB /* NAAppDelegate.m in Sources */,
 				3CB0E71B18C8BB08009CE8DB /* NAAnimatedDemoViewController.m in Sources */,
 				3C9F354E18CA922C00EA1F22 /* NAAnnotationDemoViewController.m in Sources */,
+				3C7F86CD18CE609200F7091A /* NATiledImageDemoViewController.m in Sources */,
 				3CB0E72018C8BB08009CE8DB /* NALoadViaNIBDemoViewController.m in Sources */,
 				3CB0E71D18C8BB08009CE8DB /* NAPinAnnotationsDemoViewController.m in Sources */,
 			);
@@ -402,6 +411,7 @@
 				3CB0E72F18C8C9A4009CE8DB /* NAMapViewTests.m in Sources */,
 				3C9F354918CA86D600EA1F22 /* NAInteractiveDemoViewControllerTests.m in Sources */,
 				3C9F354718CA862100EA1F22 /* NAPinAnnotationsDemoViewControllerTests.m in Sources */,
+				3C990C8518CF60FB00BF4C44 /* NATiledImageMapViewControllerTests.m in Sources */,
 				3C9F354518CA838600EA1F22 /* NAMasterViewControllerTests.m in Sources */,
 				3C9F354B18CA876700EA1F22 /* NALoadViaNIBDemoViewControllerTests.m in Sources */,
 			);
@@ -523,6 +533,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SYSTEM_APPS_DIR)/Reveal.app/Contents/SharedSupport/iOS-Libraries",
+				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Demo/Demo-Prefix.pch";
 				INFOPLIST_FILE = "Demo/Demo-Info.plist";
@@ -537,6 +551,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SYSTEM_APPS_DIR)/Reveal.app/Contents/SharedSupport/iOS-Libraries",
+				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Demo/Demo-Prefix.pch";
 				INFOPLIST_FILE = "Demo/Demo-Info.plist";

Demo/Demo/NAAnnotationDemoViewController.m

@@ -32,10 +32,10 @@ - (void)viewDidLoad
     [mapView addAnnotation:melbourne animated:NO];
 
     NAAnnotation *perth = [NAAnnotation annotationWithPoint:CGPointMake(63.0f, 379.0f)];
-	[mapView addAnnotation:perth animated:YES];
+    [mapView addAnnotation:perth animated:YES];
 
 	NAAnnotation *brisbane = [NAAnnotation annotationWithPoint:CGPointMake(679.0f, 302.0f)];
-	[mapView addAnnotation:brisbane animated:NO];
+    [mapView addAnnotation:brisbane animated:NO];
 }
 
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation

Demo/Demo/NAMasterViewController.m

@@ -12,6 +12,7 @@
 #import "NALoadViaNIBDemoViewController.h"
 #import "NAAnimatedDemoViewController.h"
 #import "NAInteractiveDemoViewController.h"
+#import "NATiledImageDemoViewController.h"
 
 @implementation NAMasterViewController
 
@@ -37,7 +38,7 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
-    return 5;
+    return 6;
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
@@ -66,6 +67,9 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         case 4:
             cell.textLabel.text = @"Interactive Demo";
             break;
+        case 5:
+            cell.textLabel.text = @"Tiled Map Demo";
+            break;
         default:
             cell.textLabel.text = @"???";
             break;
@@ -79,33 +83,22 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     if(indexPath.row == 0){
         NAAnnotationDemoViewController *vc = [[NAAnnotationDemoViewController alloc] initWithNibName:nil bundle:nil];
         [self.navigationController pushViewController:vc animated:YES];
-        return;
-    }
-
-    if(indexPath.row == 1){
+    } else if(indexPath.row == 1){
         NAPinAnnotationsDemoViewController *vc = [[NAPinAnnotationsDemoViewController alloc] initWithNibName:nil bundle:nil];
         [self.navigationController pushViewController:vc animated:YES];
-        return;
-    }
-
-    if(indexPath.row == 2){
+    } else if (indexPath.row == 2){
         NALoadViaNIBDemoViewController *vc = [[NALoadViaNIBDemoViewController alloc] initWithNibName:@"NALoadViaNIBDemoViewController" bundle:nil];
         [self.navigationController pushViewController:vc animated:YES];
-        return;
-    }
-
-    if(indexPath.row == 3){
+    } else if (indexPath.row == 3){
         NAAnimatedDemoViewController *vc = [[NAAnimatedDemoViewController alloc] initWithNibName:nil bundle:nil];
         [self.navigationController pushViewController:vc animated:YES];
-        return;
-    }
-
-    if(indexPath.row == 4){
+    } else if (indexPath.row == 4){
         NAInteractiveDemoViewController *vc = [[NAInteractiveDemoViewController alloc] initWithNibName:@"NAInteractiveDemoViewController" bundle:nil];
         [self.navigationController pushViewController:vc animated:YES];
-        return;
+    } else if (indexPath.row == 5){
+        NATiledImageDemoViewController *vc = [[NATiledImageDemoViewController alloc] initWithNibName:nil bundle:nil];
+        [self.navigationController pushViewController:vc animated:YES];
     }
-
 }
 
 @end

Demo/Demo/NAPinAnnotationsDemoViewController.m

@@ -11,21 +11,8 @@
 #import "NAPinAnnotationMapView.h"
 #import "NAPinAnnotation.h"
 
-@interface NAPinAnnotationsDemoViewController ()
-
-@end
-
 @implementation NAPinAnnotationsDemoViewController
 
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-    if (self) {
-        // Custom initialization
-    }
-    return self;
-}
-
 - (void)viewDidLoad
 {
     [super viewDidLoad];

Demo/Demo/NATiledImageDemoViewController.h

@@ -0,0 +1,12 @@
+//
+//  NATiledImageDemoViewController.h
+//
+//  Created by Daniel Doubrovkine on 3/10/14.
+//  Copyright (c) 2014 neilang.com. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface NATiledImageDemoViewController : UIViewController
+
+@end

Demo/Demo/NATiledImageDemoViewController.m

@@ -0,0 +1,58 @@
+//
+//  NATiledImageDemoViewController.m
+//  Demo
+//
+//  Created by Daniel Doubrovkine on 3/10/14.
+//  Copyright (c) 2014 neilang.com. All rights reserved.
+//
+
+#import "NATiledImageDemoViewController.h"
+#import "NATiledImageMapView.h"
+#import "NADZTileImageDataSource.h"
+
+@interface NATiledImageDemoViewController ()
+@property(nonatomic, readonly) NATiledImageMapView *mapView;
+@end
+
+@implementation NATiledImageDemoViewController
+
+-(void)viewDidLoad
+{
+    [super viewDidLoad];
+
+    NADZTileImageDataSource *dzTileImageDataSource = [[NADZTileImageDataSource alloc] init];
+    dzTileImageDataSource.maxTiledHeight = 5389;
+    dzTileImageDataSource.maxTiledWidth = 5000;
+    dzTileImageDataSource.minTileLevel = 11;
+    dzTileImageDataSource.maxTileLevel = ceil(log(MAX(dzTileImageDataSource.maxTiledWidth, dzTileImageDataSource.maxTiledHeight))/log(2));
+    dzTileImageDataSource.tileSize = 512;
+    dzTileImageDataSource.tileFormat = @"jpg";
+    dzTileImageDataSource.tileBaseURL = [NSURL URLWithString:@"https://raw.github.com/dblock/NAMapKit/tiled-map-view/Demo/Maps/Armory2014/tiles"];
+
+    NATiledImageMapView *mapView = [[NATiledImageMapView alloc] initWithFrame:self.view.bounds tiledImageDataSource:dzTileImageDataSource];
+    mapView.backgroundColor  = [UIColor colorWithRed:0.000f green:0.475f blue:0.761f alpha:1.000f];
+    mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    // mapView.displayTileBorders = YES;
+    mapView.backgroundImageURL = [NSURL URLWithString:@"https://raw.github.com/dblock/NAMapKit/tiled-map-view/Demo/Maps/Armory2014/large.jpg"];
+    _mapView = mapView;
+
+    [self.view addSubview:mapView];
+
+    NAAnnotation *champagneBar = [NAAnnotation annotationWithPoint:[mapView coordinateFor:CGPointMake(0.30f, 0.10f)]];
+    [mapView addAnnotation:champagneBar animated:NO];
+
+    NAAnnotation *artsyBooth = [NAAnnotation annotationWithPoint:[mapView coordinateFor:CGPointMake(0.53f, 0.83f)]];
+    [mapView addAnnotation:artsyBooth animated:NO];
+}
+
+-(void)viewDidAppear:(BOOL)animated
+{
+    [self.mapView zoomToFit:animated];
+}
+
+-(BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+
+@end

Demo/DemoTests/NAAnnotationDemoViewControllerTests.m

@@ -10,7 +10,9 @@
 
 SpecBegin(NAAnnotationDemoViewController)
 
-setGlobalReferenceImageDir(FB_REFERENCE_IMAGE_DIR);
+beforeAll(^{
+    setGlobalReferenceImageDir(FB_REFERENCE_IMAGE_DIR);
+});
 
 it(@"displays map with a pin", ^{
     NAAnnotationDemoViewController *vc = [[NAAnnotationDemoViewController alloc] init];

Demo/DemoTests/NAInteractiveDemoViewControllerTests.m

@@ -10,7 +10,9 @@
 
 SpecBegin(NAInteractiveDemoViewController)
 
-setGlobalReferenceImageDir(FB_REFERENCE_IMAGE_DIR);
+beforeAll(^{
+    setGlobalReferenceImageDir(FB_REFERENCE_IMAGE_DIR);
+});
 
 __block NAInteractiveDemoViewController *vc = nil;
 
@@ -26,7 +28,7 @@
 it(@"adds a pin", ^{
     [vc addPinAt:CGPointMake(100, 200) withColor:NAPinColorRed];
     expect(vc.view).to.haveValidSnapshotNamed(@"add");
-    
+
 });
 
 it(@"removes a pin", ^{

Demo/DemoTests/NALoadViaNIBDemoViewControllerTests.m

@@ -10,7 +10,9 @@
 
 SpecBegin(NALoadViaNIBDemoViewController)
 
-setGlobalReferenceImageDir(FB_REFERENCE_IMAGE_DIR);
+beforeAll(^{
+    setGlobalReferenceImageDir(FB_REFERENCE_IMAGE_DIR);
+});
 
 it(@"displays a menu", ^{
     NALoadViaNIBDemoViewController *vc = [[NALoadViaNIBDemoViewController alloc] init];

Demo/DemoTests/NAMasterViewControllerTests.m

@@ -10,7 +10,9 @@
 
 SpecBegin(NAMasterViewController)
 
-setGlobalReferenceImageDir(FB_REFERENCE_IMAGE_DIR);
+beforeAll(^{
+    setGlobalReferenceImageDir(FB_REFERENCE_IMAGE_DIR);
+});
 
 it(@"displays the master menu", ^{
     NAMasterViewController *vc = [[NAMasterViewController alloc] initWithNibName:@"NAMasterViewController" bundle:nil];

Demo/DemoTests/NAPinAnnotationsDemoViewControllerTests.m

@@ -11,7 +11,9 @@
 
 SpecBegin(NAPinAnnotationsDemoViewController)
 
-setGlobalReferenceImageDir(FB_REFERENCE_IMAGE_DIR);
+beforeAll(^{
+    setGlobalReferenceImageDir(FB_REFERENCE_IMAGE_DIR);
+});
 
 __block NAPinAnnotationsDemoViewController *vc = nil;
 

Demo/DemoTests/NATiledImageMapViewControllerTests.m

@@ -0,0 +1,29 @@
+//
+//  NATiledImageMapViewTests.m
+//
+//  Created by Daniel Doubrovkine on 3/11/14.
+//  Copyright (c) 2014 neilang.com. All rights reserved.
+//
+
+#import "NATiledImageDemoViewController.h"
+
+SpecBegin(NATiledImageDemoViewController)
+
+beforeAll(^{
+    setGlobalReferenceImageDir(FB_REFERENCE_IMAGE_DIR);
+});
+
+__block NATiledImageDemoViewController *vc = nil;
+
+beforeEach(^{
+    vc = [[NATiledImageDemoViewController alloc] init];
+    expect(vc.view).willNot.beNil();
+});
+
+// TODO: drawRect isn't called when running in a test until the test has finished
+pending(@"displays map with a pin", ^{
+    [vc viewDidAppear:NO];
+    expect(vc.view).to.haveValidSnapshotNamed(@"default");
+});
+
+SpecEnd

Demo/Podfile.lock

@@ -4,7 +4,11 @@ PODS:
     - Expecta
     - FBSnapshotTestCase
   - FBSnapshotTestCase (1.1)
-  - NAMapKit (2.1)
+  - NAMapKit (3.0):
+    - SDWebImage
+  - SDWebImage (3.5.4):
+    - SDWebImage/Core
+  - SDWebImage/Core (3.5.4)
   - Specta (0.2.1)
 
 DEPENDENCIES:
@@ -22,7 +26,8 @@ SPEC CHECKSUMS:
   Expecta: 5c147dedfea5fbcf773995f7e65020abcc936ce5
   EXPMatchers+FBSnapshotTest: 1b9506577e494191565ff51ffd5b1e76339d727b
   FBSnapshotTestCase: 188c80bfcb72e744eb0b99d45989d12687c40cf8
-  NAMapKit: cdb63fefc887562c85b6a6e46a284d9becd86324
+  NAMapKit: faa7be13485d205c0df590867d1dccbce21c2a0a
+  SDWebImage: 1a62010700adbba823b621fc217906739dbf6aa5
   Specta: 2d06220591110c6d9757d8be8ecf8e63aa40dc2a
 
 COCOAPODS: 0.29.0

NAMapKit.podspec

@@ -1,21 +1,15 @@
-#
-# Be sure to run `pod spec lint NAMapKit.podspec' to ensure this is a
-# valid spec and remove all comments before submitting the spec.
-#
-# To learn more about the attributes see http://docs.cocoapods.org/specification.html
-#
 Pod::Spec.new do |s|
   s.name         = "NAMapKit"
-  s.version      = "2.1"
+  s.version      = "3.0"
   s.summary      = "Allows you to use custom maps in MapKit compatible way."
   s.homepage     = "https://github.com/neilang/NAMapKit"
   s.license      = 'MIT'
   s.authors      = { "Neil Ang" => "[email protected]", "Tony Arnold" => "[email protected]" }
   s.source       = { :git => "https://github.com/neilang/NAMapKit.git", :tag => "v2.1" }
   s.platform     = :ios, '6.0'
-
   s.source_files = "NaMapKit/*.{h,m}"
-  s.resources = "NAMapKit/*.png"
+  s.resources    = "NAMapKit/*.png"
   s.frameworks   = 'Foundation', 'UIKit', 'CoreGraphics'
   s.requires_arc = true
+  s.dependencies = ['SDWebImage']
 end

NAMapKit/NAAnnotation.h

@@ -24,5 +24,6 @@
 -(UIView *)createViewOnMapView:(NAMapView *)mapView;
 
 @property (nonatomic, weak) NSObject<NAMapViewDelegate> *mapViewDelegate;
+@property (nonatomic, readonly) NAMapView *mapView;
 
 @end