Fabio/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

re formatting entry point

Browse source
This commit is contained in:
afischerdev 2023-05-16 10:35:41 +02:00
parent f071df5dd5
commit 4e9d3d90eb
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
brouter-core/src/main/java/btools/router/RoutingEngine.java
View file

@ -81,12 +81,11 @@ public class RoutingEngine extends Thread {
public RoutingEngine(String outfileBase, String logfileBase, File segmentDir, public RoutingEngine(String outfileBase, String logfileBase, File segmentDir,
List<OsmNodeNamed> waypoints, RoutingContext rc) { List<OsmNodeNamed> waypoints, RoutingContext rc) {
this(0, outfileBase, logfileBase, segmentDir, this(outfileBase, logfileBase, segmentDir, waypoints, rc, 0);
waypoints, rc);
} }
public RoutingEngine(int engineMode, String outfileBase, String logfileBase, File segmentDir, public RoutingEngine(String outfileBase, String logfileBase, File segmentDir,
List<OsmNodeNamed> waypoints, RoutingContext rc) { List<OsmNodeNamed> waypoints, RoutingContext rc, int engineMode) {
this.segmentDir = segmentDir; this.segmentDir = segmentDir;
this.outfileBase = outfileBase; this.outfileBase = outfileBase;
this.logfileBase = logfileBase; this.logfileBase = logfileBase;

4
brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java
View file

@ -152,7 +152,7 @@ public class BRouterWorker {
} catch (Exception e) { } catch (Exception e) {
} }
RoutingEngine cr = new RoutingEngine(engineMode, null, null, segmentDir, waypoints, rc); RoutingEngine cr = new RoutingEngine(null, null, segmentDir, waypoints, rc, engineMode);
cr.quite = true; cr.quite = true;
cr.doRun(maxRunningTime); cr.doRun(maxRunningTime);
@ -248,7 +248,7 @@ public class BRouterWorker {
} }
private List<OsmNodeNamed> readLonlats(Bundle params, int mode) { private List<OsmNodeNamed> readLonlats(Bundle params, int mode) {
List<OsmNodeNamed> wplist = new ArrayList<OsmNodeNamed>(); List<OsmNodeNamed> wplist = new ArrayList<>();
String lonLats = params.getString("lonlats"); String lonLats = params.getString("lonlats");
if (lonLats == null) throw new IllegalArgumentException("lonlats parameter not set"); if (lonLats == null) throw new IllegalArgumentException("lonlats parameter not set");

2
brouter-server/src/main/java/btools/server/RouteServer.java
View file

@ -213,7 +213,7 @@ public class RouteServer extends Thread implements Comparable<RouteServer> {
} }
} }
} }
cr = new RoutingEngine(engineMode, null, null, serviceContext.segmentDir, wplist, rc); cr = new RoutingEngine(null, null, serviceContext.segmentDir, wplist, rc, engineMode);
cr.quite = true; cr.quite = true;
cr.doRun(maxRunningTime); cr.doRun(maxRunningTime);