react-native-map4d-map-dtqg 0.1.4 → 0.1.6

package/ios/RMFMapViewManager.m

@@ -31,6 +31,35 @@
 
 RCT_EXPORT_MODULE(RMFMapView)
 
+- (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);
+  }];
+}
+
 - (UIView *)view {
   RMFMapView * rMap = [[RMFMapView alloc] initWithFrame:CGRectMake(0, 0, 200, 200)];
 //  RMFMapView * rMap = [[RMFMapView alloc] init];
@@ -79,15 +108,9 @@ RCT_EXPORT_METHOD(getCamera:(nonnull NSNumber *)reactTag
                   resolver: (RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFMapView class]]) {
-      reject(@"Invalid argument", [NSString stringWithFormat:@"Invalid view returned from registry, expecting RMFMapView, got: %@", view], NULL);
-    } else {
-      RMFMapView *mapView = (RMFMapView *)view;
+  [self withMapViewForTag:reactTag rejecter:reject handler:^(RMFMapView *mapView) {
       MFCameraPosition *camera = [mapView camera];
       resolve([RMFEventResponse fromCameraPosition:camera]);
-    }
   }];
 }
 
@@ -95,15 +118,9 @@ RCT_EXPORT_METHOD(getBounds:(nonnull NSNumber *)reactTag
                   resolver: (RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFMapView class]]) {
-      reject(@"Invalid argument", [NSString stringWithFormat:@"Invalid view returned from registry, expecting RMFMapView, got: %@", view], NULL);
-    } else {
-      RMFMapView *mapView = (RMFMapView *)view;
-      MFCoordinateBounds* bounds = [mapView getBounds];
-      resolve([RMFEventResponse fromCoordinateBounds:bounds]);
-    }
+  [self withMapViewForTag:reactTag rejecter:reject handler:^(RMFMapView *mapView) {
+    MFCoordinateBounds* bounds = [mapView getBounds];
+    resolve([RMFEventResponse fromCoordinateBounds:bounds]);
   }];
 }
 
@@ -112,38 +129,27 @@ RCT_EXPORT_METHOD(cameraForBounds:(nonnull NSNumber *)reactTag
                   resolver: (RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFMapView class]]) {
-      reject(@"Invalid argument", [NSString stringWithFormat:@"Invalid view returned from registry, expecting RMFMapView, got: %@", view], NULL);
-    } else {
-      RMFMapView *mapView = (RMFMapView *)view;
-      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];
-        }
+  [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]);
     }
+    resolve([RMFEventResponse fromCameraPosition:camera]);
   }];
 }
 
 RCT_EXPORT_METHOD(fitBounds:(nonnull NSNumber *)reactTag
                   withData:(id)json)
 {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFMapView class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFMapView, got: %@", view);
-    } else {
-      RMFMapView *mapView = (RMFMapView *)view;
+  [self withMapViewForTag:reactTag rejecter:nil handler:^(RMFMapView *mapView) {
       MFCameraPosition* camera = nil;
       id data = [RCTConvert NSDictionary:json];
       if (data[@"bounds"]) {
@@ -157,7 +163,6 @@ RCT_EXPORT_METHOD(fitBounds:(nonnull NSNumber *)reactTag
         }
         [mapView moveCamera:[MFCameraUpdate setCamera:camera]];
       }
-    }
   }];
 }
 
@@ -166,15 +171,9 @@ RCT_EXPORT_METHOD(pointForCoordinate:(nonnull NSNumber *)reactTag
                   resolver: (RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFMapView class]]) {
-      reject(@"Invalid argument", [NSString stringWithFormat:@"Invalid view returned from registry, expecting RMFMapView, got: %@", view], NULL);
-    } else {
-      RMFMapView *mapView = (RMFMapView *)view;
+  [self withMapViewForTag:reactTag rejecter:reject handler:^(RMFMapView *mapView) {
       CGPoint point = [mapView.projection pointForCoordinate:[RCTConvert CLLocationCoordinate2D:json]];
       resolve([RMFEventResponse fromCGPoint:point]);
-    }
   }];
 }
 
