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

Merge pull request #635 from afischerdev/update-cmdline2

Browse source 
Update cmd line BRouter
This commit is contained in:
afischerdev 2023-10-20 12:57:58 +02:00 committed by GitHub
commit 109782d362
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 52 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,7 @@
package btools.server; package btools.server;
import java.io.BufferedOutputStream;
import java.io.DataOutputStream;
import java.io.File; import java.io.File;
import java.io.FileOutputStream;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -14,11 +10,10 @@ import btools.router.OsmTrack;
import btools.router.RoutingContext; import btools.router.RoutingContext;
import btools.router.RoutingEngine; import btools.router.RoutingEngine;
import btools.router.RoutingParamCollector; import btools.router.RoutingParamCollector;
import btools.router.SearchBoundary;
public class BRouter { public class BRouter {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
if (args.length == 3) { // cgi-input-mode if (args.length == 3 || args.length == 4) { // cgi-input-mode
try { try {
System.setProperty("segmentBaseDir", args[0]); System.setProperty("segmentBaseDir", args[0]);
System.setProperty("profileBaseDir", args[1]); System.setProperty("profileBaseDir", args[1]);
@ -28,7 +23,7 @@ public class BRouter {
int lonIdx = queryString.indexOf("lonlats="); int lonIdx = queryString.indexOf("lonlats=");
int sepIdx = queryString.indexOf("&", lonIdx); int sepIdx = queryString.indexOf("&", lonIdx);
String lonlats = queryString.substring(lonIdx+8, sepIdx); String lonlats = queryString.substring(lonIdx + 8, sepIdx);
RoutingContext rc = new RoutingContext(); RoutingContext rc = new RoutingContext();
RoutingParamCollector routingParamCollector = new RoutingParamCollector(); RoutingParamCollector routingParamCollector = new RoutingParamCollector();
@ -37,10 +32,14 @@ public class BRouter {
Map<String, String> params = routingParamCollector.getUrlParams(queryString); Map<String, String> params = routingParamCollector.getUrlParams(queryString);
routingParamCollector.setParams(rc, wplist, params); routingParamCollector.setParams(rc, wplist, params);
// cgi-header String exportName = null;
System.out.println("Content-type: text/plain"); if (args.length == 4) {
System.out.println(); exportName = args[3];
} else {
// cgi-header
System.out.println("Content-type: text/plain");
System.out.println();
}
long maxRunningTime = 60000; // the cgi gets a 1 Minute timeout long maxRunningTime = 60000; // the cgi gets a 1 Minute timeout
String sMaxRunningTime = System.getProperty("maxRunningTime"); String sMaxRunningTime = System.getProperty("maxRunningTime");
@ -48,9 +47,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(null, null, new File(args[0]), wplist, rc);
re.doRun(maxRunningTime); re.doRun(maxRunningTime);
if (re.getErrorMessage() != null) { if (re.getErrorMessage() != null) {
System.out.println(re.getErrorMessage()); System.out.println(re.getErrorMessage());
@ -65,96 +62,53 @@ public class BRouter {
System.out.println("Find routes in an OSM map"); System.out.println("Find routes in an OSM map");
System.out.println("usage: java -jar brouter.jar <segmentdir> <profiledir> <engineMode> <profile> <lonlats-list> [parameter-list] [profile-parameter-list] "); System.out.println("usage: java -jar brouter.jar <segmentdir> <profiledir> <engineMode> <profile> <lonlats-list> [parameter-list] [profile-parameter-list] ");
System.out.println(" or: java -cp %CLASSPATH% btools.server.BRouter <segmentdir>> <profiledir> <engineMode> <profile> <lonlats-list> [parameter-list] [profile-parameter-list]"); System.out.println(" or: java -cp %CLASSPATH% btools.server.BRouter <segmentdir>> <profiledir> <engineMode> <profile> <lonlats-list> [parameter-list] [profile-parameter-list]");
System.out.println(" or: java -jar brouter.jar <segmentdir> <profiledir> <parameter-list> "); System.out.println(" or: java -jar brouter.jar <segmentdir> <profiledir> <parameter-list> [output-filename]");
System.exit(0); System.exit(0);
} }
RoutingEngine re = null;
if ("seed".equals(args[3])) {
List<OsmNodeNamed> wplist = new ArrayList<>();
wplist.add(readPosition(args, 1, "from"));
int searchRadius = Integer.parseInt(args[4]); // if = 0 search a 5x5 square
String filename = SearchBoundary.getFileName(wplist.get(0)); int engineMode = 0;
DataOutputStream dos = new DataOutputStream(new BufferedOutputStream(new FileOutputStream("traffic/" + filename))); try {
engineMode = Integer.parseInt(args[2]);
for (int direction = 0; direction < 8; direction++) { } catch (NumberFormatException e) {
RoutingContext rc = readRoutingContext(args);
SearchBoundary boundary = new SearchBoundary(wplist.get(0), searchRadius, direction / 2);
rc.trafficOutputStream = dos;
rc.inverseDirection = (direction & 1) != 0;
re = new RoutingEngine("mytrack", "mylog", new File(args[0]), wplist, rc);
re.boundary = boundary;
re.airDistanceCostFactor = rc.trafficDirectionFactor;
rc.countTraffic = true;
re.doSearch();
if (re.getErrorMessage() != null) {
break;
}
}
dos.close();
} else {
int engineMode = 0;
try {
engineMode = Integer.parseInt(args[2]);
} catch (NumberFormatException e) {
}
RoutingParamCollector routingParamCollector = new RoutingParamCollector();
List<OsmNodeNamed> wplist = routingParamCollector.getWayPointList(args[4]);
System.setProperty("segmentBaseDir", args[0]);
System.setProperty("profileBaseDir", args[1]);
String moreParams = null;
String profileParams = null;
if (args.length >= 6) {
moreParams = args[5];
}
if (args.length == 7) {
profileParams = args[6];
}
RoutingContext rc = new RoutingContext();
rc.localFunction = args[3];
if (moreParams != null) {
Map<String, String> params = routingParamCollector.getUrlParams(moreParams);
routingParamCollector.setParams(rc, wplist, params);
}
if (profileParams != null) {
Map<String, String> params = routingParamCollector.getUrlParams(profileParams);
routingParamCollector.setProfileParams(rc, params);
}
try {
if (engineMode==RoutingEngine.BROUTER_ENGINEMODE_GETELEV) {
re = new RoutingEngine("testinfo", null, new File(args[0]), wplist, rc, engineMode);
} else {
re = new RoutingEngine("testtrack", null, new File(args[0]), wplist, rc, engineMode);
}
re.doRun(0);
} catch (Exception e) {
System.out.println(e.getMessage());
}
} }
}
RoutingParamCollector routingParamCollector = new RoutingParamCollector();
List<OsmNodeNamed> wplist = routingParamCollector.getWayPointList(args[4]);
private static OsmNodeNamed readPosition(String[] args, int idx, String name) { System.setProperty("segmentBaseDir", args[0]);
OsmNodeNamed n = new OsmNodeNamed(); System.setProperty("profileBaseDir", args[1]);
n.name = name; String moreParams = null;
n.ilon = (int) ((Double.parseDouble(args[idx]) + 180.) * 1000000. + 0.5); String profileParams = null;
n.ilat = (int) ((Double.parseDouble(args[idx + 1]) + 90.) * 1000000. + 0.5); if (args.length >= 6) {
return n; moreParams = args[5];
}
private static RoutingContext readRoutingContext(String[] args) {
RoutingContext c = new RoutingContext();
if (args.length > 5) {
c.localFunction = args[5];
if (args.length > 6) {
c.setAlternativeIdx(Integer.parseInt(args[6]));
}
} }
c.memoryclass = (int) (Runtime.getRuntime().maxMemory() / 1024 / 1024); if (args.length == 7) {
// c.startDirection= Integer.valueOf( 150 ); profileParams = args[6];
return c; }
RoutingContext rc = new RoutingContext();
rc.localFunction = args[3];
if (moreParams != null) {
Map<String, String> params = routingParamCollector.getUrlParams(moreParams);
routingParamCollector.setParams(rc, wplist, params);
}
if (profileParams != null) {
Map<String, String> params = routingParamCollector.getUrlParams(profileParams);
routingParamCollector.setProfileParams(rc, params);
}
try {
RoutingEngine re = null;
if (engineMode == RoutingEngine.BROUTER_ENGINEMODE_GETELEV) {
re = new RoutingEngine("testinfo", null, new File(args[0]), wplist, rc, engineMode);
} else {
re = new RoutingEngine("testtrack", null, new File(args[0]), wplist, rc, engineMode);
}
re.doRun(0);
} catch (Exception e) {
System.out.println(e.getMessage());
}
} }
} }