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

changes for engineMode 2

Browse source
This commit is contained in:
afischerdev 2023-11-21 13:26:05 +01:00
parent fcbaf598aa
commit 8a7fa9fa81
3 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -365,6 +365,10 @@ public class RoutingEngine extends Thread {
fw.write(outputMessage); fw.write(outputMessage);
fw.close(); fw.close();
outputMessage = null; outputMessage = null;
} else {
if (!quite && outputMessage != null) {
System.out.println(outputMessage);
}
} }
long endTime = System.currentTimeMillis(); long endTime = System.currentTimeMillis();
logInfo("execution time = " + (endTime - startTime) / 1000. + " seconds"); logInfo("execution time = " + (endTime - startTime) / 1000. + " seconds");

6
brouter-server/src/main/java/btools/server/BRouter.java
View file

@ -30,6 +30,10 @@ public class BRouter {
List<OsmNodeNamed> wplist = routingParamCollector.getWayPointList(lonlats); List<OsmNodeNamed> wplist = routingParamCollector.getWayPointList(lonlats);
Map<String, String> params = routingParamCollector.getUrlParams(queryString); Map<String, String> params = routingParamCollector.getUrlParams(queryString);
int engineMode = 0;
if (params.containsKey("engineMode")) {
engineMode = Integer.parseInt(params.get("engineMode"));
}
routingParamCollector.setParams(rc, wplist, params); routingParamCollector.setParams(rc, wplist, params);
String exportName = null; String exportName = null;
@ -47,7 +51,7 @@ public class BRouter {
maxRunningTime = Integer.parseInt(sMaxRunningTime) * 1000; maxRunningTime = Integer.parseInt(sMaxRunningTime) * 1000;
} }
RoutingEngine re = new RoutingEngine(exportName, null, new File(args[0]), wplist, rc); RoutingEngine re = new RoutingEngine(exportName, null, new File(args[0]), wplist, rc, engineMode);
re.doRun(maxRunningTime); re.doRun(maxRunningTime);
if (re.getErrorMessage() != null) { if (re.getErrorMessage() != null) {
System.out.println(re.getErrorMessage()); System.out.println(re.getErrorMessage());

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

@ -211,18 +211,29 @@ public class RouteServer extends Thread implements Comparable<RouteServer> {
} else { } else {
OsmTrack track = cr.getFoundTrack(); OsmTrack track = cr.getFoundTrack();
if (engineMode == 2) {
// no zip for this engineMode
encodings = null;
}
String headers = encodings == null || encodings.indexOf("gzip") < 0 ? null : "Content-Encoding: gzip\n"; String headers = encodings == null || encodings.indexOf("gzip") < 0 ? null : "Content-Encoding: gzip\n";
writeHttpHeader(bw, handler.getMimeType(), handler.getFileName(), headers, HTTP_STATUS_OK); writeHttpHeader(bw, handler.getMimeType(), handler.getFileName(), headers, HTTP_STATUS_OK);
if (track != null) { if (engineMode == 0) {
if (headers != null) { // compressed if (track != null) {
ByteArrayOutputStream baos = new ByteArrayOutputStream(); if (headers != null) { // compressed
Writer w = new OutputStreamWriter(new GZIPOutputStream(baos), "UTF-8"); ByteArrayOutputStream baos = new ByteArrayOutputStream();
w.write(handler.formatTrack(track)); Writer w = new OutputStreamWriter(new GZIPOutputStream(baos), "UTF-8");
w.close(); w.write(handler.formatTrack(track));
bw.flush(); w.close();
clientSocket.getOutputStream().write(baos.toByteArray()); bw.flush();
} else { clientSocket.getOutputStream().write(baos.toByteArray());
bw.write(handler.formatTrack(track)); } else {
bw.write(handler.formatTrack(track));
}
}
} else if (engineMode == 2) {
String s = cr.getFoundInfo();
if (s != null) {
bw.write(s);
} }
} }
} }