react-native-map4d-services 0.1.0 → 1.0.2

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,24 +1,24 @@
-# react-native-map4d-services
-
-React Native Map4dServices for iOS + Android
-
-## Installation
-
-```sh
-npm install react-native-map4d-services
-```
-
-## Usage
-
-E.g. Auto Suggest
-
-```js
-import { fetchSuggestion } from "react-native-map4d-services";
-
-// ...
-
-fetchSuggestion({text: 'abc'})
-.then(result => {
-  console.log('Suggestion:', result);
-})
-```
+# react-native-map4d-services
+
+React Native Map4dServices for iOS + Android
+
+## Installation
+
+```sh
+npm install react-native-map4d-services
+```
+
+## Usage
+
+E.g. Auto Suggest
+
+```js
+import { fetchSuggestion } from "react-native-map4d-services";
+
+// ...
+
+fetchSuggestion({text: 'abc'})
+.then(result => {
+  console.log('Suggestion:', result);
+})
+```

package/android/build.gradle

@@ -1,59 +1,60 @@
-buildscript {
-    if (project == rootProject) {
-        repositories {
-            google()
-            mavenCentral()
-            jcenter()
-        }
-
-        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('Map4dServices_compileSdkVersion', 29)
-    defaultConfig {
-        minSdkVersion safeExtGet('Map4dServices_minSdkVersion', 16)
-        targetSdkVersion safeExtGet('Map4dServices_targetSdkVersion', 29)
-        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()
-    jcenter()
-}
-
-dependencies {
-    //noinspection GradleDynamicVersion
-    implementation "com.facebook.react:react-native:+"  // From node_modules
-}
+buildscript {
+    if (project == rootProject) {
+        repositories {
+            google()
+            mavenCentral()
+            jcenter()
+        }
+
+        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('Map4dServices_compileSdkVersion', 29)
+    defaultConfig {
+        minSdkVersion safeExtGet('Map4dServices_minSdkVersion', 16)
+        targetSdkVersion safeExtGet('Map4dServices_targetSdkVersion', 29)
+        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()
+    jcenter()
+}
+
+dependencies {
+    //noinspection GradleDynamicVersion
+    implementation "com.facebook.react:react-native:+"  // From node_modules
+    implementation 'vn.map4d:Map4dServices:2.0.0'
+}

package/android/src/main/AndroidManifest.xml

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

package/android/src/main/java/com/reactnativemap4dservices/Map4dServicesModule.java

@@ -1,34 +1,91 @@
-package com.reactnativemap4dservices;
-
-import androidx.annotation.NonNull;
-
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.module.annotations.ReactModule;
-
-@ReactModule(name = Map4dServicesModule.NAME)
-public class Map4dServicesModule extends ReactContextBaseJavaModule {
-    public static final String NAME = "Map4dServices";
-
-    public Map4dServicesModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-    }
-
-    @Override
-    @NonNull
-    public String getName() {
-        return NAME;
-    }
-
-
-    // Example method
-    // See https://reactnative.dev/docs/native-modules-android
-    @ReactMethod
-    public void multiply(int a, int b, Promise promise) {
-        promise.resolve(a * b);
-    }
-
-    public static native int nativeMultiply(int a, int b);
-}
+package com.reactnativemap4dservices;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.module.annotations.ReactModule;
+
+import vn.map4d.services.MFServicesOptions;
+
+@ReactModule(name = Map4dServicesModule.NAME)
+public class Map4dServicesModule extends ReactContextBaseJavaModule {
+  public static final String NAME = "Map4dServices";
+
+  private MFServicesOptions servicesOptions;
+
+  public Map4dServicesModule(ReactApplicationContext reactContext) {
+    super(reactContext);
+    servicesOptions = new MFServicesOptions.Builder(reactContext).build();
+  }
+
+  @Override
+  @NonNull
+  public String getName() {
+    return NAME;
+  }
+
+  /* Place | Suggestions */
+  @ReactMethod
+  public void fetchSuggestion(ReadableMap params, @NonNull Promise promise) {
+    SClient.fireRequest(servicesOptions, SRequest.buildSuggestionsRequestWithData(params), promise);
+  }
+
+  /* Place | Detail */
+  @ReactMethod
+  public void fetchPlaceDetail(String placeId, @NonNull Promise promise) {
+    SClient.fireRequest(servicesOptions, SRequest.buildPlaceDetailRequestWithId(placeId), promise);
+  }
+
+  /* Place | Text search */
+  @ReactMethod
+  public void fetchTextSearch(ReadableMap params, @NonNull Promise promise) {
+    SClient.fireRequest(servicesOptions, SRequest.buildTextSearchRequestWithData(params), promise);
+  }
+
+  /* Place | Nearby search */
+  @ReactMethod
+  public void fetchNearbySearch(ReadableMap params, @NonNull Promise promise) {
+    SClient.fireRequest(servicesOptions, SRequest.buildNearbySearchRequestWithData(params), promise);
+  }
+
+  /* Place | Viewbox search */
+  @ReactMethod
+  public void fetchViewboxSearch(ReadableMap params, @NonNull Promise promise) {
+    SClient.fireRequest(servicesOptions, SRequest.buildViewboxSearchRequestWithData(params), promise);
+  }
+
+  /* Place | Geocode */
+  @ReactMethod
+  public void fetchGeocode(ReadableMap params, @NonNull Promise promise) {
+    SClient.fireRequest(servicesOptions, SRequest.buildGeocodingRequestWithData(params), promise);
+  }
+
+  /* Route | Directions */
+  @ReactMethod
+  public void fetchDirections(ReadableMap params, @NonNull Promise promise) {
+    SClient.fireRequest(servicesOptions, SRequest.buildDirectionsRequestWithData(params), promise);
+  }
+
+  /* Route | ETA */
+  @ReactMethod
+  public void fetchRouteETA(ReadableMap params, @NonNull Promise promise) {
+    SClient.fireRequest(servicesOptions, SRequest.buildRouteETARequestWithData(params), promise);
+  }
+
+  /* Route | Distance matrix */
+  @ReactMethod
+  public void fetchDistanceMatrix(ReadableMap params, @NonNull Promise promise) {
+    SClient.fireRequest(servicesOptions, SRequest.buildDistanceMatrixRequestWithData(params), promise);
+  }
+
+  /* Route | Graph route */
+  @ReactMethod
+  public void fetchGraphRoute(ReadableMap params, @NonNull Promise promise) {
+    SClient.fireRequest(servicesOptions, SRequest.buildGraphRouteRequestWithData(params), promise);
+  }
+
+}

package/android/src/main/java/com/reactnativemap4dservices/Map4dServicesPackage.java

@@ -1,28 +1,28 @@
-package com.reactnativemap4dservices;
-
-import androidx.annotation.NonNull;
-
-import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.uimanager.ViewManager;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class Map4dServicesPackage implements ReactPackage {
-    @NonNull
-    @Override
-    public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
-        List<NativeModule> modules = new ArrayList<>();
-        modules.add(new Map4dServicesModule(reactContext));
-        return modules;
-    }
-
-    @NonNull
-    @Override
-    public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
-        return Collections.emptyList();
-    }
-}
+package com.reactnativemap4dservices;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class Map4dServicesPackage implements ReactPackage {
+  @NonNull
+  @Override
+  public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
+    List<NativeModule> modules = new ArrayList<>();
+    modules.add(new Map4dServicesModule(reactContext));
+    return modules;
+  }
+
+  @NonNull
+  @Override
+  public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
+    return Collections.emptyList();
+  }
+}

