Permalink
Browse files

Minor fixed.

  • Loading branch information...
1 parent 10fc2d0 commit 5e3361f766c542c884f65ceb9a6ab052d28a4929 @kishikawakatsumi committed Oct 4, 2012
@@ -83,7 +83,6 @@
087F5B371612E6AB004BF7D9 /* AFXMLRequestOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AFXMLRequestOperation.m; path = Vendor/AFNetworking/AFXMLRequestOperation.m; sourceTree = SOURCE_ROOT; };
087F5B381612E6AB004BF7D9 /* UIImageView+AFNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIImageView+AFNetworking.h"; path = "Vendor/AFNetworking/UIImageView+AFNetworking.h"; sourceTree = SOURCE_ROOT; };
087F5B391612E6AB004BF7D9 /* UIImageView+AFNetworking.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIImageView+AFNetworking.m"; path = "Vendor/AFNetworking/UIImageView+AFNetworking.m"; sourceTree = SOURCE_ROOT; };
- 0BAE9433161E117C0010F07F /* WMOverlayConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMOverlayConstants.h; sourceTree = "<group>"; };
1414DF4D1613D43000161754 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = "<group>"; };
1414DF4E1613D43000161754 /* Icon-72@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72@2x.png"; sourceTree = "<group>"; };
1414DF4F1613D43000161754 /* Icon-Small-50.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-Small-50.png"; sourceTree = "<group>"; };
@@ -157,7 +156,6 @@
children = (
14EAE0EB16120FE70026BD7C /* WMOverlay.h */,
14EAE0EC16120FE70026BD7C /* WMOverlay.m */,
- 0BAE9433161E117C0010F07F /* WMOverlayConstants.h */,
14EAE0F2161210A80026BD7C /* WMOverlayView.h */,
14EAE0F3161210A80026BD7C /* WMOverlayView.m */,
087F5B241612D13D004BF7D9 /* WMImageCache.h */,
@@ -467,15 +465,15 @@
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Katsumi Kishikawa";
+ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
- "PROVISIONING_PROFILE[sdk=iphoneos*]" = "D88D5E21-CCB2-4DB0-B670-4986EA1F57D1";
+ "PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
@@ -8,7 +8,7 @@
#import <UIKit/UIKit.h>
#import <MapKit/MapKit.h>
-#import "WMOverlayConstants.h"
+#import "WMOverlay.h"
@protocol WMConfigurationViewControllerDelegate;
@@ -9,10 +9,9 @@
#import <UIKit/UIKit.h>
#import <MapKit/MapKit.h>
#import <CoreLocation/CoreLocation.h>
-#import "WMOverlayConstants.h"
-#import "WMConfigurationViewController.h"
+#import "WMOverlay.h"
-@interface WMMapViewController : UIViewController <MKMapViewDelegate, WMConfigurationViewControllerDelegate>
+@interface WMMapViewController : UIViewController
@property (assign, nonatomic) MKMapType mapType;
@property (assign, nonatomic) WMMapSource mapSource;
@@ -6,15 +6,15 @@
// Copyright (c) 2012 kishikawa katsumi. All rights reserved.
//
-#import "AFNetworking.h"
#import "WMMapViewController.h"
#import "WMDetailViewController.h"
#import "WMConfigurationViewController.h"
#import "WMPlacemark.h"
#import "WMOverlay.h"
#import "WMOverlayView.h"
+#import "AFNetworking.h"
-@interface WMMapViewController () <UISearchBarDelegate, MKMapViewDelegate> {
+@interface WMMapViewController () <UISearchBarDelegate, MKMapViewDelegate, WMConfigurationViewControllerDelegate> {
WMPlacemark *droppedPin;
}
@@ -241,7 +241,7 @@ - (NSDictionary *)addressDictionaryFromJSON:(id)JSON
return addressDictionary;
}
-#pragma mark - MKMapViewDelegate
+#pragma mark -
- (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotation:(id <MKAnnotation>)annotation; {
if (annotation == mapView.userLocation) {
@@ -288,7 +288,7 @@ - (void)mapView:(MKMapView *)mapView annotationView:(MKAnnotationView *)view cal
[self performSegueWithIdentifier:@"Details" sender:view];
}
-#pragma mark - WMConfigurationViewControllerDelegate
+#pragma mark -
- (void)configurationViewController:(WMConfigurationViewController *)controller mapSourceChanged:(WMMapSource)mapSource
{
@@ -334,7 +334,6 @@ - (void)configurationViewControllerWillAddPin:(WMConfigurationViewController *)c
[operation start];
}
-
- (void)configurationViewControllerWillPrintMap:(WMConfigurationViewController *)configurationViewController
{
UIPrintInteractionController *controller = [UIPrintInteractionController sharedPrintController];
@@ -354,11 +353,7 @@ - (void)configurationViewControllerWillPrintMap:(WMConfigurationViewController *
controller.printInfo = printInfo;
controller.printFormatter = [_mapView viewPrintFormatter];
- if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
-// [controller presentFromBarButtonItem:printButton animated:YES completionHandler:completionHandler];
- } else {
- [controller presentAnimated:YES completionHandler:completionHandler];
- }
+ [controller presentAnimated:YES completionHandler:completionHandler];
}
#pragma mark -
View
@@ -9,6 +9,12 @@
#import <Foundation/Foundation.h>
#import <MapKit/MapKit.h>
+enum {
+ WMMapSourceStandard = 0,
+ WMMapSourceGoogle
+};
+typedef NSUInteger WMMapSource;
+
@interface WMOverlay : NSObject <MKOverlay>
@property (nonatomic, readonly) MKMapType mapType;
@@ -1,13 +0,0 @@
-//
-// WMOverlayConstants.h
-// ClassicMap
-//
-// Created by Grey Lee on 2012/10/05.
-// Copyright (c) 2012 kishikawa katsumi. All rights reserved.
-//
-
-enum {
- WMMapSourceStandard = 0,
- WMMapSourceGoogle
-};
-typedef NSUInteger WMMapSource;

0 comments on commit 5e3361f

Please sign in to comment.