fix: routing ensure we use the correct profile

Author: farfromrefug

src/routing/index.android.ts

@@ -70,12 +70,15 @@ export const RoutingAction = {
     },
 };
 abstract class RoutingService<T extends com.akylas.carto.additions.AKRoutingService, U extends RoutingServiceOptions> extends BaseRoutingService<T, U> {
+    @nativeProperty profile: string;
     // createNative(options: RoutingServiceOptions) {
     //     return new com.carto.geocoding.RoutingService();
     // }
     public calculateRoute(options: RoutingRequest, callback: (err: any, res: RoutingResult) => void) {
         return new Promise((resolve, reject) => {
             const nRequest = new com.carto.routing.RoutingRequest(options.projection.getNative(), mapPosVectorFromArgs(options.points));
+            // ensure the profile is set
+            this.getNative().setProfile(this.profile);
             if (options.customOptions) {
                 Object.keys(options.customOptions).forEach((k) => {
                     nRequest.setCustomParameter(k, JSVariantToNative(options.customOptions[k]));
@@ -129,13 +132,14 @@ class OSRMOfflineRoutingService extends RoutingService<com.akylas.carto.addition
 }
 
 class ValhallaOfflineRoutingService extends RoutingService<com.akylas.carto.additions.AKValhallaOfflineRoutingService, ValhallaOfflineRoutingServiceOptions> {
-    @nativeProperty profile: string;
     createNative(options: ValhallaOfflineRoutingServiceOptions) {
         return new com.akylas.carto.additions.AKValhallaOfflineRoutingService(options.path);
     }
     public matchRoute(options: RouteMatchingRequest, callback: (err: any, res: RouteMatchingResult) => void) {
         return new Promise((resolve, reject) => {
             const nRequest = new com.carto.routing.RouteMatchingRequest(options.projection.getNative(), mapPosVectorFromArgs(options.points), options.accuracy);
+            // ensure the profile is set
+            this.getNative().setProfile(this.profile);
             this.getNative().matchRouteCallback(
                 nRequest,
                 new com.akylas.carto.additions.RoutingServiceRouteMatchingCallback({

src/routing/index.d.ts

@@ -70,7 +70,7 @@ export interface PackageManagerRoutingServiceOptions extends RoutingServiceOptio
 }
 export class PackageManagerRoutingService extends RoutingService<any, PackageManagerRoutingServiceOptions> {}
 
-export type ValhallaProfile = 'car' | 'auto' | 'auto_shorter' | 'bus' | 'bicycle' | 'pedestrian' | 'truck';
+export type ValhallaProfile = 'car' | 'auto' | 'bus' | 'bicycle' | 'pedestrian' | 'truck';
 
 export interface ValhallaOfflineRoutingServiceOptions extends RoutingServiceOptions {
     path: string;

src/routing/index.ios.ts

@@ -1,4 +1,4 @@
-import { mapPosVectorFromArgs } from '..';
+import { mapPosVectorFromArgs, nativeProperty } from '..';
 import { NativeVector } from '../core';
 import {
     CartoOnlineRoutingServiceOptions,
@@ -36,6 +36,7 @@ export enum RoutingAction {
     WAIT = NTRoutingAction.T_ROUTING_ACTION_WAIT,
 }
 abstract class RoutingService<T extends NTRoutingService, U extends RoutingServiceOptions> extends BaseRoutingService<T, U> {
+    @nativeProperty profile: string;
     public calculateRoute(options: RoutingRequest, callback: (err: Error, res: RoutingResult) => void) {
         return new Promise((resolve, reject) => {
             const nRequest = NTRoutingRequest.alloc().initWithProjectionPoints(options.projection.getNative(), mapPosVectorFromArgs(options.points));
@@ -44,6 +45,9 @@ abstract class RoutingService<T extends NTRoutingService, U extends RoutingServi
                     nRequest.setCustomParameterValue(k, JSVariantToNative(options.customOptions[k]));
                 });
             }
+
+            // ensure the profile is set
+            this.getNative().setProfile(this.profile);
             const nRes = this.getNative().calculateRoute(nRequest);
             const result = nRes ? new RoutingResult(nRes) : null;
             resolve(result);
@@ -110,7 +114,8 @@ class PackageManagerValhallaRoutingService extends RoutingService<NTPackageManag
     public matchRoute(options: RouteMatchingRequest, callback: (err: Error, res: RouteMatchingResult) => void) {
         return new Promise((resolve, reject) => {
             const nRequest = NTRouteMatchingRequest.alloc().initWithProjectionPointsAccuracy(options.projection.getNative(), mapPosVectorFromArgs(options.points), options.accuracy);
-
+            // ensure the profile is set
+            this.getNative().setProfile(this.profile);
             const nRes = this.getNative().matchRoute(nRequest);
             const result = nRes ? new RouteMatchingResult(nRes) : null;
             resolve(result);