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

package/ios/Map4dMapViewManager.m

@@ -1,34 +1,34 @@
-#import <React/RCTViewManager.h>
-
-@interface Map4dMapViewManager : RCTViewManager
-@end
-
-@implementation Map4dMapViewManager
-
-RCT_EXPORT_MODULE(Map4dMapView)
-
-- (UIView *)view
-{
-  return [[UIView alloc] init];
-}
-
-RCT_CUSTOM_VIEW_PROPERTY(color, NSString, UIView)
-{
-  [view setBackgroundColor:[self hexStringToColor:json]];
-}
-
-- hexStringToColor:(NSString *)stringToConvert
-{
-  NSString *noHashString = [stringToConvert stringByReplacingOccurrencesOfString:@"#" withString:@""];
-  NSScanner *stringScanner = [NSScanner scannerWithString:noHashString];
-
-  unsigned hex;
-  if (![stringScanner scanHexInt:&hex]) return nil;
-  int r = (hex >> 16) & 0xFF;
-  int g = (hex >> 8) & 0xFF;
-  int b = (hex) & 0xFF;
-
-  return [UIColor colorWithRed:r / 255.0f green:g / 255.0f blue:b / 255.0f alpha:1.0f];
-}
-
-@end
+#import <React/RCTViewManager.h>
+
+@interface Map4dMapViewManager : RCTViewManager
+@end
+
+@implementation Map4dMapViewManager
+
+RCT_EXPORT_MODULE(Map4dMapView)
+
+- (UIView *)view
+{
+  return [[UIView alloc] init];
+}
+
+RCT_CUSTOM_VIEW_PROPERTY(color, NSString, UIView)
+{
+  [view setBackgroundColor:[self hexStringToColor:json]];
+}
+
+- hexStringToColor:(NSString *)stringToConvert
+{
+  NSString *noHashString = [stringToConvert stringByReplacingOccurrencesOfString:@"#" withString:@""];
+  NSScanner *stringScanner = [NSScanner scannerWithString:noHashString];
+
+  unsigned hex;
+  if (![stringScanner scanHexInt:&hex]) return nil;
+  int r = (hex >> 16) & 0xFF;
+  int g = (hex >> 8) & 0xFF;
+  int b = (hex) & 0xFF;
+
+  return [UIColor colorWithRed:r / 255.0f green:g / 255.0f blue:b / 255.0f alpha:1.0f];
+}
+
+@end

package/ios/RCTConvert+Map4dMap.h

@@ -1,33 +1,33 @@
-//
-//  RCTConvert+Map4dMap.h
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/3/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#ifndef RCTConvert_Map4dMap_h
-#define RCTConvert_Map4dMap_h
-
-#import <React/RCTConvert.h>
-
-@class RMFCoordinate;
-@class MFCameraPosition;
-@class RMFIcon;
-@class MFCoordinateBounds;
-@class RMFDirectionsMarkerOptions;
-
-@interface RCTConvert(Map4dMap)
-
-+ (RMFCoordinate *)RMFCoordinate:(id)json;
-+ (NSArray<RMFCoordinate *> *)RMFCoordinateArray:(id)json;
-+ (NSArray<NSArray<RMFCoordinate *> *> *)RMFCoordinateArrayArray:(id)json;
-+ (MFCameraPosition *)MFCameraPosition:(id)json;
-+ (MFCameraPosition *)MFCameraPosition:(id)json withDefaultCamera:(MFCameraPosition*)camera;
-+ (RMFIcon *)RMFIcon:(id)json;
-+ (MFCoordinateBounds *)MFCoordinateBounds:(id)json;
-+ (RMFDirectionsMarkerOptions *)RMFDirectionsMarkerOptions:(id)json;
-
-@end
-
-#endif /* RCTConvert_Map4dMap_h */
+//
+//  RCTConvert+Map4dMap.h
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/3/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#ifndef RCTConvert_Map4dMap_h
+#define RCTConvert_Map4dMap_h
+
+#import <React/RCTConvert.h>
+
+@class RMFCoordinate;
+@class MFCameraPosition;
+@class RMFIcon;
+@class MFCoordinateBounds;
+@class RMFDirectionsMarkerOptions;
+
+@interface RCTConvert(Map4dMap)
+
++ (RMFCoordinate *)RMFCoordinate:(id)json;
++ (NSArray<RMFCoordinate *> *)RMFCoordinateArray:(id)json;
++ (NSArray<NSArray<RMFCoordinate *> *> *)RMFCoordinateArrayArray:(id)json;
++ (MFCameraPosition *)MFCameraPosition:(id)json;
++ (MFCameraPosition *)MFCameraPosition:(id)json withDefaultCamera:(MFCameraPosition*)camera;
++ (RMFIcon *)RMFIcon:(id)json;
++ (MFCoordinateBounds *)MFCoordinateBounds:(id)json;
++ (RMFDirectionsMarkerOptions *)RMFDirectionsMarkerOptions:(id)json;
+
+@end
+
+#endif /* RCTConvert_Map4dMap_h */

