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

package/package.json

@@ -1,152 +1,152 @@
-{
-  "name": "react-native-map4d-map-dtqg",
-  "version": "0.1.1",
-  "description": "Map4dMap SDK for React Native",
-  "main": "lib/commonjs/index",
-  "module": "lib/module/index",
-  "types": "lib/typescript/index.d.ts",
-  "react-native": "src/index",
-  "source": "src/index",
-  "files": [
-    "src",
-    "lib",
-    "android",
-    "ios",
-    "cpp",
-    "react-native-map4d-map.podspec",
-    "!lib/typescript/example",
-    "!android/build",
-    "!ios/build",
-    "!**/__tests__",
-    "!**/__fixtures__",
-    "!**/__mocks__"
-  ],
-  "scripts": {
-    "test": "jest",
-    "typescript": "tsc --noEmit",
-    "lint": "eslint \"**/*.{js,ts,tsx}\"",
-    "prepare": "bob build",
-    "release": "release-it",
-    "example": "yarn --cwd example",
-    "pods": "cd example && pod-install --quiet",
-    "bootstrap": "yarn example && yarn && yarn pods"
-  },
-  "keywords": [
-    "react",
-    "react-native",
-    "react-component",
-    "map",
-    "mapview",
-    "map4d",
-    "iotlink"
-  ],
-  "repository": "https://github.com/map4d/map4d-map-react-native",
-  "author": "IOTLink <admin@iotlink.com.vn> (https://iotlink.com.vn/)",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/map4d/map4d-map-react-native/issues"
-  },
-  "homepage": "https://github.com/map4d/map4d-map-react-native#readme",
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "devDependencies": {
-    "@commitlint/config-conventional": "^11.0.0",
-    "@react-native-community/eslint-config": "^2.0.0",
-    "@release-it/conventional-changelog": "^2.0.0",
-    "@types/jest": "^26.0.0",
-    "@types/react": "^16.9.19",
-    "@types/react-native": "0.62.13",
-    "commitlint": "^11.0.0",
-    "deprecated-react-native-prop-types": "^2.3.0",
-    "eslint": "^7.2.0",
-    "eslint-config-prettier": "^7.0.0",
-    "eslint-plugin-prettier": "^3.1.3",
-    "husky": "^6.0.0",
-    "jest": "^26.0.1",
-    "pod-install": "^0.1.0",
-    "prettier": "^2.0.5",
-    "react": "16.13.1",
-    "react-native": "0.63.4",
-    "react-native-builder-bob": "^0.18.2",
-    "release-it": "^14.2.2",
-    "typescript": "^4.1.3"
-  },
-  "peerDependencies": {
-    "react": "*",
-    "react-native": "*"
-  },
-  "jest": {
-    "preset": "react-native",
-    "modulePathIgnorePatterns": [
-      "<rootDir>/example/node_modules",
-      "<rootDir>/lib/"
-    ]
-  },
-  "commitlint": {
-    "extends": [
-      "@commitlint/config-conventional"
-    ]
-  },
-  "release-it": {
-    "git": {
-      "commitMessage": "chore: release ${version}",
-      "tagName": "v${version}"
-    },
-    "npm": {
-      "publish": true
-    },
-    "github": {
-      "release": true
-    },
-    "plugins": {
-      "@release-it/conventional-changelog": {
-        "preset": "angular"
-      }
-    }
-  },
-  "eslintConfig": {
-    "root": true,
-    "extends": [
-      "@react-native-community",
-      "prettier"
-    ],
-    "rules": {
-      "prettier/prettier": [
-        "error",
-        {
-          "quoteProps": "consistent",
-          "singleQuote": true,
-          "tabWidth": 2,
-          "trailingComma": "es5",
-          "useTabs": false
-        }
-      ]
-    }
-  },
-  "eslintIgnore": [
-    "node_modules/",
-    "lib/"
-  ],
-  "prettier": {
-    "quoteProps": "consistent",
-    "singleQuote": true,
-    "tabWidth": 2,
-    "trailingComma": "es5",
-    "useTabs": false
-  },
-  "react-native-builder-bob": {
-    "source": "src",
-    "output": "lib",
-    "targets": [
-      "commonjs",
-      "module",
-      [
-        "typescript",
-        {
-          "project": "tsconfig.build.json"
-        }
-      ]
-    ]
-  }
-}
+{
+  "name": "react-native-map4d-map-dtqg",
+  "version": "0.1.3",
+  "description": "Map4dMap SDK for React Native",
+  "main": "lib/commonjs/index",
+  "module": "lib/module/index",
+  "types": "lib/typescript/index.d.ts",
+  "react-native": "src/index",
+  "source": "src/index",
+  "files": [
+    "src",
+    "lib",
+    "android",
+    "ios",
+    "cpp",
+    "react-native-map4d-map.podspec",
+    "!lib/typescript/example",
+    "!android/build",
+    "!ios/build",
+    "!**/__tests__",
+    "!**/__fixtures__",
+    "!**/__mocks__"
+  ],
+  "scripts": {
+    "test": "jest",
+    "typescript": "tsc --noEmit",
+    "lint": "eslint \"**/*.{js,ts,tsx}\"",
+    "prepare": "bob build",
+    "release": "release-it",
+    "example": "yarn --cwd example",
+    "pods": "cd example && pod-install --quiet",
+    "bootstrap": "yarn example && yarn && yarn pods"
+  },
+  "keywords": [
+    "react",
+    "react-native",
+    "react-component",
+    "map",
+    "mapview",
+    "map4d",
+    "iotlink"
+  ],
+  "repository": "https://github.com/map4d/map4d-map-react-native",
+  "author": "IOTLink <admin@iotlink.com.vn> (https://iotlink.com.vn/)",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/map4d/map4d-map-react-native/issues"
+  },
+  "homepage": "https://github.com/map4d/map4d-map-react-native#readme",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
+  "devDependencies": {
+    "@commitlint/config-conventional": "^11.0.0",
+    "@react-native-community/eslint-config": "^2.0.0",
+    "@release-it/conventional-changelog": "^2.0.0",
+    "@types/jest": "^26.0.0",
+    "@types/react": "^16.9.19",
+    "@types/react-native": "0.62.13",
+    "commitlint": "^11.0.0",
+    "deprecated-react-native-prop-types": "^2.3.0",
+    "eslint": "^7.2.0",
+    "eslint-config-prettier": "^7.0.0",
+    "eslint-plugin-prettier": "^3.1.3",
+    "husky": "^6.0.0",
+    "jest": "^26.0.1",
+    "pod-install": "^0.1.0",
+    "prettier": "^2.0.5",
+    "react": "16.13.1",
+    "react-native": "0.63.4",
+    "react-native-builder-bob": "^0.18.2",
+    "release-it": "^14.2.2",
+    "typescript": "^4.1.3"
+  },
+  "peerDependencies": {
+    "react": "*",
+    "react-native": "*"
+  },
+  "jest": {
+    "preset": "react-native",
+    "modulePathIgnorePatterns": [
+      "<rootDir>/example/node_modules",
+      "<rootDir>/lib/"
+    ]
+  },
+  "commitlint": {
+    "extends": [
+      "@commitlint/config-conventional"
+    ]
+  },
+  "release-it": {
+    "git": {
+      "commitMessage": "chore: release ${version}",
+      "tagName": "v${version}"
+    },
+    "npm": {
+      "publish": true
+    },
+    "github": {
+      "release": true
+    },
+    "plugins": {
+      "@release-it/conventional-changelog": {
+        "preset": "angular"
+      }
+    }
+  },
+  "eslintConfig": {
+    "root": true,
+    "extends": [
+      "@react-native-community",
+      "prettier"
+    ],
+    "rules": {
+      "prettier/prettier": [
+        "error",
+        {
+          "quoteProps": "consistent",
+          "singleQuote": true,
+          "tabWidth": 2,
+          "trailingComma": "es5",
+          "useTabs": false
+        }
+      ]
+    }
+  },
+  "eslintIgnore": [
+    "node_modules/",
+    "lib/"
+  ],
+  "prettier": {
+    "quoteProps": "consistent",
+    "singleQuote": true,
+    "tabWidth": 2,
+    "trailingComma": "es5",
+    "useTabs": false
+  },
+  "react-native-builder-bob": {
+    "source": "src",
+    "output": "lib",
+    "targets": [
+      "commonjs",
+      "module",
+      [
+        "typescript",
+        {
+          "project": "tsconfig.build.json"
+        }
+      ]
+    ]
+  }
+}

