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

package/src/components/MFBuilding.js

@@ -1,188 +1,161 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import {ViewPropTypes} from 'deprecated-react-native-prop-types';
-import {
-  requireNativeComponent,
-  Platform,
-  NativeModules,
-  findNodeHandle
-} from 'react-native';
-
-// if ViewPropTypes is not defined fall back to View.propType (to support RN < 0.44)
-const viewPropTypes = ViewPropTypes || View.propTypes;
-
-const propTypes = {
-  ...viewPropTypes,
-
-  /**
-   * The name of the building.
-   */
-  name: PropTypes.string,
-
-  /**
-   * The position of the building
-   */
-  coordinate: PropTypes.shape({
-    /**
-     * Position for the building.
-     */
-    latitude: PropTypes.number.isRequired,
-    longitude: PropTypes.number.isRequired,
-  }),
-
-  /**
-   * The model URL for the building.
-   */
-  modelUrl: PropTypes.string,
-
-  /**
-   * The texture URL for the building.
-   */
-  textureUrl: PropTypes.string,
-
-  /**
-   * The scale of the building.
-   */
-  scale: PropTypes.number,
-
-  /**
-   * The bearing of the building.
-   */
-  bearing: PropTypes.number,
-
-  /**
-   * The elevation of the building.
-   */
-  elevation: PropTypes.number,
-
-  /**
-   * Is the building selectable by the user ?
-   */
-  selected: PropTypes.bool,
-
-  /**
-   * touchable
-   */
-  touchable: PropTypes.bool,
-
-  /**
-   * visible
-   */
-  visible: PropTypes.bool,
-
-  /**
-   * userData
-   */
-  userData:PropTypes.object,
-
-  /**
-   * Callback that is called when the user presses on the building
-   */
-  onPress: PropTypes.func,
-};
-
-
-class MFBuilding extends React.Component {
-  constructor(props) {
-    super(props);
-    this._onPress = this._onPress.bind(this)
-    this._ref = this._ref.bind(this)
-  }
-
-  _onPress(event) {
-    event.stopPropagation();
-      if (this.props.onPress) {
-        this.props.onPress(event);
-    }
-  }
-
-  _ref(ref) {
-    this.building = ref;
-  }
-
-  setName(name) {
-    this._runCommand("setName", [name])
-  }
-
-  setScale(scale) {
-    this._runCommand("setScale", [scale])
-  }
-
-  setBearing(bearing) {
-    this._runCommand("setBearing", [bearing])
-  }
-
-  setElevation(elevation) {
-    this._runCommand("setElevation", [elevation])
-  }
-
-  setSelected(selected) {
-    this._runCommand("setSelected", [selected])
-  }
-
-  setTouchable(touchable) {
-    this._runCommand("setTouchable", [touchable])
-  }
-
-  setVisible(visible) {
-    this._runCommand("setVisible", [visible])
-  }
-
-  setUserData(userData) {
-    this._runCommand("setUserData", [userData])
-  }
-
-  _getHandle() {
-    return findNodeHandle(this.building);
-  }
-
-  _runCommand(name, args) {
-    switch (Platform.OS) {
-      case 'android':
-        NativeModules.UIManager.dispatchViewManagerCommand(
-          this._getHandle(),
-          this._uiManagerCommand(name),
-          args
-        );
-        break;
-
-      case 'ios':
-        this._mapManagerCommand(name)(this._getHandle(), ...args);
-        break;
-
-      default:
-        break;
-    }
-  }
-
-  _uiManagerCommand(name) {
-    const UIManager = NativeModules.UIManager;
-    const componentName = "RMFBuilding";
-
-    if (!UIManager.getViewManagerConfig) {
-      // RN < 0.58
-      return UIManager[componentName].Commands[name];
-    }
-
-    // RN >= 0.58
-    return UIManager.getViewManagerConfig(componentName).Commands[name];
-  }
-
-  _mapManagerCommand(name) {
-    return NativeModules[`RMFBuilding`][name];
-  }
-
-  render() {
-    return <RMFBuilding
-      {...this.props}
-      ref={this._ref}
-      onPress={this._onPress}
-    />;
-  }
-}
-
-MFBuilding.propTypes = propTypes;
-
-var RMFBuilding = requireNativeComponent(`RMFBuilding`, MFBuilding);
-
+import React from 'react';
+import PropTypes from 'prop-types';
+import {ViewPropTypes} from 'deprecated-react-native-prop-types';
+import {runViewManagerCommand} from '../native/ViewManagerCommand';
+import {
+  requireNativeComponent,
+  findNodeHandle
+} from 'react-native';
+
+// if ViewPropTypes is not defined fall back to View.propType (to support RN < 0.44)
+const viewPropTypes = ViewPropTypes || View.propTypes;
+
+const propTypes = {
+  ...viewPropTypes,
+
+  /**
+   * The name of the building.
+   */
+  name: PropTypes.string,
+
+  /**
+   * The position of the building
+   */
+  coordinate: PropTypes.shape({
+    /**
+     * Position for the building.
+     */
+    latitude: PropTypes.number.isRequired,
+    longitude: PropTypes.number.isRequired,
+  }),
+
+  /**
+   * The model URL for the building.
+   */
+  modelUrl: PropTypes.string,
+
+  /**
+   * The texture URL for the building.
+   */
+  textureUrl: PropTypes.string,
+
+  /**
+   * The scale of the building.
+   */
+  scale: PropTypes.number,
+
+  /**
+   * The bearing of the building.
+   */
+  bearing: PropTypes.number,
+
+  /**
+   * The elevation of the building.
+   */
+  elevation: PropTypes.number,
+
+  /**
+   * Is the building selectable by the user ?
+   */
+  selected: PropTypes.bool,
+
+  /**
+   * touchable
+   */
+  touchable: PropTypes.bool,
+
+  /**
+   * visible
+   */
+  visible: PropTypes.bool,
+
+  /**
+   * userData
+   */
+  userData:PropTypes.object,
+
+  /**
+   * Callback that is called when the user presses on the building
+   */
+  onPress: PropTypes.func,
+};
+
+
+class MFBuilding extends React.Component {
+  constructor(props) {
+    super(props);
+    this._onPress = this._onPress.bind(this)
+    this._ref = this._ref.bind(this)
+  }
+
+  _onPress(event) {
+    event.stopPropagation();
+      if (this.props.onPress) {
+        this.props.onPress(event);
+    }
+  }
+
+  _ref(ref) {
+    this.building = ref;
+  }
+
+  setName(name) {
+    this._runCommand("setName", [name])
+  }
+
+  setScale(scale) {
+    this._runCommand("setScale", [scale])
+  }
+
+  setBearing(bearing) {
+    this._runCommand("setBearing", [bearing])
+  }
+
+  setElevation(elevation) {
+    this._runCommand("setElevation", [elevation])
+  }
+
+  setSelected(selected) {
+    this._runCommand("setSelected", [selected])
+  }
+
+  setTouchable(touchable) {
+    this._runCommand("setTouchable", [touchable])
+  }
+
+  setVisible(visible) {
+    this._runCommand("setVisible", [visible])
+  }
+
+  setUserData(userData) {
+    this._runCommand("setUserData", [userData])
+  }
+
+  _getHandle() {
+    return findNodeHandle(this.building);
+  }
+
+  _runCommand(name, args) {
+    return runViewManagerCommand({
+      componentName: 'RMFBuilding',
+      moduleName: 'RMFBuilding',
+      commandName: name,
+      args,
+      reactTag: this._getHandle(),
+    });
+  }
+
+  render() {
+    return <RMFBuilding
+      {...this.props}
+      ref={this._ref}
+      onPress={this._onPress}
+    />;
+  }
+}
+
+MFBuilding.propTypes = propTypes;
+
+var RMFBuilding = requireNativeComponent(`RMFBuilding`, MFBuilding);
+
 export { MFBuilding }

