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

package/ios/RMFPolyline.h

@@ -1,38 +1,38 @@
-//
-//  RMFPolyline.h
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/3/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#ifndef RMFPolyline_h
-#define RMFPolyline_h
-
-#import <React/UIView+React.h>
-#import <Map4dMap/Map4dMap.h>
-#import "RMFPolylineMap4d.h"
-#import "RMFMapView.h"
-#import "RMFCoordinate.h"
-
-@interface RMFPolyline : UIView
-
-@property (nonatomic, strong) RMFPolylineMap4d * map4dPolyline;
-
-@property (nonatomic, copy) RCTBubblingEventBlock _Nullable onPress;
-
-@property(nonatomic, strong) NSArray<RMFCoordinate *> * coordinates;
-@property(nonatomic, assign) CGFloat width;
-@property(nonatomic, assign) NSString * lineStyle;
-@property(nonatomic, assign, nullable) UIColor * color;
-@property(nonatomic, assign) float zIndex;
-@property(nonatomic, assign) BOOL visible;
-@property(nonatomic, copy, nullable) NSDictionary * userData;
-
-- (void)didTapAtPixel:(CGPoint)pixel;
-- (void)setMapView:(RMFMapView* _Nullable)mapView;
-
-@end
-
-
-#endif /* RMFPolyline_h */
+//
+//  RMFPolyline.h
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/3/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#ifndef RMFPolyline_h
+#define RMFPolyline_h
+
+#import <React/UIView+React.h>
+#import <Map4dMap/Map4dMap.h>
+#import "RMFPolylineMap4d.h"
+#import "RMFMapView.h"
+#import "RMFCoordinate.h"
+
+@interface RMFPolyline : UIView
+
+@property (nonatomic, strong) RMFPolylineMap4d * map4dPolyline;
+
+@property (nonatomic, copy) RCTBubblingEventBlock _Nullable onPress;
+
+@property(nonatomic, strong) NSArray<RMFCoordinate *> * coordinates;
+@property(nonatomic, assign) CGFloat width;
+@property(nonatomic, assign) NSString * lineStyle;
+@property(nonatomic, assign, nullable) UIColor * color;
+@property(nonatomic, assign) float zIndex;
+@property(nonatomic, assign) BOOL visible;
+@property(nonatomic, copy, nullable) NSDictionary * userData;
+
+- (void)didTapAtPixel:(CGPoint)pixel;
+- (void)setMapView:(RMFMapView* _Nullable)mapView;
+
+@end
+
+
+#endif /* RMFPolyline_h */

package/ios/RMFPolyline.m