package/react-native-map4d-map.podspec

@@ -1,20 +1,20 @@
-require "json"
-
-package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-
-Pod::Spec.new do |s|
-  s.name         = "react-native-map4d-map"
-  s.version      = package["version"]
-  s.summary      = package["description"]
-  s.homepage     = package["homepage"]
-  s.license      = package["license"]
-  s.authors      = package["author"]
-
-  s.platforms    = { :ios => "13.0" }
-  s.source       = { :git => "https://github.com/map4d/map4d-map-react-native.git", :tag => "#{s.version}" }
-
-  s.source_files = "ios/**/*.{h,m,mm}"
-
-  s.dependency "React-Core"
-  s.dependency "Map4dMapDTQG", "~> 0.1"
-end
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+
+Pod::Spec.new do |s|
+  s.name         = "react-native-map4d-map"
+  s.version      = package["version"]
+  s.summary      = package["description"]
+  s.homepage     = package["homepage"]
+  s.license      = package["license"]
+  s.authors      = package["author"]
+
+  s.platforms    = { :ios => "13.0" }
+  s.source       = { :git => "https://github.com/map4d/map4d-map-react-native.git", :tag => "#{s.version}" }
+
+  s.source_files = "ios/**/*.{h,m,mm}"
+
+  s.dependency "React-Core"
+  s.dependency "Map4dMapDTQG", "~> 0.1"
+end

package/src/components/MFBanDoSo.js

@@ -0,0 +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 };