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

package/ios/building/RMFBuilding.h

@@ -1,41 +1,41 @@
-//
-//  RMFBuilding.h
-//  react-native-map4d-map
-//
-//  Created by Huy Dang on 6/10/25.
-//  Copyright © 2025 IOTLink. All rights reserved.
-//
-
-#ifndef RMFBuilding_h
-#define RMFBuilding_h
-
-#import <React/UIView+React.h>
-#import "RMFBuildingMap4d.h"
-#import "RMFMapView.h"
-
-@interface RMFBuilding : UIView
-
-@property(nonatomic, strong, nonnull) RMFBuildingMap4d * map4dBuilding;
-
-@property(nonatomic, copy) RCTBubblingEventBlock _Nullable onPress;
-
-@property (nonatomic, copy, nullable) NSString *name;
-@property (nonatomic, assign) CLLocationCoordinate2D coordinate;//position
-@property (nonatomic, copy, nullable) NSString *modelUrl;
-@property (nonatomic, copy, nullable) NSString *textureUrl;
-@property (nonatomic, assign) double scale;
-@property (nonatomic, assign) CGFloat bearing;
-@property (nonatomic, assign) double elevation;
-@property (nonatomic, assign) BOOL selected;
-@property (nonatomic, assign) BOOL touchable;
-@property (nonatomic, assign) BOOL visible;
-@property (nonatomic, copy, nullable) NSDictionary * userData;
-
-- (void)setMapView:(RMFMapView* _Nullable)mapView;
-
-- (void)didTapAtPixel:(CGPoint)pixel;
-
-@end
-
-
-#endif /* RMFBuilding_h */
+//
+//  RMFBuilding.h
+//  react-native-map4d-map
+//
+//  Created by Huy Dang on 6/10/25.
+//  Copyright © 2025 IOTLink. All rights reserved.
+//
+
+#ifndef RMFBuilding_h
+#define RMFBuilding_h
+
+#import <React/UIView+React.h>
+#import "RMFBuildingMap4d.h"
+#import "RMFMapView.h"
+
+@interface RMFBuilding : UIView
+
+@property(nonatomic, strong, nonnull) RMFBuildingMap4d * map4dBuilding;
+
+@property(nonatomic, copy) RCTBubblingEventBlock _Nullable onPress;
+
+@property (nonatomic, copy, nullable) NSString *name;
+@property (nonatomic, assign) CLLocationCoordinate2D coordinate;//position
+@property (nonatomic, copy, nullable) NSString *modelUrl;
+@property (nonatomic, copy, nullable) NSString *textureUrl;
+@property (nonatomic, assign) double scale;
+@property (nonatomic, assign) CGFloat bearing;
+@property (nonatomic, assign) double elevation;
+@property (nonatomic, assign) BOOL selected;
+@property (nonatomic, assign) BOOL touchable;
+@property (nonatomic, assign) BOOL visible;
+@property (nonatomic, copy, nullable) NSDictionary * userData;
+
+- (void)setMapView:(RMFMapView* _Nullable)mapView;
+
+- (void)didTapAtPixel:(CGPoint)pixel;
+
+@end
+
+
+#endif /* RMFBuilding_h */

package/ios/building/RMFBuilding.m