package/ios/RCTConvert+Map4dMap.m

@@ -1,112 +1,112 @@
-//
-//  RCTConvert+Map4dMap.m
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/3/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#import "RCTConvert+Map4dMap.h"
-#import <React/RCTConvert+CoreLocation.h>
-#import <Map4dMap/Map4dMap.h>
-#import "RMFCoordinate.h"
-#import "RMFIcon.h"
-#import "RMFDirectionsMarkerOptions.h"
-
-@implementation RCTConvert(Map4dMap)
-
-+ (RMFCoordinate *)RMFCoordinate:(id)json {
-    RMFCoordinate *coord = [RMFCoordinate new];
-    coord.coordinate = [self CLLocationCoordinate2D:json];
-    return coord;
-}
-
-RCT_ARRAY_CONVERTER(RMFCoordinate)
-
-+ (NSArray<NSArray<RMFCoordinate *> *> *)RMFCoordinateArrayArray:(id)json {
-    return RCTConvertArrayValue(@selector(RMFCoordinateArray:), json);
-}
-
-+ (MFCameraPosition *)MFCameraPosition:(id)json withDefaultCamera:(MFCameraPosition*)camera {
-  double zoom = 0;
-  double tilt = 0;
-  double bearing = 0;
-  CLLocationCoordinate2D target = CLLocationCoordinate2DMake(0, 0);
-  if (camera != nil) {
-    target = camera.target;
-    zoom = camera.zoom;
-    tilt = camera.tilt;
-    bearing = camera.bearing;
-  }
-  
-  json = [self NSDictionary:json];
-  if (json[@"center"]) {
-    target = [self CLLocationCoordinate2D:json[@"center"]];
-  }
-  
-  if (json[@"zoom"]) {
-    zoom = [self double:json[@"zoom"]];
-  }
-  
-  if (json[@"tilt"]) {
-    tilt = [self double:json[@"tilt"]];
-  }
-  
-  if (json[@"bearing"]) {
-    bearing = [self double:json[@"bearing"]];
-  }
-  
-  return [[MFCameraPosition alloc] initWithTarget:target zoom:zoom tilt:tilt bearing:bearing];
-}
-
-+ (MFCameraPosition *)MFCameraPosition:(id)json {
-  return [self MFCameraPosition:json withDefaultCamera:nil];
-}
-
-+ (RMFIcon *)RMFIcon:(id)json {
-  json = [self NSDictionary:json];
-  if (json[@"uri"]) {
-    RMFIcon * icon = [[RMFIcon alloc] init];
-    icon.uri = [self NSString:json[@"uri"]];
-    if (json[@"width"]) {
-      icon.width = [self NSNumber:json[@"width"]];
-    }
-    if (json[@"height"]) {
-      icon.height = [self NSNumber:json[@"height"]];
-    }
-    return icon;
-  }
-  return nil;
-}
-
-+ (MFCoordinateBounds *)MFCoordinateBounds:(id)json {
-  json = [self NSDictionary:json];
-  CLLocationCoordinate2D northEast = [self CLLocationCoordinate2D:json[@"northEast"]];
-  CLLocationCoordinate2D southWest = [self CLLocationCoordinate2D:json[@"southWest"]];
-  return [[MFCoordinateBounds alloc] initWithCoordinate:northEast coordinate:southWest];
-}
-
-+ (RMFDirectionsMarkerOptions *)RMFDirectionsMarkerOptions:(id)json {
-  json = [self NSDictionary:json];
-  RMFDirectionsMarkerOptions* options = [[RMFDirectionsMarkerOptions alloc] init];
-  
-  if (json[@"coordinate"]) {
-    options.coordinate = [self CLLocationCoordinate2D:json[@"coordinate"]];
-  }
-  if (json[@"icon"]) {
-    options.icon = [self RMFIcon:json[@"icon"]];
-  }
-  if (json[@"title"]) {
-    options.title = [self NSString:json[@"title"]];
-  }
-  if (json[@"titleColor"]) {
-    options.titleColor = [self UIColor:json[@"titleColor"]];
-  }
-  if (json[@"visible"]) {
-    options.visible = [self BOOL:json[@"visible"]];
-  }
-  
-  return options;
-}
-
-@end
+//
+//  RCTConvert+Map4dMap.m
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/3/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#import "RCTConvert+Map4dMap.h"
+#import <React/RCTConvert+CoreLocation.h>
+#import <Map4dMap/Map4dMap.h>
+#import "RMFCoordinate.h"
+#import "RMFIcon.h"
+#import "RMFDirectionsMarkerOptions.h"
+
+@implementation RCTConvert(Map4dMap)
+
++ (RMFCoordinate *)RMFCoordinate:(id)json {
+    RMFCoordinate *coord = [RMFCoordinate new];
+    coord.coordinate = [self CLLocationCoordinate2D:json];
+    return coord;
+}
+
+RCT_ARRAY_CONVERTER(RMFCoordinate)
+
++ (NSArray<NSArray<RMFCoordinate *> *> *)RMFCoordinateArrayArray:(id)json {
+    return RCTConvertArrayValue(@selector(RMFCoordinateArray:), json);
+}
+
++ (MFCameraPosition *)MFCameraPosition:(id)json withDefaultCamera:(MFCameraPosition*)camera {
+  double zoom = 0;
+  double tilt = 0;
+  double bearing = 0;
+  CLLocationCoordinate2D target = CLLocationCoordinate2DMake(0, 0);
+  if (camera != nil) {
+    target = camera.target;
+    zoom = camera.zoom;
+    tilt = camera.tilt;
+    bearing = camera.bearing;
+  }
+  
+  json = [self NSDictionary:json];
+  if (json[@"center"]) {
+    target = [self CLLocationCoordinate2D:json[@"center"]];
+  }
+  
+  if (json[@"zoom"]) {
+    zoom = [self double:json[@"zoom"]];
+  }
+  
+  if (json[@"tilt"]) {
+    tilt = [self double:json[@"tilt"]];
+  }
+  
+  if (json[@"bearing"]) {
+    bearing = [self double:json[@"bearing"]];
+  }
+  
+  return [[MFCameraPosition alloc] initWithTarget:target zoom:zoom tilt:tilt bearing:bearing];
+}
+
++ (MFCameraPosition *)MFCameraPosition:(id)json {
+  return [self MFCameraPosition:json withDefaultCamera:nil];
+}
+
++ (RMFIcon *)RMFIcon:(id)json {
+  json = [self NSDictionary:json];
+  if (json[@"uri"]) {
+    RMFIcon * icon = [[RMFIcon alloc] init];
+    icon.uri = [self NSString:json[@"uri"]];
+    if (json[@"width"]) {
+      icon.width = [self NSNumber:json[@"width"]];
+    }
+    if (json[@"height"]) {
+      icon.height = [self NSNumber:json[@"height"]];
+    }
+    return icon;
+  }
+  return nil;
+}
+
++ (MFCoordinateBounds *)MFCoordinateBounds:(id)json {
+  json = [self NSDictionary:json];
+  CLLocationCoordinate2D northEast = [self CLLocationCoordinate2D:json[@"northEast"]];
+  CLLocationCoordinate2D southWest = [self CLLocationCoordinate2D:json[@"southWest"]];
+  return [[MFCoordinateBounds alloc] initWithCoordinate:northEast coordinate:southWest];
+}
+
++ (RMFDirectionsMarkerOptions *)RMFDirectionsMarkerOptions:(id)json {
+  json = [self NSDictionary:json];
+  RMFDirectionsMarkerOptions* options = [[RMFDirectionsMarkerOptions alloc] init];
+  
+  if (json[@"coordinate"]) {
+    options.coordinate = [self CLLocationCoordinate2D:json[@"coordinate"]];
+  }
+  if (json[@"icon"]) {
+    options.icon = [self RMFIcon:json[@"icon"]];
+  }
+  if (json[@"title"]) {
+    options.title = [self NSString:json[@"title"]];
+  }
+  if (json[@"titleColor"]) {
+    options.titleColor = [self UIColor:json[@"titleColor"]];
+  }
+  if (json[@"visible"]) {
+    options.visible = [self BOOL:json[@"visible"]];
+  }
+  
+  return options;
+}
+
+@end

