|
@@ -160,8 +160,8 @@ |
|
@@ -160,8 +160,8 @@ |
160
|
UIImageView *userLocationTrackingView;
|
160
|
UIImageView *userLocationTrackingView;
|
161
|
UIImageView *userHeadingTrackingView;
|
161
|
UIImageView *userHeadingTrackingView;
|
162
|
|
162
|
|
163
|
- UIViewController *viewControllerPresentingAttribution;
|
|
|
164
|
- UIButton *attributionButton;
|
163
|
+ UIViewController *_viewControllerPresentingAttribution;
|
|
|
164
|
+ UIButton *_attributionButton;
|
165
|
}
|
165
|
}
|
166
|
|
166
|
|
167
|
@synthesize decelerationMode = _decelerationMode;
|
167
|
@synthesize decelerationMode = _decelerationMode;
|
|
@@ -361,7 +361,7 @@ |
|
@@ -361,7 +361,7 @@ |
361
|
[userLocation release]; userLocation = nil;
|
361
|
[userLocation release]; userLocation = nil;
|
362
|
[userLocationTrackingView release]; userLocationTrackingView = nil;
|
362
|
[userLocationTrackingView release]; userLocationTrackingView = nil;
|
363
|
[userHeadingTrackingView release]; userHeadingTrackingView = nil;
|
363
|
[userHeadingTrackingView release]; userHeadingTrackingView = nil;
|
364
|
- [attributionButton release]; attributionButton = nil;
|
364
|
+ [_attributionButton release]; _attributionButton = nil;
|
365
|
[super dealloc];
|
365
|
[super dealloc];
|
366
|
}
|
366
|
}
|
367
|
|
367
|
|
|
@@ -2812,39 +2812,39 @@ |
|
@@ -2812,39 +2812,39 @@ |
2812
|
|
2812
|
|
2813
|
- (UIViewController *)viewControllerPresentingAttribution
|
2813
|
- (UIViewController *)viewControllerPresentingAttribution
|
2814
|
{
|
2814
|
{
|
2815
|
- return viewControllerPresentingAttribution;
|
2815
|
+ return _viewControllerPresentingAttribution;
|
2816
|
}
|
2816
|
}
|
2817
|
|
2817
|
|
2818
|
- (void)setViewControllerPresentingAttribution:(UIViewController *)viewController
|
2818
|
- (void)setViewControllerPresentingAttribution:(UIViewController *)viewController
|
2819
|
{
|
2819
|
{
|
2820
|
- viewControllerPresentingAttribution = viewController;
|
2820
|
+ _viewControllerPresentingAttribution = viewController;
|
2821
|
|
2821
|
|
2822
|
- if (self.viewControllerPresentingAttribution && ! attributionButton)
|
2822
|
+ if (_viewControllerPresentingAttribution && ! _attributionButton)
|
2823
|
{
|
2823
|
{
|
2824
|
- attributionButton = [[UIButton buttonWithType:UIButtonTypeInfoLight] retain];
|
2824
|
+ _attributionButton = [[UIButton buttonWithType:UIButtonTypeInfoLight] retain];
|
2825
|
|
2825
|
|
2826
|
- attributionButton.autoresizingMask = UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleLeftMargin;
|
2826
|
+ _attributionButton.autoresizingMask = UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleLeftMargin;
|
2827
|
|
2827
|
|
2828
|
- [attributionButton addTarget:self action:@selector(showAttribution:) forControlEvents:UIControlEventTouchUpInside];
|
2828
|
+ [_attributionButton addTarget:self action:@selector(showAttribution:) forControlEvents:UIControlEventTouchUpInside];
|
2829
|
|
2829
|
|
2830
|
- attributionButton.frame = CGRectMake(self.bounds.size.width - 30,
|
2830
|
+ _attributionButton.frame = CGRectMake(self.bounds.size.width - 30,
|
2831
|
self.bounds.size.height - 30,
|
2831
|
self.bounds.size.height - 30,
|
2832
|
- attributionButton.bounds.size.width,
|
|
|
2833
|
- attributionButton.bounds.size.height);
|
2832
|
+ _attributionButton.bounds.size.width,
|
|
|
2833
|
+ _attributionButton.bounds.size.height);
|
2834
|
|
2834
|
|
2835
|
- [self addSubview:attributionButton];
|
2835
|
+ [self addSubview:_attributionButton];
|
2836
|
}
|
2836
|
}
|
2837
|
}
|
2837
|
}
|
2838
|
|
2838
|
|
2839
|
- (void)showAttribution:(id)sender
|
2839
|
- (void)showAttribution:(id)sender
|
2840
|
{
|
2840
|
{
|
2841
|
- if (self.viewControllerPresentingAttribution)
|
2841
|
+ if (_viewControllerPresentingAttribution)
|
2842
|
{
|
2842
|
{
|
2843
|
RMAttributionViewController *attributionViewController = [[[RMAttributionViewController alloc] initWithMapView:self] autorelease];
|
2843
|
RMAttributionViewController *attributionViewController = [[[RMAttributionViewController alloc] initWithMapView:self] autorelease];
|
2844
|
|
2844
|
|
2845
|
attributionViewController.modalTransitionStyle = UIModalTransitionStylePartialCurl;
|
2845
|
attributionViewController.modalTransitionStyle = UIModalTransitionStylePartialCurl;
|
2846
|
|
2846
|
|
2847
|
- [self.viewControllerPresentingAttribution presentModalViewController:attributionViewController animated:YES];
|
2847
|
+ [_viewControllerPresentingAttribution presentModalViewController:attributionViewController animated:YES];
|
2848
|
}
|
2848
|
}
|
2849
|
}
|
2849
|
}
|
2850
|
|
2850
|
|