@@ -183,67 +182,37 @@ RCT_EXPORT_METHOD(coordinateForPoint:(nonnull NSNumber *)reactTag
                   resolver: (RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFMapView class]]) {
-      reject(@"Invalid argument", [NSString stringWithFormat:@"Invalid view returned from registry, expecting RMFMapView, got: %@", view], NULL);
-    } else {
-      RMFMapView *mapView = (RMFMapView *)view;
-      CLLocationCoordinate2D coordinate = [mapView.projection coordinateForPoint:[RCTConvert CGPoint:json]];
-      resolve([RMFEventResponse fromCoordinate:coordinate]);
-    }
+  [self withMapViewForTag:reactTag rejecter:reject handler:^(RMFMapView *mapView) {
+    CLLocationCoordinate2D coordinate = [mapView.projection coordinateForPoint:[RCTConvert CGPoint:json]];
+    resolve([RMFEventResponse fromCoordinate:coordinate]);
   }];
 }
 
 RCT_EXPORT_METHOD(animateCamera:(nonnull NSNumber *)reactTag
                   withCamera:(id)json) {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFMapView class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFMapView, got: %@", view);
-    } else {
-      RMFMapView *mapView = (RMFMapView *)view;
+  [self withMapViewForTag:reactTag rejecter:nil handler:^(RMFMapView *mapView) {
       [mapView animateCamera:[MFCameraUpdate setCamera:[RCTConvert MFCameraPosition:json withDefaultCamera:mapView.camera]]];
-    }
   }];
 }
 
 RCT_EXPORT_METHOD(moveCamera:(nonnull NSNumber *)reactTag
                   withCamera:(id)json) {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFMapView class]]) {
-      RCTLogError(@"Invalid view returned from registry, expecting RMFMapView, got: %@", view);
-    } else {
-      RMFMapView *mapView = (RMFMapView *)view;
+  [self withMapViewForTag:reactTag rejecter:nil handler:^(RMFMapView *mapView) {
       [mapView moveCamera:[MFCameraUpdate setCamera:[RCTConvert MFCameraPosition:json withDefaultCamera:mapView.camera]]];
-    }
   }];
 }
 
 RCT_EXPORT_METHOD(showsMyLocationButton:(nonnull NSNumber *)reactTag
                   enable:(BOOL)enable) {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFMapView class]]) {
-
-    } else {
-      RMFMapView *mapView = (RMFMapView *)view;
+  [self withMapViewForTag:reactTag rejecter:nil handler:^(RMFMapView *mapView) {
       mapView.settings.myLocationButton = enable;
-    }
   }];
 }
 
 RCT_EXPORT_METHOD(setMyLocationEnabled:(nonnull NSNumber *)reactTag
                   enable:(BOOL)enable) {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFMapView class]]) {
-      
-    } else {
-      RMFMapView *mapView = (RMFMapView *)view;
+  [self withMapViewForTag:reactTag rejecter:nil handler:^(RMFMapView *mapView) {
       [mapView setMyLocationEnabled:enable];
-    }
   }];
 }
 