package/android/src/main/java/com/reactnativemap4dservices/SClient.java

@@ -0,0 +1,50 @@
+package com.reactnativemap4dservices;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.WritableNativeMap;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import vn.map4d.services.MFServiceCallback;
+import vn.map4d.services.MFServiceOptions;
+import vn.map4d.services.MFServiceTask;
+import vn.map4d.services.MFServices;
+import vn.map4d.services.MFServicesOptions;
+
+class SClient {
+  static void fireRequest(MFServicesOptions options, MFServiceOptions serviceOptions, @NonNull Promise promise) {
+    MFServiceTask serviceTask = new MFServices(options)
+      .request(serviceOptions, new MFServiceCallback<JSONObject>() {
+        @Override
+        public void onSuccess(@Nullable JSONObject json) {
+          if (json == null) {
+            promise.resolve(null);
+          }
+          else {
+            try {
+              final WritableMap data = SJsonUtils.convertJsonToMap(json);
+              promise.resolve(data);
+            } catch (JSONException e) {
+              WritableMap result = new WritableNativeMap();
+              result.putString("code", "Map4dServices");
+              result.putString("message", "Error when parse JSON data result !");
+              promise.resolve(result);
+            }
+          }
+        }
+
+        @Override
+        public void onError(String code, String message) {
+          WritableMap result = new WritableNativeMap();
+          result.putString("code", code);
+          result.putString("message", message);
+          promise.resolve(result);
+        }
+      });
+  }
+}

package/android/src/main/java/com/reactnativemap4dservices/SConverter.java

