fix 'dummy' parameter
This commit is contained in:
parent
6a8863510d
commit
a07fd6a400
@ -606,7 +606,9 @@ public class RoutingEngine extends Thread {
|
|||||||
|
|
||||||
RoutingEngine re = null;
|
RoutingEngine re = null;
|
||||||
RoutingContext rc = new RoutingContext();
|
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);
|
re = new RoutingEngine(null, null, segmentDir, wpliststart, rc, BROUTER_ENGINEMODE_ROUNDTRIP);
|
||||||
rc.useDynamicDistance = true;
|
rc.useDynamicDistance = true;
|
||||||
@ -746,7 +748,9 @@ public class RoutingEngine extends Thread {
|
|||||||
|
|
||||||
RoutingEngine re = null;
|
RoutingEngine re = null;
|
||||||
RoutingContext rc = new RoutingContext();
|
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);
|
re = new RoutingEngine(null, null, segmentDir, wpliststart, rc, BROUTER_ENGINEMODE_ROUNDTRIP);
|
||||||
rc.useDynamicDistance = true;
|
rc.useDynamicDistance = true;
|
||||||
|
|||||||
@ -64,7 +64,8 @@ public class BRouterService extends Service {
|
|||||||
worker.segmentDir = new File(baseDir, "brouter/segments4");
|
worker.segmentDir = new File(baseDir, "brouter/segments4");
|
||||||
String errMsg = null;
|
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);
|
String remoteProfile = params.getString("remoteProfile", null);
|
||||||
|
|
||||||
if (remoteProfile == null) {
|
if (remoteProfile == null) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user