@@ -251,126 +220,72 @@ RCT_EXPORT_METHOD(getMyLocation:(nonnull NSNumber *)reactTag
                   resolver: (RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFMapView class]]) {
-      reject(@"Invalid argument", [NSString stringWithFormat:@"Invalid view returned from registry, expecting RMFMapView, got: %@", view], NULL);
-    } else {
-      RMFMapView *mapView = (RMFMapView *)view;
+  [self withMapViewForTag:reactTag rejecter:reject handler:^(RMFMapView *mapView) {
       CLLocation *location = [mapView getMyLocation];
       resolve([RMFEventResponse fromCLLocation:location]);
-    }
   }];
 }
 
 RCT_EXPORT_METHOD(setPOIsEnabled:(nonnull NSNumber *)reactTag
                   enable:(BOOL)enable) {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFMapView class]]) {
-      
-    } else {
-      RMFMapView *mapView = (RMFMapView *)view;
-      [mapView setPOIsEnabled:enable];
-    }
+  [self withMapViewForTag:reactTag rejecter:nil handler:^(RMFMapView *mapView) {
+    [mapView setPOIsEnabled:enable];
   }];
 }
 
 RCT_EXPORT_METHOD(setTime:(nonnull NSNumber *)reactTag
                   withTime:(id)json) {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFMapView class]]) {
-      
-    } else {
-      RMFMapView *mapView = (RMFMapView *)view;
+  [self withMapViewForTag:reactTag rejecter:nil handler:^(RMFMapView *mapView) {
       NSDate * date = [RCTConvert NSDate:json];
       if (date) {
         [mapView setTime:date];
       }
-    }
   }];
 }
 
 RCT_EXPORT_METHOD(setMapStyle:(nonnull NSNumber *)reactTag
                   withStyle:(NSString *)style) {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFMapView class]]) {
-
-    } else {
-      RMFMapView *mapView = (RMFMapView *)view;
+  [self withMapViewForTag:reactTag rejecter:nil handler:^(RMFMapView *mapView) {
       if (style.length > 0) {
         MFMapStyle *mapStyle = [[MFMapStyle alloc] initWithJSONString:style];
         [mapView setMapStyle:mapStyle];
       }
-    }
   }];
 }
 
 
 RCT_EXPORT_METHOD(setZoomGesturesEnabled:(nonnull NSNumber *)reactTag
                   enable:(BOOL)enable) {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFMapView class]]) {
-      
-    } else {
-      RMFMapView *mapView = (RMFMapView *)view;
+  [self withMapViewForTag:reactTag rejecter:nil handler:^(RMFMapView *mapView) {
       mapView.settings.zoomGestures = enable;
-    }
   }];
 }
 
 RCT_EXPORT_METHOD(setScrollGesturesEnabled:(nonnull NSNumber *)reactTag
                   enable:(BOOL)enable) {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFMapView class]]) {
-      
-    } else {
-      RMFMapView *mapView = (RMFMapView *)view;
+  [self withMapViewForTag:reactTag rejecter:nil handler:^(RMFMapView *mapView) {
       mapView.settings.scrollGestures = enable;
-    }
   }];
 }
 
 RCT_EXPORT_METHOD(setRotateGesturesEnabled:(nonnull NSNumber *)reactTag
                   enable:(BOOL)enable) {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFMapView class]]) {
-      
-    } else {
-      RMFMapView *mapView = (RMFMapView *)view;
+  [self withMapViewForTag:reactTag rejecter:nil handler:^(RMFMapView *mapView) {
       mapView.settings.rotateGestures = enable;
-    }
   }];
 }
 
 RCT_EXPORT_METHOD(setTiltGesturesEnabled:(nonnull NSNumber *)reactTag
                   enable:(BOOL)enable) {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFMapView class]]) {
-      
-    } else {
-      RMFMapView *mapView = (RMFMapView *)view;
+  [self withMapViewForTag:reactTag rejecter:nil handler:^(RMFMapView *mapView) {
       mapView.settings.tiltGestures = enable;
-    }
   }];
 }
 
 RCT_EXPORT_METHOD(setAllGesturesEnabled:(nonnull NSNumber *)reactTag
                   enable:(BOOL)enable) {
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RMFMapView class]]) {
-      
-    } else {
-      RMFMapView *mapView = (RMFMapView *)view;
+  [self withMapViewForTag:reactTag rejecter:nil handler:^(RMFMapView *mapView) {
       [mapView.settings setAllGesturesEnabled:enable];
-    }
   }];
 }
 

package/ios/RMFMarkerManager.m

@@ -16,6 +16,26 @@
 
 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;
@@ -44,112 +64,64 @@ 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]];
-        }
+    [self withMarkerForTag:reactTag handler:^(RMFMarker *marker) {
+        [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];
-        }
+    [self withMarkerForTag:reactTag handler:^(RMFMarker *marker) {
+        [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];
-        }
+    [self withMarkerForTag:reactTag handler:^(RMFMarker *marker) {
+        [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];
-        }
+    [self withMarkerForTag:reactTag handler:^(RMFMarker *marker) {
+        [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];
-        }
+    [self withMarkerForTag:reactTag handler:^(RMFMarker *marker) {
+        [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];
-        }
+    [self withMarkerForTag:reactTag handler:^(RMFMarker *marker) {
+        [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];
-        }
+    [self withMarkerForTag:reactTag handler:^(RMFMarker *marker) {
+      [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]];
-        }
+    [self withMarkerForTag:reactTag handler:^(RMFMarker *marker) {
+      [marker setUserData:[RCTConvert NSDictionary:json]];
     }];
 }