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

package/ios/RMFDirectionsMarkerOptions.h

@@ -1,24 +1,24 @@
-//
-//  RMFDirectionsMarkerOptions.h
-//  Map4dMap React Native
-//
-//  Created by Huy Dang on 11/16/21.
-//
-
-#ifndef RMFDirectionsMarkerOptions_h
-#define RMFDirectionsMarkerOptions_h
-
-#import "RMFIcon.h"
-#import <CoreLocation/CoreLocation.h>
-
-@interface RMFDirectionsMarkerOptions : NSObject
-
-@property (nonatomic, assign) CLLocationCoordinate2D coordinate;
-@property (nonatomic, strong, nullable) RMFIcon* icon;
-@property (nonatomic, strong, nullable) NSString* title;
-@property (nonatomic, strong, nullable) UIColor* titleColor;
-@property (nonatomic, assign) BOOL visible;
-
-@end
-
-#endif /* RMFDirectionsMarkerOptions_h */
+//
+//  RMFDirectionsMarkerOptions.h
+//  Map4dMap React Native
+//
+//  Created by Huy Dang on 11/16/21.
+//
+
+#ifndef RMFDirectionsMarkerOptions_h
+#define RMFDirectionsMarkerOptions_h
+
+#import "RMFIcon.h"
+#import <CoreLocation/CoreLocation.h>
+
+@interface RMFDirectionsMarkerOptions : NSObject
+
+@property (nonatomic, assign) CLLocationCoordinate2D coordinate;
+@property (nonatomic, strong, nullable) RMFIcon* icon;
+@property (nonatomic, strong, nullable) NSString* title;
+@property (nonatomic, strong, nullable) UIColor* titleColor;
+@property (nonatomic, assign) BOOL visible;
+
+@end
+
+#endif /* RMFDirectionsMarkerOptions_h */

package/ios/RMFDirectionsMarkerOptions.m

@@ -1,23 +1,23 @@
-//
-//  RMFDirectionsMarkerOptions.m
-//  Map4dMap React Native
-//
-//  Created by Huy Dang on 11/16/21.
-//
-
-#import "RMFDirectionsMarkerOptions.h"
-
-@implementation RMFDirectionsMarkerOptions
-
-- (instancetype)init {
-  if (self = [super init]) {
-    _coordinate = kCLLocationCoordinate2DInvalid;
-    _icon = nil;
-    _title = nil;
-    _titleColor = nil;
-    _visible = YES;
-  }
-  return self;
-}
-
-@end
+//
+//  RMFDirectionsMarkerOptions.m
+//  Map4dMap React Native
+//
+//  Created by Huy Dang on 11/16/21.
+//
+
+#import "RMFDirectionsMarkerOptions.h"
+
+@implementation RMFDirectionsMarkerOptions
+
+- (instancetype)init {
+  if (self = [super init]) {
+    _coordinate = kCLLocationCoordinate2DInvalid;
+    _icon = nil;
+    _title = nil;
+    _titleColor = nil;
+    _visible = YES;
+  }
+  return self;
+}
+
+@end

package/ios/RMFDirectionsRenderer.h