@@ -1,101 +1,101 @@
-//
-//  RMFPolyline.m
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/3/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#import "RMFPolyline.h"
-#import "RMFEventResponse.h"
-
-@implementation RMFPolyline
-
-- (instancetype)init {
-  if ((self = [super init])) {
-    _map4dPolyline = [[RMFPolylineMap4d alloc] init];
-    _map4dPolyline.reactPolyline = self;
-    
-    _coordinates = nil;
-    _width = _map4dPolyline.width;
-    _lineStyle = @"solid";//MFPolylineStyleSolid
-    _color = _map4dPolyline.color;
-    _zIndex = _map4dPolyline.zIndex;
-    _visible = true;//!_map4dPolyline.isHidden
-    _userData = nil;
-  }
-  return self;
-}
-
-- (void)setMapView:(RMFMapView *)mapView {
-  _map4dPolyline.map = mapView;
-}
-
-/** Properties */
-
-- (void)setCoordinates:(NSArray<RMFCoordinate *> *)coordinates {
-  _coordinates = coordinates;
-  MFMutablePath* path = [[MFMutablePath alloc] init];
-  for(int i = 0; i < coordinates.count; i++)
-  {
-    [path addCoordinate:coordinates[i].coordinate];
-  }
-  _map4dPolyline.path = path;
-}
-
-- (void)setWidth:(CGFloat)width {
-  _width = width;
-  _map4dPolyline.width = width;
-}
-
-- (void)setColor:(UIColor *)color {
-  _color = color;
-  _map4dPolyline.color = color;
-}
-
-- (void)setLineStyle:(NSString *)lineStyle {
-  _lineStyle = lineStyle;
-  if ([lineStyle isEqualToString:@"dotted"]) {
-    _map4dPolyline.strokePattern = [MFStrokePattern dashWithLength:_width gap:_width];
-  } else {
-    _map4dPolyline.strokePattern = MFStrokePattern.solid;
-  }
-}
-
-- (void)setZIndex:(float)zIndex {
-  _zIndex = zIndex;
-  _map4dPolyline.zIndex = zIndex;
-}
-
-- (void)setVisible:(BOOL)visible {
-  _visible = visible;
-  _map4dPolyline.isHidden = !visible;
-}
-
-- (void)setUserInteractionEnabled:(BOOL)enabled {
-  [super setUserInteractionEnabled:enabled];
-  _map4dPolyline.userInteractionEnabled = enabled;
-}
-
- - (void)setUserData:(NSDictionary *)userData {
-   _userData = userData;
- }
-
-/** Event */
-- (void)didTapAtPixel:(CGPoint)pixel {
-  if (!self.onPress) {
-    return;
-  }
-  
-  CLLocationCoordinate2D tapLocation = [_map4dPolyline.map.projection coordinateForPoint:pixel];
-  NSMutableDictionary* response = [NSMutableDictionary dictionaryWithDictionary:[RMFEventResponse fromCoordinate:tapLocation
-                                                                                                           pixel:pixel]];
-  response[@"polyline"] = @{
-    @"userData": _userData != nil ? _userData : @{}
-  };
-  response[@"action"] = @"polyline-press";
-  
-  self.onPress(response);
-}
-
-@end
+//
+//  RMFPolyline.m
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/3/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#import "RMFPolyline.h"
+#import "RMFEventResponse.h"
+
+@implementation RMFPolyline
+
+- (instancetype)init {
+  if ((self = [super init])) {
+    _map4dPolyline = [[RMFPolylineMap4d alloc] init];
+    _map4dPolyline.reactPolyline = self;
+    
+    _coordinates = nil;
+    _width = _map4dPolyline.width;
+    _lineStyle = @"solid";//MFPolylineStyleSolid
+    _color = _map4dPolyline.color;
+    _zIndex = _map4dPolyline.zIndex;
+    _visible = true;//!_map4dPolyline.isHidden
+    _userData = nil;
+  }
+  return self;
+}
+
+- (void)setMapView:(RMFMapView *)mapView {
+  _map4dPolyline.map = mapView;
+}
+
+/** Properties */
+
+- (void)setCoordinates:(NSArray<RMFCoordinate *> *)coordinates {
+  _coordinates = coordinates;
+  MFMutablePath* path = [[MFMutablePath alloc] init];
+  for(int i = 0; i < coordinates.count; i++)
+  {
+    [path addCoordinate:coordinates[i].coordinate];
+  }
+  _map4dPolyline.path = path;
+}
+
+- (void)setWidth:(CGFloat)width {
+  _width = width;
+  _map4dPolyline.width = width;
+}
+
+- (void)setColor:(UIColor *)color {
+  _color = color;
+  _map4dPolyline.color = color;
+}
+
+- (void)setLineStyle:(NSString *)lineStyle {
+  _lineStyle = lineStyle;
+  if ([lineStyle isEqualToString:@"dotted"]) {
+    _map4dPolyline.strokePattern = [MFStrokePattern dashWithLength:_width gap:_width];
+  } else {
+    _map4dPolyline.strokePattern = MFStrokePattern.solid;
+  }
+}
+
+- (void)setZIndex:(float)zIndex {
+  _zIndex = zIndex;
+  _map4dPolyline.zIndex = zIndex;
+}
+
+- (void)setVisible:(BOOL)visible {
+  _visible = visible;
+  _map4dPolyline.isHidden = !visible;
+}
+
+- (void)setUserInteractionEnabled:(BOOL)enabled {
+  [super setUserInteractionEnabled:enabled];
+  _map4dPolyline.userInteractionEnabled = enabled;
+}
+
+ - (void)setUserData:(NSDictionary *)userData {
+   _userData = userData;
+ }
+
+/** Event */
+- (void)didTapAtPixel:(CGPoint)pixel {
+  if (!self.onPress) {
+    return;
+  }
+  
+  CLLocationCoordinate2D tapLocation = [_map4dPolyline.map.projection coordinateForPoint:pixel];
+  NSMutableDictionary* response = [NSMutableDictionary dictionaryWithDictionary:[RMFEventResponse fromCoordinate:tapLocation
+                                                                                                           pixel:pixel]];
+  response[@"polyline"] = @{
+    @"userData": _userData != nil ? _userData : @{}
+  };
+  response[@"action"] = @"polyline-press";
+  
+  self.onPress(response);
+}
+
+@end

