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

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2021 IOTLink
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2021 IOTLink
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,88 +1,133 @@
-# react-native-map4d-map-dtqg
-
-Map4dMap DTQG SDK for React Native
-
-## Installation
-
-```sh
-npm install react-native-map4d-map-dtqg
-```
-
-## Usage
-
-```javascript
-import {MFMapView} from 'react-native-map4d-map-dtqg';
-import React from 'react';
-import {
-  SafeAreaView,
-  StyleSheet
-} from 'react-native';
-
-function App() {
-  return (
-    <>
-      <SafeAreaView style={styles.safeView}>
-        <MFMapView style={styles.container}/>
-      </SafeAreaView>
-    </>
-  );
-};
-
-const styles = StyleSheet.create({
-  safeView: {
-    flex: 1,
-  },
-  container: {
-    flex: 1,
-  },
-});
-
-export default App;
-```
-
-## AreaFocuser usage
-
-```javascript
-import {MFMapView} from 'react-native-map4d-map-dtqg';
-import React, {useRef} from 'react';
-import {Button, SafeAreaView} from 'react-native';
-
-function App() {
-  const mapRef = useRef(null);
-
-  const onFocusWithHighlight = async () => {
-    const areaFocuser = mapRef.current?.areaFocuser;
-    if (!areaFocuser) return;
-
-    await areaFocuser.focusProvince({
-      name: 'Ha Noi',
-      highlight: true,
-    });
-  };
-
-  const onRemoveHighlight = async () => {
-    const areaFocuser = mapRef.current?.areaFocuser;
-    if (!areaFocuser) return;
-
-    await areaFocuser.focusProvince(null);
-  };
-
-  return (
-    <SafeAreaView style={{flex: 1}}>
-      <Button title="Focus with highlight" onPress={onFocusWithHighlight} />
-      <Button title="Remove highlight" onPress={onRemoveHighlight} />
-      <MFMapView style={{flex: 1}} ref={mapRef} />
-    </SafeAreaView>
-  );
-}
-```
-
-`focusProvince(options)` options:
-- `name`: province name, example `Ha Noi`
-- `highlight`: `true` to show a highlight polygon mask managed internally by `MFMapView`
-- Pass `null` (or no `name`) to clear current highlight.
-
-Examples:
-- `focusProvince({ name: 'Ha Noi' })`
-- `focusProvince({ name: 'Ha Noi', highlight: true })`
-- `focusProvince(null)`
+# react-native-map4d-map-dtqg
+
+Map4dMap DTQG SDK for React Native
+
+## Installation
+
+```sh
+npm install react-native-map4d-map-dtqg
+```
+
+## Usage
+
+```javascript
+import {MFMapView} from 'react-native-map4d-map-dtqg';
+import React from 'react';
+import {
+  SafeAreaView,
+  StyleSheet
+} from 'react-native';
+
+function App() {
+  return (
+    <>
+      <SafeAreaView style={styles.safeView}>
+        <MFMapView style={styles.container}/>
+      </SafeAreaView>
+    </>
+  );
+};
+
+const styles = StyleSheet.create({
+  safeView: {
+    flex: 1,
+  },
+  container: {
+    flex: 1,
+  },
+});
+
+export default App;
+```
+
+## AreaFocus usage
+
+```javascript
+import {MFMapView} from 'react-native-map4d-map-dtqg';
+import React, {useRef} from 'react';
+import {Button, SafeAreaView} from 'react-native';
+
+function App() {
+  const mapRef = useRef(null);
+
+  const onFocusProvinceByName = async () => {
+    const mapView = mapRef.current;
+    if (!mapView) return;
+
+    await mapView.focusArea({
+      type: 'province',
+      name: 'Ha Noi',
+      display: 'highlight',
+    });
+  };
+
+  const onFocusProvinceById = async () => {
+    const mapView = mapRef.current;
+    if (!mapView) return;
+
+    await mapView.focusArea({
+      type: 'province',
+      id: 30,
+      display: 'normal',
+    });
+  };
+
+  const onFocusIndustrial = async () => {
+    const mapView = mapRef.current;
+    if (!mapView) return;
+
+    await mapView.focusArea({
+      type: 'industrialZone',
+      id: 2,
+      display: 'normal',
+    });
+  };
+
+  const onFocusEconomic = async () => {
+    const mapView = mapRef.current;
+    if (!mapView) return;
+
+    await mapView.focusArea({
+      type: 'economicZone',
+      id: 2,
+      display: 'highlight',
+    });
+  };
+
+  const onClear = async () => {
+    const mapView = mapRef.current;
+    if (!mapView) return;
+
+    mapView.clearFocusedArea();
+  };
+
+  return (
+    <SafeAreaView style={{flex: 1}}>
+      <Button title="Province (name) highlight" onPress={onFocusProvinceByName} />
+      <Button title="Province (id)" onPress={onFocusProvinceById} />
+      <Button title="Industrial" onPress={onFocusIndustrial} />
+      <Button title="Economic highlight" onPress={onFocusEconomic} />
+      <Button title="Clear" onPress={onClear} />
+      <MFMapView style={{flex: 1}} ref={mapRef} />
+    </SafeAreaView>
+  );
+}
+```
+
+`focusArea(focusOptions)` options:
+- `focusOptions.type`: required, accepts string or numeric type:
+  - Province: `'province'`
+  - Industrial/economic aliases: `'industrialZone' | 'economicZone' | 'ecoIndustrialZone' | 'freeTradeZone' | 'nonTariffZone' | 'otherZoneModel'`
+- `focusOptions.id`: optional for province, required for industrial/economic types
+- `focusOptions.name`: optional province name (used when province `id` is not provided)
+- `focusOptions.display`: `'normal' | 'highlight'` (default `'normal'`)
+- `focusOptions.padding`: optional camera padding `{left, right, top, bottom}`
+
+Examples:
+- `focusArea({ type: 'province', name: 'Ha Noi' })`
+- `focusArea({ type: 'province', id: 1, display: 'highlight' })`
+- `focusArea({ type: 'industrialZone', id: 2, display: 'normal', padding: { top: 80, right: 0, bottom: 0, left: 80 } })`
+- `focusArea({ type: 'economicZone', id: 2, display: 'highlight' })`
+- `focusArea({ type: 'freeTradeZone', id: 10 })`
+- `focusArea({ type: IndustrialEconomicType.NON_TARIFF_ZONE, id: 11 })`
+- `clearFocusedArea()` to clear current focus

