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

package/ios/RMFDirectionsRendererManager.m

@@ -1,84 +1,86 @@
-//
-//  RMFDirectionsRendererManager.m
-//  Map4dMap React Native
-//
-//  Created by Huy Dang on 11/15/21.
-//
-
-#import "RMFDirectionsRendererManager.h"
-#import "RMFDirectionsRenderer.h"
-#import "RCTConvert+Map4dMap.h"
-#import <React/RCTBridge.h>
-#import <React/RCTUIManager.h>
-
-@implementation RMFDirectionsRendererManager
-
-RCT_EXPORT_MODULE(RMFDirectionsRenderer)
-
-- (UIView*)view {
-  RMFDirectionsRenderer* renderer = [[RMFDirectionsRenderer alloc] init];
-  return renderer;
-}
-
-RCT_EXPORT_VIEW_PROPERTY(routes, RMFCoordinateArrayArray)
-RCT_EXPORT_VIEW_PROPERTY(directions, NSString)
-RCT_EXPORT_VIEW_PROPERTY(activedIndex, NSUInteger)
-
-RCT_EXPORT_VIEW_PROPERTY(activeStrokeWidth, CGFloat)
-RCT_EXPORT_VIEW_PROPERTY(activeStrokeColor, UIColor)
-RCT_EXPORT_VIEW_PROPERTY(activeOutlineWidth, CGFloat)
-RCT_EXPORT_VIEW_PROPERTY(activeOutlineColor, UIColor)
-
-RCT_EXPORT_VIEW_PROPERTY(inactiveStrokeWidth, CGFloat)
-RCT_EXPORT_VIEW_PROPERTY(inactiveStrokeColor, UIColor)
-RCT_EXPORT_VIEW_PROPERTY(inactiveOutlineWidth, CGFloat)
-RCT_EXPORT_VIEW_PROPERTY(inactiveOutlineColor, UIColor)
-
-RCT_EXPORT_VIEW_PROPERTY(originPOIOptions, RMFDirectionsMarkerOptions)
-RCT_EXPORT_VIEW_PROPERTY(destinationPOIOptions, RMFDirectionsMarkerOptions)
-
-RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
-
-RCT_EXPORT_METHOD(setActivedIndex:(nonnull NSNumber *)reactTag
-                  withRouteIndex:(NSUInteger)routeIndex)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFDirectionsRenderer class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFCircle, got: %@", view);
-    } else {
-      RMFDirectionsRenderer* renderer = (RMFDirectionsRenderer*)view;
-      renderer.activedIndex = routeIndex;
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setRoutes:(nonnull NSNumber *)reactTag
-                  withRoutes:(id)routes)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFDirectionsRenderer class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFPolygon, got: %@", view);
-    } else {
-      RMFDirectionsRenderer* renderer = (RMFDirectionsRenderer*)view;
-      [renderer setRoutes:[RCTConvert RMFCoordinateArrayArray:routes]];
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setDirections:(nonnull NSNumber *)reactTag
-                  withDirections:(NSString*)directions)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFDirectionsRenderer class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFMarker, got: %@", view);
-    } else {
-      RMFDirectionsRenderer* renderer = (RMFDirectionsRenderer*)view;
-      [renderer.map4dDirectionsRenderer setRoutesWithJson:directions];
-    }
-  }];
-}
-
-@end
+//
+//  RMFDirectionsRendererManager.m
+//  Map4dMap React Native
+//
+//  Created by Huy Dang on 11/15/21.
+//
+
+#import "RMFDirectionsRendererManager.h"
+#import "RMFDirectionsRenderer.h"
+#import "RCTConvert+Map4dMap.h"
+#import <React/RCTBridge.h>
+#import <React/RCTUIManager.h>
+
+@implementation RMFDirectionsRendererManager
+
+RCT_EXPORT_MODULE(RMFDirectionsRenderer)
+
+- (void)withRendererForTag:(nonnull NSNumber *)reactTag
+                   handler:(void (^)(RMFDirectionsRenderer *renderer))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:[RMFDirectionsRenderer class]]) {
+      RCTLogError(@"Invalid view returned from registry, expecting RMFDirectionsRenderer, got: %@", view);
+      return;
+    }
+
+    handler((RMFDirectionsRenderer *)view);
+  }];
+}
+
+- (UIView*)view {
+  RMFDirectionsRenderer* renderer = [[RMFDirectionsRenderer alloc] init];
+  return renderer;
+}
+
+RCT_EXPORT_VIEW_PROPERTY(routes, RMFCoordinateArrayArray)
+RCT_EXPORT_VIEW_PROPERTY(directions, NSString)
+RCT_EXPORT_VIEW_PROPERTY(activedIndex, NSUInteger)
+
+RCT_EXPORT_VIEW_PROPERTY(activeStrokeWidth, CGFloat)
+RCT_EXPORT_VIEW_PROPERTY(activeStrokeColor, UIColor)
+RCT_EXPORT_VIEW_PROPERTY(activeOutlineWidth, CGFloat)
+RCT_EXPORT_VIEW_PROPERTY(activeOutlineColor, UIColor)
+
+RCT_EXPORT_VIEW_PROPERTY(inactiveStrokeWidth, CGFloat)
+RCT_EXPORT_VIEW_PROPERTY(inactiveStrokeColor, UIColor)
+RCT_EXPORT_VIEW_PROPERTY(inactiveOutlineWidth, CGFloat)
+RCT_EXPORT_VIEW_PROPERTY(inactiveOutlineColor, UIColor)
+
+RCT_EXPORT_VIEW_PROPERTY(originPOIOptions, RMFDirectionsMarkerOptions)
+RCT_EXPORT_VIEW_PROPERTY(destinationPOIOptions, RMFDirectionsMarkerOptions)
+
+RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
+
+RCT_EXPORT_METHOD(setActivedIndex:(nonnull NSNumber *)reactTag
+                  withRouteIndex:(NSUInteger)routeIndex)
+{
+  [self withRendererForTag:reactTag handler:^(RMFDirectionsRenderer *renderer) {
+    renderer.activedIndex = routeIndex;
+  }];
+}
+
+RCT_EXPORT_METHOD(setRoutes:(nonnull NSNumber *)reactTag
+                  withRoutes:(id)routes)
+{
+  [self withRendererForTag:reactTag handler:^(RMFDirectionsRenderer *renderer) {
+    [renderer setRoutes:[RCTConvert RMFCoordinateArrayArray:routes]];
+  }];
+}
+
+RCT_EXPORT_METHOD(setDirections:(nonnull NSNumber *)reactTag
+                  withDirections:(NSString*)directions)
+{
+  [self withRendererForTag:reactTag handler:^(RMFDirectionsRenderer *renderer) {
+    [renderer.map4dDirectionsRenderer setRoutesWithJson:directions];
+  }];
+}
+
+@end

