Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r929 -r992
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 929)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 992)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Geotechnics;
@@ -48,14 +49,15 @@
             ValidateDamProjectData(damProjectData);
 
             Input input = new Input();
-            input.ProjectWorkingPath = damProjectData.ProjectWorkingPath;
+            input.ProjectPath = damProjectData.ProjectPath;
+            input.CalculationMap = damProjectData.CalculationMap;
 
             TransferAnalysisSpecification(damProjectData, input);
             TransferStabilityParameters(damProjectData, input);
 
             Dike dike = damProjectData.Dike;
             input.Locations = new Io.XmlInput.Location[dike.Locations.Count];
-            TransferLocations(dike.Locations, input.Locations);
+            TransferLocations(damProjectData.ProjectPath, dike.Locations, input.Locations);
             input.SurfaceLines = new SurfaceLine[dike.SurfaceLines2.Count];
             TransferSurfaceLines(dike.SurfaceLines2, input.SurfaceLines);
             input.Soils = new Soil[dike.SoilList.Soils.Count];
@@ -276,7 +278,7 @@
             }
         }
 
-        private static void TransferLocations(IList<Location> dikeLocations, Io.XmlInput.Location[] inputLocations)
+        private static void TransferLocations(string projectPath, IList<Location> dikeLocations, Io.XmlInput.Location[] inputLocations)
         {
             int locationCount = dikeLocations.Count;
             for (int i = 0; i < locationCount; i++)
@@ -399,9 +401,20 @@
                 inputLocation.DikeEmbankmentMaterial = location.DikeEmbankmentMaterial;
                 if (location.StabilityOptions != null)
                 {
+                    var tmpPath = projectPath ?? Directory.GetCurrentDirectory();
+                    var tmpMap = location.StabilityOptions.SoilGeometries2DPath;
+                    if (tmpMap.StartsWith(tmpPath))
+                    {
+                        tmpMap = tmpMap.Remove(0, tmpPath.Length);
+                    }
+                    if (tmpMap.StartsWith(Path.DirectorySeparatorChar.ToString()))
+                    {
+                        tmpMap = tmpMap.Remove(0, 1);
+                    }
+
                     inputLocation.StabilityOptions = new LocationStabilityOptions
                     {
-                        MapForSoilgeometries2D = location.StabilityOptions.MapForSoilGeometries2D,
+                        MapForSoilgeometries2D = tmpMap,
                         SoilDatabaseName = location.StabilityOptions.SoilDatabaseName,
                         ZoneType = ConversionHelper.ConvertToInputZoneType(location.StabilityOptions.StabilityZoneType),
                         ForbiddenZoneFactorSpecified = location.StabilityOptions.ForbiddenZoneFactor.HasValue