package/ios/RMFCircle.h

@@ -1,37 +1,37 @@
-//
-//  RMFCircle.h
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/3/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#ifndef RMFCircle_h
-#define RMFCircle_h
-
-#import <React/UIView+React.h>
-#import "RMFCircleMap4d.h"
-#import "RMFMapView.h"
-
-@interface RMFCircle : UIView
-
-@property(nonatomic, strong) RMFCircleMap4d * map4dCircle;
-
-@property(nonatomic, copy) RCTBubblingEventBlock _Nullable onPress;
-
-@property(nonatomic, assign) CLLocationCoordinate2D centerCoordinate;
-@property(nonatomic, assign) UIColor* fillColor;
-@property(nonatomic, assign) UIColor* strokeColor;
-@property(nonatomic, assign) double strokeWidth;
-@property(nonatomic, assign) double radius;
-@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 /* RMFCircle_h */
+//
+//  RMFCircle.h
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/3/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#ifndef RMFCircle_h
+#define RMFCircle_h
+
+#import <React/UIView+React.h>
+#import "RMFCircleMap4d.h"
+#import "RMFMapView.h"
+
+@interface RMFCircle : UIView
+
+@property(nonatomic, strong) RMFCircleMap4d * map4dCircle;
+
+@property(nonatomic, copy) RCTBubblingEventBlock _Nullable onPress;
+
+@property(nonatomic, assign) CLLocationCoordinate2D centerCoordinate;
+@property(nonatomic, assign) UIColor* fillColor;
+@property(nonatomic, assign) UIColor* strokeColor;
+@property(nonatomic, assign) double strokeWidth;
+@property(nonatomic, assign) double radius;
+@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 /* RMFCircle_h */

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 */