package/ios/RMFPolylineManager.h

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

package/ios/RMFPolylineManager.m

@@ -1,139 +1,117 @@
-//
-//  RMFPolylineManager.m
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/3/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#import "RMFPolylineManager.h"
-#import "RMFPolyline.h"
-#import <Foundation/Foundation.h>
-#import "RCTConvert+Map4dMap.h"
-#import <React/RCTBridge.h>
-#import <React/RCTUIManager.h>
-
-@implementation RMFPolylineManager
-
-
-RCT_EXPORT_MODULE(RMFPolyline)
-
-- (UIView *)view {
-  RMFPolyline * polyline = [[RMFPolyline alloc] init];
-  return polyline;
-}
-
-RCT_EXPORT_VIEW_PROPERTY(coordinates, RMFCoordinateArray)
-RCT_EXPORT_VIEW_PROPERTY(width, CGFloat)
-RCT_EXPORT_VIEW_PROPERTY(color, UIColor)
-RCT_EXPORT_VIEW_PROPERTY(lineStyle, NSString)
-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(setCoordinates:(nonnull NSNumber *)reactTag
-                  withCoordinates:(id)coordinates)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFPolyline class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFCircle, got: %@", view);
-    } else {
-      RMFPolyline *polyline = (RMFPolyline *)view;
-      [polyline setCoordinates:[RCTConvert RMFCoordinateArray:coordinates]];
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setWidth:(nonnull NSNumber *)reactTag
-                  width:(CGFloat)width)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFPolyline class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFCircle, got: %@", view);
-    } else {
-      RMFPolyline *polyline = (RMFPolyline *)view;
-      [polyline setWidth:width];
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setColor:(nonnull NSNumber *)reactTag
-                  color:(id)json)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFPolyline class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFCircle, got: %@", view);
-    } else {
-      RMFPolyline *polyline = (RMFPolyline *)view;
-      UIColor* color = [RCTConvert UIColor:json];
-      if (color != nil) {
-        [polyline setColor:color];
-      }
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setLineStyle:(nonnull NSNumber *)reactTag
-                  style:(NSString*)style)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFPolyline class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFCircle, got: %@", view);
-    } else {
-      RMFPolyline *polyline = (RMFPolyline *)view;
-      [polyline setLineStyle:style];
-    }
-  }];
-}
-
-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:[RMFPolyline class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFCircle, got: %@", view);
-    } else {
-      RMFPolyline *polyline = (RMFPolyline *)view;
-      [polyline 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:[RMFPolyline class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFCircle, got: %@", view);
-    } else {
-      RMFPolyline *polyline = (RMFPolyline *)view;
-      [polyline 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:[RMFPolyline class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFCircle, got: %@", view);
-    } else {
-      RMFPolyline *polyline = (RMFPolyline *)view;
-      [polyline setUserData:[RCTConvert NSDictionary:json]];
-    }
-  }];
-}
-
-
-@end
+//
+//  RMFPolylineManager.m
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/3/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#import "RMFPolylineManager.h"
+#import "RMFPolyline.h"
+#import <Foundation/Foundation.h>
+#import "RCTConvert+Map4dMap.h"
+#import <React/RCTBridge.h>
+#import <React/RCTUIManager.h>
+
+@implementation RMFPolylineManager
+
+
+RCT_EXPORT_MODULE(RMFPolyline)
+
+- (void)withPolylineForTag:(nonnull NSNumber *)reactTag
+                   handler:(void (^)(RMFPolyline *polyline))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:[RMFPolyline class]]) {
+      RCTLogError(@"Invalid view returned from registry, expecting RMFPolyline, got: %@", view);
+      return;
+    }
+
+    handler((RMFPolyline *)view);
+  }];
+}
+
+- (UIView *)view {
+  RMFPolyline * polyline = [[RMFPolyline alloc] init];
+  return polyline;
+}
+
+RCT_EXPORT_VIEW_PROPERTY(coordinates, RMFCoordinateArray)
+RCT_EXPORT_VIEW_PROPERTY(width, CGFloat)
+RCT_EXPORT_VIEW_PROPERTY(color, UIColor)
+RCT_EXPORT_VIEW_PROPERTY(lineStyle, NSString)
+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(setCoordinates:(nonnull NSNumber *)reactTag
+                  withCoordinates:(id)coordinates)
+{
+  [self withPolylineForTag:reactTag handler:^(RMFPolyline *polyline) {
+    [polyline setCoordinates:[RCTConvert RMFCoordinateArray:coordinates]];
+  }];
+}
+
+RCT_EXPORT_METHOD(setWidth:(nonnull NSNumber *)reactTag
+                  width:(CGFloat)width)
+{
+  [self withPolylineForTag:reactTag handler:^(RMFPolyline *polyline) {
+    [polyline setWidth:width];
+  }];
+}
+
+RCT_EXPORT_METHOD(setColor:(nonnull NSNumber *)reactTag
+                  color:(id)json)
+{
+  [self withPolylineForTag:reactTag handler:^(RMFPolyline *polyline) {
+    UIColor* color = [RCTConvert UIColor:json];
+    if (color != nil) {
+      [polyline setColor:color];
+    }
+  }];
+}
+
+RCT_EXPORT_METHOD(setLineStyle:(nonnull NSNumber *)reactTag
+                  style:(NSString*)style)
+{
+  [self withPolylineForTag:reactTag handler:^(RMFPolyline *polyline) {
+    [polyline setLineStyle:style];
+  }];
+}
+
+RCT_EXPORT_METHOD(setZIndex:(nonnull NSNumber *)reactTag
+                  zIndex:(float)zIndex)
+{
+  [self withPolylineForTag:reactTag handler:^(RMFPolyline *polyline) {
+    [polyline setZIndex:zIndex];
+  }];
+}
+
+RCT_EXPORT_METHOD(setVisible:(nonnull NSNumber *)reactTag
+                  visible:(BOOL)visible)
+{
+  [self withPolylineForTag:reactTag handler:^(RMFPolyline *polyline) {
+    [polyline setVisible:visible];
+  }];
+}
+
+RCT_EXPORT_METHOD(setUserData:(nonnull NSNumber *)reactTag
+                  userData:(id)json)
+{
+  [self withPolylineForTag:reactTag handler:^(RMFPolyline *polyline) {
+    [polyline setUserData:[RCTConvert NSDictionary:json]];
+  }];
+}
+
+
+@end

package/ios/RMFPolylineMap4d.h

@@ -1,22 +1,22 @@
-//
-//  RMFPolylineMap4d.h
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/3/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#ifndef RMFPolylineMap4d_h
-#define RMFPolylineMap4d_h
-
-#import <Map4dMap/Map4dMap.h>
-
-@class RMFPolyline;
-
-@interface RMFPolylineMap4d : MFPolyline
-
-@property (nonatomic, weak) RMFPolyline *reactPolyline;
-
-@end
-
-#endif /* RMFPolylineMap4d_h */
+//
+//  RMFPolylineMap4d.h
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/3/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#ifndef RMFPolylineMap4d_h
+#define RMFPolylineMap4d_h
+
+#import <Map4dMap/Map4dMap.h>
+
+@class RMFPolyline;
+
+@interface RMFPolylineMap4d : MFPolyline
+
+@property (nonatomic, weak) RMFPolyline *reactPolyline;
+
+@end
+
+#endif /* RMFPolylineMap4d_h */

package/ios/RMFPolylineMap4d.m

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