package/src/components/MFCircle.js

@@ -1,173 +1,146 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import {ViewPropTypes, ColorPropType} from 'deprecated-react-native-prop-types';
-import {
-  requireNativeComponent,
-  Platform,
-  NativeModules,
-  findNodeHandle,
-  processColor
-} from 'react-native';
-
-// if ViewPropTypes is not defined fall back to View.propType (to support RN < 0.44)
-const viewPropTypes = ViewPropTypes || View.propTypes;
-
-const propTypes = {
-  ...viewPropTypes,
-
-  /**
-   * The coordinate of the center of the circle
-   */
-  center: PropTypes.shape({
-    /**
-     * Coordinates for the center of the circle.
-     */
-    latitude: PropTypes.number.isRequired,
-    longitude: PropTypes.number.isRequired,
-  }).isRequired,
-
-  /**
-   * The radius of the circle to be drawn (in meters)
-   */
-  radius: PropTypes.number.isRequired,
-
-  /**
-   * The stroke width to use for the circle.
-   */
-  strokeWidth: PropTypes.number,
-
-  /**
-   * The stroke color to use for the circle.
-   */
-  strokeColor: ColorPropType,
-
-  /**
-   * The fill color to use for the circle.
-   */
-  fillColor: ColorPropType,
-
-  /**
-   * zIndex
-   */
-  zIndex: PropTypes.number,
-
-  /**
-   * visible
-   */
-  visible: PropTypes.bool,
-
-  /**
-   * userData
-   */
-  userData:PropTypes.object,
-
-  /**
-   * Callback that is called when the user presses on the circle
-   */
-  onPress: PropTypes.func,
-};
-
-// const defaultProps = {
-//   strokeColor: '#000',
-//   strokeWidth: 1,
-// };
-
-class MFCircle extends React.Component {
-  constructor(props) {
-    super(props);
-    this._onPress = this._onPress.bind(this)
-    this._ref = this._ref.bind(this)
-  }
-
-  setCenter(center) {
-    this._runCommand("setCenter", [center])
-  }
-  setRadius(radius) {
-    this._runCommand("setRadius", [radius])
-  }
-  setFillColor(color) {
-    this._runCommand("setFillColor", [processColor(color)])
-  }
-  setStrokeColor(color) {
-    this._runCommand("setStrokeColor", [processColor(color)])
-  }
-  setStrokeWidth(width) {
-    this._runCommand("setStrokeWidth", [width])
-  }
-  setUserData(userData) {
-    this._runCommand("setUserData", [userData])
-  }
-  setZIndex(zIndex) {
-    this._runCommand("setZIndex", [zIndex])
-  }
-  setVisible(visible) {
-    this._runCommand("setVisible", [visible])
-  }
-
-  _getHandle() {
-    return findNodeHandle(this.circle);
-  }
-
-
-  _runCommand(name, args) {
-    switch (Platform.OS) {
-      case 'android':
-        NativeModules.UIManager.dispatchViewManagerCommand(
-          this._getHandle(),
-          this._uiManagerCommand(name),
-          args
-        );
-        break;
-
-      case 'ios':
-        this._mapManagerCommand(name)(this._getHandle(), ...args);
-        break;
-
-      default:
-        break;
-    }
-  }
-
-  _uiManagerCommand(name) {
-    const UIManager = NativeModules.UIManager;
-    const componentName = "RMFCircle";
-
-    if (!UIManager.getViewManagerConfig) {
-      // RN < 0.58
-      return UIManager[componentName].Commands[name];
-    }
-
-    // RN >= 0.58        
-    return UIManager.getViewManagerConfig(componentName).Commands[name];
-  }
-  
-  _mapManagerCommand(name) {
-    return NativeModules[`RMFCircle`][name];
-  }
-
-  _onPress(event) {
-    event.stopPropagation();
-      if (this.props.onPress) {
-        this.props.onPress(event);
-    }
-  }
-
-  _ref(ref) {
-    this.circle = ref;
-  }
-
-  render() {
-    return <RMFCircle
-      {...this.props}
-      ref={this._ref}
-      onPress={this._onPress}
-    />;
-  }
-}
-
-MFCircle.propTypes = propTypes;
-// MFCircle.defaultProps = defaultProps;
-
-var RMFCircle = requireNativeComponent(`RMFCircle`, MFCircle);
-
-export {MFCircle}
+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,
+  findNodeHandle,
+  processColor
+} from 'react-native';
+
+// if ViewPropTypes is not defined fall back to View.propType (to support RN < 0.44)
+const viewPropTypes = ViewPropTypes || View.propTypes;
+
+const propTypes = {
+  ...viewPropTypes,
+
+  /**
+   * The coordinate of the center of the circle
+   */
+  center: PropTypes.shape({
+    /**
+     * Coordinates for the center of the circle.
+     */
+    latitude: PropTypes.number.isRequired,
+    longitude: PropTypes.number.isRequired,
+  }).isRequired,
+
+  /**
+   * The radius of the circle to be drawn (in meters)
+   */
+  radius: PropTypes.number.isRequired,
+
+  /**
+   * The stroke width to use for the circle.
+   */
+  strokeWidth: PropTypes.number,
+
+  /**
+   * The stroke color to use for the circle.
+   */
+  strokeColor: ColorPropType,
+
+  /**
+   * The fill color to use for the circle.
+   */
+  fillColor: ColorPropType,
+
+  /**
+   * zIndex
+   */
+  zIndex: PropTypes.number,
+
+  /**
+   * visible
+   */
+  visible: PropTypes.bool,
+
+  /**
+   * userData
+   */
+  userData:PropTypes.object,
+
+  /**
+   * Callback that is called when the user presses on the circle
+   */
+  onPress: PropTypes.func,
+};
+
+// const defaultProps = {
+//   strokeColor: '#000',
+//   strokeWidth: 1,
+// };
+
+class MFCircle extends React.Component {
+  constructor(props) {
+    super(props);
+    this._onPress = this._onPress.bind(this)
+    this._ref = this._ref.bind(this)
+  }
+
+  setCenter(center) {
+    this._runCommand("setCenter", [center])
+  }
+  setRadius(radius) {
+    this._runCommand("setRadius", [radius])
+  }
+  setFillColor(color) {
+    this._runCommand("setFillColor", [processColor(color)])
+  }
+  setStrokeColor(color) {
+    this._runCommand("setStrokeColor", [processColor(color)])
+  }
+  setStrokeWidth(width) {
+    this._runCommand("setStrokeWidth", [width])
+  }
+  setUserData(userData) {
+    this._runCommand("setUserData", [userData])
+  }
+  setZIndex(zIndex) {
+    this._runCommand("setZIndex", [zIndex])
+  }
+  setVisible(visible) {
+    this._runCommand("setVisible", [visible])
+  }
+
+  _getHandle() {
+    return findNodeHandle(this.circle);
+  }
+
+
+  _runCommand(name, args) {
+    return runViewManagerCommand({
+      componentName: 'RMFCircle',
+      moduleName: 'RMFCircle',
+      commandName: name,
+      args,
+      reactTag: this._getHandle(),
+    });
+  }
+
+  _onPress(event) {
+    event.stopPropagation();
+      if (this.props.onPress) {
+        this.props.onPress(event);
+    }
+  }
+
+  _ref(ref) {
+    this.circle = ref;
+  }
+
+  render() {
+    return <RMFCircle
+      {...this.props}
+      ref={this._ref}
+      onPress={this._onPress}
+    />;
+  }
+}
+
+MFCircle.propTypes = propTypes;
+// MFCircle.defaultProps = defaultProps;
+
+var RMFCircle = requireNativeComponent(`RMFCircle`, MFCircle);
+
+export {MFCircle}