react-native-map4d-services 1.0.2 → 1.2.0

package/ios/Map4dServices.h

@@ -1,5 +1,5 @@
-#import <React/RCTBridgeModule.h>
-
-@interface Map4dServices : NSObject <RCTBridgeModule>
-
-@end
+#import <React/RCTBridgeModule.h>
+
+@interface Map4dServices : NSObject <RCTBridgeModule>
+
+@end

package/ios/Map4dServices.m

@@ -1,81 +1,67 @@
-#import "Map4dServices.h"
-#import "SRequest.h"
-#import "SClient.h"
-
-@implementation Map4dServices
-
-RCT_EXPORT_MODULE()
-
-// https://reactnative.dev/docs/native-modules-ios
-
-/* Place | Suggestions */
-RCT_EXPORT_METHOD(fetchSuggestion:(id)params
-                  withResolver:(RCTPromiseResolveBlock)resolve
-                  withRejecter:(RCTPromiseRejectBlock)reject) {
-  [SClient fireRequest:[SRequest buildSuggestionsRequestWithData:params] resolve:resolve reject:reject];
-}
-
-/* Place | Detail */
-RCT_EXPORT_METHOD(fetchPlaceDetail:(NSString *)placeId
-                  withResolver:(RCTPromiseResolveBlock)resolve
-                  withRejecter:(RCTPromiseRejectBlock)reject) {
-  [SClient fireRequest:[SRequest buildPlaceDetailRequestWithId:placeId] resolve:resolve reject:reject];
-}
-
-/* Place | Text search */
-RCT_EXPORT_METHOD(fetchTextSearch:(id)params
-                  withResolver:(RCTPromiseResolveBlock)resolve
-                  withRejecter:(RCTPromiseRejectBlock)reject) {
-  [SClient fireRequest:[SRequest buildTextSearchRequestWithData:params] resolve:resolve reject:reject];
-}
-
-/* Place | Nearby search */
-RCT_EXPORT_METHOD(fetchNearbySearch:(id)params
-                  withResolver:(RCTPromiseResolveBlock)resolve
-                  withRejecter:(RCTPromiseRejectBlock)reject) {
-  [SClient fireRequest:[SRequest buildNearbySearchRequestWithData:params] resolve:resolve reject:reject];
-}
-
-/* Place | Viewbox search */
-RCT_EXPORT_METHOD(fetchViewboxSearch:(id)params
-                  withResolver:(RCTPromiseResolveBlock)resolve
-                  withRejecter:(RCTPromiseRejectBlock)reject) {
-  [SClient fireRequest:[SRequest buildViewboxSearchRequestWithData:params] resolve:resolve reject:reject];
-}
-
-/* Place | Geocode */
-RCT_EXPORT_METHOD(fetchGeocode:(id)params
-                  withResolver:(RCTPromiseResolveBlock)resolve
-                  withRejecter:(RCTPromiseRejectBlock)reject) {
-  [SClient fireRequest:[SRequest buildGeocodingRequestWithData:params] resolve:resolve reject:reject];
-}
-
-/* Route | Directions */
-RCT_EXPORT_METHOD(fetchDirections:(id)params
-                  withResolver:(RCTPromiseResolveBlock)resolve
-                  withRejecter:(RCTPromiseRejectBlock)reject) {
-  [SClient fireRequest:[SRequest buildDirectionsRequestWithData:params] resolve:resolve reject:reject];
-}
-
-/* Route | ETA */
-RCT_EXPORT_METHOD(fetchRouteETA:(id)params
-                  withResolver:(RCTPromiseResolveBlock)resolve
-                  withRejecter:(RCTPromiseRejectBlock)reject) {
-  [SClient fireRequest:[SRequest buildRouteETARequestWithData:params] resolve:resolve reject:reject];
-}
-
-/* Route | Distance matrix */
-RCT_EXPORT_METHOD(fetchDistanceMatrix:(id)params
-                  withResolver:(RCTPromiseResolveBlock)resolve
-                  withRejecter:(RCTPromiseRejectBlock)reject) {
-  [SClient fireRequest:[SRequest buildDistanceMatrixRequestWithData:params] resolve:resolve reject:reject];
-}
-
-/* Route | Graph route */
-RCT_EXPORT_METHOD(fetchGraphRoute:(id)params
-                  withResolver:(RCTPromiseResolveBlock)resolve
-                  withRejecter:(RCTPromiseRejectBlock)reject) {
-  [SClient fireRequest:[SRequest buildGraphRouteRequestWithData:params] resolve:resolve reject:reject];
-}
-
-@end
+#import "Map4dServices.h"
+#import "SRequest.h"
+#import "SClient.h"
+
+@implementation Map4dServices
+
+RCT_EXPORT_MODULE()
+
+// https://reactnative.dev/docs/native-modules-ios
+
+/* Place | Suggestions */
+RCT_EXPORT_METHOD(fetchSuggestion:(id)params
+                  withResolver:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject) {
+  [SClient fireRequest:[SRequest buildSuggestionsRequestWithData:params] resolve:resolve reject:reject];
+}
+
+/* Place | Detail */
+RCT_EXPORT_METHOD(fetchPlaceDetail:(NSString *)placeId
+                  withResolver:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject) {
+  [SClient fireRequest:[SRequest buildPlaceDetailRequestWithId:placeId] resolve:resolve reject:reject];
+}
+
+/* Place | Text search */
+RCT_EXPORT_METHOD(fetchTextSearch:(id)params
+                  withResolver:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject) {
+  [SClient fireRequest:[SRequest buildTextSearchRequestWithData:params] resolve:resolve reject:reject];
+}
+
+/* Place | Nearby search */
+RCT_EXPORT_METHOD(fetchNearbySearch:(id)params
+                  withResolver:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject) {
+  [SClient fireRequest:[SRequest buildNearbySearchRequestWithData:params] resolve:resolve reject:reject];
+}
+
+/* Place | Viewbox search */
+RCT_EXPORT_METHOD(fetchViewboxSearch:(id)params
+                  withResolver:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject) {
+  [SClient fireRequest:[SRequest buildViewboxSearchRequestWithData:params] resolve:resolve reject:reject];
+}
+
+/* Place | Geocode */
+RCT_EXPORT_METHOD(fetchGeocode:(id)params
+                  withResolver:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject) {
+  [SClient fireRequest:[SRequest buildGeocodingRequestWithData:params] resolve:resolve reject:reject];
+}
+
+/* Route | Directions */
+RCT_EXPORT_METHOD(fetchDirections:(id)params
+                  withResolver:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject) {
+  [SClient fireRequest:[SRequest buildDirectionsRequestWithData:params] resolve:resolve reject:reject];
+}
+
+/* Route | Distance matrix */
+RCT_EXPORT_METHOD(fetchDistanceMatrix:(id)params
+                  withResolver:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject) {
+  [SClient fireRequest:[SRequest buildDistanceMatrixRequestWithData:params] resolve:resolve reject:reject];
+}
+
+@end

