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

package/ios/RMFPOI.m

@@ -1,123 +1,123 @@
-//
-//  RMFPOI.m
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/5/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#import "RMFPOI.h"
-#import <Foundation/Foundation.h>
-#import "RMFEventResponse.h"
-
-@implementation RMFPOI
-
-- (instancetype)init {
-  if ((self = [super init])) {
-    _map4dPOI = [[RMFPOIMap4d alloc] init];
-    _map4dPOI.reactPOI = self;
-    
-    _coordinate = _map4dPOI.position;
-    _title = nil;//_map4dPOI.title;
-    _titleColor = _map4dPOI.color;
-    _subtitle = nil;//_map4dPOI.subtitle;
-    _poiType = nil;//_map4dPOI.type;
-    _icon = nil;
-    _zIndex = _map4dPOI.zIndex;
-    _visible = true;//!_map4dPOI.isHidden;
-    _userData = nil;
-  }
-  return self;
-}
-
-- (void)setMapView:(RMFMapView *)mapView {
-  _map4dPOI.map = mapView;
-}
-
-/** Properties */
-
-- (void)setCoordinate:(CLLocationCoordinate2D)coordinate {
-  _coordinate = coordinate;
-  _map4dPOI.position = coordinate;
-}
-
-- (void)setTitle:(NSString *)title {
-  _title = title;
-  _map4dPOI.title = title;
-}
-
-- (void)setTitleColor:(UIColor *)titleColor {
-  _titleColor = titleColor;
-  _map4dPOI.color = titleColor;
-}
-
-- (void)setSubtitle:(NSString *)subtitle {
-  _subtitle = subtitle;
-  _map4dPOI.subtitle = subtitle;
-}
-
-- (void)setPoiType:(NSString *)poiType {
-  _poiType = poiType;
-  _map4dPOI.type = poiType;
-}
-- (void)setIcon:(RMFIcon *)icon {
-  _icon = icon;
-  if (icon == nil || icon.uri == nil) {
-    _map4dPOI.icon = nil;
-    return;
-  }
-
-  dispatch_async(dispatch_get_global_queue(0,0), ^{
-    NSData * imageData = [[NSData alloc] initWithContentsOfURL: [NSURL URLWithString: icon.uri]];
-    if (imageData != nil) {
-      dispatch_async(dispatch_get_main_queue(), ^{
-        UIImage* icon = [UIImage imageWithData:imageData];
-        self->_map4dPOI.icon = [UIImage imageWithCGImage:[icon CGImage]
-                                                   scale:[UIScreen mainScreen].scale
-                                             orientation:icon.imageOrientation];
-      });
-    }
-  });
-}
-
-- (void)setZIndex:(float)zIndex {
-  _zIndex = zIndex;
-  _map4dPOI.zIndex = zIndex;
-}
-
-- (void)setVisible:(BOOL)visible {
-  _visible = visible;
-  _map4dPOI.isHidden = !visible;
-}
-
-- (void)setUserInteractionEnabled:(BOOL)enabled {
-  [super setUserInteractionEnabled:enabled];
-  _map4dPOI.userInteractionEnabled = enabled;
-}
-
- - (void)setUserData:(NSDictionary *)userData {
-   _userData = userData;
-//   _map4dPOI.userData = userData;
- }
-
-/** Event */
-
-- (void)didTapAtPixel:(CGPoint)pixel {
-  if (!self.onPress) {
-    return;
-  }
-  
-  CLLocationCoordinate2D tapLocation = [_map4dPOI.map.projection coordinateForPoint:pixel];
-  NSMutableDictionary* response = [NSMutableDictionary dictionaryWithDictionary:[RMFEventResponse fromCoordinate:tapLocation
-                                                                                                           pixel:pixel]];
-  response[@"poi"] = @{
-    kRMFLatLngCoordinateResponseKey: [RMFEventResponse fromCoordinate:_coordinate],
-    @"title": _title,
-    @"userData": _userData != nil ? _userData : @{}
-  };
-  response[@"action"] = @"poi-press";
-  
-  self.onPress(response);
-}
-
-@end
+//
+//  RMFPOI.m
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/5/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#import "RMFPOI.h"
+#import <Foundation/Foundation.h>
+#import "RMFEventResponse.h"
+
+@implementation RMFPOI
+
+- (instancetype)init {
+  if ((self = [super init])) {
+    _map4dPOI = [[RMFPOIMap4d alloc] init];
+    _map4dPOI.reactPOI = self;
+    
+    _coordinate = _map4dPOI.position;
+    _title = nil;//_map4dPOI.title;
+    _titleColor = _map4dPOI.color;
+    _subtitle = nil;//_map4dPOI.subtitle;
+    _poiType = nil;//_map4dPOI.type;
+    _icon = nil;
+    _zIndex = _map4dPOI.zIndex;
+    _visible = true;//!_map4dPOI.isHidden;
+    _userData = nil;
+  }
+  return self;
+}
+
+- (void)setMapView:(RMFMapView *)mapView {
+  _map4dPOI.map = mapView;
+}
+
+/** Properties */
+
+- (void)setCoordinate:(CLLocationCoordinate2D)coordinate {
+  _coordinate = coordinate;
+  _map4dPOI.position = coordinate;
+}
+
+- (void)setTitle:(NSString *)title {
+  _title = title;
+  _map4dPOI.title = title;
+}
+
+- (void)setTitleColor:(UIColor *)titleColor {
+  _titleColor = titleColor;
+  _map4dPOI.color = titleColor;
+}
+
+- (void)setSubtitle:(NSString *)subtitle {
+  _subtitle = subtitle;
+  _map4dPOI.subtitle = subtitle;
+}
+
+- (void)setPoiType:(NSString *)poiType {
+  _poiType = poiType;
+  _map4dPOI.type = poiType;
+}
+- (void)setIcon:(RMFIcon *)icon {
+  _icon = icon;
+  if (icon == nil || icon.uri == nil) {
+    _map4dPOI.icon = nil;
+    return;
+  }
+
+  dispatch_async(dispatch_get_global_queue(0,0), ^{
+    NSData * imageData = [[NSData alloc] initWithContentsOfURL: [NSURL URLWithString: icon.uri]];
+    if (imageData != nil) {
+      dispatch_async(dispatch_get_main_queue(), ^{
+        UIImage* icon = [UIImage imageWithData:imageData];
+        self->_map4dPOI.icon = [UIImage imageWithCGImage:[icon CGImage]
+                                                   scale:[UIScreen mainScreen].scale
+                                             orientation:icon.imageOrientation];
+      });
+    }
+  });
+}
+
+- (void)setZIndex:(float)zIndex {
+  _zIndex = zIndex;
+  _map4dPOI.zIndex = zIndex;
+}
+
+- (void)setVisible:(BOOL)visible {
+  _visible = visible;
+  _map4dPOI.isHidden = !visible;
+}
+
+- (void)setUserInteractionEnabled:(BOOL)enabled {
+  [super setUserInteractionEnabled:enabled];
+  _map4dPOI.userInteractionEnabled = enabled;
+}
+
+ - (void)setUserData:(NSDictionary *)userData {
+   _userData = userData;
+//   _map4dPOI.userData = userData;
+ }
+
+/** Event */
+
+- (void)didTapAtPixel:(CGPoint)pixel {
+  if (!self.onPress) {
+    return;
+  }
+  
+  CLLocationCoordinate2D tapLocation = [_map4dPOI.map.projection coordinateForPoint:pixel];
+  NSMutableDictionary* response = [NSMutableDictionary dictionaryWithDictionary:[RMFEventResponse fromCoordinate:tapLocation
+                                                                                                           pixel:pixel]];
+  response[@"poi"] = @{
+    kRMFLatLngCoordinateResponseKey: [RMFEventResponse fromCoordinate:_coordinate],
+    @"title": _title,
+    @"userData": _userData != nil ? _userData : @{}
+  };
+  response[@"action"] = @"poi-press";
+  
+  self.onPress(response);
+}
+
+@end

