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

add param collector and calls

Browse source
This commit is contained in:
afischerdev 2023-10-18 12:37:05 +02:00
parent 90cc045404
commit 3fae9246d6
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,7 @@ import btools.router.OsmTrack;
import btools.router.ProfileCache; import btools.router.ProfileCache;
import btools.router.RoutingContext; import btools.router.RoutingContext;
import btools.router.RoutingEngine; import btools.router.RoutingEngine;
import btools.router.RoutingParamCollector;
import btools.server.request.ProfileUploadHandler; import btools.server.request.ProfileUploadHandler;
import btools.server.request.RequestHandler; import btools.server.request.RequestHandler;
import btools.server.request.ServerHandler; import btools.server.request.ServerHandler;
@ -146,7 +147,9 @@ public class RouteServer extends Thread implements Comparable<RouteServer> {
} }
String url = getline.split(" ")[1]; String url = getline.split(" ")[1];
Map<String, String> params = getUrlParams(url);
RoutingParamCollector routingParamCollector = new RoutingParamCollector();
Map<String, String> params = routingParamCollector.getUrlParams(url);
long maxRunningTime = getMaxRunningTime(); long maxRunningTime = getMaxRunningTime();
@ -186,12 +189,17 @@ public class RouteServer extends Thread implements Comparable<RouteServer> {
return; return;
} }
RoutingContext rc = handler.readRoutingContext(); RoutingContext rc = handler.readRoutingContext();
List<OsmNodeNamed> wplist = handler.readWayPointList(); List<OsmNodeNamed> wplist = routingParamCollector.getWayPointList(params.get("lonlats"));
if (wplist.size() < 10) { if (wplist.size() < 10) {
SuspectManager.nearRecentWps.add(wplist); SuspectManager.nearRecentWps.add(wplist);
} }
int engineMode = 0; int engineMode = 0;
if (params.containsKey("engineMode")) {
engineMode = Integer.parseInt(params.get("engineMode"));
}
routingParamCollector.setParams(rc, wplist, params);
for (Map.Entry<String, String> e : params.entrySet()) { for (Map.Entry<String, String> e : params.entrySet()) {
if ("engineMode".equals(e.getKey())) { if ("engineMode".equals(e.getKey())) {
engineMode = Integer.parseInt(e.getValue()); engineMode = Integer.parseInt(e.getValue());