@@ -1,104 +1,104 @@
-//
-//  RMFBuilding.m
-//  react-native-map4d-map
-//
-//  Created by Huy Dang on 6/10/25.
-//  Copyright © 2025 IOTLink. All rights reserved.
-//
-
-#import "RMFBuilding.h"
-#import "RMFEventResponse.h"
-
-@implementation RMFBuilding
-
-- (instancetype)init {
-  self = [super init];
-  if (self) {
-    _map4dBuilding = [[RMFBuildingMap4d alloc] init];
-    _map4dBuilding.reactBuilding = self;
-
-    _name = _map4dBuilding.name;
-    _coordinate = _map4dBuilding.position;
-    _modelUrl = _map4dBuilding.model;
-    _textureUrl = _map4dBuilding.texture;
-    _scale = _map4dBuilding.scale;
-    _bearing = _map4dBuilding.bearing;
-    _elevation = _map4dBuilding.elevation;
-    _selected = _map4dBuilding.selected;
-    _touchable = _map4dBuilding.userInteractionEnabled;
-    _visible = !_map4dBuilding.isHidden;
-    _userData = nil;
-  }
-  return self;
-}
-
-- (void)setMapView:(RMFMapView *)mapView {
-  _map4dBuilding.map = mapView;
-}
-
-- (void)didTapAtPixel:(CGPoint)pixel {
-  if (self.onPress) {
-    CLLocationCoordinate2D tapLocation = [_map4dBuilding.map.projection coordinateForPoint:pixel];
-    NSMutableDictionary* response = [NSMutableDictionary dictionaryWithDictionary:[RMFEventResponse fromCoordinate:tapLocation
-                                                                                                             pixel:pixel]];
-    response[@"building"] = @{
-      kRMFLatLngCoordinateResponseKey: [RMFEventResponse fromCoordinate:_map4dBuilding.position],
-      @"userData": _userData != nil ? _userData : @{}
-    };
-    response[@"action"] = @"building-press";
-    
-    self.onPress(response);
-  };
-}
-
-- (void)setName:(NSString *)name {
-  _name = name;
-  _map4dBuilding.name = name;
-}
-
-- (void)setCoordinate:(CLLocationCoordinate2D)coordinate {
-  _coordinate = coordinate;
-  _map4dBuilding.position = coordinate;
-}
-
-- (void)setModelUrl:(NSString *)modelUrl {
-  _modelUrl = modelUrl;
-  _map4dBuilding.model = modelUrl;
-}
-
-- (void)setTextureUrl:(NSString *)textureUrl {
-  _textureUrl = textureUrl;
-  _map4dBuilding.texture = textureUrl;
-}
-
-- (void)setScale:(double)scale {
-  _scale = scale;
-  _map4dBuilding.scale = scale;
-}
-
-- (void)setBearing:(CGFloat)bearing {
-  _bearing = bearing;
-  _map4dBuilding.bearing = bearing;
-}
-
-- (void)setElevation:(double)elevation {
-  _elevation = elevation;
-  _map4dBuilding.elevation = elevation;
-}
-
-- (void)setSelected:(BOOL)selected {
-  _selected = selected;
-  _map4dBuilding.selected = selected;
-}
-
-- (void)setTouchable:(BOOL)touchable {
-  _touchable = touchable;
-  _map4dBuilding.userInteractionEnabled = touchable;
-}
-
-- (void)setVisible:(BOOL)visible {
-  _visible = visible;
-  _map4dBuilding.isHidden = !visible;
-}
-
-@end
+//
+//  RMFBuilding.m
+//  react-native-map4d-map
+//
+//  Created by Huy Dang on 6/10/25.
+//  Copyright © 2025 IOTLink. All rights reserved.
+//
+
+#import "RMFBuilding.h"
+#import "RMFEventResponse.h"
+
+@implementation RMFBuilding
+
+- (instancetype)init {
+  self = [super init];
+  if (self) {
+    _map4dBuilding = [[RMFBuildingMap4d alloc] init];
+    _map4dBuilding.reactBuilding = self;
+
+    _name = _map4dBuilding.name;
+    _coordinate = _map4dBuilding.position;
+    _modelUrl = _map4dBuilding.model;
+    _textureUrl = _map4dBuilding.texture;
+    _scale = _map4dBuilding.scale;
+    _bearing = _map4dBuilding.bearing;
+    _elevation = _map4dBuilding.elevation;
+    _selected = _map4dBuilding.selected;
+    _touchable = _map4dBuilding.userInteractionEnabled;
+    _visible = !_map4dBuilding.isHidden;
+    _userData = nil;
+  }
+  return self;
+}
+
+- (void)setMapView:(RMFMapView *)mapView {
+  _map4dBuilding.map = mapView;
+}
+
+- (void)didTapAtPixel:(CGPoint)pixel {
+  if (self.onPress) {
+    CLLocationCoordinate2D tapLocation = [_map4dBuilding.map.projection coordinateForPoint:pixel];
+    NSMutableDictionary* response = [NSMutableDictionary dictionaryWithDictionary:[RMFEventResponse fromCoordinate:tapLocation
+                                                                                                             pixel:pixel]];
+    response[@"building"] = @{
+      kRMFLatLngCoordinateResponseKey: [RMFEventResponse fromCoordinate:_map4dBuilding.position],
+      @"userData": _userData != nil ? _userData : @{}
+    };
+    response[@"action"] = @"building-press";
+    
+    self.onPress(response);
+  };
+}
+
+- (void)setName:(NSString *)name {
+  _name = name;
+  _map4dBuilding.name = name;
+}
+
+- (void)setCoordinate:(CLLocationCoordinate2D)coordinate {
+  _coordinate = coordinate;
+  _map4dBuilding.position = coordinate;
+}
+
+- (void)setModelUrl:(NSString *)modelUrl {
+  _modelUrl = modelUrl;
+  _map4dBuilding.model = modelUrl;
+}
+
+- (void)setTextureUrl:(NSString *)textureUrl {
+  _textureUrl = textureUrl;
+  _map4dBuilding.texture = textureUrl;
+}
+
+- (void)setScale:(double)scale {
+  _scale = scale;
+  _map4dBuilding.scale = scale;
+}
+
+- (void)setBearing:(CGFloat)bearing {
+  _bearing = bearing;
+  _map4dBuilding.bearing = bearing;
+}
+
+- (void)setElevation:(double)elevation {
+  _elevation = elevation;
+  _map4dBuilding.elevation = elevation;
+}
+
+- (void)setSelected:(BOOL)selected {
+  _selected = selected;
+  _map4dBuilding.selected = selected;
+}
+
+- (void)setTouchable:(BOOL)touchable {
+  _touchable = touchable;
+  _map4dBuilding.userInteractionEnabled = touchable;
+}
+
+- (void)setVisible:(BOOL)visible {
+  _visible = visible;
+  _map4dBuilding.isHidden = !visible;
+}
+
+@end

