react-native-map4d-map-dtqg 0.1.3 → 0.1.5

package/ios/RMFCircle.m

@@ -1,100 +1,100 @@
-//
-//  RMFCircle.m
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/3/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#import "RMFCircle.h"
-#import <Foundation/Foundation.h>
-#import "RMFEventResponse.h"
-
-@implementation RMFCircle
-
-- (instancetype)init {
-  if ((self = [super init])) {
-    _map4dCircle = [[RMFCircleMap4d alloc] init];
-    _map4dCircle.reactCircle = self;
-
-    _radius = _map4dCircle.radius;
-    _fillColor = _map4dCircle.fillColor;
-    _strokeWidth = _map4dCircle.strokeWidth;
-    _strokeColor = _map4dCircle.strokeColor;
-    _centerCoordinate = _map4dCircle.position;
-    _zIndex = _map4dCircle.zIndex;
-    _visible = true;//!_map4dCircle.isHidden;
-    _userData = nil;
-  }
-  return self;
-}
-
-- (void)setMapView:(RMFMapView *)mapView {
-  _map4dCircle.map = mapView;
-}
-
-/** Property */
-- (void)setCenterCoordinate:(CLLocationCoordinate2D)center {
-  _centerCoordinate = center;
-  _map4dCircle.position = center;
-}
-
-- (void)setRadius:(double)radius {
-  _radius = radius;
-  _map4dCircle.radius = radius;
-}
-
-- (void)setFillColor:(UIColor *)fillColor {
-  _fillColor = fillColor;
-  _map4dCircle.fillColor = fillColor;
-}
-
-- (void)setStrokeColor:(UIColor *)strokeColor {
-  _strokeColor = strokeColor;
-  _map4dCircle.strokeColor = strokeColor;
-}
-
-- (void)setStrokeWidth:(double)strokeWidth {
-  _strokeWidth = strokeWidth;
-  _map4dCircle.strokeWidth = strokeWidth;
-}
-
-- (void)setUserInteractionEnabled:(BOOL)enabled {
-  [super setUserInteractionEnabled:enabled];
-  _map4dCircle.userInteractionEnabled = enabled;
-}
-
-- (void)setZIndex:(float)zIndex {
-  _zIndex = zIndex;
-  _map4dCircle.zIndex = zIndex;
-}
-
-- (void)setVisible:(BOOL)visible {
-  _visible = visible;
-  _map4dCircle.isHidden = !visible;
-}
-
- - (void)setUserData:(NSDictionary *)userData {
-   _userData = userData;
- }
-
-/** Event */
-- (void)didTapAtPixel:(CGPoint)pixel {
-  if(!self.onPress) {
-    return;
-  }
-  
-  CLLocationCoordinate2D tapLocation = [_map4dCircle.map.projection coordinateForPoint:pixel];
-  NSMutableDictionary* response = [NSMutableDictionary dictionaryWithDictionary:[RMFEventResponse fromCoordinate:tapLocation
-                                                                                                           pixel:pixel]];
-  response[@"circle"] = @{
-    @"center": [RMFEventResponse fromCoordinate:_centerCoordinate],
-    @"radius": @(_radius),
-    @"userData": _userData != nil ? _userData : @{}
-  };
-  response[@"action"] = @"circle-press";
-  
-  self.onPress(response);
-}
-
-@end
+//
+//  RMFCircle.m
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/3/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#import "RMFCircle.h"
+#import <Foundation/Foundation.h>
+#import "RMFEventResponse.h"
+
+@implementation RMFCircle
+
+- (instancetype)init {
+  if ((self = [super init])) {
+    _map4dCircle = [[RMFCircleMap4d alloc] init];
+    _map4dCircle.reactCircle = self;
+
+    _radius = _map4dCircle.radius;
+    _fillColor = _map4dCircle.fillColor;
+    _strokeWidth = _map4dCircle.strokeWidth;
+    _strokeColor = _map4dCircle.strokeColor;
+    _centerCoordinate = _map4dCircle.position;
+    _zIndex = _map4dCircle.zIndex;
+    _visible = true;//!_map4dCircle.isHidden;
+    _userData = nil;
+  }
+  return self;
+}
+
+- (void)setMapView:(RMFMapView *)mapView {
+  _map4dCircle.map = mapView;
+}
+
+/** Property */
+- (void)setCenterCoordinate:(CLLocationCoordinate2D)center {
+  _centerCoordinate = center;
+  _map4dCircle.position = center;
+}
+
+- (void)setRadius:(double)radius {
+  _radius = radius;
+  _map4dCircle.radius = radius;
+}
+
+- (void)setFillColor:(UIColor *)fillColor {
+  _fillColor = fillColor;
+  _map4dCircle.fillColor = fillColor;
+}
+
+- (void)setStrokeColor:(UIColor *)strokeColor {
+  _strokeColor = strokeColor;
+  _map4dCircle.strokeColor = strokeColor;
+}
+
+- (void)setStrokeWidth:(double)strokeWidth {
+  _strokeWidth = strokeWidth;
+  _map4dCircle.strokeWidth = strokeWidth;
+}
+
+- (void)setUserInteractionEnabled:(BOOL)enabled {
+  [super setUserInteractionEnabled:enabled];
+  _map4dCircle.userInteractionEnabled = enabled;
+}
+
+- (void)setZIndex:(float)zIndex {
+  _zIndex = zIndex;
+  _map4dCircle.zIndex = zIndex;
+}
+
+- (void)setVisible:(BOOL)visible {
+  _visible = visible;
+  _map4dCircle.isHidden = !visible;
+}
+
+ - (void)setUserData:(NSDictionary *)userData {
+   _userData = userData;
+ }
+
+/** Event */
+- (void)didTapAtPixel:(CGPoint)pixel {
+  if(!self.onPress) {
+    return;
+  }
+  
+  CLLocationCoordinate2D tapLocation = [_map4dCircle.map.projection coordinateForPoint:pixel];
+  NSMutableDictionary* response = [NSMutableDictionary dictionaryWithDictionary:[RMFEventResponse fromCoordinate:tapLocation
+                                                                                                           pixel:pixel]];
+  response[@"circle"] = @{
+    @"center": [RMFEventResponse fromCoordinate:_centerCoordinate],
+    @"radius": @(_radius),
+    @"userData": _userData != nil ? _userData : @{}
+  };
+  response[@"action"] = @"circle-press";
+  
+  self.onPress(response);
+}
+
+@end