package/ios/Map4dServices.xcodeproj/project.pbxproj

@@ -171,7 +171,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -214,7 +214,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;

package/ios/SClient.h

@@ -1,23 +1,23 @@
-//
-//  SClient.h
-//  react-native-map4d-services
-//
-//  Created by Huy Dang on 26/01/2022.
-//
-
-#ifndef SClient_h
-#define SClient_h
-
-#import <React/RCTBridgeModule.h>
-#import <Map4dServices/Map4dServices.h>
-
-@interface SClient : NSObject
-
-+ (void)fireRequest:(MFServiceRequest *)request
-            resolve:(RCTPromiseResolveBlock)resolve
-             reject:(RCTPromiseRejectBlock)reject;
-
-@end
-
-
-#endif /* SClient_h */
+//
+//  SClient.h
+//  react-native-map4d-services
+//
+//  Created by Huy Dang on 26/01/2022.
+//
+
+#ifndef SClient_h
+#define SClient_h
+
+#import <React/RCTBridgeModule.h>
+#import <Map4dServices/Map4dServices.h>
+
+@interface SClient : NSObject
+
++ (void)fireRequest:(MFServiceRequest *)request
+            resolve:(RCTPromiseResolveBlock)resolve
+             reject:(RCTPromiseRejectBlock)reject;
+
+@end
+
+
+#endif /* SClient_h */

package/ios/SClient.m

@@ -1,47 +1,47 @@
-//
-//  SClient.m
-//  react-native-map4d-services
-//
-//  Created by Huy Dang on 26/01/2022.
-//
-
-#import "SClient.h"
-
-@implementation SClient
-
-static MFServices *_services = nil;
-
-+ (MFServices *)services {
-  if (_services == nil) {
-    _services = [[MFServices alloc] init];
-  }
-  return _services;
-}
-
-+ (void)fireRequest:(MFServiceRequest *)request
-            resolve:(RCTPromiseResolveBlock)resolve
-             reject:(RCTPromiseRejectBlock)reject {
-  [SClient.services dataTaskWithRequest:request
-                      completionHandler:^(NSData * _Nullable data, id<MFServiceError>  _Nullable error) {
-    if (error != nil) {
-      resolve(@{
-        @"code": error.code,
-        @"message": error.message
-      });
-    }
-
-    NSError *parseError = nil;
-    NSDictionary *dictionary = [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:&parseError];
-
-    if (parseError != nil) {
-      resolve(@{
-        @"code": [NSString stringWithFormat:@"%ld", parseError.code],
-        @"message": parseError.localizedDescription
-      });
-    }
-
-    resolve(dictionary);
-  }];
-}
-
-@end
+//
+//  SClient.m
+//  react-native-map4d-services
+//
+//  Created by Huy Dang on 26/01/2022.
+//
+
+#import "SClient.h"
+
+@implementation SClient
+
+static MFServices *_services = nil;
+
++ (MFServices *)services {
+  if (_services == nil) {
+    _services = [[MFServices alloc] init];
+  }
+  return _services;
+}
+
++ (void)fireRequest:(MFServiceRequest *)request
+            resolve:(RCTPromiseResolveBlock)resolve
+             reject:(RCTPromiseRejectBlock)reject {
+  [SClient.services dataTaskWithRequest:request
+                      completionHandler:^(NSData * _Nullable data, id<MFServiceError>  _Nullable error) {
+    if (error != nil) {
+      resolve(@{
+        @"code": error.code,
+        @"message": error.message
+      });
+    }
+
+    NSError *parseError = nil;
+    NSDictionary *dictionary = [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:&parseError];
+
+    if (parseError != nil) {
+      resolve(@{
+        @"code": [NSString stringWithFormat:@"%ld", parseError.code],
+        @"message": parseError.localizedDescription
+      });
+    }
+
+    resolve(dictionary);
+  }];
+}
+
+@end

package/ios/SParamConvert.h

@@ -1,44 +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 */
+//
+//  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 */