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

package/ios/RMFMarkerManager.h

@@ -1,17 +1,17 @@
-//
-//  RMFMarkerManager.h
-//  Map4dMap
-//
-//  Created by Huy Dang on 4/24/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#ifndef RMFMarkerManager_h
-#define RMFMarkerManager_h
-
-#import <React/RCTViewManager.h>
-
-@interface RMFMarkerManager : RCTViewManager
-@end
-
-#endif /* RMFMarkerManager_h */
+//
+//  RMFMarkerManager.h
+//  Map4dMap
+//
+//  Created by Huy Dang on 4/24/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#ifndef RMFMarkerManager_h
+#define RMFMarkerManager_h
+
+#import <React/RCTViewManager.h>
+
+@interface RMFMarkerManager : RCTViewManager
+@end
+
+#endif /* RMFMarkerManager_h */

package/ios/RMFMarkerManager.m

@@ -1,156 +1,128 @@
-//
-//  RMFMarkerManager.m
-//  Map4dMap
-//
-//  Created by Huy Dang on 4/28/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#import "RMFMarkerManager.h"
-#import "RMFMarker.h"
-#import <React/RCTConvert+CoreLocation.h>
-#import <React/RCTBridge.h>
-#import <React/RCTUIManager.h>
-
-@implementation RMFMarkerManager
-
-RCT_EXPORT_MODULE(RMFMarker)
-
-- (UIView *)view {
-  RMFMarker * marker = [[RMFMarker alloc] init];
-  return marker;
-}
-
-RCT_EXPORT_VIEW_PROPERTY(coordinate, CLLocationCoordinate2D)
-RCT_EXPORT_VIEW_PROPERTY(anchor, CGPoint)
-RCT_EXPORT_VIEW_PROPERTY(elevation, double)
-RCT_EXPORT_VIEW_PROPERTY(rotation, double)
-RCT_EXPORT_VIEW_PROPERTY(draggable, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(infoWindowAnchor, CGPoint)
-RCT_EXPORT_VIEW_PROPERTY(title, NSString)
-RCT_EXPORT_VIEW_PROPERTY(snippet, NSString)
-RCT_EXPORT_VIEW_PROPERTY(userInteractionEnabled, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(icon, RMFIcon)
-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_VIEW_PROPERTY(onPressInfoWindow, RCTDirectEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onDragStart, RCTDirectEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onDrag, RCTDirectEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onDragEnd, RCTDirectEventBlock)
-
-RCT_EXPORT_METHOD(setCoordinate:(nonnull NSNumber *)reactTag
-                  withCoordinate:(id)coordinate)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        id view = viewRegistry[reactTag];
-        if (![view isKindOfClass:[RMFMarker class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting RMFMarker, got: %@", view);
-        } else {
-            RMFMarker *marker = (RMFMarker *)view;
-            [marker setCoordinate:[RCTConvert CLLocationCoordinate2D:coordinate]];
-        }
-    }];
-}
-
-RCT_EXPORT_METHOD(setRotation:(nonnull NSNumber *)reactTag
-                  rotation:(double)rotation)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        id view = viewRegistry[reactTag];
-        if (![view isKindOfClass:[RMFMarker class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting RMFMarker, got: %@", view);
-        } else {
-            RMFMarker *marker = (RMFMarker *)view;
-            [marker setRotation:rotation];
-        }
-    }];
-}
-
-RCT_EXPORT_METHOD(setTitle:(nonnull NSNumber *)reactTag
-                  title:(NSString*)title)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        id view = viewRegistry[reactTag];
-        if (![view isKindOfClass:[RMFMarker class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting RMFMarker, got: %@", view);
-        } else {
-            RMFMarker *marker = (RMFMarker *)view;
-            [marker setTitle:title];
-        }
-    }];
-}
-
-RCT_EXPORT_METHOD(setSnippet:(nonnull NSNumber *)reactTag
-                  snippet:(NSString*)snippet)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        id view = viewRegistry[reactTag];
-        if (![view isKindOfClass:[RMFMarker class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting RMFMarker, got: %@", view);
-        } else {
-            RMFMarker *marker = (RMFMarker *)view;
-            [marker setSnippet:snippet];
-        }
-    }];
-}
-
-RCT_EXPORT_METHOD(setDraggable:(nonnull NSNumber *)reactTag
-                  draggable:(BOOL)draggable)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        id view = viewRegistry[reactTag];
-        if (![view isKindOfClass:[RMFMarker class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting RMFMarker, got: %@", view);
-        } else {
-            RMFMarker *marker = (RMFMarker *)view;
-            [marker setDraggable:draggable];
-        }
-    }];
-}
-
-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:[RMFMarker class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting RMFMarker, got: %@", view);
-        } else {
-            RMFMarker *marker = (RMFMarker *)view;
-            [marker 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:[RMFMarker class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting RMFMarker, got: %@", view);
-        } else {
-          RMFMarker *marker = (RMFMarker *)view;
-          [marker 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:[RMFMarker class]]) {
-            RCTLogError(@"Invalid view returned from registry, expecting RMFMarker, got: %@", view);
-        } else {
-          RMFMarker *marker = (RMFMarker *)view;
-          [marker setUserData:[RCTConvert NSDictionary:json]];
-        }
-    }];
-}
-
-@end
+//
+//  RMFMarkerManager.m
+//  Map4dMap
+//
+//  Created by Huy Dang on 4/28/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#import "RMFMarkerManager.h"
+#import "RMFMarker.h"
+#import <React/RCTConvert+CoreLocation.h>
+#import <React/RCTBridge.h>
+#import <React/RCTUIManager.h>
+
+@implementation RMFMarkerManager
+
+RCT_EXPORT_MODULE(RMFMarker)
+
+- (void)withMarkerForTag:(nonnull NSNumber *)reactTag
+                 handler:(void (^)(RMFMarker *marker))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:[RMFMarker class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting RMFMarker, got: %@", view);
+            return;
+        }
+
+        handler((RMFMarker *)view);
+    }];
+}
+
+- (UIView *)view {
+  RMFMarker * marker = [[RMFMarker alloc] init];
+  return marker;
+}
+
+RCT_EXPORT_VIEW_PROPERTY(coordinate, CLLocationCoordinate2D)
+RCT_EXPORT_VIEW_PROPERTY(anchor, CGPoint)
+RCT_EXPORT_VIEW_PROPERTY(elevation, double)
+RCT_EXPORT_VIEW_PROPERTY(rotation, double)
+RCT_EXPORT_VIEW_PROPERTY(draggable, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(infoWindowAnchor, CGPoint)
+RCT_EXPORT_VIEW_PROPERTY(title, NSString)
+RCT_EXPORT_VIEW_PROPERTY(snippet, NSString)
+RCT_EXPORT_VIEW_PROPERTY(userInteractionEnabled, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(icon, RMFIcon)
+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_VIEW_PROPERTY(onPressInfoWindow, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onDragStart, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onDrag, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onDragEnd, RCTDirectEventBlock)
+
+RCT_EXPORT_METHOD(setCoordinate:(nonnull NSNumber *)reactTag
+                  withCoordinate:(id)coordinate)
+{
+    [self withMarkerForTag:reactTag handler:^(RMFMarker *marker) {
+        [marker setCoordinate:[RCTConvert CLLocationCoordinate2D:coordinate]];
+    }];
+}
+
+RCT_EXPORT_METHOD(setRotation:(nonnull NSNumber *)reactTag
+                  rotation:(double)rotation)
+{
+    [self withMarkerForTag:reactTag handler:^(RMFMarker *marker) {
+        [marker setRotation:rotation];
+    }];
+}
+
+RCT_EXPORT_METHOD(setTitle:(nonnull NSNumber *)reactTag
+                  title:(NSString*)title)
+{
+    [self withMarkerForTag:reactTag handler:^(RMFMarker *marker) {
+        [marker setTitle:title];
+    }];
+}
+
+RCT_EXPORT_METHOD(setSnippet:(nonnull NSNumber *)reactTag
+                  snippet:(NSString*)snippet)
+{
+    [self withMarkerForTag:reactTag handler:^(RMFMarker *marker) {
+        [marker setSnippet:snippet];
+    }];
+}
+
+RCT_EXPORT_METHOD(setDraggable:(nonnull NSNumber *)reactTag
+                  draggable:(BOOL)draggable)
+{
+    [self withMarkerForTag:reactTag handler:^(RMFMarker *marker) {
+        [marker setDraggable:draggable];
+    }];
+}
+
+RCT_EXPORT_METHOD(setZIndex:(nonnull NSNumber *)reactTag
+                  zIndex:(float)zIndex)
+{
+    [self withMarkerForTag:reactTag handler:^(RMFMarker *marker) {
+        [marker setZIndex:zIndex];
+    }];
+}
+
+RCT_EXPORT_METHOD(setVisible:(nonnull NSNumber *)reactTag
+                  visible:(BOOL)visible)
+{
+    [self withMarkerForTag:reactTag handler:^(RMFMarker *marker) {
+      [marker setVisible:visible];
+    }];
+}
+
+RCT_EXPORT_METHOD(setUserData:(nonnull NSNumber *)reactTag
+                  userData:(id)json)
+{
+    [self withMarkerForTag:reactTag handler:^(RMFMarker *marker) {
+      [marker setUserData:[RCTConvert NSDictionary:json]];
+    }];
+}
+
+@end

package/ios/RMFMarkerMap4d.h

@@ -1,19 +1,19 @@
-//
-//  RMFMarkerMap4d.h
-//  Map4dMap
-//
-//  Created by Huy Dang on 5/4/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#ifndef RMFMarkerMap4d_h
-#define RMFMarkerMap4d_h
-
-#import <Map4dMap/Map4dMap.h>
-
-@class RMFMarker;
-@interface RMFMarkerMap4d : MFMarker
-@property (nonatomic, weak) RMFMarker *reactMarker;
-@end
-
-#endif /* RMFMarkerMap4d_h */
+//
+//  RMFMarkerMap4d.h
+//  Map4dMap
+//
+//  Created by Huy Dang on 5/4/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#ifndef RMFMarkerMap4d_h
+#define RMFMarkerMap4d_h
+
+#import <Map4dMap/Map4dMap.h>
+
+@class RMFMarker;
+@interface RMFMarkerMap4d : MFMarker
+@property (nonatomic, weak) RMFMarker *reactMarker;
+@end
+
+#endif /* RMFMarkerMap4d_h */

package/ios/RMFMarkerMap4d.m

@@ -1,13 +1,13 @@
-//
-//  RMFMarkerMap4d.m
-//  Map4dMap
-//
-//  Created by Huy Dang on 5/4/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#import "RMFMarkerMap4d.h"
-#import <Foundation/Foundation.h>
-
-@implementation RMFMarkerMap4d
-@end
+//
+//  RMFMarkerMap4d.m
+//  Map4dMap
+//
+//  Created by Huy Dang on 5/4/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#import "RMFMarkerMap4d.h"
+#import <Foundation/Foundation.h>
+
+@implementation RMFMarkerMap4d
+@end

package/ios/RMFPOI.h

@@ -1,38 +1,38 @@
-//
-//  RMFPOI.h
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/5/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#ifndef RMFPOI_h
-#define RMFPOI_h
-
-#import <React/UIView+React.h>
-#import "RMFPOIMap4d.h"
-#import "RMFMapView.h"
-#import "RMFIcon.h"
-
-@interface RMFPOI : UIView
-
-@property (nonatomic, strong, nonnull) RMFPOIMap4d * map4dPOI;
-
-@property (nonatomic, copy) RCTBubblingEventBlock _Nullable onPress;
-
-@property (nonatomic, assign) CLLocationCoordinate2D coordinate;
-@property (nonatomic, strong, nullable) NSString *title;
-@property (nonatomic, strong, nullable) UIColor* titleColor;
-@property (nonatomic, strong, nullable) NSString* subtitle;
-@property (nonatomic, strong, nullable) NSString* poiType;
-@property (nonatomic, copy, nullable) RMFIcon *icon;
-@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 /* RMFPOI_h */
+//
+//  RMFPOI.h
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/5/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#ifndef RMFPOI_h
+#define RMFPOI_h
+
+#import <React/UIView+React.h>
+#import "RMFPOIMap4d.h"
+#import "RMFMapView.h"
+#import "RMFIcon.h"
+
+@interface RMFPOI : UIView
+
+@property (nonatomic, strong, nonnull) RMFPOIMap4d * map4dPOI;
+
+@property (nonatomic, copy) RCTBubblingEventBlock _Nullable onPress;
+
+@property (nonatomic, assign) CLLocationCoordinate2D coordinate;
+@property (nonatomic, strong, nullable) NSString *title;
+@property (nonatomic, strong, nullable) UIColor* titleColor;
+@property (nonatomic, strong, nullable) NSString* subtitle;
+@property (nonatomic, strong, nullable) NSString* poiType;
+@property (nonatomic, copy, nullable) RMFIcon *icon;
+@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 /* RMFPOI_h */