package/ios/RMFPOIManager.h

@@ -1,18 +1,18 @@
-//
-//  RMFPOIManager.h
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/5/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#ifndef RMFPOIManager_h
-#define RMFPOIManager_h
-
-#import <React/RCTViewManager.h>
-
-@interface RMFPOIManager : RCTViewManager
-
-@end
-
-#endif /* RMFPOIManager_h */
+//
+//  RMFPOIManager.h
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/5/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#ifndef RMFPOIManager_h
+#define RMFPOIManager_h
+
+#import <React/RCTViewManager.h>
+
+@interface RMFPOIManager : RCTViewManager
+
+@end
+
+#endif /* RMFPOIManager_h */

package/ios/RMFPOIManager.m

@@ -1,168 +1,134 @@
-//
-//  RMFPOIManager.m
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/5/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#import "RMFPOIManager.h"
-#import "RMFPOI.h"
-#import "RCTConvert+Map4dMap.h"
-#import <React/RCTBridge.h>
-#import <React/RCTUIManager.h>
-#import <React/RCTConvert+CoreLocation.h>
-#import <Foundation/Foundation.h>
-
-@implementation RMFPOIManager
-
-RCT_EXPORT_MODULE(RMFPOI)
-
-- (UIView *)view {
-  RMFPOI * poi = [[RMFPOI alloc] init];
-  return poi;
-}
-
-RCT_EXPORT_VIEW_PROPERTY(coordinate, CLLocationCoordinate2D)
-RCT_EXPORT_VIEW_PROPERTY(title, NSString)
-RCT_EXPORT_VIEW_PROPERTY(titleColor, UIColor)
-RCT_EXPORT_VIEW_PROPERTY(subtitle, NSString)
-RCT_EXPORT_VIEW_PROPERTY(poiType, NSString)
-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(userInteractionEnabled, BOOL)
-
-RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
-
-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:[RMFPOI class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFMarker, got: %@", view);
-    } else {
-      RMFPOI *poi = (RMFPOI *)view;
-      [poi setCoordinate:[RCTConvert CLLocationCoordinate2D:coordinate]];
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setTitle:(nonnull NSNumber *)reactTag
-                  withTitle:(NSString*)title)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFPOI class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFMarker, got: %@", view);
-    } else {
-      RMFPOI *poi = (RMFPOI *)view;
-      [poi setTitle:title];
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setTitleColor:(nonnull NSNumber *)reactTag
-                  withColor:(id)json)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFPOI class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFMarker, got: %@", view);
-    } else {
-      RMFPOI *poi = (RMFPOI *)view;
-      UIColor* color = [RCTConvert UIColor:json];
-      if (color != nil) {
-        [poi setTitleColor:color];
-      }
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setSubTitle:(nonnull NSNumber *)reactTag
-                  withSubTitle:(NSString*)subTitle)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFPOI class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFMarker, got: %@", view);
-    } else {
-      RMFPOI *poi = (RMFPOI *)view;
-      [poi setSubtitle:subTitle];
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setPoiType:(nonnull NSNumber *)reactTag
-                  withType:(NSString*)type)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFPOI class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFMarker, got: %@", view);
-    } else {
-      RMFPOI *poi = (RMFPOI *)view;
-      [poi setPoiType:type];
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setIcon:(nonnull NSNumber *)reactTag
-                  withIcon:(id)json)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFPOI class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFMarker, got: %@", view);
-    } else {
-      RMFPOI *poi = (RMFPOI *)view;
-      [poi setIcon:[RCTConvert RMFIcon:json]];
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setZIndex:(nonnull NSNumber *)reactTag
-                  withZIndex:(float)zIndex)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFPOI class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFMarker, got: %@", view);
-    } else {
-      RMFPOI *poi = (RMFPOI *)view;
-      [poi 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:[RMFPOI class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFMarker, got: %@", view);
-    } else {
-      RMFPOI *poi = (RMFPOI *)view;
-      [poi 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:[RMFPOI class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFMarker, got: %@", view);
-    } else {
-      RMFPOI *poi = (RMFPOI *)view;
-      [poi setUserData:[RCTConvert NSDictionary:json]];
-    }
-  }];
-}
-
-@end
+//
+//  RMFPOIManager.m
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/5/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#import "RMFPOIManager.h"
+#import "RMFPOI.h"
+#import "RCTConvert+Map4dMap.h"
+#import <React/RCTBridge.h>
+#import <React/RCTUIManager.h>
+#import <React/RCTConvert+CoreLocation.h>
+#import <Foundation/Foundation.h>
+
+@implementation RMFPOIManager
+
+RCT_EXPORT_MODULE(RMFPOI)
+
+- (void)withPOIForTag:(nonnull NSNumber *)reactTag
+               handler:(void (^)(RMFPOI *poi))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:[RMFPOI class]]) {
+      RCTLogError(@"Invalid view returned from registry, expecting RMFPOI, got: %@", view);
+      return;
+    }
+
+    handler((RMFPOI *)view);
+  }];
+}
+
+- (UIView *)view {
+  RMFPOI * poi = [[RMFPOI alloc] init];
+  return poi;
+}
+
+RCT_EXPORT_VIEW_PROPERTY(coordinate, CLLocationCoordinate2D)
+RCT_EXPORT_VIEW_PROPERTY(title, NSString)
+RCT_EXPORT_VIEW_PROPERTY(titleColor, UIColor)
+RCT_EXPORT_VIEW_PROPERTY(subtitle, NSString)
+RCT_EXPORT_VIEW_PROPERTY(poiType, NSString)
+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(userInteractionEnabled, BOOL)
+
+RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
+
+RCT_EXPORT_METHOD(setCoordinate:(nonnull NSNumber *)reactTag
+                  withCoordinate:(id)coordinate)
+{
+  [self withPOIForTag:reactTag handler:^(RMFPOI *poi) {
+    [poi setCoordinate:[RCTConvert CLLocationCoordinate2D:coordinate]];
+  }];
+}
+
+RCT_EXPORT_METHOD(setTitle:(nonnull NSNumber *)reactTag
+                  withTitle:(NSString*)title)
+{
+  [self withPOIForTag:reactTag handler:^(RMFPOI *poi) {
+    [poi setTitle:title];
+  }];
+}
+
+RCT_EXPORT_METHOD(setTitleColor:(nonnull NSNumber *)reactTag
+                  withColor:(id)json)
+{
+  [self withPOIForTag:reactTag handler:^(RMFPOI *poi) {
+    UIColor* color = [RCTConvert UIColor:json];
+    if (color != nil) {
+      [poi setTitleColor:color];
+    }
+  }];
+}
+
+RCT_EXPORT_METHOD(setSubTitle:(nonnull NSNumber *)reactTag
+                  withSubTitle:(NSString*)subTitle)
+{
+  [self withPOIForTag:reactTag handler:^(RMFPOI *poi) {
+    [poi setSubtitle:subTitle];
+  }];
+}
+
+RCT_EXPORT_METHOD(setPoiType:(nonnull NSNumber *)reactTag
+                  withType:(NSString*)type)
+{
+  [self withPOIForTag:reactTag handler:^(RMFPOI *poi) {
+    [poi setPoiType:type];
+  }];
+}
+
+RCT_EXPORT_METHOD(setIcon:(nonnull NSNumber *)reactTag
+                  withIcon:(id)json)
+{
+  [self withPOIForTag:reactTag handler:^(RMFPOI *poi) {
+    [poi setIcon:[RCTConvert RMFIcon:json]];
+  }];
+}
+
+RCT_EXPORT_METHOD(setZIndex:(nonnull NSNumber *)reactTag
+                  withZIndex:(float)zIndex)
+{
+  [self withPOIForTag:reactTag handler:^(RMFPOI *poi) {
+    [poi setZIndex:zIndex];
+  }];
+}
+
+RCT_EXPORT_METHOD(setVisible:(nonnull NSNumber *)reactTag
+                  visible:(BOOL)visible)
+{
+  [self withPOIForTag:reactTag handler:^(RMFPOI *poi) {
+    [poi setVisible:visible];
+  }];
+}
+
+RCT_EXPORT_METHOD(setUserData:(nonnull NSNumber *)reactTag
+                  userData:(id)json)
+{
+  [self withPOIForTag:reactTag handler:^(RMFPOI *poi) {
+    [poi setUserData:[RCTConvert NSDictionary:json]];
+  }];
+}
+
+@end