package/android/build.gradle

@@ -1,60 +1,60 @@
-buildscript {
-    if (project == rootProject) {
-        repositories {
-            google()
-            mavenCentral()
-        }
-
-        dependencies {
-            classpath 'com.android.tools.build:gradle:3.5.3'
-        }
-    }
-}
-
-apply plugin: 'com.android.library'
-
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-}
-
-android {
-    compileSdkVersion safeExtGet('Map4dMap_compileSdkVersion', 30)
-    defaultConfig {
-        minSdkVersion safeExtGet('Map4dMap_minSdkVersion', 21)
-        targetSdkVersion safeExtGet('Map4dMap_targetSdkVersion', 30)
-        versionCode 1
-        versionName "1.0"
-
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-    }
-    lintOptions {
-        disable 'GradleCompatible'
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-}
-
-repositories {
-    mavenLocal()
-    maven {
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url("$rootDir/../node_modules/react-native/android")
-    }
-    google()
-    mavenCentral()
-}
-
-dependencies {
-    //noinspection GradleDynamicVersion
-    implementation "com.facebook.react:react-native:+"  // From node_modules
-    implementation 'vn.map4d:Map4dTypes:1.1.+'
-    implementation 'vn.map4d:Map4dMapDTQG:0.1.+'
-    implementation 'vn.map4d:Map4dMapUtils:0.0.+'
-}
+buildscript {
+    if (project == rootProject) {
+        repositories {
+            google()
+            mavenCentral()
+        }
+
+        dependencies {
+            classpath 'com.android.tools.build:gradle:3.5.3'
+        }
+    }
+}
+
+apply plugin: 'com.android.library'
+
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
+android {
+    compileSdkVersion safeExtGet('Map4dMap_compileSdkVersion', 30)
+    defaultConfig {
+        minSdkVersion safeExtGet('Map4dMap_minSdkVersion', 21)
+        targetSdkVersion safeExtGet('Map4dMap_targetSdkVersion', 30)
+        versionCode 1
+        versionName "1.0"
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+    lintOptions {
+        disable 'GradleCompatible'
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+repositories {
+    mavenLocal()
+    maven {
+        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+        url("$rootDir/../node_modules/react-native/android")
+    }
+    google()
+    mavenCentral()
+}
+
+dependencies {
+    //noinspection GradleDynamicVersion
+    implementation "com.facebook.react:react-native:+"  // From node_modules
+    implementation 'vn.map4d:Map4dTypes:1.1.+'
+    implementation 'vn.map4d:Map4dMapDTQG:0.1.+'
+    implementation 'vn.map4d:Map4dMapUtils:0.0.+'
+}

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.reactnativemap4dmap">
-
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.reactnativemap4dmap">
+
+</manifest>

package/android/src/main/java/com/reactnativemap4dmap/ImageUtils.java

@@ -1,87 +1,87 @@
-package com.reactnativemap4dmap;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.VectorDrawable;
-import android.os.Build;
-import android.util.DisplayMetrics;
-import android.view.View;
-import android.view.WindowManager;
-
-import androidx.core.content.ContextCompat;
-import androidx.core.graphics.drawable.DrawableCompat;
-
-import vn.map4d.map.annotations.MFBitmapDescriptor;
-import vn.map4d.map.annotations.MFBitmapDescriptorFactory;
-import vn.map4d.map.annotations.RMFBitmapDescriptor;
-import vn.map4d.map.core.MapContext;
-
-class ImageUtils {
-
-  private static DisplayMetrics metrics;
-
-  static {
-    final DisplayMetrics metrics = new DisplayMetrics();
-    WindowManager wm = (WindowManager) MapContext.getContext().getSystemService(Context.WINDOW_SERVICE);
-
-    wm.getDefaultDisplay().getMetrics(metrics);
-    ImageUtils.metrics = metrics;
-
-    DisplayMetrics realMetrics = null;
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-      realMetrics = new DisplayMetrics();
-      wm.getDefaultDisplay().getRealMetrics(realMetrics);
-    }
-    if (realMetrics != null) {
-      ImageUtils.metrics = realMetrics;
-    }
-  }
-
-  static int getDrawableResourceByName(View view, String name) {
-    return view.getResources().getIdentifier(
-      name,
-      "drawable",
-      view.getContext().getPackageName());
-  }
-
-  static MFBitmapDescriptor getBitmapDescriptorByName(View view, String name) {
-    return MFBitmapDescriptorFactory.fromResource(getDrawableResourceByName(view, name));
-  }
-
-  static MFBitmapDescriptor getBitmapByName(View view, String name) {
-    return getBitmapByName(view, name, -1, -1);
-  }
-
-  static MFBitmapDescriptor getBitmapByName(View view, String name, int width, int height) {
-    int resourceId = getDrawableResourceByName(view, name);
-    Drawable drawable = ContextCompat.getDrawable(MapContext.getContext(), resourceId);
-    if (drawable instanceof BitmapDrawable || drawable instanceof VectorDrawable) {
-      Bitmap bitmap = createBitmapFromDrawable(drawable, width, height);
-      return RMFBitmapDescriptor.create(bitmap, ImageUtils.metrics.densityDpi);
-    }
-    else {
-      throw new IllegalArgumentException("The resource provided must be a Bitmap.");
-    }
-  }
-
-  private static Bitmap createBitmapFromDrawable(Drawable drawable, int width, int height) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-      drawable = (DrawableCompat.wrap(drawable)).mutate();
-    }
-    int tWidth = width <= 0 ? drawable.getIntrinsicWidth(): width;
-    int tHeight = height <= 0 ? drawable.getIntrinsicHeight(): height;
-
-    Bitmap bitmap = Bitmap.createBitmap(
-            tWidth,
-            tHeight,
-            Bitmap.Config.ARGB_8888);
-    Canvas canvas = new Canvas(bitmap);
-    drawable.setBounds(0, 0, tWidth, tHeight);
-    drawable.draw(canvas);
-
-    return bitmap;
-  }
-}
+package com.reactnativemap4dmap;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.VectorDrawable;
+import android.os.Build;
+import android.util.DisplayMetrics;
+import android.view.View;
+import android.view.WindowManager;
+
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+
+import vn.map4d.map.annotations.MFBitmapDescriptor;
+import vn.map4d.map.annotations.MFBitmapDescriptorFactory;
+import vn.map4d.map.annotations.RMFBitmapDescriptor;
+import vn.map4d.map.core.MapContext;
+
+class ImageUtils {
+
+  private static DisplayMetrics metrics;
+
+  static {
+    final DisplayMetrics metrics = new DisplayMetrics();
+    WindowManager wm = (WindowManager) MapContext.getContext().getSystemService(Context.WINDOW_SERVICE);
+
+    wm.getDefaultDisplay().getMetrics(metrics);
+    ImageUtils.metrics = metrics;
+
+    DisplayMetrics realMetrics = null;
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+      realMetrics = new DisplayMetrics();
+      wm.getDefaultDisplay().getRealMetrics(realMetrics);
+    }
+    if (realMetrics != null) {
+      ImageUtils.metrics = realMetrics;
+    }
+  }
+
+  static int getDrawableResourceByName(View view, String name) {
+    return view.getResources().getIdentifier(
+      name,
+      "drawable",
+      view.getContext().getPackageName());
+  }
+
+  static MFBitmapDescriptor getBitmapDescriptorByName(View view, String name) {
+    return MFBitmapDescriptorFactory.fromResource(getDrawableResourceByName(view, name));
+  }
+
+  static MFBitmapDescriptor getBitmapByName(View view, String name) {
+    return getBitmapByName(view, name, -1, -1);
+  }
+
+  static MFBitmapDescriptor getBitmapByName(View view, String name, int width, int height) {
+    int resourceId = getDrawableResourceByName(view, name);
+    Drawable drawable = ContextCompat.getDrawable(MapContext.getContext(), resourceId);
+    if (drawable instanceof BitmapDrawable || drawable instanceof VectorDrawable) {
+      Bitmap bitmap = createBitmapFromDrawable(drawable, width, height);
+      return RMFBitmapDescriptor.create(bitmap, ImageUtils.metrics.densityDpi);
+    }
+    else {
+      throw new IllegalArgumentException("The resource provided must be a Bitmap.");
+    }
+  }
+
+  private static Bitmap createBitmapFromDrawable(Drawable drawable, int width, int height) {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+      drawable = (DrawableCompat.wrap(drawable)).mutate();
+    }
+    int tWidth = width <= 0 ? drawable.getIntrinsicWidth(): width;
+    int tHeight = height <= 0 ? drawable.getIntrinsicHeight(): height;
+
+    Bitmap bitmap = Bitmap.createBitmap(
+            tWidth,
+            tHeight,
+            Bitmap.Config.ARGB_8888);
+    Canvas canvas = new Canvas(bitmap);
+    drawable.setBounds(0, 0, tWidth, tHeight);
+    drawable.draw(canvas);
+
+    return bitmap;
+  }
+}