Merge branch 'release/1.2.1'

Author: Denis Bogatyrev

DBMapSelectorViewController.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'DBMapSelectorViewController'
-  s.version      = '1.2.0'
+  s.version      = '1.2.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/DBMapSelectorViewControllerExample/Info.plist

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

README.md

@@ -91,7 +91,9 @@ You can change additional MapSelector properties. Full properties list is shown
 - `BOOL fillInside` - Used to switching between inside or outside filling;
 - `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;
-- `BOOL shouldShowRadiusText` - Indicates whether the radius text should be displayed or not.
+- `CGFloat mapRegionCoef` - Used to specify the magnification factor maps region. This parameter affects display the maps region after changing the selector settings. It is recommended to set a value greater than 1.f;
+- `BOOL shouldShowRadiusText` - Indicates whether the radius text should be displayed or not;
+- `BOOL shouldLongPressGesture` - It allows to move the selector to a new location via long press gesture.
 
 ### DBMapSelectorManagerDelegate
 
@@ -123,6 +125,11 @@ You can implement these methods in your `MyViewController` class in order to res
 ```
 ## Version history
 
+### 1.2.1
+- Added new property `BOOL shouldLongPressGesture`. It allows to move the selector to a new location via long press gesture.
+- Added new property `CGFloat mapRegionCoef`. The magnification factor maps region after changing the selector settings. It is recommended to set a value greater than 1.f.
+- Improved drawing selector after first display map controller. Fixed problem when sometimes it cuts the circle after first load.
+
 ### 1.2.0
 - The DBMapSelectorViewController was replaced by a DBMapSelectorManager. This change allows the functionality provided by this component to be more easily integrated into existing projects where, for instance, the target view controller already inherits from another custom view controller. (Thank [Marcelo Schroeder](https://github.com/marcelo-schroeder) for giving solution).
 - Improved user experience when moving the map selector.

Source/DBMapSelectorManager.h

@@ -74,9 +74,18 @@ typedef NS_ENUM(NSInteger, DBMapSelectorEditingType) {
  */
 @property (nonatomic, strong) UIColor                   *strokeColor;
 
-/*! @brief Indicates whether the radius text should be displayed or not. */
+/*!
+ @brief The magnification factor maps region after changing the selector settings
+ @discussion It is recommended to set a value greater than 1.f
+ */
+@property (nonatomic, assign) CGFloat                   mapRegionCoef;          // default is equal 2.f
+
+/*! @brief Indicates whether the radius text should be displayed or not */
 @property (nonatomic) BOOL                              shouldShowRadiusText;
 
+/*! @brief It allows to move the selector to a new location via long press gesture */
+@property (nonatomic) BOOL                              shouldLongPressGesture; // default is NO
+
 - (instancetype)initWithMapView:(MKMapView *)mapView;
 - (void)applySelectorSettings;
 

Source/DBMapSelectorManager.m

@@ -20,14 +20,17 @@
 
 
 @interface DBMapSelectorManager () {
+    BOOL                            _isFirstTimeApplySelectorSettings;
     DBMapSelectorOverlay            *_selectorOverlay;
     DBMapSelectorOverlayRenderer    *_selectorOverlayRenderer;
-
+    
     BOOL                            _mapViewGestureEnabled;
     MKMapPoint                      _prevMapPoint;
     CLLocationDistance              _prevRadius;
     CGRect                          _radiusTouchRect;
     UIView                          *_radiusTouchView;
+    
+    UILongPressGestureRecognizer    *_longPressGestureRecognizer;
 }
 
 @end
@@ -37,6 +40,7 @@ @implementation DBMapSelectorManager
 - (instancetype)initWithMapView:(MKMapView *)mapView {
     self = [super init];
     if (self) {
+        _isFirstTimeApplySelectorSettings = YES;
         _mapView = mapView;
         [self prepareForFirstUse];
     }
@@ -55,8 +59,11 @@ - (void)prepareForFirstUse {
 //    [self.mapView addSubview:_radiusTouchView];
 #endif
 
+    _longPressGestureRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(longPressGestureRecognizer:)];
+    
     _mapViewGestureEnabled = YES;
     [self.mapView addGestureRecognizer:[self selectorGestureRecognizer]];
+    
 }
 
 #pragma mark Defaults
@@ -71,12 +78,18 @@ - (void)selectorSetDefaults {
     self.shouldShowRadiusText = YES;
     self.fillColor = [UIColor orangeColor];
     self.strokeColor = [UIColor darkGrayColor];
+    self.mapRegionCoef = 2.f;
 }
 
 - (void)applySelectorSettings {
     [self updateMapRegionForMapSelector];
     [self displaySelectorAnnotationIfNeeded];
     [self recalculateRadiusTouchRect];
+    if (_isFirstTimeApplySelectorSettings) {
+        _isFirstTimeApplySelectorSettings = NO;
+        [self.mapView removeOverlay:_selectorOverlay];
+        [self.mapView addOverlay:_selectorOverlay];
+    }
 }
 
 #pragma mark - GestureRecognizer
@@ -147,6 +160,28 @@ - (DBMapSelectorGestureRecognizer *)selectorGestureRecognizer {
     return selectorGestureRecognizer;
 }
 
+- (void)longPressGestureRecognizer:(UILongPressGestureRecognizer *)gestureRecognizer {
+    if ([gestureRecognizer isKindOfClass:[UILongPressGestureRecognizer class]] &&
+        ( self.editingType == DBMapSelectorEditingTypeFull || self.editingType == DBMapSelectorEditingTypeCoordinateOnly )) {
+        switch (gestureRecognizer.state) {
+            case UIGestureRecognizerStateBegan: {
+                CGPoint touchPoint = [gestureRecognizer locationInView:self.mapView];
+                CLLocationCoordinate2D coord = [self.mapView convertPoint:touchPoint toCoordinateFromView:self.mapView];
+                self.circleCoordinate = coord;
+                [self displaySelectorAnnotationIfNeeded];
+                break;
+            }
+            case UIGestureRecognizerStateEnded:
+                if (NO == MKMapRectContainsRect(self.mapView.visibleMapRect, _selectorOverlay.boundingMapRect)) {
+                    [self updateMapRegionForMapSelector];
+                }
+                break;
+            default:
+                break;
+        }
+    }
+}
+
 #pragma mark - Accessors
 
 - (void)setCircleRadius:(CLLocationDistance)circleRadius {
@@ -243,6 +278,17 @@ - (void)setShouldShowRadiusText:(BOOL)shouldShowRadiusText {
     _selectorOverlay.shouldShowRadiusText = shouldShowRadiusText;
 }
 
+- (void)setShouldLongPressGesture:(BOOL)shouldLongPressGesture {
+    if (_shouldLongPressGesture != shouldLongPressGesture) {
+        _shouldLongPressGesture = shouldLongPressGesture;
+        if (_shouldLongPressGesture) {
+            [self.mapView addGestureRecognizer:_longPressGestureRecognizer];
+        } else {
+            [self.mapView removeGestureRecognizer:_longPressGestureRecognizer];
+        }
+    }
+}
+
 #pragma mark - Additional
 
 - (void)recalculateRadiusTouchRect {
@@ -261,7 +307,7 @@ - (void)updateMapRegionForMapSelector {
     MKCoordinateRegion selectorRegion = MKCoordinateRegionForMapRect(_selectorOverlay.boundingMapRect);
     MKCoordinateRegion region;
     region.center = selectorRegion.center;
-    region.span = MKCoordinateSpanMake(selectorRegion.span.latitudeDelta *2.f, selectorRegion.span.longitudeDelta *2.f);
+    region.span = MKCoordinateSpanMake(selectorRegion.span.latitudeDelta * _mapRegionCoef, selectorRegion.span.longitudeDelta * _mapRegionCoef);
     [self.mapView setRegion:region animated:YES];
 }