react-native-ipostmap-navigation 1.0.1 → 1.0.2

package/ios/Map4dNavigationReactNative.mm

@@ -2,7 +2,7 @@
 #import <Map4dServices/Map4dServices.h>
 #import <Map4dNavigation/Map4dNavigation.h>
 #import <React/RCTUtils.h>
-#import "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/{SParamConvert.h → NParamConvert.h}

@@ -1,16 +1,16 @@
 //
-//  SParamConvert.h
+//  NParamConvert.h
 //  react-native-map4d-services
 //
 //  Created by Huy Dang on 26/01/2022.
 //
 
-#ifndef SParamConvert_h
-#define SParamConvert_h
+#ifndef NParamConvert_h
+#define NParamConvert_h
 
 #import <Map4dServices/Map4dServices.h>
 
-@interface SParamConvert : NSObject
+@interface NParamConvert : NSObject
 
 + (BOOL)BOOL:(id)json fallback:(BOOL)fallback;
 
@@ -41,4 +41,4 @@
 @end
 
 
-#endif /* SParamConvert_h */
+#endif /* NParamConvert_h */

package/ios/{SParamConvert.m → NParamConvert.m}

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

package/package.json

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