From a07fd6a4005ea1be0daf904bdf584e038b98e160 Mon Sep 17 00:00:00 2001 From: afischerdev Date: Wed, 12 Mar 2025 18:55:55 +0100 Subject: [PATCH] fix 'dummy' parameter --- .../src/main/java/btools/router/RoutingEngine.java | 8 ++++++-- .../src/main/java/btools/routingapp/BRouterService.java | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/brouter-core/src/main/java/btools/router/RoutingEngine.java b/brouter-core/src/main/java/btools/router/RoutingEngine.java index 1996488..dac558d 100644 --- a/brouter-core/src/main/java/btools/router/RoutingEngine.java +++ b/brouter-core/src/main/java/btools/router/RoutingEngine.java @@ -606,7 +606,9 @@ public class RoutingEngine extends Thread { RoutingEngine re = null; RoutingContext rc = new RoutingContext(); - rc.localFunction = "dummy"; + String name = routingContext.localFunction; + int idx = name.lastIndexOf(File.separator); + rc.localFunction = idx == -1 ? "dummy" : name.substring(0, idx+1) + "dummy.brf"; re = new RoutingEngine(null, null, segmentDir, wpliststart, rc, BROUTER_ENGINEMODE_ROUNDTRIP); rc.useDynamicDistance = true; @@ -746,7 +748,9 @@ public class RoutingEngine extends Thread { RoutingEngine re = null; RoutingContext rc = new RoutingContext(); - rc.localFunction = "dummy"; + String name = routingContext.localFunction; + int idx = name.lastIndexOf(File.separator); + rc.localFunction = idx == -1 ? "dummy" : name.substring(0, idx+1) + "dummy.brf"; re = new RoutingEngine(null, null, segmentDir, wpliststart, rc, BROUTER_ENGINEMODE_ROUNDTRIP); rc.useDynamicDistance = true; diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterService.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterService.java index a1e8963..9dbdade 100644 --- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterService.java +++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterService.java @@ -64,7 +64,8 @@ public class BRouterService extends Service { worker.segmentDir = new File(baseDir, "brouter/segments4"); String errMsg = null; - if (engineMode == RoutingEngine.BROUTER_ENGINEMODE_ROUTING) { + if (engineMode == RoutingEngine.BROUTER_ENGINEMODE_ROUTING || + engineMode == RoutingEngine.BROUTER_ENGINEMODE_ROUNDTRIP) { String remoteProfile = params.getString("remoteProfile", null); if (remoteProfile == null) {