react-native-ipostmap-navigation 1.0.0 → 1.0.2

package/ios/Map4dNavigationReactNative.mm

@@ -2,7 +2,7 @@
 #import <Map4dServices/Map4dServices.h>
 #import <Map4dNavigation/Map4dNavigation.h>
 #import <React/RCTUtils.h>
-#import <react-native-ipostmap-services/SParamConvert.h>
+#import "NParamConvert.h"
 
 @interface MFDirectionsResult (Extension)
 
@@ -74,14 +74,14 @@
     return nil;
   }
   
-  MFLocationComponent *origin = [SParamConvert MFLocationComponent:dict[@"origin"]];
-  MFLocationComponent *destination = [SParamConvert MFLocationComponent:dict[@"destination"]];
+  MFLocationComponent *origin = [NParamConvert MFLocationComponent:dict[@"origin"]];
+  MFLocationComponent *destination = [NParamConvert MFLocationComponent:dict[@"destination"]];
   MFDirectionsParams *params = [[MFDirectionsParams alloc] initWithOrigin:origin destination:destination];
-  params.mode = [SParamConvert MFTravelMode:dict[@"mode"] fallback:params.mode];
-  params.waypoints = [SParamConvert MFLocationComponentArray:dict[@"waypoints"]];
-  params.language = [SParamConvert MFLanguageResult:dict[@"language"] fallback:params.language];
-  params.weighting = [SParamConvert MFRouteWeighting:dict[@"weighting"] fallback:params.weighting];
-  params.restriction = [SParamConvert MFRouteRestriction:dict[@"restriction"]];
+  params.mode = [NParamConvert MFTravelMode:dict[@"mode"] fallback:params.mode];
+  params.waypoints = [NParamConvert MFLocationComponentArray:dict[@"waypoints"]];
+  params.language = [NParamConvert MFLanguageResult:dict[@"language"] fallback:params.language];
+  params.weighting = [NParamConvert MFRouteWeighting:dict[@"weighting"] fallback:params.weighting];
+  params.restriction = [NParamConvert MFRouteRestriction:dict[@"restriction"]];
   
   return params;
 }

package/ios/NParamConvert.h

@@ -0,0 +1,44 @@
+//
+//  NParamConvert.h
+//  react-native-map4d-services
+//
+//  Created by Huy Dang on 26/01/2022.
+//
+
+#ifndef NParamConvert_h
+#define NParamConvert_h
+
+#import <Map4dServices/Map4dServices.h>
+
+@interface NParamConvert : 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 /* NParamConvert_h */

package/ios/NParamConvert.m

@@ -0,0 +1,229 @@
+//
+//  NParamConvert.m
+//  react-native-map4d-services
+//
+//  Created by Huy Dang on 26/01/2022.
+//
+
+#import <React/RCTConvert.h>
+#import <React/RCTConvert+CoreLocation.h>
+#import "NParamConvert.h"
+
+@interface NParamConvert (Private)
++ (BOOL)isNull:(id)json;
++ (BOOL)isMFRouteType:(NSString *)type;
++ (MFRouteType)MFRouteType:(NSString *)type;
+@end
+
+#pragma mark - NParamConvert
+
+@implementation NParamConvert
+
++ (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 = [NParamConvert MFLocationComponent:json[@"southwest"]];
+  MFLocationComponent *northeast = [NParamConvert MFLocationComponent:json[@"northeast"]];
+  return [[MFViewboxComponent alloc] initWithSouthwest:southwest.coordinate northeast:northeast.coordinate];
+}
+
++ (MFRouteRestriction *)MFRouteRestriction:(id)json {
+  if ([self isNull:json]) {
+    return nil;
+  }
+  
+  MFLocationComponent *location = [NParamConvert MFLocationComponent:json[@"location"]];
+  NSUInteger radius = json[@"radius"] != nil ? [RCTConvert NSUInteger:json[@"radius"]] : 0;
+  MFViewboxComponent *viewbox = [NParamConvert MFViewboxComponent:json[@"viewbox"]];
+  NSArray<MFLocationComponent *> *path = [NParamConvert 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 ([NParamConvert isMFRouteType:types[i]]) {
+            [result avoidRouteType:[NParamConvert MFRouteType:types[i]]];
+          }
+        }
+      }
+      else {
+        result = [[MFRouteRestriction alloc] initWithRouteType:[NParamConvert MFRouteType:types[0]]];
+        for (NSUInteger i = 1; i < types.count; i++) {
+          if ([NParamConvert isMFRouteType:types[i]]) {
+            [result avoidRouteType:[NParamConvert 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 - NParamConvert (Private)
+
+
+@implementation NParamConvert (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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ipostmap-navigation",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "iPostMap Navigation SDK for React Native",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",