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

fix: custom profile dir relative to profile dir

Browse source
This commit is contained in:
Norbert Renner 2014-05-22 13:09:35 +02:00
parent 3df98310fb
commit 8327fd4e24
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -130,7 +130,8 @@ public class RouteServer extends Thread
ServiceContext serviceContext = new ServiceContext(); ServiceContext serviceContext = new ServiceContext();
serviceContext.segmentDir = args[0]; serviceContext.segmentDir = args[0];
System.setProperty( "profileBaseDir", args[1] ); serviceContext.profileDir = args[1];
System.setProperty( "profileBaseDir", serviceContext.profileDir );
serviceContext.customProfileDir = args[2]; serviceContext.customProfileDir = args[2];
int maxthreads = Integer.parseInt( args[4] ); int maxthreads = Integer.parseInt( args[4] );

1
brouter-server/src/main/java/btools/server/ServiceContext.java
View file

@ -11,6 +11,7 @@ import btools.router.OsmNodeNamed;
public class ServiceContext public class ServiceContext
{ {
public String segmentDir; public String segmentDir;
public String profileDir;
public String customProfileDir; public String customProfileDir;
public Map<String,String> profileMap = null; public Map<String,String> profileMap = null;
public List<OsmNodeNamed> nogoList; public List<OsmNodeNamed> nogoList;

3
brouter-server/src/main/java/btools/server/request/ProfileUploadHandler.java
View file

@ -53,7 +53,8 @@ public class ProfileUploadHandler
private File getOrCreateCustomProfileDir() private File getOrCreateCustomProfileDir()
{ {
File customProfileDir = new File(serviceContext.customProfileDir); // workaround: customProfileDir relative to profileDir, because RoutingEngine doesn't know custom profiles
File customProfileDir = new File(serviceContext.profileDir, serviceContext.customProfileDir);
if (!customProfileDir.exists()) if (!customProfileDir.exists())
{ {
customProfileDir.mkdir(); customProfileDir.mkdir();