Merge branch 'release/1.0.1'

Author: Denis Bogatyrev

DBMapSelectorViewController.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'DBMapSelectorViewController'
-  s.version      = '1.0.0'
+  s.version      = '1.0.1'
   s.authors = { 'Denis Bogatyrev' => 'denis.bogatyrev@gmail.com' }
   s.summary      = 'This component allows you to select circular map region from the MKMapView'
   s.homepage     = 'https://github.com/d0ping/DBMapSelectorViewController'

Example/Classes/ViewController.h

@@ -8,7 +8,7 @@
 
 #import "DBMapSelectorViewController.h"
 
-@interface ViewController : DBMapSelectorViewController <UITextFieldDelegate>
+@interface ViewController : DBMapSelectorViewController <DBMapSelectorViewControllerDelegate>
 
 @property (nonatomic, weak) IBOutlet UISwitch               *hiddenSwitch;
 

Example/Classes/ViewController.m

@@ -23,15 +23,17 @@ @implementation ViewController
 
 #pragma mark - Source
 
-- (void)loadView {
-    [super loadView];
+- (void)viewDidLoad {
+    [super viewDidLoad];
 
+    self.delegate = self;
     _mapView.showsUserLocation = YES;
 
     // Set Begin Settings
-    self.selectorCoordinate = CLLocationCoordinate2DMake(55.75399400, 37.62209300);
-    self.selectorRadius = 3000;
-    self.selectorRadiusMax = 25000;
+    self.circleCoordinate = CLLocationCoordinate2DMake(55.75399400, 37.62209300);
+    self.circleRadius = 3000;
+    self.circleRadiusMax = 25000;
+    [self updateMapRegionForMapSelector];
 
     _fillColorDict = @{@"Orange": [UIColor orangeColor], @"Green": [UIColor greenColor],  @"Pure": [UIColor purpleColor],  @"Cyan": [UIColor cyanColor], @"Yellow": [UIColor yellowColor],  @"Magenta": [UIColor magentaColor]};
     _strokeColorDict = @{@"Dark Gray": [UIColor darkGrayColor], @"Black": [UIColor blackColor], @"Brown": [UIColor brownColor], @"Red": [UIColor redColor], @"Blue": [UIColor blueColor]};
@@ -40,27 +42,19 @@ - (void)loadView {
     _fillColorPickerView.delegate = self;
     _fillColorPickerView.dataSource = self;
     _fillColorPickerView.showsSelectionIndicator = YES;
-
+    
     _strokeColorPickerView = [[UIPickerView alloc] init];
     _strokeColorPickerView.delegate = self;
     _strokeColorPickerView.dataSource = self;
     _strokeColorPickerView.showsSelectionIndicator = YES;
 
     NSString *fillColorKey = @"Orange";
     _fillColorTextField.text = fillColorKey;
-    self.selectorFillColor = _fillColorDict[fillColorKey];
+    self.fillColor = _fillColorDict[fillColorKey];
 
     NSString *strokeColorKey = @"Dark Gray";
     _strokeColorTextField.text = strokeColorKey;
-    self.selectorStrokeColor = _strokeColorDict[strokeColorKey];
-    
-    
-    [self didChangeCoordinate:self.selectorCoordinate];
-    [self didChangeRadius:self.selectorRadius];
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
+    self.strokeColor = _strokeColorDict[strokeColorKey];
 
     UIBarButtonItem *doneButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(inputAccessoryViewDidFinish)];
     UIToolbar *toolbar = [[UIToolbar alloc] initWithFrame:CGRectMake(0,0, 320, 44)];
@@ -71,6 +65,7 @@ - (void)viewDidLoad {
 
     _strokeColorTextField.inputView = _strokeColorPickerView;
     _strokeColorTextField.inputAccessoryView = toolbar;
+    
 }
 
 - (void)inputAccessoryViewDidFinish {
@@ -81,20 +76,20 @@ - (void)inputAccessoryViewDidFinish {
 #pragma mark - Actions
 
 - (IBAction)editingTypeSegmentedControlValueDidChange:(UISegmentedControl *)sender {
-    self.selectorEditingType = sender.selectedSegmentIndex;
+    self.editingType = sender.selectedSegmentIndex;
 }
 
 - (IBAction)hiddenSwitchValueDidChange:(UISwitch *)sender {
-    self.selectorHidden = !sender.on;
+    self.hidden = !sender.on;
 }
 
-#pragma mark - DBMapSelectorViewController Protocol
+#pragma mark - DBMapSelectorViewController Delegate
 
-- (void)didChangeCoordinate:(CLLocationCoordinate2D)coordinate {
+- (void)mapSelectorViewController:(DBMapSelectorViewController *)mapSelectorViewController didChangeCoordinate:(CLLocationCoordinate2D)coordinate {
     _coordinateLabel.text = [NSString stringWithFormat:@"Coordinate = {%.5f, %.5f}", coordinate.latitude, coordinate.longitude];
 }
 
-- (void)didChangeRadius:(CLLocationDistance)radius {
+- (void)mapSelectorViewController:(DBMapSelectorViewController *)mapSelectorViewController didChangeRadius:(CLLocationDistance)radius {
     NSString *radiusStr = (radius >= 1000) ? [NSString stringWithFormat:@"%.1f km", radius * .001f] : [NSString stringWithFormat:@"%.0f m", radius];
     _radiusLabel.text = [@"Radius = " stringByAppendingString:radiusStr];
 }
@@ -120,24 +115,11 @@ - (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComp
     NSString *colorKey = dict.allKeys[row];
     if ([pickerView isEqual:_fillColorPickerView]) {
         self.fillColorTextField.text = colorKey;
-        self.selectorFillColor = _fillColorDict[colorKey];
+        self.fillColor = _fillColorDict[colorKey];
     } else if ([pickerView isEqual:_strokeColorPickerView]) {
         self.strokeColorTextField.text = colorKey;
-        self.selectorStrokeColor = _strokeColorDict[colorKey];
+        self.strokeColor = _strokeColorDict[colorKey];
     }
 }
 
-//#pragma mark - UITextField Delegate
-//
-//- (BOOL) textFieldShouldBeginEditing:(UITextView *)textView {
-//    _fillColorPickerView.frame = CGRectMake(0, 500, _fillColorPickerView.frame.size.width, _fillColorPickerView.frame.size.height);
-//    [UIView beginAnimations:nil context:NULL];
-//    [UIView setAnimationDuration:.3f];
-//    [UIView setAnimationDelegate:self];
-//    _fillColorPickerView.frame = CGRectMake(0, 200, _fillColorPickerView.frame.size.width, _fillColorPickerView.frame.size.height);
-//    [self.view addSubview:_fillColorPickerView];
-//    [UIView commitAnimations];
-//    return NO;
-//}
-
 @end

Example/DBMapSelectorViewControllerExample/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>1.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Example/Resources/Screenshot.jpg

@@ -2,7 +2,7 @@
 
 This component allows you to select circular map region from the MKMapView.
 
-![Screenshot of Example](https://github.com/d0ping/DBMapSelectorViewController/blob/develop/Example/Resources/Screenshot.jpg)
+![Screenshot of Example](https://github.com/d0ping/DBMapSelectorViewController/blob/master/Example/Resources/Screenshot.jpg)
 
 ## Adding to your project
 
@@ -33,59 +33,64 @@ To use DBMapSelectorViewController in your project you should perform the follow
 
 ### Setting
 
-To customize the selector you should set selector properties in the loadView method of your `MyViewController`. Selector properties must be set after execute `[super loadView];`. For example, how it can be implemented:
+To customize the selector you should set selector properties in the `viewDidLoad` method of your `MyViewController`. Selector properties must be set after execute `[super viewDidLoad];`.
+
+After you have set the `circleCoordinate` and `circleRadius` parameters manually you must execute `updateMapRegionForMapSelector` method.
+
+For example, how it can be implemented:
 
 ```objc
-- (void)loadView {
-    [super loadView];
+- (void)viewDidLoad {
+    [super viewDidLoad];
 
-    self.selectorCoordinate = CLLocationCoordinate2DMake(55.75399400, 37.62209300);
-    self.selectorRadius = 2500;
-    self.selectorRadiusMin = 500;
-    self.selectorRadiusMax = 25000;
+    self.circleCoordinate = CLLocationCoordinate2DMake(55.75399400, 37.62209300);
+    self.circleRadius = 2500;
+    self.circleRadiusMin = 500;
+    self.circleRadiusMax = 25000;
+    [self updateMapRegionForMapSelector];
 
-    self.selectorFillColor = [UIColor purpleColor];
-    self.selectorStrokeColor = [UIColor darkGrayColor];
+    self.fillColor = [UIColor purpleColor];
+    self.strokeColor = [UIColor darkGrayColor];
 }
 ```
 
 ### Property list selector
 
-- `DBMapSelectorEditingType selectorEditingType` - Used to specify the selector editing type. Property can equal one of four values:
+- `DBMapSelectorEditingType editingType` - Used to specify the selector editing type. Property can equal one of four values:
   - `DBMapSelectorEditingTypeFull` allows to edit coordinate and radius,
   - `DBMapSelectorEditingTypeCoordinateOnly` allows to edit cooordinate only,
   - `DBMapSelectorEditingTypeRadiusOnly` allows to edit radius only,
   - `DBMapSelectorEditingTypeNone` read only mode;
-- `CLLocationCoordinate2D selectorCoordinate` - Used to specify the selector coordinate;
-- `CLLocationDistance selectorRadius` - Used to specify the selector radius. Default is equal 1000 meter;
-- `CLLocationDistance selectorRadiusMin` - Used to specify the minimum selector radius. Default is equal 100 meter;
-- `CLLocationDistance selectorRadiusMax` - Used to specify the maximum selector radius. Default is equal 10000 meter;
-- `BOOL selectorHidden` - Used to hide or show selector. Default is NO;
-- `UIColor *selectorFillColor` - Used to specify the selector fill color. Color is used to fill the circular map region;
-- `UIColor *selectorStrokeColor` - Used to specify the selector stroke color. Color is used to delimit the circular map region.
+- `CLLocationCoordinate2D circleCoordinate` - Used to specify the selector coordinate;
+- `CLLocationDistance circleRadius` - Used to specify the selector radius. Default is equal 1000 meter;
+- `CLLocationDistance circleRadiusMin` - Used to specify the minimum selector radius. Default is equal 100 meter;
+- `CLLocationDistance circleRadiusMax` - Used to specify the maximum selector radius. Default is equal 10000 meter;
+- `BOOL hidden` - Used to hide or show selector. Default is NO;
+- `UIColor *fillColor` - Used to specify the selector fill color. Color is used to fill the circular map region;
+- `UIColor *strokeColor` - Used to specify the selector stroke color. Color is used to delimit the circular map region.
 
-### DBMapSelectorViewControllerProtocol
+### DBMapSelectorViewControllerDelegate
 
-Inside the `DBMapSelectorViewController` class is implemented `DBMapSelectorViewControllerProtocol`. It's allows to receive messages when the main properties (coordinate and radius) of the selector will be changed.
+To be able to react when the main properties (coordinate and radius) of the selector will be changed you must become delegate DBMapSelectorViewController. DBMapSelectorViewControllerDelegate protocol you can see here:
 
 ```objc
-@protocol DBMapSelectorViewControllerProtocol <NSObject>
+@protocol DBMapSelectorViewControllerDelegate <NSObject>
 
 @optional
-- (void)didChangeCoordinate:(CLLocationCoordinate2D)coordinate;
-- (void)didChangeRadius:(CLLocationDistance)radius;
+- (void)mapSelectorViewController:(DBMapSelectorViewController *)mapSelectorViewController didChangeCoordinate:(CLLocationCoordinate2D)coordinate;
+- (void)mapSelectorViewController:(DBMapSelectorViewController *)mapSelectorViewController didChangeRadius:(CLLocationDistance)radius;
 
 @end
 ```
 
 You can implement these methods in your `MyViewController` class in order to respond to these changes. For example, how it can be implemented in your class:
 
 ```objc
-- (void)didChangeCoordinate:(CLLocationCoordinate2D)coordinate {
+- (void)mapSelectorViewController:(DBMapSelectorViewController *)mapSelectorViewController didChangeCoordinate:(CLLocationCoordinate2D)coordinate {
     _coordinateLabel.text = [NSString stringWithFormat:@"Coordinate = {%.5f, %.5f}", coordinate.latitude, coordinate.longitude];
 }
 
-- (void)didChangeRadius:(CLLocationDistance)radius {
+- (void)mapSelectorViewController:(DBMapSelectorViewController *)mapSelectorViewController didChangeRadius:(CLLocationDistance)radius {
     NSString *radiusStr = (radius >= 1000) ? [NSString stringWithFormat:@"%.1f km", radius * .001f] : [NSString stringWithFormat:@"%.0f m", radius];
     _radiusLabel.text = [@"Radius = " stringByAppendingString:radiusStr];
 }

README.md

@@ -17,17 +17,19 @@ typedef NS_ENUM(NSInteger, DBMapSelectorEditingType) {
     DBMapSelectorEditingTypeNone,
 };
 
-@protocol DBMapSelectorViewControllerProtocol <NSObject>
+@class DBMapSelectorViewController;
+@protocol DBMapSelectorViewControllerDelegate <NSObject>
 
 @optional
-- (void)didChangeCoordinate:(CLLocationCoordinate2D)coordinate;
-- (void)didChangeRadius:(CLLocationDistance)radius;
+- (void)mapSelectorViewController:(DBMapSelectorViewController *)mapSelectorViewController didChangeCoordinate:(CLLocationCoordinate2D)coordinate;
+- (void)mapSelectorViewController:(DBMapSelectorViewController *)mapSelectorViewController didChangeRadius:(CLLocationDistance)radius;
 
 @end
 
 @class DBMapSelectorOverlay;
-@interface DBMapSelectorViewController : UIViewController <MKMapViewDelegate, DBMapSelectorViewControllerProtocol>
+@interface DBMapSelectorViewController : UIViewController <MKMapViewDelegate>
 
+@property (nonatomic, weak) id<DBMapSelectorViewControllerDelegate> delegate;
 @property (nonatomic, weak) IBOutlet MKMapView          *mapView;
 
 /*!
@@ -38,33 +40,35 @@ typedef NS_ENUM(NSInteger, DBMapSelectorEditingType) {
  DBMapSelectorEditingTypeRadiusOnly allows to edit radius only,
  DBMapSelectorEditingTypeNone read only mode.
  */
-@property (nonatomic, assign) DBMapSelectorEditingType  selectorEditingType;
+@property (nonatomic, assign) DBMapSelectorEditingType  editingType;
 
 /*! @brief Used to specify the selector coordinate */
-@property (nonatomic, assign) CLLocationCoordinate2D    selectorCoordinate;
+@property (nonatomic, assign) CLLocationCoordinate2D    circleCoordinate;
 
 /*! @brief Used to specify the selector radius */
-@property (nonatomic, assign) CLLocationDistance        selectorRadius;         // default is equal 1000 meter
+@property (nonatomic, assign) CLLocationDistance        circleRadius;           // default is equal 1000 meter
 
 /*! @brief Used to specify the minimum selector radius */
-@property (nonatomic, assign) CLLocationDistance        selectorRadiusMin;      // default is equal 100 meter
+@property (nonatomic, assign) CLLocationDistance        circleRadiusMin;        // default is equal 100 meter
 
 /*! @brief Used to specify the maximum selector radius */
-@property (nonatomic, assign) CLLocationDistance        selectorRadiusMax;      // default is equal 10000 meter
+@property (nonatomic, assign) CLLocationDistance        circleRadiusMax;        // default is equal 10000 meter
 
 /*! @brief Used to hide or show selector */
-@property (nonatomic, getter=isHidden) BOOL             selectorHidden;         // default is NO
+@property (nonatomic, getter=isHidden) BOOL             hidden;                 // default is NO
 
 /*! 
  @brief Used to specify the selector fill color
  @discussion Color is used to fill the circular map region
  */
-@property (nonatomic, strong) UIColor                   *selectorFillColor;
+@property (nonatomic, strong) UIColor                   *fillColor;
 
 /*! 
  @brief Used to specify the selector stroke color 
  @discussion Color is used to delimit the circular map region
  */
-@property (nonatomic, strong) UIColor                   *selectorStrokeColor;
+@property (nonatomic, strong) UIColor                   *strokeColor;
+
+- (void)updateMapRegionForMapSelector;
 
 @end