package/ios/RMFPOIMap4d.h

@@ -1,22 +1,22 @@
-//
-//  RMFPOIMap4d.h
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/5/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#ifndef RMFPOIMap4d_h
-#define RMFPOIMap4d_h
-
-#import <Map4dMap/Map4dMap.h>
-
-@class RMFPOI;
-
-@interface RMFPOIMap4d : MFPOI
-
-@property (nonatomic, weak) RMFPOI * reactPOI;
-
-@end
-
-#endif /* RMFPOIMap4d_h */
+//
+//  RMFPOIMap4d.h
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/5/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#ifndef RMFPOIMap4d_h
+#define RMFPOIMap4d_h
+
+#import <Map4dMap/Map4dMap.h>
+
+@class RMFPOI;
+
+@interface RMFPOIMap4d : MFPOI
+
+@property (nonatomic, weak) RMFPOI * reactPOI;
+
+@end
+
+#endif /* RMFPOIMap4d_h */

package/ios/RMFPOIMap4d.m

@@ -1,12 +1,12 @@
-//
-//  RMFPOIMap4d.m
-//  Map4dMap
-//
-//  Created by Huy Dang on 7/5/20.
-//  Copyright © 2020 IOTLink. All rights reserved.
-//
-
-#import "RMFPOIMap4d.h"
-
-@implementation RMFPOIMap4d
-@end
+//
+//  RMFPOIMap4d.m
+//  Map4dMap
+//
+//  Created by Huy Dang on 7/5/20.
+//  Copyright © 2020 IOTLink. All rights reserved.
+//
+
+#import "RMFPOIMap4d.h"
+
+@implementation RMFPOIMap4d
+@end