package/ios/building/RMFBuildingManager.h

@@ -1,19 +1,19 @@
-//
-//  RMFBuildingManager.h
-//  react-native-map4d-map
-//
-//  Created by Huy Dang on 6/10/25.
-//  Copyright © 2025 IOTLink. All rights reserved.
-//
-
-#ifndef RMFBuildingManager_h
-#define RMFBuildingManager_h
-
-#import <React/RCTViewManager.h>
-
-@interface RMFBuildingManager : RCTViewManager
-
-@end
-
-
-#endif /* RMFBuildingManager_h */
+//
+//  RMFBuildingManager.h
+//  react-native-map4d-map
+//
+//  Created by Huy Dang on 6/10/25.
+//  Copyright © 2025 IOTLink. All rights reserved.
+//
+
+#ifndef RMFBuildingManager_h
+#define RMFBuildingManager_h
+
+#import <React/RCTViewManager.h>
+
+@interface RMFBuildingManager : RCTViewManager
+
+@end
+
+
+#endif /* RMFBuildingManager_h */

package/ios/building/RMFBuildingManager.m

@@ -1,133 +1,105 @@
-//
-//  RMFBuildingManager.m
-//  react-native-map4d-map
-//
-//  Created by Huy Dang on 6/10/25.
-//  Copyright © 2025 IOTLink. All rights reserved.
-//
-
-#import "RMFBuildingManager.h"
-#import "RMFBuilding.h"
-#import <React/RCTConvert+CoreLocation.h>
-#import <React/RCTBridge.h>
-#import <React/RCTUIManager.h>
-
-@implementation RMFBuildingManager
-
-RCT_EXPORT_MODULE(RMFBuilding)
-
-- (UIView *)view {
-  RMFBuilding *building = [[RMFBuilding alloc] init];
-  return building;
-}
-
-RCT_EXPORT_VIEW_PROPERTY(name, NSString)
-RCT_EXPORT_VIEW_PROPERTY(coordinate, CLLocationCoordinate2D)
-RCT_EXPORT_VIEW_PROPERTY(modelUrl, NSString)
-RCT_EXPORT_VIEW_PROPERTY(textureUrl, NSString)
-RCT_EXPORT_VIEW_PROPERTY(scale, double)
-RCT_EXPORT_VIEW_PROPERTY(bearing, CGFloat)
-RCT_EXPORT_VIEW_PROPERTY(elevation, double)
-RCT_EXPORT_VIEW_PROPERTY(selected, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(touchable, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(visible, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(userData, NSDictionary)
-RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
-
-RCT_EXPORT_METHOD(setName:(nonnull NSNumber *)reactTag name:(NSString *)name) {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFBuilding class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFBuilding, got: %@", view);
-    } else {
-      RMFBuilding *building = (RMFBuilding *)view;
-      [building setName:name];
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setScale:(nonnull NSNumber *)reactTag scale:(double)scale) {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFBuilding class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFBuilding, got: %@", view);
-    } else {
-      RMFBuilding *building = (RMFBuilding *)view;
-      [building setScale:scale];
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setBearing:(nonnull NSNumber *)reactTag bearing:(CGFloat)bearing) {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFBuilding class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFBuilding, got: %@", view);
-    } else {
-      RMFBuilding *building = (RMFBuilding *)view;
-      [building setBearing:bearing];
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setElevation:(nonnull NSNumber *)reactTag elevation:(double)elevation) {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFBuilding class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFBuilding, got: %@", view);
-    } else {
-      RMFBuilding *building = (RMFBuilding *)view;
-      [building setElevation:elevation];
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setSelected:(nonnull NSNumber *)reactTag selected:(BOOL)selected) {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFBuilding class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFBuilding, got: %@", view);
-    } else {
-      RMFBuilding *building = (RMFBuilding *)view;
-      [building setSelected:selected];
-    }
-  }];
-}
-
-RCT_EXPORT_METHOD(setTouchable:(nonnull NSNumber *)reactTag touchable:(BOOL)touchable) {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFBuilding class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFBuilding, got: %@", view);
-    } else {
-      RMFBuilding *building = (RMFBuilding *)view;
-      [building setTouchable:touchable];
-    }
-  }];
-}
-
-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:[RMFBuilding class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFBuilding, got: %@", view);
-    } else {
-      RMFBuilding *building = (RMFBuilding *)view;
-      [building 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:[RMFBuilding class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFBuilding, got: %@", view);
-    } else {
-      RMFBuilding *building = (RMFBuilding *)view;
-      [building setUserData:[RCTConvert NSDictionary:json]];
-    }
-  }];
-}
-
-@end
+//
+//  RMFBuildingManager.m
+//  react-native-map4d-map
+//
+//  Created by Huy Dang on 6/10/25.
+//  Copyright © 2025 IOTLink. All rights reserved.
+//
+
+#import "RMFBuildingManager.h"
+#import "RMFBuilding.h"
+#import <React/RCTConvert+CoreLocation.h>
+#import <React/RCTBridge.h>
+#import <React/RCTUIManager.h>
+
+@implementation RMFBuildingManager
+
+RCT_EXPORT_MODULE(RMFBuilding)
+
+- (void)withBuildingForTag:(nonnull NSNumber *)reactTag
+                   handler:(void (^)(RMFBuilding *building))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:[RMFBuilding class]]) {
+      RCTLogError(@"Invalid view returned from registry, expecting RMFBuilding, got: %@", view);
+      return;
+    }
+
+    handler((RMFBuilding *)view);
+  }];
+}
+
+- (UIView *)view {
+  RMFBuilding *building = [[RMFBuilding alloc] init];
+  return building;
+}
+
+RCT_EXPORT_VIEW_PROPERTY(name, NSString)
+RCT_EXPORT_VIEW_PROPERTY(coordinate, CLLocationCoordinate2D)
+RCT_EXPORT_VIEW_PROPERTY(modelUrl, NSString)
+RCT_EXPORT_VIEW_PROPERTY(textureUrl, NSString)
+RCT_EXPORT_VIEW_PROPERTY(scale, double)
+RCT_EXPORT_VIEW_PROPERTY(bearing, CGFloat)
+RCT_EXPORT_VIEW_PROPERTY(elevation, double)
+RCT_EXPORT_VIEW_PROPERTY(selected, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(touchable, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(visible, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(userData, NSDictionary)
+RCT_EXPORT_VIEW_PROPERTY(onPress, RCTBubblingEventBlock)
+
+RCT_EXPORT_METHOD(setName:(nonnull NSNumber *)reactTag name:(NSString *)name) {
+  [self withBuildingForTag:reactTag handler:^(RMFBuilding *building) {
+    [building setName:name];
+  }];
+}
+
+RCT_EXPORT_METHOD(setScale:(nonnull NSNumber *)reactTag scale:(double)scale) {
+  [self withBuildingForTag:reactTag handler:^(RMFBuilding *building) {
+    [building setScale:scale];
+  }];
+}
+
+RCT_EXPORT_METHOD(setBearing:(nonnull NSNumber *)reactTag bearing:(CGFloat)bearing) {
+  [self withBuildingForTag:reactTag handler:^(RMFBuilding *building) {
+    [building setBearing:bearing];
+  }];
+}
+
+RCT_EXPORT_METHOD(setElevation:(nonnull NSNumber *)reactTag elevation:(double)elevation) {
+  [self withBuildingForTag:reactTag handler:^(RMFBuilding *building) {
+    [building setElevation:elevation];
+  }];
+}
+
+RCT_EXPORT_METHOD(setSelected:(nonnull NSNumber *)reactTag selected:(BOOL)selected) {
+  [self withBuildingForTag:reactTag handler:^(RMFBuilding *building) {
+    [building setSelected:selected];
+  }];
+}
+
+RCT_EXPORT_METHOD(setTouchable:(nonnull NSNumber *)reactTag touchable:(BOOL)touchable) {
+  [self withBuildingForTag:reactTag handler:^(RMFBuilding *building) {
+    [building setTouchable:touchable];
+  }];
+}
+
+RCT_EXPORT_METHOD(setVisible:(nonnull NSNumber *)reactTag visible:(BOOL)visible) {
+  [self withBuildingForTag:reactTag handler:^(RMFBuilding *building) {
+    [building setVisible:visible];
+  }];
+}
+
+RCT_EXPORT_METHOD(setUserData:(nonnull NSNumber *)reactTag userData:(id)json) {
+  [self withBuildingForTag:reactTag handler:^(RMFBuilding *building) {
+    [building setUserData:[RCTConvert NSDictionary:json]];
+  }];
+}
+
+@end

package/ios/building/RMFBuildingMap4d.h

@@ -1,23 +1,23 @@
-//
-//  RMFBuildingMap4d.h
-//  react-native-map4d-map
-//
-//  Created by Huy Dang on 6/10/25.
-//  Copyright © 2025 IOTLink. All rights reserved.
-//
-
-#ifndef RMFBuildingMap4d_h
-#define RMFBuildingMap4d_h
-
-#import <Map4dMap/Map4dMap.h>
-
-@class RMFBuilding;
-
-@interface RMFBuildingMap4d : MFBuilding
-
-@property (nonatomic, weak) RMFBuilding *reactBuilding;
-
-@end
-
-
-#endif /* RMFBuildingMap4d_h */
+//
+//  RMFBuildingMap4d.h
+//  react-native-map4d-map
+//
+//  Created by Huy Dang on 6/10/25.
+//  Copyright © 2025 IOTLink. All rights reserved.
+//
+
+#ifndef RMFBuildingMap4d_h
+#define RMFBuildingMap4d_h
+
+#import <Map4dMap/Map4dMap.h>
+
+@class RMFBuilding;
+
+@interface RMFBuildingMap4d : MFBuilding
+
+@property (nonatomic, weak) RMFBuilding *reactBuilding;
+
+@end
+
+
+#endif /* RMFBuildingMap4d_h */

package/ios/building/RMFBuildingMap4d.m

@@ -1,15 +1,15 @@
-//
-//  RMFBuildingMap4d.m
-//  react-native-map4d-map
-//
-//  Created by Huy Dang on 6/10/25.
-//  Copyright © 2025 IOTLink. All rights reserved.
-//
-
-#import "RMFBuildingMap4d.h"
-
-@implementation RMFBuildingMap4d
-
-
-
-@end
+//
+//  RMFBuildingMap4d.m
+//  react-native-map4d-map
+//
+//  Created by Huy Dang on 6/10/25.
+//  Copyright © 2025 IOTLink. All rights reserved.
+//
+
+#import "RMFBuildingMap4d.h"
+
+@implementation RMFBuildingMap4d
+
+
+
+@end