@@ -0,0 +1,166 @@
+package com.reactnativemap4dservices;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+class SConverter {
+  private static String toAvoidPath(ReadableArray array) {
+    if (array == null) {
+      return null;
+    }
+    StringBuilder resultBuilder = new StringBuilder();
+    for (int i = 0; i < array.size(); ++i) {
+      resultBuilder.append(toLocation(array.getMap(i)));
+      if (i < array.size() - 1) {
+        resultBuilder.append(",");
+      }
+    }
+    return resultBuilder.toString();
+  }
+
+  static String toLocation(ReadableMap map) {
+    if (map == null) {
+      return null;
+    }
+    double lat = map.getDouble("latitude");
+    double lng = map.getDouble("longitude");
+    return lat + "," + lng;
+  }
+
+  static String toViewbox(ReadableMap map) {
+    if (map == null) {
+      return null;
+    }
+    String southWest = toLocation(map.getMap("southwest"));
+    String northEast = toLocation(map.getMap("northeast"));
+    return southWest + "," + northEast;
+  }
+
+  static String toDatetime(double time) {
+    long datetime = (long) time;
+    return String.valueOf(datetime);
+  }
+
+  static String toTypes(@NonNull ReadableArray types) {
+    StringBuilder result = new StringBuilder();
+    for (int i = 0; i < types.size(); ++i) {
+      if (i > 0) {
+        result.append("&types=");
+      }
+      result.append(types.getString(i));
+    }
+    return result.toString();
+  }
+
+  static String toTags(@NonNull ReadableArray tags) {
+    StringBuilder result = new StringBuilder();
+    for (int i = 0; i < tags.size(); ++i) {
+      if (i > 0) {
+        result.append("&tags=");
+      }
+      result.append(tags.getString(i));
+    }
+    return result.toString();
+  }
+
+  static int toWeighting(@NonNull String weighting) {
+    switch (weighting) {
+      case "shortest":
+        return 0;
+      case "fastest":
+        return 1;
+      case "balance":
+        return 2;
+      default:
+        return 3;
+    }
+  }
+
+  static String toLocationList(ReadableArray map) {
+    if (map == null) {
+      return null;
+    }
+
+    StringBuilder result = new StringBuilder();
+    for (int i = 0; i < map.size(); ++i) {
+      result.append(toLocation(map.getMap(i)));
+      if (i < map.size() - 1) {
+        result.append(";");
+      }
+    }
+    return result.toString();
+  }
+
+  static JSONArray toOriginJsonArray(ReadableArray origins) {
+    if (origins == null) {
+      return null;
+    }
+    JSONArray originsJsonArray = null;
+    if (origins != null && origins.size() > 0) {
+      originsJsonArray = new JSONArray();
+    }
+    for (int i = 0; i < origins.size(); ++i) {
+      ReadableMap origin = origins.getMap(i);
+      try {
+        JSONObject originJsonObject = new JSONObject();
+        String alias = origin.getString("alias");
+        originJsonObject.put("alias", alias);
+        originJsonObject.put("location", toLocation(origin));
+        originsJsonArray.put(originJsonObject);
+      } catch (JSONException e) {
+        e.printStackTrace();
+      }
+    }
+    return originsJsonArray;
+  }
+
+  static String toAvoid(ReadableMap map) {
+    if (map == null) {
+      return null;
+    }
+    StringBuilder resultBuilder = new StringBuilder();
+    if (map.hasKey("location")) {
+      String location = toLocation(map.getMap("location"));
+      if (location != null) {
+        resultBuilder.append(location);
+        if (map.hasKey("radius")) {
+          int radius = map.getInt("radius");
+          resultBuilder.append(",").append(radius);
+        }
+      }
+    }
+    else if (map.hasKey("viewbox")) {
+      resultBuilder.append(toViewbox(map.getMap("viewbox")));
+    }
+    else if (map.hasKey("path")) {
+      resultBuilder.append(toAvoidPath(map.getArray("path")));
+    }
+
+    return resultBuilder.toString();
+  }
+
+  static String toAvoidRoads(ReadableMap map) {
+    if (map == null) {
+      return null;
+    }
+    if (map.hasKey("types")) {
+      StringBuilder resultBuilder = new StringBuilder();
+      ReadableArray array = map.getArray("types");
+      for (int i = 0; i < array.size(); ++i) {
+        String type = array.getString(i);
+        resultBuilder.append(type);
+        if (i < array.size() - 1) {
+          resultBuilder.append(",");
+        }
+      }
+      return resultBuilder.toString();
+    }
+    return null;
+  }
+}