From 8327fd4e24485e5914c06802b5892e3f957688c9 Mon Sep 17 00:00:00 2001
From: Norbert Renner <norbert.renner@gmx.de>
Date: Thu, 22 May 2014 13:09:35 +0200
Subject: [PATCH] fix: custom profile dir relative to profile dir

---
 brouter-server/src/main/java/btools/server/RouteServer.java    | 3 ++-
 brouter-server/src/main/java/btools/server/ServiceContext.java | 1 +
 .../main/java/btools/server/request/ProfileUploadHandler.java  | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/brouter-server/src/main/java/btools/server/RouteServer.java b/brouter-server/src/main/java/btools/server/RouteServer.java
index 20098ae..6760d97 100644
--- a/brouter-server/src/main/java/btools/server/RouteServer.java
+++ b/brouter-server/src/main/java/btools/server/RouteServer.java
@@ -130,7 +130,8 @@ public class RouteServer extends Thread
 
         ServiceContext serviceContext = new ServiceContext();
         serviceContext.segmentDir = args[0];
-        System.setProperty( "profileBaseDir", args[1] );
+        serviceContext.profileDir = args[1];
+        System.setProperty( "profileBaseDir", serviceContext.profileDir );
         serviceContext.customProfileDir = args[2];
 
         int maxthreads = Integer.parseInt( args[4] );
diff --git a/brouter-server/src/main/java/btools/server/ServiceContext.java b/brouter-server/src/main/java/btools/server/ServiceContext.java
index 823177f..eabd996 100644
--- a/brouter-server/src/main/java/btools/server/ServiceContext.java
+++ b/brouter-server/src/main/java/btools/server/ServiceContext.java
@@ -11,6 +11,7 @@ import btools.router.OsmNodeNamed;
 public class ServiceContext
 {
   public String segmentDir;
+  public String profileDir;
   public String customProfileDir;
   public Map<String,String> profileMap = null;
   public List<OsmNodeNamed> nogoList;
diff --git a/brouter-server/src/main/java/btools/server/request/ProfileUploadHandler.java b/brouter-server/src/main/java/btools/server/request/ProfileUploadHandler.java
index b6ecfbe..4e4def3 100644
--- a/brouter-server/src/main/java/btools/server/request/ProfileUploadHandler.java
+++ b/brouter-server/src/main/java/btools/server/request/ProfileUploadHandler.java
@@ -53,7 +53,8 @@ public class ProfileUploadHandler
 
   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())
     {
       customProfileDir.mkdir();