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

package/src/components/MFMapView.js

@@ -4,11 +4,11 @@ import {ViewPropTypes, ColorPropType} from 'deprecated-react-native-prop-types';
 import {AreaFocusManager} from './extends/AreaFocusManager';
 import {AreaFocuser} from './extends/AreaFocuser';
 import {MFPolygon} from './MFPolygon';
+import {getMap4dMapNativeModule} from '../native/Map4dMapNativeModule';
+import {runViewManagerCommand} from '../native/ViewManagerCommand';
 import {
   requireNativeComponent,
   Platform,
-  UIManager,
-  NativeModules,
   findNodeHandle
 } from 'react-native';
 
@@ -231,7 +231,7 @@ class MFMapView extends React.Component {
 
   getCamera() {
     if (Platform.OS === 'android') {
-      return NativeModules.Map4dMap.getCamera(this._getHandle());
+      return this._runMap4dMapModuleMethod('getCamera', [this._getHandle()]);
     } else if (Platform.OS === 'ios') {
       return this._runCommand('getCamera', []);
     }
@@ -240,7 +240,7 @@ class MFMapView extends React.Component {
 
   getBounds() {
     if (Platform.OS === 'android') {
-      return NativeModules.Map4dMap.getBounds(this._getHandle());
+      return this._runMap4dMapModuleMethod('getBounds', [this._getHandle()]);
     } else if (Platform.OS === 'ios') {
       return this._runCommand('getBounds', []);
     }
@@ -249,7 +249,7 @@ class MFMapView extends React.Component {
 
   getMyLocation() {
     if (Platform.OS === 'android') {
-      return NativeModules.Map4dMap.getMyLocation(this._getHandle());
+      return this._runMap4dMapModuleMethod('getMyLocation', [this._getHandle()]);
     } else if (Platform.OS === 'ios') {
       return this._runCommand('getMyLocation', []);
     }
@@ -312,10 +312,10 @@ class MFMapView extends React.Component {
 
   cameraForBounds(boundsData) {
     if (Platform.OS === 'android') {
-      return NativeModules.Map4dMap.cameraForBounds(
+      return this._runMap4dMapModuleMethod('cameraForBounds', [
         this._getHandle(),
         boundsData
-      );
+      ]);
     } else if (Platform.OS === 'ios') {
       return this._runCommand('cameraForBounds', [boundsData]);
     }
@@ -334,10 +334,10 @@ class MFMapView extends React.Component {
    */
   pointForCoordinate(coordinate) {
     if (Platform.OS === 'android') {
-      return NativeModules.Map4dMap.pointForCoordinate(
+      return this._runMap4dMapModuleMethod('pointForCoordinate', [
         this._getHandle(),
         coordinate
-      );
+      ]);
     } else if (Platform.OS === 'ios') {
       return this._runCommand('pointForCoordinate', [coordinate]);
     }
@@ -355,10 +355,10 @@ class MFMapView extends React.Component {
    */
   coordinateForPoint(point) {
     if (Platform.OS === 'android') {
-      return NativeModules.Map4dMap.coordinateForPoint(
+      return this._runMap4dMapModuleMethod('coordinateForPoint', [
         this._getHandle(),
         point
-      );
+      ]);
     } else if (Platform.OS === 'ios') {
       return this._runCommand('coordinateForPoint', [point]);
     }
@@ -384,53 +384,31 @@ class MFMapView extends React.Component {
     return findNodeHandle(this.map);
   }
 
-  _runCommand(name, args) {
-    switch (Platform.OS) {
-      case 'android': {
-        if (!UIManager || typeof UIManager.dispatchViewManagerCommand !== 'function') {
-          return Promise.reject('UIManager.dispatchViewManagerCommand is unavailable on this React Native version')
-        }
-
-        const commandId = this._uiManagerCommand(name)
-        if (commandId == null) {
-          return Promise.reject(`Cannot find native command "${name}" for RMFMapView`)
-        }
-
-        return UIManager.dispatchViewManagerCommand(
-          this._getHandle(),
-          commandId,
-          args
-        );
-      }
-
-      case 'ios':
-        return this._mapManagerCommand(name)(this._getHandle(), ...args);
-
-      default:
-        return Promise.reject(`Invalid platform was passed: ${Platform.OS}`);
-    }
-  }
-
-  _uiManagerCommand(name) {
-    const uiManager = UIManager || NativeModules.UIManager;
-    const componentName = "RMFMapView";
-
-    if (!uiManager) {
-      return null;
-    }
+  _runMap4dMapModuleMethod(name, args) {
+    const map4dMapNativeModule = getMap4dMapNativeModule();
 
-    if (!uiManager.getViewManagerConfig) {
-      // RN < 0.58
-      return uiManager[componentName].Commands[name];
+    if (
+      !map4dMapNativeModule ||
+      typeof map4dMapNativeModule[name] !== 'function'
+    ) {
+      return Promise.reject(
+        `Map4dMap native method "${name}" is unavailable`
+      );
     }
 
-    // RN >= 0.58        
-    const config = uiManager.getViewManagerConfig(componentName);
-    return config && config.Commands ? config.Commands[name] : null;
+    return map4dMapNativeModule[name](...args);
   }
 
-  _mapManagerCommand(name) {
-    return NativeModules[`RMFMapView`][name];
+  _runCommand(name, args) {
+    return runViewManagerCommand({
+      componentName: 'RMFMapView',
+      moduleName: 'RMFMapView',
+      commandName: name,
+      args,
+      reactTag: this._getHandle(),
+      platform: Platform.OS,
+      rejectOnError: true,
+    });
   }
 
   render() {

package/src/components/MFMarker.js

@@ -1,13 +1,11 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import {ViewPropTypes} from 'deprecated-react-native-prop-types';
+import {runViewManagerCommand} from '../native/ViewManagerCommand';
 import {
   requireNativeComponent,
   StyleSheet,
-  Platform,
   Image,
-  UIManager,
-  NativeModules,
   findNodeHandle
 } from 'react-native';
 
@@ -172,53 +170,14 @@ class MFMarker extends React.Component {
 
 
     _runCommand(name, args) {
-        switch (Platform.OS) {
-          case 'android': {
-            if (!UIManager || typeof UIManager.dispatchViewManagerCommand !== 'function') {
-              return;
-            }
-
-            const commandId = this._uiManagerCommand(name);
-            if (commandId == null) {
-              return;
-            }
-
-            UIManager.dispatchViewManagerCommand(this._getHandle(), commandId, args);
-            break;
-          }
-    
-          case 'ios':
-            //this.getMapManagerCommand(name)(this._getHandle(), ...args);
-            this._mapManagerCommand(name)(this._getHandle(), ...args);
-            break;
-    
-          default:
-            break;
-        }
-      }
-
-      _uiManagerCommand(name) {
-        const uiManager = UIManager || NativeModules.UIManager;
-        const componentName = "RMFMarker";
-
-        if (!uiManager) {
-          return null;
-        }
-    
-        if (!uiManager.getViewManagerConfig) {
-          // RN < 0.58
-          const legacyConfig = uiManager[componentName];
-          return legacyConfig && legacyConfig.Commands ? legacyConfig.Commands[name] : null;
-        }
-    
-        // RN >= 0.58        
-        const config = uiManager.getViewManagerConfig(componentName);
-        return config && config.Commands ? config.Commands[name] : null;
-      }
-      
-      _mapManagerCommand(name) {
-        return NativeModules[`RMFMarker`][name];
-      }
+      return runViewManagerCommand({
+        componentName: 'RMFMarker',
+        moduleName: 'RMFMarker',
+        commandName: name,
+        args,
+        reactTag: this._getHandle(),
+      });
+    }
 
       _onPress(event) {
         event.stopPropagation();

package/src/components/MFPOI.js

@@ -1,12 +1,10 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import {ViewPropTypes, ColorPropType} from 'deprecated-react-native-prop-types';
+import {runViewManagerCommand} from '../native/ViewManagerCommand';
 import {
   requireNativeComponent,
-  Platform,
   Image,
-  UIManager,
-  NativeModules,
   findNodeHandle,
   processColor
 } from 'react-native';
@@ -128,51 +126,13 @@ class MFPOI extends React.Component {
 
 
   _runCommand(name, args) {
-    switch (Platform.OS) {
-      case 'android': {
-        if (!UIManager || typeof UIManager.dispatchViewManagerCommand !== 'function') {
-          return;
-        }
-
-        const commandId = this._uiManagerCommand(name);
-        if (commandId == null) {
-          return;
-        }
-
-        UIManager.dispatchViewManagerCommand(this._getHandle(), commandId, args);
-        break;
-      }
-
-      case 'ios':
-        this._mapManagerCommand(name)(this._getHandle(), ...args);
-        break;
-
-      default:
-        break;
-    }
-  }
-
-  _uiManagerCommand(name) {
-    const uiManager = UIManager || NativeModules.UIManager;
-    const componentName = "RMFPOI";
-
-    if (!uiManager) {
-      return null;
-    }
-
-    if (!uiManager.getViewManagerConfig) {
-      // RN < 0.58
-      const legacyConfig = uiManager[componentName];
-      return legacyConfig && legacyConfig.Commands ? legacyConfig.Commands[name] : null;
-    }
-
-    // RN >= 0.58        
-    const config = uiManager.getViewManagerConfig(componentName);
-    return config && config.Commands ? config.Commands[name] : null;
-  }
-  
-  _mapManagerCommand(name) {
-    return NativeModules[`RMFPOI`][name];
+    return runViewManagerCommand({
+      componentName: 'RMFPOI',
+      moduleName: 'RMFPOI',
+      commandName: name,
+      args,
+      reactTag: this._getHandle(),
+    });
   }
 
   render() {

package/src/components/MFPolygon.js

@@ -1,11 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {ViewPropTypes, ColorPropType} from 'deprecated-react-native-prop-types';
+import {runViewManagerCommand} from '../native/ViewManagerCommand';
 import {
   requireNativeComponent,
-  Platform,
-  UIManager,
-  NativeModules,
   findNodeHandle,
   processColor
 } from 'react-native';
@@ -136,51 +134,13 @@ class MFPolygon extends React.Component {
   }
 
   _runCommand(name, args) {
-    switch (Platform.OS) {
-      case 'android': {
-        if (!UIManager || typeof UIManager.dispatchViewManagerCommand !== 'function') {
-          return;
-        }
-
-        const commandId = this._uiManagerCommand(name);
-        if (commandId == null) {
-          return;
-        }
-
-        UIManager.dispatchViewManagerCommand(this._getHandle(), commandId, args);
-        break;
-      }
-
-      case 'ios':
-        this._mapManagerCommand(name)(this._getHandle(), ...args);
-        break;
-
-      default:
-        break;
-    }
-  }
-
-  _uiManagerCommand(name) {
-    const uiManager = UIManager || NativeModules.UIManager;
-    const componentName = "RMFPolygon";
-
-    if (!uiManager) {
-      return null;
-    }
-
-    if (!uiManager.getViewManagerConfig) {
-      // RN < 0.58
-      const legacyConfig = uiManager[componentName];
-      return legacyConfig && legacyConfig.Commands ? legacyConfig.Commands[name] : null;
-    }
-
-    // RN >= 0.58        
-    const config = uiManager.getViewManagerConfig(componentName);
-    return config && config.Commands ? config.Commands[name] : null;
-  }
-
-  _mapManagerCommand(name) {
-    return NativeModules[`RMFPolygon`][name];
+    return runViewManagerCommand({
+      componentName: 'RMFPolygon',
+      moduleName: 'RMFPolygon',
+      commandName: name,
+      args,
+      reactTag: this._getHandle(),
+    });
   }
 
   render() {

package/src/components/MFPolyline.js

@@ -1,11 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {ViewPropTypes, ColorPropType} from 'deprecated-react-native-prop-types';
+import {runViewManagerCommand} from '../native/ViewManagerCommand';
 import {
   requireNativeComponent,
-  Platform,
-  UIManager,
-  NativeModules,
   findNodeHandle,
   processColor
 } from 'react-native';
@@ -122,51 +120,13 @@ class MFPolyline extends React.Component {
   }
 
   _runCommand(name, args) {
-    switch (Platform.OS) {
-      case 'android': {
-        if (!UIManager || typeof UIManager.dispatchViewManagerCommand !== 'function') {
-          return;
-        }
-
-        const commandId = this._uiManagerCommand(name);
-        if (commandId == null) {
-          return;
-        }
-
-        UIManager.dispatchViewManagerCommand(this._getHandle(), commandId, args);
-        break;
-      }
-
-      case 'ios':
-        this._mapManagerCommand(name)(this._getHandle(), ...args);
-        break;
-
-      default:
-        break;
-    }
-  }
-
-  _uiManagerCommand(name) {
-    const uiManager = UIManager || NativeModules.UIManager;
-    const componentName = "RMFPolyline";
-
-    if (!uiManager) {
-      return null;
-    }
-
-    if (!uiManager.getViewManagerConfig) {
-      // RN < 0.58
-      const legacyConfig = uiManager[componentName];
-      return legacyConfig && legacyConfig.Commands ? legacyConfig.Commands[name] : null;
-    }
-
-    // RN >= 0.58        
-    const config = uiManager.getViewManagerConfig(componentName);
-    return config && config.Commands ? config.Commands[name] : null;
-  }
-
-  _mapManagerCommand(name) {
-    return NativeModules[`RMFPolyline`][name];
+    return runViewManagerCommand({
+      componentName: 'RMFPolyline',
+      moduleName: 'RMFPolyline',
+      commandName: name,
+      args,
+      reactTag: this._getHandle(),
+    });
   }
 
   render() {

package/src/components/internal/GeojsonStyleUtils.js

@@ -50,6 +50,7 @@ function generateLayerStyle(source, items) {
           source_layer: line.layer,
           filter: line.filter,
           draw: line.draw,
+          metadata: { managedBy: 'MFBanDoSo' },
         });
       });
     }
@@ -63,6 +64,7 @@ function generateLayerStyle(source, items) {
           source_layer: fill.layer,
           filter: fill.filter,
           draw: fill.draw,
+          metadata: { managedBy: 'MFBanDoSo' },
         });
       });
     }
@@ -76,6 +78,7 @@ function generateLayerStyle(source, items) {
           source_layer: symbol.layer,
           filter: symbol.filter,
           draw: symbol.draw,
+          metadata: { managedBy: 'MFBanDoSo' },
         });
       });
     }

package/src/native/Map4dMapNativeModule.js

@@ -0,0 +1,3 @@
+import {getNativeModule} from './NativeModuleResolver';
+
+export const getMap4dMapNativeModule = () => getNativeModule('Map4dMap');

package/src/native/NativeModuleResolver.js

@@ -0,0 +1,33 @@
+const getReactNative = () => require('react-native');
+
+export const getNativeModule = (moduleName) => {
+  const reactNative = getReactNative();
+  const turboRegistry = reactNative && reactNative.TurboModuleRegistry;
+
+  if (turboRegistry && typeof turboRegistry.get === 'function') {
+    const turboModule = turboRegistry.get(moduleName);
+    if (turboModule) {
+      return turboModule;
+    }
+  }
+
+  const nativeModules = reactNative && reactNative.NativeModules;
+  if (!nativeModules) {
+    return null;
+  }
+
+  return nativeModules[moduleName] || null;
+};
+
+export const getUIManager = () => {
+  const reactNative = getReactNative();
+  if (!reactNative) {
+    return null;
+  }
+
+  if (reactNative.UIManager) {
+    return reactNative.UIManager;
+  }
+
+  return reactNative.NativeModules ? reactNative.NativeModules.UIManager : null;
+};

package/src/native/ViewManagerCommand.js

@@ -0,0 +1,82 @@
+import {Platform, UIManager} from 'react-native';
+import {getNativeModule, getUIManager} from './NativeModuleResolver';
+
+const rejectOrIgnore = (message, rejectOnError) => {
+  if (rejectOnError) {
+    return Promise.reject(message);
+  }
+
+  return undefined;
+};
+
+export const getViewManagerCommandId = (componentName, commandName) => {
+  const uiManager = UIManager || getUIManager();
+
+  if (!uiManager) {
+    return null;
+  }
+
+  if (!uiManager.getViewManagerConfig) {
+    // RN < 0.58
+    const legacyConfig = uiManager[componentName];
+    return legacyConfig && legacyConfig.Commands
+      ? legacyConfig.Commands[commandName]
+      : null;
+  }
+
+  // RN >= 0.58
+  const config = uiManager.getViewManagerConfig(componentName);
+  return config && config.Commands ? config.Commands[commandName] : null;
+};
+
+export const runViewManagerCommand = ({
+  componentName,
+  moduleName,
+  commandName,
+  args = [],
+  reactTag,
+  platform = Platform.OS,
+  rejectOnError = false,
+}) => {
+  switch (platform) {
+    case 'android': {
+      const uiManager = UIManager || getUIManager();
+      if (!uiManager || typeof uiManager.dispatchViewManagerCommand !== 'function') {
+        return rejectOrIgnore(
+          'UIManager.dispatchViewManagerCommand is unavailable on this React Native version',
+          rejectOnError
+        );
+      }
+
+      const commandId = getViewManagerCommandId(componentName, commandName);
+      if (commandId == null) {
+        return rejectOrIgnore(
+          `Cannot find native command "${commandName}" for ${componentName}`,
+          rejectOnError
+        );
+      }
+
+      return uiManager.dispatchViewManagerCommand(reactTag, commandId, args);
+    }
+
+    case 'ios': {
+      const mapManager = getNativeModule(moduleName || componentName);
+      const mapManagerCommand = mapManager ? mapManager[commandName] : null;
+
+      if (typeof mapManagerCommand !== 'function') {
+        return rejectOrIgnore(
+          `Cannot find native command "${commandName}" for ${componentName}`,
+          rejectOnError
+        );
+      }
+
+      return mapManagerCommand(reactTag, ...args);
+    }
+
+    default:
+      return rejectOrIgnore(
+        `Invalid platform was passed: ${platform}`,
+        rejectOnError
+      );
+  }
+};

package/src/specs/NativeMap4dMap.js

@@ -0,0 +1,12 @@
+import {TurboModuleRegistry} from 'react-native';
+
+export interface Spec {
+  getCamera(reactTag: number): Promise<Object>;
+  getBounds(reactTag: number): Promise<Object>;
+  getMyLocation(reactTag: number): Promise<Object>;
+  pointForCoordinate(reactTag: number, coordinate: Object): Promise<Object>;
+  coordinateForPoint(reactTag: number, point: Object): Promise<Object>;
+  cameraForBounds(reactTag: number, boundsData: Object): Promise<Object>;
+}
+
+export default TurboModuleRegistry.get<Spec>('Map4dMap');

package/ios/Map4dMapViewManager.m

@@ -1,34 +0,0 @@
-#import <React/RCTViewManager.h>
-
-@interface Map4dMapViewManager : RCTViewManager
-@end
-
-@implementation Map4dMapViewManager
-
-RCT_EXPORT_MODULE(Map4dMapView)
-
-- (UIView *)view
-{
-  return [[UIView alloc] init];
-}
-
-RCT_CUSTOM_VIEW_PROPERTY(color, NSString, UIView)
-{
-  [view setBackgroundColor:[self hexStringToColor:json]];
-}
-
-- hexStringToColor:(NSString *)stringToConvert
-{
-  NSString *noHashString = [stringToConvert stringByReplacingOccurrencesOfString:@"#" withString:@""];
-  NSScanner *stringScanner = [NSScanner scannerWithString:noHashString];
-
-  unsigned hex;
-  if (![stringScanner scanHexInt:&hex]) return nil;
-  int r = (hex >> 16) & 0xFF;
-  int g = (hex >> 8) & 0xFF;
-  int b = (hex) & 0xFF;
-
-  return [UIColor colorWithRed:r / 255.0f green:g / 255.0f blue:b / 255.0f alpha:1.0f];
-}
-
-@end