@@ -1,47 +1,47 @@
-//
-//  RMFDirectionsRenderer.h
-//  Map4dMap React Native
-//
-//  Created by Huy Dang on 11/15/21.
-//
-
-#ifndef RMFDirectionsRenderer_h
-#define RMFDirectionsRenderer_h
-
-#import <React/UIView+React.h>
-#import <Map4dMap/Map4dMap.h>
-#import "RMFDirectionsRendererMap4d.h"
-#import "RMFCoordinate.h"
-#import "RMFDirectionsMarkerOptions.h"
-
-@class RMFMapView;
-
-@interface RMFDirectionsRenderer : UIView
-
-@property (nonatomic, strong, nonnull) RMFDirectionsRendererMap4d* map4dDirectionsRenderer;
-
-@property (nonatomic, copy) RCTBubblingEventBlock _Nullable onPress;
-
-@property (nonatomic, strong, nullable) NSArray<NSArray<RMFCoordinate*>*>* routes;
-@property (nonatomic, strong, nullable) NSString* directions;
-@property (nonatomic, assign) NSUInteger activedIndex;
-
-@property(nonatomic, assign) CGFloat activeStrokeWidth;
-@property(nonatomic, strong, nullable) UIColor* activeStrokeColor;
-@property(nonatomic, assign) CGFloat activeOutlineWidth;
-@property(nonatomic, strong, nullable) UIColor* activeOutlineColor;
-
-@property(nonatomic, assign) CGFloat inactiveStrokeWidth;
-@property(nonatomic, strong, nullable) UIColor* inactiveStrokeColor;
-@property(nonatomic, assign) CGFloat inactiveOutlineWidth;
-@property(nonatomic, strong, nullable) UIColor* inactiveOutlineColor;
-
-@property(nonatomic, strong, nullable) RMFDirectionsMarkerOptions* originPOIOptions;
-@property(nonatomic, strong, nullable) RMFDirectionsMarkerOptions* destinationPOIOptions;
-
-- (void)setMapView:(RMFMapView* _Nullable)mapView;
-- (void)didTapAtPixel:(CGPoint)pixel withRouteIndex:(NSInteger)routeIndex;
-
-@end
-
-#endif /* RMFDirectionsRenderer_h */
+//
+//  RMFDirectionsRenderer.h
+//  Map4dMap React Native
+//
+//  Created by Huy Dang on 11/15/21.
+//
+
+#ifndef RMFDirectionsRenderer_h
+#define RMFDirectionsRenderer_h
+
+#import <React/UIView+React.h>
+#import <Map4dMap/Map4dMap.h>
+#import "RMFDirectionsRendererMap4d.h"
+#import "RMFCoordinate.h"
+#import "RMFDirectionsMarkerOptions.h"
+
+@class RMFMapView;
+
+@interface RMFDirectionsRenderer : UIView
+
+@property (nonatomic, strong, nonnull) RMFDirectionsRendererMap4d* map4dDirectionsRenderer;
+
+@property (nonatomic, copy) RCTBubblingEventBlock _Nullable onPress;
+
+@property (nonatomic, strong, nullable) NSArray<NSArray<RMFCoordinate*>*>* routes;
+@property (nonatomic, strong, nullable) NSString* directions;
+@property (nonatomic, assign) NSUInteger activedIndex;
+
+@property(nonatomic, assign) CGFloat activeStrokeWidth;
+@property(nonatomic, strong, nullable) UIColor* activeStrokeColor;
+@property(nonatomic, assign) CGFloat activeOutlineWidth;
+@property(nonatomic, strong, nullable) UIColor* activeOutlineColor;
+
+@property(nonatomic, assign) CGFloat inactiveStrokeWidth;
+@property(nonatomic, strong, nullable) UIColor* inactiveStrokeColor;
+@property(nonatomic, assign) CGFloat inactiveOutlineWidth;
+@property(nonatomic, strong, nullable) UIColor* inactiveOutlineColor;
+
+@property(nonatomic, strong, nullable) RMFDirectionsMarkerOptions* originPOIOptions;
+@property(nonatomic, strong, nullable) RMFDirectionsMarkerOptions* destinationPOIOptions;
+
+- (void)setMapView:(RMFMapView* _Nullable)mapView;
+- (void)didTapAtPixel:(CGPoint)pixel withRouteIndex:(NSInteger)routeIndex;
+
+@end
+
+#endif /* RMFDirectionsRenderer_h */

package/ios/RMFDirectionsRenderer.m

