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

package/ios/Map4dMap.m

@@ -1,14 +1,119 @@
-#import "Map4dMap.h"
-
-
-@implementation Map4dMap
-
-RCT_EXPORT_MODULE()
-
-RCT_EXPORT_METHOD(sampleMethod:(NSString *)stringArgument numberParameter:(nonnull NSNumber *)numberArgument callback:(RCTResponseSenderBlock)callback)
-{
-    // TODO: Implement some actually useful functionality
-    callback(@[[NSString stringWithFormat: @"numberArgument: %@ stringArgument: %@", numberArgument, stringArgument]]);
-}
-
-@end
+#import "Map4dMap.h"
+#import <Foundation/Foundation.h>
+#import <React/RCTBridge.h>
+#import <React/RCTLog.h>
+#import <React/RCTUIManager.h>
+#import <React/RCTConvert+CoreLocation.h>
+#import "RCTConvert+Map4dMap.h"
+#import "RMFEventResponse.h"
+#import "RMFMapView.h"
+
+
+@implementation Map4dMap
+
+RCT_EXPORT_MODULE()
+
+- (void)withMapViewForTag:(nonnull NSNumber *)reactTag
+                  rejecter:(RCTPromiseRejectBlock)reject
+                   handler:(void (^)(RMFMapView *mapView))handler
+{
+    RCTUIManager *uiManager = self.bridge.uiManager;
+    if (uiManager == nil) {
+        if (reject) {
+            reject(@"E_UI_MANAGER_UNAVAILABLE", @"UIManager is unavailable on iOS runtime", nil);
+        } else {
+            RCTLogError(@"UIManager is unavailable on iOS runtime");
+        }
+        return;
+    }
+
+    [uiManager addUIBlock:^(__unused RCTUIManager *manager,
+                            NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        id view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[RMFMapView class]]) {
+            if (reject) {
+                reject(@"E_INVALID_VIEW",
+                       [NSString stringWithFormat:@"Invalid view returned from registry, expecting RMFMapView, got: %@", view],
+                       nil);
+            } else {
+                RCTLogError(@"Invalid view returned from registry, expecting RMFMapView, got: %@", view);
+            }
+            return;
+        }
+
+        handler((RMFMapView *)view);
+    }];
+}
+
+RCT_EXPORT_METHOD(getCamera:(nonnull NSNumber *)reactTag
+                                    resolver:(RCTPromiseResolveBlock)resolve
+                                    rejecter:(RCTPromiseRejectBlock)reject)
+{
+    [self withMapViewForTag:reactTag rejecter:reject handler:^(RMFMapView *mapView) {
+        resolve([RMFEventResponse fromCameraPosition:[mapView camera]]);
+    }];
+}
+
+RCT_EXPORT_METHOD(getBounds:(nonnull NSNumber *)reactTag
+                                    resolver:(RCTPromiseResolveBlock)resolve
+                                    rejecter:(RCTPromiseRejectBlock)reject)
+{
+    [self withMapViewForTag:reactTag rejecter:reject handler:^(RMFMapView *mapView) {
+        resolve([RMFEventResponse fromCoordinateBounds:[mapView getBounds]]);
+    }];
+}
+
+RCT_EXPORT_METHOD(getMyLocation:(nonnull NSNumber *)reactTag
+                                    resolver:(RCTPromiseResolveBlock)resolve
+                                    rejecter:(RCTPromiseRejectBlock)reject)
+{
+    [self withMapViewForTag:reactTag rejecter:reject handler:^(RMFMapView *mapView) {
+        resolve([RMFEventResponse fromCLLocation:[mapView getMyLocation]]);
+    }];
+}
+
+RCT_EXPORT_METHOD(pointForCoordinate:(nonnull NSNumber *)reactTag
+                                    coordinate:(id)json
+                                    resolver:(RCTPromiseResolveBlock)resolve
+                                    rejecter:(RCTPromiseRejectBlock)reject)
+{
+    [self withMapViewForTag:reactTag rejecter:reject handler:^(RMFMapView *mapView) {
+        CGPoint point = [mapView.projection pointForCoordinate:[RCTConvert CLLocationCoordinate2D:json]];
+        resolve([RMFEventResponse fromCGPoint:point]);
+    }];
+}
+
+RCT_EXPORT_METHOD(coordinateForPoint:(nonnull NSNumber *)reactTag
+                                    point:(id)json
+                                    resolver:(RCTPromiseResolveBlock)resolve
+                                    rejecter:(RCTPromiseRejectBlock)reject)
+{
+    [self withMapViewForTag:reactTag rejecter:reject handler:^(RMFMapView *mapView) {
+        CLLocationCoordinate2D coordinate = [mapView.projection coordinateForPoint:[RCTConvert CGPoint:json]];
+        resolve([RMFEventResponse fromCoordinate:coordinate]);
+    }];
+}
+
+RCT_EXPORT_METHOD(cameraForBounds:(nonnull NSNumber *)reactTag
+                                    boundsData:(id)json
+                                    resolver:(RCTPromiseResolveBlock)resolve
+                                    rejecter:(RCTPromiseRejectBlock)reject)
+{
+    [self withMapViewForTag:reactTag rejecter:reject handler:^(RMFMapView *mapView) {
+        MFCameraPosition *camera = nil;
+        id data = [RCTConvert NSDictionary:json];
+        if (data[@"bounds"]) {
+            MFCoordinateBounds *bounds = [RCTConvert MFCoordinateBounds:data[@"bounds"]];
+            if (data[@"padding"]) {
+                UIEdgeInsets insets = [RCTConvert UIEdgeInsets:data[@"padding"]];
+                camera = [mapView cameraForBounds:bounds insets:insets];
+            } else {
+                camera = [mapView cameraForBounds:bounds];
+            }
+        }
+
+        resolve([RMFEventResponse fromCameraPosition:camera]);
+    }];
+}
+
+@end

package/ios/Map4dMapTurbo.mm

@@ -0,0 +1,16 @@
+#import "Map4dMap.h"
+
+#if defined(RCT_NEW_ARCH_ENABLED) && __has_include("Map4dMapSpec.h")
+#import "Map4dMapSpec.h"
+#import <ReactCommon/RCTTurboModule.h>
+#import <memory>
+
+@implementation Map4dMap (TurboModule)
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
+{
+  return std::make_shared<facebook::react::NativeMap4dMapSpecJSI>(params);
+}
+
+@end
+#endif

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