package/ios/RMFCircleManager.h

@@ -1,18 +1,18 @@
-//
-//  RMFCircleManager.h
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/3/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#ifndef RMFCircleManager_h
-#define RMFCircleManager_h
-
-#import <React/RCTViewManager.h>
-
-@interface RMFCircleManager : RCTViewManager
-
-@end
-
-#endif /* RMFCircleManager_h */
+//
+//  RMFCircleManager.h
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/3/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#ifndef RMFCircleManager_h
+#define RMFCircleManager_h
+
+#import <React/RCTViewManager.h>
+
+@interface RMFCircleManager : RCTViewManager
+
+@end
+
+#endif /* RMFCircleManager_h */

package/ios/RMFCircleManager.m

@@ -1,155 +1,127 @@
-//
-//  RMFCircleManager.m
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/3/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#import "RMFCircleManager.h"
-#import "RMFCircle.h"
-#import <Foundation/Foundation.h>
-#import <React/RCTConvert+CoreLocation.h>
-#import <React/RCTBridge.h>
-#import <React/RCTUIManager.h>
-
-@implementation RMFCircleManager
-
-RCT_EXPORT_MODULE(RMFCircle)
-
-- (UIView *)view {
-  RMFCircle * circle = [[RMFCircle alloc] init];
-  return circle;
-}
-
-RCT_REMAP_VIEW_PROPERTY(center, centerCoordinate, CLLocationCoordinate2D)
-RCT_EXPORT_VIEW_PROPERTY(radius, double)
-RCT_EXPORT_VIEW_PROPERTY(fillColor, UIColor)
-RCT_EXPORT_VIEW_PROPERTY(strokeColor, UIColor)
-RCT_EXPORT_VIEW_PROPERTY(strokeWidth, double)
-RCT_EXPORT_VIEW_PROPERTY(userInteractionEnabled, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(zIndex, float)
-RCT_EXPORT_VIEW_PROPERTY(visible, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(userData, NSDictionary)
-
-RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
-
-RCT_EXPORT_METHOD(setCenter:(nonnull NSNumber *)reactTag
-                  withCoordinate:(id)coordinate)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFCircle class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFCircle, got: %@", view);
-    } else {
-      RMFCircle *circle = (RMFCircle *)view;
-      [circle setCenterCoordinate:[RCTConvert CLLocationCoordinate2D:coordinate]];
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setRadius:(nonnull NSNumber *)reactTag
-                  withRadius:(double)radius)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFCircle class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFCircle, got: %@", view);
-    } else {
-      RMFCircle *circle = (RMFCircle *)view;
-      [circle setRadius:radius];
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setFillColor:(nonnull NSNumber *)reactTag
-                  color:(id)color)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFCircle class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFCircle, got: %@", view);
-    } else {
-      RMFCircle *circle = (RMFCircle *)view;
-      UIColor* fillCorlor = [RCTConvert UIColor:color];
-      if (fillCorlor != nil) {
-        [circle setFillColor:fillCorlor];
-      }
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setStrokeColor:(nonnull NSNumber *)reactTag
-                  color:(id)color)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFCircle class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFCircle, got: %@", view);
-    } else {
-      RMFCircle *circle = (RMFCircle *)view;
-      UIColor* strokeColor = [RCTConvert UIColor:color];
-      if (strokeColor != nil) {
-        [circle setStrokeColor:strokeColor];
-      }
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setStrokeWidth:(nonnull NSNumber *)reactTag
-                  width:(double)width)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFCircle class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFCircle, got: %@", view);
-    } else {
-      RMFCircle *circle = (RMFCircle *)view;
-      [circle setStrokeWidth:width];
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setZIndex:(nonnull NSNumber *)reactTag
-                  zIndex:(float)zIndex)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFCircle class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFCircle, got: %@", view);
-    } else {
-      RMFCircle *circle = (RMFCircle *)view;
-      [circle setZIndex:zIndex];
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setVisible:(nonnull NSNumber *)reactTag
-                  visible:(BOOL)visible)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFCircle class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFCircle, got: %@", view);
-    } else {
-      RMFCircle *circle = (RMFCircle *)view;
-      [circle setVisible:visible];
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setUserData:(nonnull NSNumber *)reactTag
-                  userData:(id)json)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFCircle class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFCircle, got: %@", view);
-    } else {
-      RMFCircle *circle = (RMFCircle *)view;
-      [circle setUserData:[RCTConvert NSDictionary:json]];
-    }
-  }];
-}
-
-@end
+//
+//  RMFCircleManager.m
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/3/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#import "RMFCircleManager.h"
+#import "RMFCircle.h"
+#import <Foundation/Foundation.h>
+#import <React/RCTConvert+CoreLocation.h>
+#import <React/RCTBridge.h>
+#import <React/RCTUIManager.h>
+
+@implementation RMFCircleManager
+
+RCT_EXPORT_MODULE(RMFCircle)
+
+- (void)withCircleForTag:(nonnull NSNumber *)reactTag
+                 handler:(void (^)(RMFCircle *circle))handler
+{
+  RCTUIManager *uiManager = self.bridge.uiManager;
+  if (uiManager == nil) {
+    RCTLogError(@"UIManager is unavailable on iOS runtime");
+    return;
+  }
+
+  [uiManager addUIBlock:^(__unused RCTUIManager *manager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+    id view = viewRegistry[reactTag];
+    if (![view isKindOfClass:[RMFCircle class]]) {
+      RCTLogError(@"Invalid view returned from registry, expecting RMFCircle, got: %@", view);
+      return;
+    }
+
+    handler((RMFCircle *)view);
+  }];
+}
+
+- (UIView *)view {
+  RMFCircle * circle = [[RMFCircle alloc] init];
+  return circle;
+}
+
+RCT_REMAP_VIEW_PROPERTY(center, centerCoordinate, CLLocationCoordinate2D)
+RCT_EXPORT_VIEW_PROPERTY(radius, double)
+RCT_EXPORT_VIEW_PROPERTY(fillColor, UIColor)
+RCT_EXPORT_VIEW_PROPERTY(strokeColor, UIColor)
+RCT_EXPORT_VIEW_PROPERTY(strokeWidth, double)
+RCT_EXPORT_VIEW_PROPERTY(userInteractionEnabled, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(zIndex, float)
+RCT_EXPORT_VIEW_PROPERTY(visible, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(userData, NSDictionary)
+
+RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
+
+RCT_EXPORT_METHOD(setCenter:(nonnull NSNumber *)reactTag
+                  withCoordinate:(id)coordinate)
+{
+  [self withCircleForTag:reactTag handler:^(RMFCircle *circle) {
+    [circle setCenterCoordinate:[RCTConvert CLLocationCoordinate2D:coordinate]];
+  }];
+}
+
+RCT_EXPORT_METHOD(setRadius:(nonnull NSNumber *)reactTag
+                  withRadius:(double)radius)
+{
+  [self withCircleForTag:reactTag handler:^(RMFCircle *circle) {
+    [circle setRadius:radius];
+  }];
+}
+
+RCT_EXPORT_METHOD(setFillColor:(nonnull NSNumber *)reactTag
+                  color:(id)color)
+{
+  [self withCircleForTag:reactTag handler:^(RMFCircle *circle) {
+    UIColor* fillCorlor = [RCTConvert UIColor:color];
+    if (fillCorlor != nil) {
+      [circle setFillColor:fillCorlor];
+    }
+  }];
+}
+
+RCT_EXPORT_METHOD(setStrokeColor:(nonnull NSNumber *)reactTag
+                  color:(id)color)
+{
+  [self withCircleForTag:reactTag handler:^(RMFCircle *circle) {
+    UIColor* strokeColor = [RCTConvert UIColor:color];
+    if (strokeColor != nil) {
+      [circle setStrokeColor:strokeColor];
+    }
+  }];
+}
+
+RCT_EXPORT_METHOD(setStrokeWidth:(nonnull NSNumber *)reactTag
+                  width:(double)width)
+{
+  [self withCircleForTag:reactTag handler:^(RMFCircle *circle) {
+    [circle setStrokeWidth:width];
+  }];
+}
+
+RCT_EXPORT_METHOD(setZIndex:(nonnull NSNumber *)reactTag
+                  zIndex:(float)zIndex)
+{
+  [self withCircleForTag:reactTag handler:^(RMFCircle *circle) {
+    [circle setZIndex:zIndex];
+  }];
+}
+
+RCT_EXPORT_METHOD(setVisible:(nonnull NSNumber *)reactTag
+                  visible:(BOOL)visible)
+{
+  [self withCircleForTag:reactTag handler:^(RMFCircle *circle) {
+    [circle setVisible:visible];
+  }];
+}
+
+RCT_EXPORT_METHOD(setUserData:(nonnull NSNumber *)reactTag
+                  userData:(id)json)
+{
+  [self withCircleForTag:reactTag handler:^(RMFCircle *circle) {
+    [circle setUserData:[RCTConvert NSDictionary:json]];
+  }];
+}
+
+@end

package/ios/RMFCircleMap4d.h

@@ -1,23 +1,23 @@
-//
-//  RMFCircleMap4d.h
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/3/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#ifndef RMFCircleMap4d_h
-#define RMFCircleMap4d_h
-
-#import <Map4dMap/Map4dMap.h>
-
-@class RMFCircle;
-
-@interface RMFCircleMap4d : MFCircle
-
-@property (nonatomic, weak) RMFCircle *reactCircle;
-
-@end
-
-
-#endif /* RMFCircleMap4d_h */
+//
+//  RMFCircleMap4d.h
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/3/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#ifndef RMFCircleMap4d_h
+#define RMFCircleMap4d_h
+
+#import <Map4dMap/Map4dMap.h>
+
+@class RMFCircle;
+
+@interface RMFCircleMap4d : MFCircle
+
+@property (nonatomic, weak) RMFCircle *reactCircle;
+
+@end
+
+
+#endif /* RMFCircleMap4d_h */

package/ios/RMFCircleMap4d.m

@@ -1,13 +1,13 @@
-//
-//  RMFCircleMap4d.m
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/4/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#import "RMFCircleMap4d.h"
-
-@implementation RMFCircleMap4d
-
-@end
+//
+//  RMFCircleMap4d.m
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/4/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#import "RMFCircleMap4d.h"
+
+@implementation RMFCircleMap4d
+
+@end

package/ios/RMFCoordinate.h

@@ -1,22 +1,22 @@
-//
-//  RMFCoordinate.h
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/4/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#ifndef MFCoordinate_h
-#define MFCoordinate_h
-
-#import <Foundation/Foundation.h>
-#import <CoreLocation/CoreLocation.h>
-
-@interface RMFCoordinate : NSObject
-
-@property (nonatomic, assign) CLLocationCoordinate2D coordinate;
-
-@end
-
-
-#endif /* RMFCoordinate_h */
+//
+//  RMFCoordinate.h
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/4/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#ifndef MFCoordinate_h
+#define MFCoordinate_h
+
+#import <Foundation/Foundation.h>
+#import <CoreLocation/CoreLocation.h>
+
+@interface RMFCoordinate : NSObject
+
+@property (nonatomic, assign) CLLocationCoordinate2D coordinate;
+
+@end
+
+
+#endif /* RMFCoordinate_h */

package/ios/RMFCoordinate.m

@@ -1,13 +1,13 @@
-//
-//  RMFCoordinate.m
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/4/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#import "RMFCoordinate.h"
-#import <Foundation/Foundation.h>
-
-@implementation RMFCoordinate
-@end
+//
+//  RMFCoordinate.m
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/4/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#import "RMFCoordinate.h"
+#import <Foundation/Foundation.h>
+
+@implementation RMFCoordinate
+@end