@@ -1,182 +1,182 @@
-//
-//  RMFDirectionsRenderer.m
-//  Map4dMap React Native
-//
-//  Created by Huy Dang on 11/15/21.
-//
-
-#import "RMFDirectionsRenderer.h"
-#import "RMFEventResponse.h"
-
-@implementation RMFDirectionsRenderer
-
-- (instancetype)init {
-  if (self = [super init]) {
-    _map4dDirectionsRenderer = [[RMFDirectionsRendererMap4d alloc] init];
-    _map4dDirectionsRenderer.reactRenderer = self;
-    
-    _routes = nil;
-    _directions = nil;
-    
-    _activedIndex = _map4dDirectionsRenderer.activedIndex;
-
-    _activeStrokeColor = _map4dDirectionsRenderer.activeStrokeColor;
-    _activeStrokeWidth = _map4dDirectionsRenderer.activeStrokeWidth;
-    _activeOutlineColor = _map4dDirectionsRenderer.activeOutlineColor;
-    _activeOutlineWidth = _map4dDirectionsRenderer.activeOutlineWidth;
-
-    _inactiveStrokeColor = _map4dDirectionsRenderer.inactiveStrokeColor;
-    _inactiveStrokeWidth = _map4dDirectionsRenderer.inactiveStrokeWidth;
-    _inactiveOutlineColor = _map4dDirectionsRenderer.inactiveOutlineColor;
-    _inactiveOutlineWidth = _map4dDirectionsRenderer.inactiveOutlineWidth;
-    
-    _originPOIOptions = nil;
-    _destinationPOIOptions = nil;
-  }
-  return self;
-}
-
-- (void)setMapView:(RMFMapView *)mapView {
-  _map4dDirectionsRenderer.activedIndex = _activedIndex;
-  _map4dDirectionsRenderer.map = (MFMapView*)mapView;
-}
-
-- (void)didTapAtPixel:(CGPoint)pixel withRouteIndex:(NSInteger)routeIndex {
-  if (!self.onPress) {
-    return;
-  }
-  
-  CLLocationCoordinate2D tapLocation = [_map4dDirectionsRenderer.map.projection coordinateForPoint:pixel];
-  NSMutableDictionary* response = [NSMutableDictionary dictionaryWithDictionary:[RMFEventResponse fromCoordinate:tapLocation
-                                                                                                           pixel:pixel]];
-  response[@"routeIndex"] = @(routeIndex);
-  response[@"action"] = @"directions-press";
-  self.onPress(response);
-}
-
-- (void)setRoutes:(NSArray<NSArray<RMFCoordinate *> *> *)routes {
-  _routes = routes;
-  NSMutableArray<MFPath*>* paths = [NSMutableArray arrayWithCapacity:routes.count];
-  for (int i = 0; i < routes.count; i++) {
-    NSArray<RMFCoordinate*>* route = [routes objectAtIndex:i];
-    MFMutablePath* path = [[MFMutablePath alloc] init];
-    for (int j = 0; j < route.count; j++) {
-      [path addCoordinate:route[j].coordinate];
-    }
-    
-    [paths addObject:path];
-  }
-  
-  if (paths.count > 0) {
-    _map4dDirectionsRenderer.routes = paths;
-  }
-  else {
-    _map4dDirectionsRenderer.routes = nil;
-  }
-}
-
-- (void)setDirections:(NSString *)json {
-  _directions = json;
-  [_map4dDirectionsRenderer setRoutesWithJson:json];
-}
-
-- (void)setActivedIndex:(NSUInteger)activedIndex {
-  _activedIndex = activedIndex;
-  _map4dDirectionsRenderer.activedIndex = activedIndex;
-}
-
-- (void)setActiveStrokeColor:(UIColor *)color {
-  _activeStrokeColor = color;
-  _map4dDirectionsRenderer.activeStrokeColor = color;
-}
-
-- (void)setActiveStrokeWidth:(CGFloat)width {
-  _activeStrokeWidth = width;
-  _map4dDirectionsRenderer.activeStrokeWidth = width;
-}
-
-- (void)setActiveOutlineColor:(UIColor *)color {
-  _activeOutlineColor = color;
-  _map4dDirectionsRenderer.activeOutlineColor = color;
-}
-
-- (void)setActiveOutlineWidth:(CGFloat)width {
-  _activeOutlineWidth = width;
-  _map4dDirectionsRenderer.activeOutlineWidth = width;
-}
-
-- (void)setInactiveStrokeColor:(UIColor *)color {
-  _inactiveStrokeColor = color;
-  _map4dDirectionsRenderer.inactiveStrokeColor = color;
-}
-
-- (void)setInactiveStrokeWidth:(CGFloat)width {
-  _inactiveStrokeWidth = width;
-  _map4dDirectionsRenderer.inactiveStrokeWidth = width;
-}
-
-- (void)setInactiveOutlineColor:(UIColor *)color {
-  _inactiveOutlineColor = color;
-  _map4dDirectionsRenderer.inactiveOutlineColor = color;
-}
-
-- (void)setInactiveOutlineWidth:(CGFloat)width {
-  _inactiveOutlineWidth = width;
-  _map4dDirectionsRenderer.inactiveOutlineWidth = width;
-}
-
-- (void)setOriginPOIOptions:(RMFDirectionsMarkerOptions *)options {
-  _originPOIOptions = options;
-  
-  _map4dDirectionsRenderer.hideOriginPOI = !options.visible;
-  _map4dDirectionsRenderer.originPosition = options.coordinate;
-  _map4dDirectionsRenderer.originTitle = options.title;
-  _map4dDirectionsRenderer.originTitleColor = options.titleColor;
-  
-  if (options.icon == nil || options.icon.uri == nil) {
-    _map4dDirectionsRenderer.originIcon = nil;
-  }
-  else {
-    dispatch_async(dispatch_get_global_queue(0,0), ^{
-      NSData * imageData = [[NSData alloc] initWithContentsOfURL: [NSURL URLWithString: options.icon.uri]];
-      if (imageData != nil) {
-        dispatch_async(dispatch_get_main_queue(), ^{
-          UIImage* icon = [UIImage imageWithData:imageData];
-          UIImage* scaleIcon = [UIImage imageWithCGImage:[icon CGImage]
-                                                   scale:[UIScreen mainScreen].scale
-                                             orientation:icon.imageOrientation];
-          self->_map4dDirectionsRenderer.originIcon = scaleIcon;
-        });
-      }
-    });
-  }
-}
-
-- (void)setDestinationPOIOptions:(RMFDirectionsMarkerOptions *)options {
-  _destinationPOIOptions = options;
-  
-  _map4dDirectionsRenderer.hideDestinationPOI = !options.visible;
-  _map4dDirectionsRenderer.destinationPosition = options.coordinate;
-  _map4dDirectionsRenderer.destinationTitle = options.title;
-  _map4dDirectionsRenderer.destinationTitleColor = options.titleColor;
-  
-  if (options.icon == nil || options.icon.uri == nil) {
-    _map4dDirectionsRenderer.destinationIcon = nil;
-  }
-  else {
-    dispatch_async(dispatch_get_global_queue(0,0), ^{
-      NSData * imageData = [[NSData alloc] initWithContentsOfURL: [NSURL URLWithString: options.icon.uri]];
-      if (imageData != nil) {
-        dispatch_async(dispatch_get_main_queue(), ^{
-          UIImage* icon = [UIImage imageWithData:imageData];
-          UIImage* scaleImage = [UIImage imageWithCGImage:[icon CGImage]
-                                                    scale:[UIScreen mainScreen].scale
-                                              orientation:icon.imageOrientation];
-          self->_map4dDirectionsRenderer.destinationIcon = scaleImage;
-        });
-      }
-    });
-  }
-}
-
-@end
+//
+//  RMFDirectionsRenderer.m
+//  Map4dMap React Native
+//
+//  Created by Huy Dang on 11/15/21.
+//
+
+#import "RMFDirectionsRenderer.h"
+#import "RMFEventResponse.h"
+
+@implementation RMFDirectionsRenderer
+
+- (instancetype)init {
+  if (self = [super init]) {
+    _map4dDirectionsRenderer = [[RMFDirectionsRendererMap4d alloc] init];
+    _map4dDirectionsRenderer.reactRenderer = self;
+    
+    _routes = nil;
+    _directions = nil;
+    
+    _activedIndex = _map4dDirectionsRenderer.activedIndex;
+
+    _activeStrokeColor = _map4dDirectionsRenderer.activeStrokeColor;
+    _activeStrokeWidth = _map4dDirectionsRenderer.activeStrokeWidth;
+    _activeOutlineColor = _map4dDirectionsRenderer.activeOutlineColor;
+    _activeOutlineWidth = _map4dDirectionsRenderer.activeOutlineWidth;
+
+    _inactiveStrokeColor = _map4dDirectionsRenderer.inactiveStrokeColor;
+    _inactiveStrokeWidth = _map4dDirectionsRenderer.inactiveStrokeWidth;
+    _inactiveOutlineColor = _map4dDirectionsRenderer.inactiveOutlineColor;
+    _inactiveOutlineWidth = _map4dDirectionsRenderer.inactiveOutlineWidth;
+    
+    _originPOIOptions = nil;
+    _destinationPOIOptions = nil;
+  }
+  return self;
+}
+
+- (void)setMapView:(RMFMapView *)mapView {
+  _map4dDirectionsRenderer.activedIndex = _activedIndex;
+  _map4dDirectionsRenderer.map = (MFMapView*)mapView;
+}
+
+- (void)didTapAtPixel:(CGPoint)pixel withRouteIndex:(NSInteger)routeIndex {
+  if (!self.onPress) {
+    return;
+  }
+  
+  CLLocationCoordinate2D tapLocation = [_map4dDirectionsRenderer.map.projection coordinateForPoint:pixel];
+  NSMutableDictionary* response = [NSMutableDictionary dictionaryWithDictionary:[RMFEventResponse fromCoordinate:tapLocation
+                                                                                                           pixel:pixel]];
+  response[@"routeIndex"] = @(routeIndex);
+  response[@"action"] = @"directions-press";
+  self.onPress(response);
+}
+
+- (void)setRoutes:(NSArray<NSArray<RMFCoordinate *> *> *)routes {
+  _routes = routes;
+  NSMutableArray<MFPath*>* paths = [NSMutableArray arrayWithCapacity:routes.count];
+  for (int i = 0; i < routes.count; i++) {
+    NSArray<RMFCoordinate*>* route = [routes objectAtIndex:i];
+    MFMutablePath* path = [[MFMutablePath alloc] init];
+    for (int j = 0; j < route.count; j++) {
+      [path addCoordinate:route[j].coordinate];
+    }
+    
+    [paths addObject:path];
+  }
+  
+  if (paths.count > 0) {
+    _map4dDirectionsRenderer.routes = paths;
+  }
+  else {
+    _map4dDirectionsRenderer.routes = nil;
+  }
+}
+
+- (void)setDirections:(NSString *)json {
+  _directions = json;
+  [_map4dDirectionsRenderer setRoutesWithJson:json];
+}
+
+- (void)setActivedIndex:(NSUInteger)activedIndex {
+  _activedIndex = activedIndex;
+  _map4dDirectionsRenderer.activedIndex = activedIndex;
+}
+
+- (void)setActiveStrokeColor:(UIColor *)color {
+  _activeStrokeColor = color;
+  _map4dDirectionsRenderer.activeStrokeColor = color;
+}
+
+- (void)setActiveStrokeWidth:(CGFloat)width {
+  _activeStrokeWidth = width;
+  _map4dDirectionsRenderer.activeStrokeWidth = width;
+}
+
+- (void)setActiveOutlineColor:(UIColor *)color {
+  _activeOutlineColor = color;
+  _map4dDirectionsRenderer.activeOutlineColor = color;
+}
+
+- (void)setActiveOutlineWidth:(CGFloat)width {
+  _activeOutlineWidth = width;
+  _map4dDirectionsRenderer.activeOutlineWidth = width;
+}
+
+- (void)setInactiveStrokeColor:(UIColor *)color {
+  _inactiveStrokeColor = color;
+  _map4dDirectionsRenderer.inactiveStrokeColor = color;
+}
+
+- (void)setInactiveStrokeWidth:(CGFloat)width {
+  _inactiveStrokeWidth = width;
+  _map4dDirectionsRenderer.inactiveStrokeWidth = width;
+}
+
+- (void)setInactiveOutlineColor:(UIColor *)color {
+  _inactiveOutlineColor = color;
+  _map4dDirectionsRenderer.inactiveOutlineColor = color;
+}
+
+- (void)setInactiveOutlineWidth:(CGFloat)width {
+  _inactiveOutlineWidth = width;
+  _map4dDirectionsRenderer.inactiveOutlineWidth = width;
+}
+
+- (void)setOriginPOIOptions:(RMFDirectionsMarkerOptions *)options {
+  _originPOIOptions = options;
+  
+  _map4dDirectionsRenderer.hideOriginPOI = !options.visible;
+  _map4dDirectionsRenderer.originPosition = options.coordinate;
+  _map4dDirectionsRenderer.originTitle = options.title;
+  _map4dDirectionsRenderer.originTitleColor = options.titleColor;
+  
+  if (options.icon == nil || options.icon.uri == nil) {
+    _map4dDirectionsRenderer.originIcon = nil;
+  }
+  else {
+    dispatch_async(dispatch_get_global_queue(0,0), ^{
+      NSData * imageData = [[NSData alloc] initWithContentsOfURL: [NSURL URLWithString: options.icon.uri]];
+      if (imageData != nil) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+          UIImage* icon = [UIImage imageWithData:imageData];
+          UIImage* scaleIcon = [UIImage imageWithCGImage:[icon CGImage]
+                                                   scale:[UIScreen mainScreen].scale
+                                             orientation:icon.imageOrientation];
+          self->_map4dDirectionsRenderer.originIcon = scaleIcon;
+        });
+      }
+    });
+  }
+}
+
+- (void)setDestinationPOIOptions:(RMFDirectionsMarkerOptions *)options {
+  _destinationPOIOptions = options;
+  
+  _map4dDirectionsRenderer.hideDestinationPOI = !options.visible;
+  _map4dDirectionsRenderer.destinationPosition = options.coordinate;
+  _map4dDirectionsRenderer.destinationTitle = options.title;
+  _map4dDirectionsRenderer.destinationTitleColor = options.titleColor;
+  
+  if (options.icon == nil || options.icon.uri == nil) {
+    _map4dDirectionsRenderer.destinationIcon = nil;
+  }
+  else {
+    dispatch_async(dispatch_get_global_queue(0,0), ^{
+      NSData * imageData = [[NSData alloc] initWithContentsOfURL: [NSURL URLWithString: options.icon.uri]];
+      if (imageData != nil) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+          UIImage* icon = [UIImage imageWithData:imageData];
+          UIImage* scaleImage = [UIImage imageWithCGImage:[icon CGImage]
+                                                    scale:[UIScreen mainScreen].scale
+                                              orientation:icon.imageOrientation];
+          self->_map4dDirectionsRenderer.destinationIcon = scaleImage;
+        });
+      }
+    });
+  }
+}
+
+@end

package/ios/RMFDirectionsRendererManager.h

@@ -1,17 +1,17 @@
-//
-//  RMFDirectionsRendererManager.h
-//  Map4dMap React Native
-//
-//  Created by Huy Dang on 11/15/21.
-//
-
-#ifndef RMFDirectionsRendererManager_h
-#define RMFDirectionsRendererManager_h
-
-#import <React/RCTViewManager.h>
-
-@interface RMFDirectionsRendererManager : RCTViewManager
-
-@end
-
-#endif /* RMFDirectionsRendererManager_h */
+//
+//  RMFDirectionsRendererManager.h
+//  Map4dMap React Native
+//
+//  Created by Huy Dang on 11/15/21.
+//
+
+#ifndef RMFDirectionsRendererManager_h
+#define RMFDirectionsRendererManager_h
+
+#import <React/RCTViewManager.h>
+
+@interface RMFDirectionsRendererManager : RCTViewManager
+
+@end
+
+#endif /* RMFDirectionsRendererManager_h */