package/ios/RMFDirectionsRendererMap4d.h

@@ -1,21 +1,21 @@
-//
-//  RMFDirectionsRendererMap4d.h
-//  Map4dMap React Native
-//
-//  Created by Huy Dang on 11/15/21.
-//
-
-#ifndef RMFDirectionsRendererMap4d_h
-#define RMFDirectionsRendererMap4d_h
-
-#import <Map4dMap/Map4dMap.h>
-
-@class RMFDirectionsRenderer;
-
-@interface RMFDirectionsRendererMap4d : MFDirectionsRenderer
-
-@property (nonatomic, weak) RMFDirectionsRenderer* reactRenderer;
-
-@end
-
-#endif /* RMFDirectionsRendererMap4d_h */
+//
+//  RMFDirectionsRendererMap4d.h
+//  Map4dMap React Native
+//
+//  Created by Huy Dang on 11/15/21.
+//
+
+#ifndef RMFDirectionsRendererMap4d_h
+#define RMFDirectionsRendererMap4d_h
+
+#import <Map4dMap/Map4dMap.h>
+
+@class RMFDirectionsRenderer;
+
+@interface RMFDirectionsRendererMap4d : MFDirectionsRenderer
+
+@property (nonatomic, weak) RMFDirectionsRenderer* reactRenderer;
+
+@end
+
+#endif /* RMFDirectionsRendererMap4d_h */

