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

package/src/components/MFBanDoSo.js

@@ -1,124 +1,124 @@
-import PropTypes from 'prop-types';
-import { MFMapView } from './MFMapView';
-import {
-  buildGeojsonStyle,
-  createCategoryItemsSignature,
-} from './internal/GeojsonStyleUtils';
-
-const FilterStylePropType = PropTypes.shape({
-  kind: PropTypes.oneOfType([
-    PropTypes.string,
-    PropTypes.arrayOf(PropTypes.string),
-  ]),
-  kind_detail: PropTypes.oneOfType([
-    PropTypes.string,
-    PropTypes.arrayOf(PropTypes.string),
-  ]),
-});
-
-const DrawLinePropType = PropTypes.shape({
-  color: PropTypes.string,
-  width: PropTypes.oneOfType([PropTypes.number, PropTypes.array]),
-});
-
-const DrawFillPropType = PropTypes.shape({
-  color: PropTypes.string,
-});
-
-const DrawSymbolPropType = PropTypes.shape({
-  icon_image: PropTypes.string,
-  icon_index: PropTypes.number,
-  icon_color: PropTypes.string,
-  use_direct_icon_url: PropTypes.bool,
-});
-
-const CategoryStylePropType = PropTypes.shape({
-  line: PropTypes.arrayOf(
-    PropTypes.shape({
-      layer: PropTypes.string,
-      filter: FilterStylePropType,
-      draw: DrawLinePropType,
-    })
-  ),
-  fill: PropTypes.arrayOf(
-    PropTypes.shape({
-      layer: PropTypes.string,
-      filter: FilterStylePropType,
-      draw: DrawFillPropType,
-    })
-  ),
-  symbol: PropTypes.arrayOf(
-    PropTypes.shape({
-      layer: PropTypes.string,
-      filter: FilterStylePropType,
-      draw: DrawSymbolPropType,
-    })
-  ),
-});
-
-const CategoryItemPropType = PropTypes.shape({
-  key: PropTypes.string,
-  title: PropTypes.string,
-  group: PropTypes.string,
-  order: PropTypes.number,
-  checked: PropTypes.bool,
-  style: CategoryStylePropType,
-});
-
-class MFBanDoSo extends MFMapView {
-  constructor(props) {
-    super(props);
-    this._appliedGeojsonStyle = null;
-  }
-
-  componentDidMount() {
-    this._syncGeojsonStyle();
-  }
-
-  componentDidUpdate(prevProps, prevState) {
-    const mapReadyChanged = prevState.isReady !== this.state.isReady;
-    const mapStyleChanged = prevProps.mapStyle !== this.props.mapStyle;
-    const sourceUrlChanged = prevProps.sourceUrl !== this.props.sourceUrl;
-    const itemsChanged =
-      createCategoryItemsSignature(prevProps.items) !==
-      createCategoryItemsSignature(this.props.items);
-
-    if (
-      mapReadyChanged ||
-      mapStyleChanged ||
-      sourceUrlChanged ||
-      itemsChanged
-    ) {
-      this._syncGeojsonStyle();
-    }
-  }
-
-  _syncGeojsonStyle() {
-    if (!this.state.isReady) {
-      return;
-    }
-
-    const items = this.props.items || [];
-
-    const geojsonStyle = buildGeojsonStyle(
-      this.props.mapStyle,
-      this.props.sourceUrl,
-      items
-    );
-
-    if (!geojsonStyle || geojsonStyle === this._appliedGeojsonStyle) {
-      return;
-    }
-
-    this._appliedGeojsonStyle = geojsonStyle;
-    this._runCommand('setMapStyle', [geojsonStyle]);
-  }
-}
-
-MFBanDoSo.propTypes = {
-  ...MFMapView.propTypes,
-  items: PropTypes.arrayOf(CategoryItemPropType),
-  sourceUrl: PropTypes.string.isRequired,
-};
-
-export { MFBanDoSo };
+import PropTypes from 'prop-types';
+import { MFMapView } from './MFMapView';
+import {
+  buildGeojsonStyle,
+  createCategoryItemsSignature,
+} from './internal/GeojsonStyleUtils';
+
+const FilterStylePropType = PropTypes.shape({
+  kind: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.arrayOf(PropTypes.string),
+  ]),
+  kind_detail: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.arrayOf(PropTypes.string),
+  ]),
+});
+
+const DrawLinePropType = PropTypes.shape({
+  color: PropTypes.string,
+  width: PropTypes.oneOfType([PropTypes.number, PropTypes.array]),
+});
+
+const DrawFillPropType = PropTypes.shape({
+  color: PropTypes.string,
+});
+
+const DrawSymbolPropType = PropTypes.shape({
+  icon_image: PropTypes.string,
+  icon_index: PropTypes.number,
+  icon_color: PropTypes.string,
+  use_direct_icon_url: PropTypes.bool,
+});
+
+const CategoryStylePropType = PropTypes.shape({
+  line: PropTypes.arrayOf(
+    PropTypes.shape({
+      layer: PropTypes.string,
+      filter: FilterStylePropType,
+      draw: DrawLinePropType,
+    })
+  ),
+  fill: PropTypes.arrayOf(
+    PropTypes.shape({
+      layer: PropTypes.string,
+      filter: FilterStylePropType,
+      draw: DrawFillPropType,
+    })
+  ),
+  symbol: PropTypes.arrayOf(
+    PropTypes.shape({
+      layer: PropTypes.string,
+      filter: FilterStylePropType,
+      draw: DrawSymbolPropType,
+    })
+  ),
+});
+
+const CategoryItemPropType = PropTypes.shape({
+  key: PropTypes.string,
+  title: PropTypes.string,
+  group: PropTypes.string,
+  order: PropTypes.number,
+  checked: PropTypes.bool,
+  style: CategoryStylePropType,
+});
+
+class MFBanDoSo extends MFMapView {
+  constructor(props) {
+    super(props);
+    this._appliedGeojsonStyle = null;
+  }
+
+  componentDidMount() {
+    this._syncGeojsonStyle();
+  }
+
+  componentDidUpdate(prevProps, prevState) {
+    const mapReadyChanged = prevState.isReady !== this.state.isReady;
+    const mapStyleChanged = prevProps.mapStyle !== this.props.mapStyle;
+    const sourceUrlChanged = prevProps.sourceUrl !== this.props.sourceUrl;
+    const itemsChanged =
+      createCategoryItemsSignature(prevProps.items) !==
+      createCategoryItemsSignature(this.props.items);
+
+    if (
+      mapReadyChanged ||
+      mapStyleChanged ||
+      sourceUrlChanged ||
+      itemsChanged
+    ) {
+      this._syncGeojsonStyle();
+    }
+  }
+
+  _syncGeojsonStyle() {
+    if (!this.state.isReady) {
+      return;
+    }
+
+    const items = this.props.items || [];
+
+    const geojsonStyle = buildGeojsonStyle(
+      this.props.mapStyle,
+      this.props.sourceUrl,
+      items
+    );
+
+    if (!geojsonStyle || geojsonStyle === this._appliedGeojsonStyle) {
+      return;
+    }
+
+    this._appliedGeojsonStyle = geojsonStyle;
+    this._runCommand('setMapStyle', [geojsonStyle]);
+  }
+}
+
+MFBanDoSo.propTypes = {
+  ...MFMapView.propTypes,
+  items: PropTypes.arrayOf(CategoryItemPropType),
+  sourceUrl: PropTypes.string.isRequired,
+};
+
+export { MFBanDoSo };

package/src/components/MFBuilding.js

@@ -1,188 +1,201 @@
-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 {
+  requireNativeComponent,
+  Platform,
+  UIManager,
+  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': {
+        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 = "RMFBuilding";
+
+    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[`RMFBuilding`][name];
+  }
+
+  render() {
+    return <RMFBuilding
+      {...this.props}
+      ref={this._ref}
+      onPress={this._onPress}
+    />;
+  }
+}
+
+MFBuilding.propTypes = propTypes;
+
+var RMFBuilding = requireNativeComponent(`RMFBuilding`, MFBuilding);
+
 export { MFBuilding }