react-native-map4d-services 1.0.1 → 1.0.2

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

@@ -5,6 +5,7 @@ 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;
@@ -29,16 +30,20 @@ class SClient {
               final WritableMap data = SJsonUtils.convertJsonToMap(json);
               promise.resolve(data);
             } catch (JSONException e) {
-              promise.reject(
-                "Map4dServices",
-                "Error when parse JSON data result !");
+              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) {
-          promise.reject(code, message);
+          WritableMap result = new WritableNativeMap();
+          result.putString("code", code);
+          result.putString("message", message);
+          promise.resolve(result);
         }
       });
   }

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

@@ -19,17 +19,17 @@ public class SRequest {
     serviceOptionsBuilder.method(MFMethod.GET);
 
     MFRequestParams requestParams = new MFRequestParams();
-    if (params.hasKey("text")) {
+    if (params.hasKey("text") && !params.isNull("text")) {
       String text = params.getString("text");
       requestParams.put("text", text);
     }
 
-    if (params.hasKey("acronym")) {
+    if (params.hasKey("acronym") && !params.isNull("acronym")) {
       boolean acronym = params.getBoolean("acronym");
       requestParams.put("acronym", String.valueOf(acronym));
     }
 
-    if (params.hasKey("location")) {
+    if (params.hasKey("location") && !params.isNull("location")) {
       String location = SConverter.toLocation(params.getMap("location"));
       requestParams.put("location", location);
     }
@@ -54,22 +54,22 @@ public class SRequest {
     serviceOptionsBuilder.method(MFMethod.GET);
 
     MFRequestParams requestParams = new MFRequestParams();
-    if (params.hasKey("text")) {
+    if (params.hasKey("text") && !params.isNull("text")) {
       String text = params.getString("text");
       requestParams.put("text", text);
     }
 
-    if (params.hasKey("location")) {
+    if (params.hasKey("location") && !params.isNull("location")) {
       String location = SConverter.toLocation(params.getMap("location"));
       requestParams.put("location", location);
     }
 
-    if (params.hasKey("types")) {
+    if (params.hasKey("types")  && !params.isNull("types")) {
       String types = SConverter.toTypes(params.getArray("types"));
       requestParams.put("types", types);
     }
 
-    if (params.hasKey("datetime")) {
+    if (params.hasKey("datetime") && !params.isNull("datetime")) {
       String datetime = SConverter.toDatetime(params.getDouble("datetime"));
       requestParams.put("datetime", datetime);
     }
@@ -83,32 +83,32 @@ public class SRequest {
     serviceOptionsBuilder.method(MFMethod.GET);
 
     MFRequestParams requestParams = new MFRequestParams();
-    if (params.hasKey("location")) {
+    if (params.hasKey("location") && !params.isNull("location")) {
       String location = SConverter.toLocation(params.getMap("location"));
       requestParams.put("location", location);
     }
 
-    if (params.hasKey("radius")) {
+    if (params.hasKey("radius")  && !params.isNull("radius")) {
       String radius = String.valueOf(params.getInt("radius"));
       requestParams.put("radius", radius);
     }
 
-    if (params.hasKey("text")) {
+    if (params.hasKey("text") && !params.isNull("text")) {
       String text = params.getString("text");
       requestParams.put("text", text);
     }
 
-    if (params.hasKey("types")) {
+    if (params.hasKey("types")  && !params.isNull("types")) {
       String types = SConverter.toTypes(params.getArray("types"));
       requestParams.put("types", types);
     }
 
-    if (params.hasKey("tags")) {
+    if (params.hasKey("tags") && !params.isNull("tags")) {
       String tags = SConverter.toTags(params.getArray("tags"));
       requestParams.put("tags", tags);
     }
 
-    if (params.hasKey("datetime")) {
+    if (params.hasKey("datetime") && !params.isNull("datetime")) {
       String datetime = SConverter.toDatetime(params.getDouble("datetime"));
       requestParams.put("datetime", datetime);
     }
@@ -123,27 +123,27 @@ public class SRequest {
     serviceOptionsBuilder.method(MFMethod.GET);
 
     MFRequestParams requestParams = new MFRequestParams();
-    if (params.hasKey("viewbox")) {
+    if (params.hasKey("viewbox") && !params.isNull("viewbox")) {
       String viewbox = SConverter.toViewbox(params.getMap("viewbox"));
       requestParams.put("viewbox", viewbox);
     }
 
-    if (params.hasKey("text")) {
+    if (params.hasKey("text") && !params.isNull("text")) {
       String text = params.getString("text");
       requestParams.put("text", text);
     }
 
-    if (params.hasKey("types")) {
+    if (params.hasKey("types") && !params.isNull("types")) {
       String types = SConverter.toTypes(params.getArray("types"));
       requestParams.put("types", types);
     }
 
-    if (params.hasKey("tags")) {
+    if (params.hasKey("tags") && !params.isNull("tags")) {
       String tags = SConverter.toTags(params.getArray("tags"));
       requestParams.put("tags", tags);
     }
 
-    if (params.hasKey("datetime")) {
+    if (params.hasKey("datetime") && !params.isNull("datetime")) {
       String datetime = SConverter.toDatetime(params.getDouble("datetime"));
       requestParams.put("datetime", datetime);
     }
@@ -157,17 +157,17 @@ public class SRequest {
     serviceOptionsBuilder.method(MFMethod.GET);
 
     MFRequestParams requestParams = new MFRequestParams();
-    if (params.hasKey("address")) {
+    if (params.hasKey("address") && !params.isNull("address")) {
       String address = params.getString("address");
       requestParams.put("address", address);
     }
 
-    if (params.hasKey("location")) {
+    if (params.hasKey("location") && !params.isNull("location")) {
       String location = SConverter.toLocation(params.getMap("location"));
       requestParams.put("location", location);
     }
 
-    if (params.hasKey("viewbox")) {
+    if (params.hasKey("viewbox") && !params.isNull("viewbox")) {
       String viewbox = SConverter.toViewbox(params.getMap("viewbox"));
       requestParams.put("viewbox", viewbox);
     }
@@ -182,37 +182,37 @@ public class SRequest {
 
     MFRequestParams requestParams = new MFRequestParams();
 
-    if (params.hasKey("origin")) {
+    if (params.hasKey("origin") && !params.isNull("origin")) {
       String origin = SConverter.toLocation(params.getMap("origin"));
       requestParams.put("origin", origin);
     }
 
-    if (params.hasKey("destination")) {
+    if (params.hasKey("destination") && !params.isNull("destination")) {
       String destination = SConverter.toLocation(params.getMap("destination"));
       requestParams.put("destination", destination);
     }
 
-    if (params.hasKey("mode")) {
+    if (params.hasKey("mode") && !params.isNull("mode")) {
       String mode = params.getString("mode");
       requestParams.put("mode", mode);
     }
 
-    if (params.hasKey("weighting")) {
+    if (params.hasKey("weighting") && !params.isNull("weighting")) {
       int weighting = SConverter.toWeighting(params.getString("weighting"));
       requestParams.put("weighting", String.valueOf(weighting));
     }
 
-    if (params.hasKey("language")) {
+    if (params.hasKey("language") && !params.isNull("language")) {
       String language = params.getString("language");
       requestParams.put("language", language);
     }
 
-    if (params.hasKey("waypoints")) {
+    if (params.hasKey("waypoints") && !params.isNull("waypoints")) {
       String waypoints = SConverter.toLocationList(params.getArray("waypoints"));
       requestParams.put("points", waypoints);
     }
 
-    if (params.hasKey("restriction")) {
+    if (params.hasKey("restriction") && !params.isNull("restriction")) {
       ReadableMap restrictionMap = params.getMap("restriction");
       String avoid = SConverter.toAvoid(restrictionMap);
       if (avoid != null && !avoid.isEmpty()) {
@@ -236,32 +236,32 @@ public class SRequest {
 
     JSONObject jsonObject = new JSONObject();
     try {
-      if (params.hasKey("origins")) {
+      if (params.hasKey("origins") && !params.isNull("origins")) {
         JSONArray origins = SConverter.toOriginJsonArray(params.getArray("origins"));
         jsonObject.put("origins", origins);
       }
 
-      if (params.hasKey("destination")) {
+      if (params.hasKey("destination") && !params.isNull("destination")) {
         String destination = SConverter.toLocation(params.getMap("destination"));
         jsonObject.put("destination", destination);
       }
 
-      if (params.hasKey("mode")) {
+      if (params.hasKey("mode") && !params.isNull("mode")) {
         String mode = params.getString("mode");
         jsonObject.put("mode", mode);
       }
 
-      if (params.hasKey("weighting")) {
+      if (params.hasKey("weighting") && !params.isNull("weighting")) {
         int weighting = SConverter.toWeighting(params.getString("weighting"));
         jsonObject.put("weighting", String.valueOf(weighting));
       }
 
-      if (params.hasKey("language")) {
+      if (params.hasKey("language") && !params.isNull("language")) {
         String language = params.getString("language");
         jsonObject.put("language", language);
       }
 
-      if (params.hasKey("restriction")) {
+      if (params.hasKey("restriction") && !params.isNull("restriction")) {
         ReadableMap restrictionMap = params.getMap("restriction");
         String avoid = SConverter.toAvoid(restrictionMap);
         if (avoid != null && !avoid.isEmpty()) {
@@ -288,32 +288,32 @@ public class SRequest {
 
     MFRequestParams requestParams = new MFRequestParams();
 
-    if (params.hasKey("origins")) {
+    if (params.hasKey("origins") && !params.isNull("origins")) {
       String origins = SConverter.toLocationList(params.getArray("origins"));
       requestParams.put("origins", origins);
     }
 
-    if (params.hasKey("destinations")) {
+    if (params.hasKey("destinations") && !params.isNull("destinations")) {
       String destinations = SConverter.toLocationList(params.getArray("destinations"));
       requestParams.put("destinations", destinations);
     }
 
-    if (params.hasKey("mode")) {
+    if (params.hasKey("mode") && !params.isNull("mode")) {
       String mode = params.getString("mode");
       requestParams.put("mode", mode);
     }
 
-    if (params.hasKey("weighting")) {
+    if (params.hasKey("weighting") && !params.isNull("weighting")) {
       int weighting = SConverter.toWeighting(params.getString("weighting"));
       requestParams.put("weighting", String.valueOf(weighting));
     }
 
-    if (params.hasKey("language")) {
+    if (params.hasKey("language") && !params.isNull("language")) {
       String language = params.getString("language");
       requestParams.put("language", language);
     }
 
-    if (params.hasKey("restriction")) {
+    if (params.hasKey("restriction") && !params.isNull("restriction")) {
       ReadableMap restrictionMap = params.getMap("restriction");
       String avoid = SConverter.toAvoid(restrictionMap);
       if (avoid != null && !avoid.isEmpty()) {
@@ -337,27 +337,27 @@ public class SRequest {
 
     MFRequestParams requestParams = new MFRequestParams();
 
-    if (params.hasKey("locations")) {
+    if (params.hasKey("locations") && !params.isNull("locations")) {
       String points = SConverter.toLocationList(params.getArray("locations"));
       requestParams.put("points", points);
     }
 
-    if (params.hasKey("mode")) {
+    if (params.hasKey("mode") && !params.isNull("mode")) {
       String mode = params.getString("mode");
       requestParams.put("mode", mode);
     }
 
-    if (params.hasKey("weighting")) {
+    if (params.hasKey("weighting") && !params.isNull("weighting")) {
       int weighting = SConverter.toWeighting(params.getString("weighting"));
       requestParams.put("weighting", String.valueOf(weighting));
     }
 
-    if (params.hasKey("language")) {
+    if (params.hasKey("language") && !params.isNull("language")) {
       String language = params.getString("language");
       requestParams.put("language", language);
     }
 
-    if (params.hasKey("restriction")) {
+    if (params.hasKey("restriction") && !params.isNull("restriction")) {
       ReadableMap restrictionMap = params.getMap("restriction");
       String avoid = SConverter.toAvoid(restrictionMap);
       if (avoid != null && !avoid.isEmpty()) {

package/ios/SParamConvert.h

@@ -0,0 +1,44 @@
+//
+//  SParamConvert.h
+//  react-native-map4d-services
+//
+//  Created by Huy Dang on 26/01/2022.
+//
+
+#ifndef SParamConvert_h
+#define SParamConvert_h
+
+#import <Map4dServices/Map4dServices.h>
+
+@interface SParamConvert : NSObject
+
++ (BOOL)BOOL:(id)json fallback:(BOOL)fallback;
+
++ (NSUInteger)NSUInteger:(id)json;
+
++ (NSUInteger)NSUInteger:(id)json fallback:(NSUInteger)fallback;
+
++ (NSString *)NSString:(id)json;
+
++ (NSArray<NSString *> *)NSStringArray:(id)json;
+
++ (NSDate *)NSDate:(id)json;
+
++ (MFLocationComponent *)MFLocationComponent:(id)json;
+
++ (NSArray<MFLocationComponent *> *)MFLocationComponentArray:(id)json;
+
++ (MFViewboxComponent *)MFViewboxComponent:(id)json;
+
++ (MFRouteRestriction *)MFRouteRestriction:(id)json;
+
++ (MFTravelMode)MFTravelMode:(id)json fallback:(MFTravelMode)fallback;
+
++ (MFRouteWeighting)MFRouteWeighting:(id)json fallback:(MFRouteWeighting)fallback;
+
++ (MFLanguageResult)MFLanguageResult:(id)json fallback:(MFLanguageResult)fallback;
+
+@end
+
+
+#endif /* SParamConvert_h */

package/ios/SParamConvert.m

@@ -0,0 +1,229 @@
+//
+//  SParamConvert.m
+//  react-native-map4d-services
+//
+//  Created by Huy Dang on 26/01/2022.
+//
+
+#import <React/RCTConvert.h>
+#import <React/RCTConvert+CoreLocation.h>
+#import "SParamConvert.h"
+
+@interface SParamConvert (Private)
++ (BOOL)isNull:(id)json;
++ (BOOL)isMFRouteType:(NSString *)type;
++ (MFRouteType)MFRouteType:(NSString *)type;
+@end
+
+#pragma mark - SParamConvert
+
+@implementation SParamConvert
+
++ (BOOL)BOOL:(id)json fallback:(BOOL)fallback {
+  return [self isNull:json] ? fallback : [RCTConvert BOOL:json];
+}
+
++ (NSUInteger)NSUInteger:(id)json {
+  return [self NSUInteger:json fallback:0];
+}
+
++ (NSUInteger)NSUInteger:(id)json fallback:(NSUInteger)fallback {
+  return [self isNull:json] ? fallback : [RCTConvert NSUInteger:json];
+}
+
++ (NSString *)NSString:(id)json {
+  return [self isNull:json] ? nil : [RCTConvert NSString:json];
+}
+
++ (NSArray<NSString *> *)NSStringArray:(id)json {
+  if ([self isNull:json]) {
+    return nil;
+  }
+  
+  NSMutableArray *array = [NSMutableArray arrayWithCapacity:[json count]];
+  for (id e in json) {
+    NSString *str = [self NSString:e];
+    if (str != nil) {
+      [array addObject:str];
+    }
+  }
+  return array;
+}
+
++ (NSDate *)NSDate:(id)json {
+  return [self isNull:json] ? nil : [RCTConvert NSDate:json];
+}
+
++ (MFLocationComponent *)MFLocationComponent:(id)json {
+  if ([self isNull:json]) {
+    return nil;
+  }
+  CLLocationCoordinate2D coordinate = [RCTConvert CLLocationCoordinate2D:json];
+  return [[MFLocationComponent alloc] initWithCoordinate:coordinate alias:json[@"alias"]];
+}
+
++ (NSArray<MFLocationComponent *> *)MFLocationComponentArray:(id)json {
+  if ([self isNull:json]) {
+    return nil;
+  }
+  
+  NSMutableArray<MFLocationComponent *> *array = [NSMutableArray arrayWithCapacity:[json count]];
+  for (id e in json) {
+    MFLocationComponent *location = [self MFLocationComponent:e];
+    if (location != nil) {
+      [array addObject:location];
+    }
+  }
+  return array;
+}
+
++ (MFViewboxComponent *)MFViewboxComponent:(id)json {
+  if ([self isNull:json]) {
+    return nil;
+  }
+
+  MFLocationComponent *southwest = [SParamConvert MFLocationComponent:json[@"southwest"]];
+  MFLocationComponent *northeast = [SParamConvert MFLocationComponent:json[@"northeast"]];
+  return [[MFViewboxComponent alloc] initWithSouthwest:southwest.coordinate northeast:northeast.coordinate];
+}
+
++ (MFRouteRestriction *)MFRouteRestriction:(id)json {
+  if ([self isNull:json]) {
+    return nil;
+  }
+  
+  MFLocationComponent *location = [SParamConvert MFLocationComponent:json[@"location"]];
+  NSUInteger radius = json[@"radius"] != nil ? [RCTConvert NSUInteger:json[@"radius"]] : 0;
+  MFViewboxComponent *viewbox = [SParamConvert MFViewboxComponent:json[@"viewbox"]];
+  NSArray<MFLocationComponent *> *path = [SParamConvert MFLocationComponentArray:json[@"path"]];
+  NSArray<NSString *> *types = [RCTConvert NSStringArray:json[@"types"]];
+  
+  MFRouteRestriction *result = nil;
+    if (location != nil) {
+      result = [[MFRouteRestriction alloc] initWithLocation:location radius:radius];
+    }
+    else if (viewbox != nil) {
+      result = [[MFRouteRestriction alloc] initWithViewbox:viewbox];
+    }
+    else if (path != nil) {
+      result = [[MFRouteRestriction alloc] initWithPath:path];
+    }
+    
+    if (types != nil && types.count > 0) {
+      if (result != nil) {
+        for (NSUInteger i = 0; i < types.count; i++) {
+          if ([SParamConvert isMFRouteType:types[i]]) {
+            [result avoidRouteType:[SParamConvert MFRouteType:types[i]]];
+          }
+        }
+      }
+      else {
+        result = [[MFRouteRestriction alloc] initWithRouteType:[SParamConvert MFRouteType:types[0]]];
+        for (NSUInteger i = 1; i < types.count; i++) {
+          if ([SParamConvert isMFRouteType:types[i]]) {
+            [result avoidRouteType:[SParamConvert MFRouteType:types[i]]];
+          }
+        }
+      }
+    }
+    
+    return result;
+  
+}
+
++ (MFTravelMode)MFTravelMode:(id)json fallback:(MFTravelMode)fallback {
+  if ([self isNull:json]) {
+    return fallback;
+  }
+
+  NSString *mode = [RCTConvert NSString:json];
+  if ([@"motorcycle" isEqualToString:mode]) {
+    return MFTravelModeMotorcycle;
+  }
+  else if ([@"foot" isEqualToString:mode]) {
+    return MFTravelModeFoot;
+  }
+  else if ([@"bike" isEqualToString:mode]) {
+    return MFTravelModeBike;
+  }
+  else {
+    return MFTravelModeCar;
+  }
+}
+
++ (MFRouteWeighting)MFRouteWeighting:(id)json fallback:(MFRouteWeighting)fallback {
+  if ([self isNull:json]) {
+    return fallback;
+  }
+
+  NSString *weighting = [RCTConvert NSString:json];
+  if ([@"shortest" isEqualToString:weighting]) {
+    return MFRouteWeightingShortest;
+  }
+  else if ([@"balance" isEqualToString:weighting]) {
+    return MFRouteWeightingBalance;
+  }
+  else {
+    return MFRouteWeightingFastest;
+  }
+}
+
++ (MFLanguageResult)MFLanguageResult:(id)json fallback:(MFLanguageResult)fallback {
+  if ([self isNull:json]) {
+    return fallback;
+  }
+
+  NSString *language = [RCTConvert NSString:json];
+  if ([@"en" isEqualToString:language]) {
+    return MFLanguageResultEnglish;
+  }
+  else {
+    return MFLanguageResultVietnamese;
+  }
+}
+
+@end
+
+#pragma mark - SParamConvert (Private)
+
+
+@implementation SParamConvert (Private)
+
++ (BOOL)isNull:(id)json {
+  if (json == nil || [json isKindOfClass:[NSNull class]]) {
+    return true;
+  }
+  return false;
+}
+
++ (BOOL)isMFRouteType:(NSString *)type {
+  if ([@"motorway" isEqualToString:type] ||
+      [@"trunk" isEqualToString:type] ||
+      [@"ferry" isEqualToString:type] ||
+      [@"bridge" isEqualToString:type] ||
+      [@"tunnel" isEqualToString:type]) {
+    return YES;
+  }
+  return NO;
+}
+
++ (MFRouteType)MFRouteType:(NSString *)type {
+  if ([@"motorway" isEqualToString:type]) {
+    return MFRouteTypeMotorway;
+  }
+  else if ([@"trunk" isEqualToString:type]) {
+    return MFRouteTypeTrunk;
+  }
+  else if ([@"ferry" isEqualToString:type]) {
+    return MFRouteTypeFerry;
+  }
+  else if ([@"bridge" isEqualToString:type]) {
+    return MFRouteTypeBridge;
+  }
+  else if ([@"tunnel" isEqualToString:type]) {
+    return MFRouteTypeTunnel;
+  }
+  return 0;
+}
+
+@end

package/ios/SRequest.m

@@ -6,7 +6,7 @@
 //
 
 #import "SRequest.h"
-#import "RCTConvert+Services.h"
+#import "SParamConvert.h"
 
 @implementation SRequest
 
@@ -15,8 +15,8 @@
 + (MFServiceRequest *)buildGeocodingRequestWithData:(NSDictionary *)data {
   MFServiceRequest *request = [[MFServiceRequest alloc] initWithPath:@"/sdk/v2/geocode"];
   MFGeocodeParams *params = [[MFGeocodeParams alloc] initWithAddress:data[@"address"]];
-  params.location = [RCTConvert MFLocationComponent:data[@"location"]];
-  params.viewbox = [RCTConvert MFViewboxComponent:data[@"viewbox"]];
+  params.location = [SParamConvert MFLocationComponent:data[@"location"]];
+  params.viewbox = [SParamConvert MFViewboxComponent:data[@"viewbox"]];
   
   request.params = params;
   return request;
@@ -32,10 +32,9 @@
 + (MFServiceRequest *)buildTextSearchRequestWithData:(NSDictionary *)data {
   MFServiceRequest *request = [[MFServiceRequest alloc] initWithPath:@"/sdk/place/text-search"];
   MFTextSearchParams *params = [[MFTextSearchParams alloc] initWithText:data[@"text"]];
-  
-  params.types = data[@"types"];
-  params.location = [RCTConvert MFLocationComponent:data[@"location"]];
-  params.datetime = [RCTConvert NSDate:data[@"datetime"]];
+  params.types = [SParamConvert NSStringArray:data[@"types"]];
+  params.location = [SParamConvert MFLocationComponent:data[@"location"]];
+  params.datetime = [SParamConvert NSDate:data[@"datetime"]];
   
   request.params = params;
   return request;
@@ -43,12 +42,12 @@
 
 + (MFServiceRequest *)buildNearbySearchRequestWithData:(NSDictionary *)data {
   MFServiceRequest *request = [[MFServiceRequest alloc] initWithPath:@"/sdk/place/nearby-search"];
-  MFNearbySearchParams *params = [[MFNearbySearchParams alloc] initWithLocation:[RCTConvert MFLocationComponent:data[@"location"]]
-                                                                         radius:[RCTConvert NSUInteger:data[@"radius"]]
-                                                                           text:data[@"text"]];
-  params.types = data[@"types"];
-  params.tags = data[@"tags"];
-  params.datetime = [RCTConvert NSDate:data[@"datetime"]];
+  MFNearbySearchParams *params = [[MFNearbySearchParams alloc] initWithLocation:[SParamConvert MFLocationComponent:data[@"location"]]
+                                                                         radius:[SParamConvert NSUInteger:data[@"radius"]]
+                                                                           text:[SParamConvert NSString:data[@"text"]]];
+  params.types = [SParamConvert NSStringArray:data[@"types"]];
+  params.tags = [SParamConvert NSStringArray:data[@"tags"]];
+  params.datetime = [SParamConvert NSDate:data[@"datetime"]];
   
   request.params = params;
   return request;
@@ -56,11 +55,11 @@
 
 + (MFServiceRequest *)buildViewboxSearchRequestWithData:(NSDictionary *)data {
   MFServiceRequest *request = [[MFServiceRequest alloc] initWithPath:@"/sdk/place/viewbox-search"];
-  MFViewboxSearchParams *params = [[MFViewboxSearchParams alloc] initWithViewbox:[RCTConvert MFViewboxComponent:data[@"viewbox"]]
-                                                                            text:data[@"text"]];
-  params.types = data[@"types"];
-  params.tags = data[@"tags"];
-  params.datetime = [RCTConvert NSDate:data[@"datetime"]];
+  MFViewboxSearchParams *params = [[MFViewboxSearchParams alloc] initWithViewbox:[SParamConvert MFViewboxComponent:data[@"viewbox"]]
+                                                                            text:[SParamConvert NSString:data[@"text"]]];
+  params.types = [SParamConvert NSStringArray:data[@"types"]];
+  params.tags = [SParamConvert NSStringArray:data[@"tags"]];
+  params.datetime = [SParamConvert NSDate:data[@"datetime"]];
   
   request.params = params;
   return request;
@@ -68,9 +67,9 @@
 
 + (MFServiceRequest *)buildSuggestionsRequestWithData:(NSDictionary *)data {
   MFServiceRequest *request = [[MFServiceRequest alloc] initWithPath:@"/sdk/autosuggest"];
-  MFSuggestionParams *params = [[MFSuggestionParams alloc] initWithText:data[@"text"]];
-  params.acronym = [RCTConvert BOOL:data[@"acronym"]];
-  params.location = [RCTConvert MFLocationComponent:data[@"location"]];
+  MFSuggestionParams *params = [[MFSuggestionParams alloc] initWithText:[SParamConvert NSString:data[@"text"]]];
+  params.location = [SParamConvert MFLocationComponent:data[@"location"]];
+  params.acronym = [SParamConvert BOOL:data[@"acronym"] fallback:params.acronym];
   
   request.params = params;
   return request;
@@ -81,14 +80,14 @@
 + (MFServiceRequest *)buildDirectionsRequestWithData:(NSDictionary *)data {
   MFServiceRequest *request = [[MFServiceRequest alloc] initWithPath:@"/sdk/route"];
   
-  MFLocationComponent *origin = [RCTConvert MFLocationComponent:data[@"origin"]];
-  MFLocationComponent *destination = [RCTConvert MFLocationComponent:data[@"destination"]];
+  MFLocationComponent *origin = [SParamConvert MFLocationComponent:data[@"origin"]];
+  MFLocationComponent *destination = [SParamConvert MFLocationComponent:data[@"destination"]];
   MFDirectionsParams *params = [[MFDirectionsParams alloc] initWithOrigin:origin destination:destination];
-  params.waypoints = [RCTConvert MFLocationComponentArray:data[@"points"]];
-  params.mode = [RCTConvert MFTravelMode:data[@"mode"]];
-  params.language = [RCTConvert MFLanguageResult:data[@"language"]];
-  params.weighting = [RCTConvert MFRouteWeighting:data[@"weighting"]];
-  params.restriction = [RCTConvert MFRouteRestriction:data[@"restriction"]];
+  params.waypoints = [SParamConvert MFLocationComponentArray:data[@"points"]];
+  params.mode = [SParamConvert MFTravelMode:data[@"mode"] fallback:params.mode];
+  params.language = [SParamConvert MFLanguageResult:data[@"language"] fallback:params.language];
+  params.weighting = [SParamConvert MFRouteWeighting:data[@"weighting"] fallback:params.weighting];
+  params.restriction = [SParamConvert MFRouteRestriction:data[@"restriction"]];
   
   request.params = params;
   return request;
@@ -97,13 +96,13 @@
 + (MFServiceRequest *)buildRouteETARequestWithData:(NSDictionary *)data {
   MFServiceRequest *request = [[MFServiceRequest alloc] initWithPath:@"/sdk/route/eta"];
   
-  NSArray<MFLocationComponent *> *origins = [RCTConvert MFLocationComponentArray:data[@"origins"]];
-  MFLocationComponent *destination = [RCTConvert MFLocationComponent:data[@"destination"]];
+  NSArray<MFLocationComponent *> *origins = [SParamConvert MFLocationComponentArray:data[@"origins"]];
+  MFLocationComponent *destination = [SParamConvert MFLocationComponent:data[@"destination"]];
   MFRouteETAParams *params = [[MFRouteETAParams alloc] initWithOrigins:origins destination:destination];
-  params.mode = [RCTConvert MFTravelMode:data[@"mode"]];
-  params.language = [RCTConvert MFLanguageResult:data[@"language"]];
-  params.weighting = [RCTConvert MFRouteWeighting:data[@"weighting"]];
-  params.restriction = [RCTConvert MFRouteRestriction:data[@"restriction"]];
+  params.mode = [SParamConvert MFTravelMode:data[@"mode"] fallback:params.mode];
+  params.language = [SParamConvert MFLanguageResult:data[@"language"] fallback:params.language];
+  params.weighting = [SParamConvert MFRouteWeighting:data[@"weighting"] fallback:params.weighting];
+  params.restriction = [SParamConvert MFRouteRestriction:data[@"restriction"]];
   
   request.params = params;
   request.method = MFRequestMethodPost;
@@ -113,13 +112,13 @@
 + (MFServiceRequest *)buildDistanceMatrixRequestWithData:(NSDictionary *)data {
   MFServiceRequest *request = [[MFServiceRequest alloc] initWithPath:@"/sdk/route/matrix"];
   
-  NSArray<MFLocationComponent *> *origins = [RCTConvert MFLocationComponentArray:data[@"origins"]];
-  NSArray<MFLocationComponent *> *destinations = [RCTConvert MFLocationComponentArray:data[@"destinations"]];
+  NSArray<MFLocationComponent *> *origins = [SParamConvert MFLocationComponentArray:data[@"origins"]];
+  NSArray<MFLocationComponent *> *destinations = [SParamConvert MFLocationComponentArray:data[@"destinations"]];
   MFDistanceMatrixParams *params = [[MFDistanceMatrixParams alloc] initWithOrigins:origins destinations:destinations];
-  params.mode = [RCTConvert MFTravelMode:data[@"mode"]];
-  params.language = [RCTConvert MFLanguageResult:data[@"language"]];
-  params.weighting = [RCTConvert MFRouteWeighting:data[@"weighting"]];
-  params.restriction = [RCTConvert MFRouteRestriction:data[@"restriction"]];
+  params.mode = [SParamConvert MFTravelMode:data[@"mode"] fallback:params.mode];
+  params.language = [SParamConvert MFLanguageResult:data[@"language"] fallback:params.language];
+  params.weighting = [SParamConvert MFRouteWeighting:data[@"weighting"] fallback:params.weighting];
+  params.restriction = [SParamConvert MFRouteRestriction:data[@"restriction"]];
   
   request.params = params;
   return request;
@@ -128,12 +127,12 @@
 + (MFServiceRequest *)buildGraphRouteRequestWithData:(NSDictionary *)data {
   MFServiceRequest *request = [[MFServiceRequest alloc] initWithPath:@"/sdk/route/graph"];
   
-  NSArray<MFLocationComponent *> *points = [RCTConvert MFLocationComponentArray:data[@"locations"]];
+  NSArray<MFLocationComponent *> *points = [SParamConvert MFLocationComponentArray:data[@"locations"]];
   MFGraphRouteParams *params = [[MFGraphRouteParams alloc] initWithLocations:points];
-  params.mode = [RCTConvert MFTravelMode:data[@"mode"]];
-  params.language = [RCTConvert MFLanguageResult:data[@"language"]];
-  params.weighting = [RCTConvert MFRouteWeighting:data[@"weighting"]];
-  params.restriction = [RCTConvert MFRouteRestriction:data[@"restriction"]];
+  params.mode = [SParamConvert MFTravelMode:data[@"mode"] fallback:params.mode];
+  params.language = [SParamConvert MFLanguageResult:data[@"language"] fallback:params.language];
+  params.weighting = [SParamConvert MFRouteWeighting:data[@"weighting"] fallback:params.weighting];
+  params.restriction = [SParamConvert MFRouteRestriction:data[@"restriction"]];
   
   request.params = params;
   return request;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-map4d-services",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "React Native Map4dServices for iOS + Android",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/ios/RCTConvert+Services.h

@@ -1,33 +0,0 @@
-//
-//  RCTConvert+Services.h
-//  react-native-map4d-services
-//
-//  Created by Huy Dang on 26/01/2022.
-//
-
-#ifndef RCTConvert_Services_h
-#define RCTConvert_Services_h
-
-#import <React/RCTConvert.h>
-#import <Map4dServices/Map4dServices.h>
-
-@interface RCTConvert (Services)
-
-+ (MFLocationComponent *)MFLocationComponent:(id)json;
-
-+ (NSArray<MFLocationComponent *> *)MFLocationComponentArray:(id)json;
-
-+ (MFViewboxComponent *)MFViewboxComponent:(id)json;
-
-+ (MFRouteRestriction *)MFRouteRestriction:(id)json;
-
-+ (MFTravelMode)MFTravelMode:(id)json;
-
-+ (MFRouteWeighting)MFRouteWeighting:(id)json;
-
-+ (MFLanguageResult)MFLanguageResult:(id)json;
-
-@end
-
-
-#endif /* RCTConvert_Services_h */

package/ios/RCTConvert+Services.m

@@ -1,146 +0,0 @@
-//
-//  RCTConvert+Services.m
-//  react-native-map4d-services
-//
-//  Created by Huy Dang on 26/01/2022.
-//
-
-#import <React/RCTConvert+CoreLocation.h>
-#import "RCTConvert+Services.h"
-
-@implementation RCTConvert (Services)
-
-+ (MFLocationComponent *)MFLocationComponent:(id)json {
-  if (json == nil) {
-    return nil;
-  }
-  CLLocationCoordinate2D coordinate = [RCTConvert CLLocationCoordinate2D:json];
-  return [[MFLocationComponent alloc] initWithCoordinate:coordinate alias:json[@"alias"]];
-}
-
-RCT_ARRAY_CONVERTER(MFLocationComponent);
-
-+ (MFViewboxComponent *)MFViewboxComponent:(id)json {
-  if (json == nil) {
-    return nil;
-  }
-
-  MFLocationComponent *southwest = [RCTConvert MFLocationComponent:json[@"southwest"]];
-  MFLocationComponent *northeast = [RCTConvert MFLocationComponent:json[@"northeast"]];
-  return [[MFViewboxComponent alloc] initWithSouthwest:southwest.coordinate northeast:northeast.coordinate];
-}
-
-+ (MFRouteRestriction *)MFRouteRestriction:(id)json {
-  if (json == nil) {
-    return nil;
-  }
-  
-  MFLocationComponent *location = [RCTConvert MFLocationComponent:json[@"location"]];
-  NSUInteger radius = json[@"radius"] != nil ? [RCTConvert NSUInteger:json[@"radius"]] : 0;
-  MFViewboxComponent *viewbox = [RCTConvert MFViewboxComponent:json[@"viewbox"]];
-  NSArray<MFLocationComponent *> *path = [RCTConvert MFLocationComponentArray:json[@"path"]];
-  NSArray<NSString *> *types = [RCTConvert NSStringArray:json[@"types"]];
-  
-  MFRouteRestriction *result = nil;
-    if (location != nil) {
-      result = [[MFRouteRestriction alloc] initWithLocation:location radius:radius];
-    }
-    else if (viewbox != nil) {
-      result = [[MFRouteRestriction alloc] initWithViewbox:viewbox];
-    }
-    else if (path != nil) {
-      result = [[MFRouteRestriction alloc] initWithPath:path];
-    }
-    
-    if (types != nil && types.count > 0) {
-      if (result != nil) {
-        for (NSUInteger i = 0; i < types.count; i++) {
-          if ([RCTConvert isMFRouteType:types[i]]) {
-            [result avoidRouteType:[RCTConvert MFRouteType:types[i]]];
-          }
-        }
-      }
-      else {
-        result = [[MFRouteRestriction alloc] initWithRouteType:[RCTConvert MFRouteType:types[0]]];
-        for (NSUInteger i = 1; i < types.count; i++) {
-          if ([RCTConvert isMFRouteType:types[i]]) {
-            [result avoidRouteType:[RCTConvert MFRouteType:types[i]]];
-          }
-        }
-      }
-    }
-    
-    return result;
-  
-}
-
-+ (MFTravelMode)MFTravelMode:(id)json {
-  NSString *mode = [RCTConvert NSString:json];
-  if ([@"motorcycle" isEqualToString:mode]) {
-    return MFTravelModeMotorcycle;
-  }
-  else if ([@"foot" isEqualToString:mode]) {
-    return MFTravelModeFoot;
-  }
-  else if ([@"bike" isEqualToString:mode]) {
-    return MFTravelModeBike;
-  }
-  else {
-    return MFTravelModeCar;
-  }
-}
-
-+ (MFRouteWeighting)MFRouteWeighting:(id)json {
-  NSString *weighting = [RCTConvert NSString:json];
-  if ([@"shortest" isEqualToString:weighting]) {
-    return MFRouteWeightingShortest;
-  }
-  else if ([@"balance" isEqualToString:weighting]) {
-    return MFRouteWeightingBalance;
-  }
-  else {
-    return MFRouteWeightingFastest;
-  }
-}
-
-+ (MFLanguageResult)MFLanguageResult:(id)json {
-  NSString *language = [RCTConvert NSString:json];
-  if ([@"en" isEqualToString:language]) {
-    return MFLanguageResultEnglish;
-  }
-  else {
-    return MFLanguageResultVietnamese;
-  }
-}
-
-+ (BOOL)isMFRouteType:(NSString *)type {
-  if ([@"motorway" isEqualToString:type] ||
-      [@"trunk" isEqualToString:type] ||
-      [@"ferry" isEqualToString:type] ||
-      [@"bridge" isEqualToString:type] ||
-      [@"tunnel" isEqualToString:type]) {
-    return YES;
-  }
-  return NO;
-}
-
-+ (MFRouteType)MFRouteType:(NSString *)type {
-  if ([@"motorway" isEqualToString:type]) {
-    return MFRouteTypeMotorway;
-  }
-  else if ([@"trunk" isEqualToString:type]) {
-    return MFRouteTypeTrunk;
-  }
-  else if ([@"ferry" isEqualToString:type]) {
-    return MFRouteTypeFerry;
-  }
-  else if ([@"bridge" isEqualToString:type]) {
-    return MFRouteTypeBridge;
-  }
-  else if ([@"tunnel" isEqualToString:type]) {
-    return MFRouteTypeTunnel;
-  }
-  return 0;
-}
-
-@end