package/ios/RMFDirectionsRendererMap4d.m

@@ -1,12 +1,12 @@
-//
-//  RMFDirectionsRendererMap4d.m
-//  Map4dMap React Native
-//
-//  Created by Huy Dang on 11/15/21.
-//
-
-#import "RMFDirectionsRendererMap4d.h"
-
-@implementation RMFDirectionsRendererMap4d
-
-@end
+//
+//  RMFDirectionsRendererMap4d.m
+//  Map4dMap React Native
+//
+//  Created by Huy Dang on 11/15/21.
+//
+
+#import "RMFDirectionsRendererMap4d.h"
+
+@implementation RMFDirectionsRendererMap4d
+
+@end

package/ios/RMFDummyView.h

@@ -1,7 +1,7 @@
-#import <UIKit/UIKit.h>
-
-
-@interface RMFDummyView : UIView
-@property (nonatomic, weak) UIView *view;
-- (instancetype)initWithView:(UIView*)view;
+#import <UIKit/UIKit.h>
+
+
+@interface RMFDummyView : UIView
+@property (nonatomic, weak) UIView *view;
+- (instancetype)initWithView:(UIView*)view;
 @end

package/ios/RMFDummyView.m

@@ -1,13 +1,13 @@
-
-#import <Foundation/Foundation.h>
-#import "RMFDummyView.h"
-
-@implementation RMFDummyView
-- (instancetype)initWithView:(UIView*)view
-{
-  if ((self = [super init])) {
-    self.view = view;
-  }
-  return self;
-}
+
+#import <Foundation/Foundation.h>
+#import "RMFDummyView.h"
+
+@implementation RMFDummyView
+- (instancetype)initWithView:(UIView*)view
+{
+  if ((self = [super init])) {
+    self.view = view;
+  }
+  return self;
+}
 @end

package/ios/RMFEventResponse.h

@@ -1,39 +1,39 @@
-//
-//  RMFEventResponse.h
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/8/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#ifndef MFEventResponse_h
-#define MFEventResponse_h
-
-#import <CoreLocation/CoreLocation.h>
-
-@class RMFMarker;
-@class RMFCircle;
-@class RMFPOI;
-@class RMFPolyline;
-@class RMFPolygon;
-
-@class MFPOI;
-@class MFProjection;
-@class MFCameraPosition;
-@class MFCoordinateBounds;
-
-FOUNDATION_EXPORT NSString *const kRMFLatLngCoordinateResponseKey;
-FOUNDATION_EXPORT NSString *const kRMFPointCoordinateResponseKey;
-
-@interface RMFEventResponse : NSObject
-
-+ (NSDictionary*)fromCoordinate:(CLLocationCoordinate2D)coordinate;
-+ (NSDictionary*)fromCoordinate:(CLLocationCoordinate2D)location pixel:(CGPoint)pixel;
-+ (NSDictionary*)fromCameraPosition:(MFCameraPosition*) position;
-+ (NSDictionary*)fromCoordinateBounds:(MFCoordinateBounds*)bounds;
-+ (NSDictionary*)fromCGPoint:(CGPoint) point;
-+ (NSDictionary*)fromCLLocation:(CLLocation*) location;
-
-@end
-
-#endif /* RMFEventResponse_h */
+//
+//  RMFEventResponse.h
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/8/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#ifndef MFEventResponse_h
+#define MFEventResponse_h
+
+#import <CoreLocation/CoreLocation.h>
+
+@class RMFMarker;
+@class RMFCircle;
+@class RMFPOI;
+@class RMFPolyline;
+@class RMFPolygon;
+
+@class MFPOI;
+@class MFProjection;
+@class MFCameraPosition;
+@class MFCoordinateBounds;
+
+FOUNDATION_EXPORT NSString *const kRMFLatLngCoordinateResponseKey;
+FOUNDATION_EXPORT NSString *const kRMFPointCoordinateResponseKey;
+
+@interface RMFEventResponse : NSObject
+
++ (NSDictionary*)fromCoordinate:(CLLocationCoordinate2D)coordinate;
++ (NSDictionary*)fromCoordinate:(CLLocationCoordinate2D)location pixel:(CGPoint)pixel;
++ (NSDictionary*)fromCameraPosition:(MFCameraPosition*) position;
++ (NSDictionary*)fromCoordinateBounds:(MFCoordinateBounds*)bounds;
++ (NSDictionary*)fromCGPoint:(CGPoint) point;
++ (NSDictionary*)fromCLLocation:(CLLocation*) location;
+
+@end
+
+#endif /* RMFEventResponse_h */

package/ios/RMFEventResponse.m

@@ -1,98 +1,98 @@
-//
-//  RMFEventResponse.m
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/8/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#import "RMFEventResponse.h"
-#import "RMFMarker.h"
-#import "RMFCircle.h"
-#import "RMFPolyline.h"
-#import "RMFPolygon.h"
-#import "RMFPOI.h"
-
-NSString *const kRMFLatLngCoordinateResponseKey = @"location";
-NSString *const kRMFPointCoordinateResponseKey = @"pixel";
-
-@implementation RMFEventResponse
-
-+ (NSString*) hexStringFromColor:(UIColor*) color {
-  if (color != nil) {
-    CGFloat r, g, b, a;
-    [color getRed:&r green:&g blue:&b alpha:&a];
-    return [NSString stringWithFormat:@"#%02lX%02lX%02lX%02lX", lroundf(r * 255), lroundf(g * 255), lroundf(b * 255), lroundf(a * 255)];
-  }
-  return @"";
-}
-
-+ (NSDictionary*)fromCoordinate:(CLLocationCoordinate2D)coordinate {
-  return (@{
-    @"latitude": @(coordinate.latitude),
-    @"longitude": @(coordinate.longitude),
-  });
-}
-
-+ (NSDictionary*)fromCameraPosition:(MFCameraPosition*) position {
-  if (position == nil) {
-    return (@{});
-  }
-  return (@{
-    @"center": @{
-        @"latitude": @(position.target.latitude),
-        @"longitude": @(position.target.longitude)
-    },
-    @"zoom": @(position.zoom),
-    @"bearing": @(position.bearing),
-    @"tilt": @(position.tilt)
-  });
-}
-
-+ (NSDictionary*)fromCoordinateBounds:(MFCoordinateBounds*)bounds {
-  if (bounds == nil) {
-    return @{};
-  }
-  return @{
-    @"northEast": @{
-      @"latitude": @(bounds.northEast.latitude),
-      @"longitude": @(bounds.northEast.longitude)
-    },
-    @"southWest": @{
-      @"latitude": @(bounds.southWest.latitude),
-      @"longitude": @(bounds.southWest.longitude)
-    }
-  };
-}
-
-+ (NSDictionary*)fromCGPoint:(CGPoint) point {
-  return (@{ @"x": @(point.x), @"y": @(point.y) });
-}
-
-+ (NSDictionary*)fromCLLocation:(CLLocation *)location {
-  if (location == nil) {
-    return (@{});
-  }
-
-  return (@{
-    @"coordinate": @{
-        @"latitude": @(location.coordinate.latitude),
-        @"longitude": @(location.coordinate.longitude)
-    },
-    @"altitude": @(location.altitude),
-    @"timestamp": @(location.timestamp.timeIntervalSinceReferenceDate * 1000),
-    @"accuracy": @(location.horizontalAccuracy),
-    @"altitudeAccuracy": @(location.verticalAccuracy),
-    @"speed": @(location.speed),
-    @"heading": @(location.course),
-  });
-}
-
-+ (NSDictionary *)fromCoordinate:(CLLocationCoordinate2D)location pixel:(CGPoint)pixel {
-  return @{
-    kRMFLatLngCoordinateResponseKey: [RMFEventResponse fromCoordinate:location],
-    kRMFPointCoordinateResponseKey: [RMFEventResponse fromCGPoint:pixel]
-  };
-}
-
-@end
+//
+//  RMFEventResponse.m
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/8/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#import "RMFEventResponse.h"
+#import "RMFMarker.h"
+#import "RMFCircle.h"
+#import "RMFPolyline.h"
+#import "RMFPolygon.h"
+#import "RMFPOI.h"
+
+NSString *const kRMFLatLngCoordinateResponseKey = @"location";
+NSString *const kRMFPointCoordinateResponseKey = @"pixel";
+
+@implementation RMFEventResponse
+
++ (NSString*) hexStringFromColor:(UIColor*) color {
+  if (color != nil) {
+    CGFloat r, g, b, a;
+    [color getRed:&r green:&g blue:&b alpha:&a];
+    return [NSString stringWithFormat:@"#%02lX%02lX%02lX%02lX", lroundf(r * 255), lroundf(g * 255), lroundf(b * 255), lroundf(a * 255)];
+  }
+  return @"";
+}
+
++ (NSDictionary*)fromCoordinate:(CLLocationCoordinate2D)coordinate {
+  return (@{
+    @"latitude": @(coordinate.latitude),
+    @"longitude": @(coordinate.longitude),
+  });
+}
+
++ (NSDictionary*)fromCameraPosition:(MFCameraPosition*) position {
+  if (position == nil) {
+    return (@{});
+  }
+  return (@{
+    @"center": @{
+        @"latitude": @(position.target.latitude),
+        @"longitude": @(position.target.longitude)
+    },
+    @"zoom": @(position.zoom),
+    @"bearing": @(position.bearing),
+    @"tilt": @(position.tilt)
+  });
+}
+
++ (NSDictionary*)fromCoordinateBounds:(MFCoordinateBounds*)bounds {
+  if (bounds == nil) {
+    return @{};
+  }
+  return @{
+    @"northEast": @{
+      @"latitude": @(bounds.northEast.latitude),
+      @"longitude": @(bounds.northEast.longitude)
+    },
+    @"southWest": @{
+      @"latitude": @(bounds.southWest.latitude),
+      @"longitude": @(bounds.southWest.longitude)
+    }
+  };
+}
+
++ (NSDictionary*)fromCGPoint:(CGPoint) point {
+  return (@{ @"x": @(point.x), @"y": @(point.y) });
+}
+
++ (NSDictionary*)fromCLLocation:(CLLocation *)location {
+  if (location == nil) {
+    return (@{});
+  }
+
+  return (@{
+    @"coordinate": @{
+        @"latitude": @(location.coordinate.latitude),
+        @"longitude": @(location.coordinate.longitude)
+    },
+    @"altitude": @(location.altitude),
+    @"timestamp": @(location.timestamp.timeIntervalSinceReferenceDate * 1000),
+    @"accuracy": @(location.horizontalAccuracy),
+    @"altitudeAccuracy": @(location.verticalAccuracy),
+    @"speed": @(location.speed),
+    @"heading": @(location.course),
+  });
+}
+
++ (NSDictionary *)fromCoordinate:(CLLocationCoordinate2D)location pixel:(CGPoint)pixel {
+  return @{
+    kRMFLatLngCoordinateResponseKey: [RMFEventResponse fromCoordinate:location],
+    kRMFPointCoordinateResponseKey: [RMFEventResponse fromCGPoint:pixel]
+  };
+}
+
+@end

package/ios/RMFIcon.h

@@ -1,24 +1,24 @@
-//
-//  RMFIcon.h
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/13/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#ifndef RMFIcon_h
-#define RMFIcon_h
-
-@interface RMFIcon : NSObject
-
-@property (nonatomic, copy, nullable) NSString *uri;
-@property (nonatomic, assign, nullable) NSNumber *width;
-@property (nonatomic, assign, nullable) NSNumber *height;
-
-@property (nonatomic, copy, nullable) UIImage* image;
-
-- (instancetype _Nonnull) init;
-
-@end
-
-#endif /* RMFIcon_h */
+//
+//  RMFIcon.h
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/13/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#ifndef RMFIcon_h
+#define RMFIcon_h
+
+@interface RMFIcon : NSObject
+
+@property (nonatomic, copy, nullable) NSString *uri;
+@property (nonatomic, assign, nullable) NSNumber *width;
+@property (nonatomic, assign, nullable) NSNumber *height;
+
+@property (nonatomic, copy, nullable) UIImage* image;
+
+- (instancetype _Nonnull) init;
+
+@end
+
+#endif /* RMFIcon_h */