Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/SoilGeometry2DName.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/SoilGeometry2DName.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/SoilGeometry2DName.cs	(revision 3305)
@@ -0,0 +1,34 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Dam.Data
+{
+    public class SoilGeometry2DName
+    {
+        private string geometry2DName;
+      
+        public virtual string Geometry2DName
+        {
+            get { return geometry2DName; }
+            set { geometry2DName = value; }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvParserException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvParserException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvParserException.cs	(revision 3305)
@@ -0,0 +1,52 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Deltares.Dam.Data
+{
+
+    [Serializable]
+    public class CsvParserException : Exception
+    {
+        public CsvParserException()
+        {
+        }
+
+        public CsvParserException(string message)
+            : base(message)
+        {
+        }
+
+        public CsvParserException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+
+        protected CsvParserException(
+            SerializationInfo info,
+            StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/TimeSerieCollection.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/TimeSerieCollection.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/TimeSerieCollection.cs	(revision 3305)
@@ -0,0 +1,276 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Linq;
+using System.IO;
+using Deltares.Dam.Data.Assemblers;
+using Deltares.Standard.Extensions;
+
+namespace Deltares.Dam.Data
+{
+
+    public class TimeSerieCollection
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TimeSerieCollection"/> class.
+        /// </summary>
+        public TimeSerieCollection()
+        {
+            this.Series = new List<TimeSerie>();
+        }
+
+        /// <summary>
+        /// Gets or sets the series.
+        /// </summary>
+        /// <value>
+        /// The series.
+        /// </value>
+        public List<TimeSerie> Series { get; set; }
+
+        /// <summary>
+        /// Gets or sets the version.
+        /// </summary>
+        /// <value>
+        /// The version.
+        /// </value>
+        public string Version { get; set; }
+
+        /// <summary>
+        /// Gets or sets the time zone.
+        /// </summary>
+        /// <value>
+        /// The time zone.
+        /// </value>
+        public double TimeZone { get; set; }
+
+        /// <summary>
+        /// Loads a time serie collection from file and validates the file with the resource embedded XSD
+        /// </summary>
+        /// <param name="fileInfo">The file info object containing the file to load</param>
+        /// <returns>When valid a loaded time serie collection</returns>
+        /// <exception cref="TimeSerieSchemaValidationException"></exception>
+        public static TimeSerieCollection LoadFromFile(FileInfo fileInfo)
+        {
+            return LoadFromFile(fileInfo.FullName, true);
+        }
+
+        /// <summary>
+        /// Loads a time serie collection from file and validates the file with the resource embedded XSD
+        /// </summary>
+        /// <param name="fileName">The file to load</param>
+        /// <returns>When valid a loaded time serie collection</returns>
+        /// <exception cref="TimeSerieSchemaValidationException"></exception>
+        public static TimeSerieCollection LoadFromFile(string fileName)
+        {
+            return LoadFromFile(fileName, true);
+        }
+
+        /// <summary>
+        /// Loads a time serie collection from file. 
+        /// </summary>
+        /// <param name="fileName">The file name of the time serie</param>
+        /// <param name="validateWithEmbeddedXsd">The value indicating if the file needs to be validated</param>
+        /// <returns>The loaded time serie collection</returns>
+        public static TimeSerieCollection LoadFromFile(string fileName, bool validateWithEmbeddedXsd)
+        {
+            try
+            {
+                string message;
+                var assembler = new TimeSeriesAssembler();
+                var doc = XDocument.Load(fileName);
+                if (validateWithEmbeddedXsd)
+                    if (!assembler.ValidateSchema(doc, out message))
+                        throw new TimeSerieSchemaValidationException(message);
+                return assembler.CreateDomainObject(doc);
+            }
+            catch (Exception e)
+            {
+                throw new TimeSerieSchemaValidationException(fileName + ": " + e.Message);                
+            }                        
+        }
+
+        /// <summary>
+        /// Saves the time serie collection to a specified file using the time serie assembler
+        /// </summary>
+        /// <param name="fileName">The name of the file</param>
+        public void Save(string fileName)
+        {
+            ThrowHelper.ThrowIfFileNameNullOrEmpty(fileName, StringResourceNames.FileNameNotValid);
+
+            var timeSerieAssembler = new TimeSeriesAssembler();
+            XDocument doc = timeSerieAssembler.CreateDataTransferDocument(this);
+            doc.Save(fileName);
+            FileWriterUtil.RemoveThreeBytesFromXml(fileName); // apply this fix for FEWS!
+        }
+
+        /// <summary>
+        /// Updates the time serie entries with new values by applying the function to each value entry
+        /// </summary>
+        /// <param name="parameterId">The parameter ID of the time serie to update</param>
+        /// <param name="function">The function to apply to each entry</param>
+        public void UpdateAllEntryValues(string parameterId, Func<double, double> function)
+        {
+            foreach (var timeSerie in this.GetSeriesByParameterId(parameterId))
+            {
+                foreach (var sourceEntry in timeSerie.Entries)
+                {
+                    if (!sourceEntry.Value.AlmostEquals(timeSerie.MissVal))
+                    {
+                        sourceEntry.Value = function(sourceEntry.Value);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Creates a shallow copy of the current time serie collection and applies the map function to each of its entries
+        /// </summary>
+        public IEnumerable<TimeSerie> Map(IEnumerable<string> locations, string parameterId, IEnumerable<Func<TimeSerie, TimeSerie>> functionList)
+        {
+            return from locationId in locations 
+                   from timeSerie in this.GetSeriesByLocationId(locationId).Where(x => x.ParameterId.Equals(parameterId)) 
+                   from function in functionList 
+                   select function(timeSerie);
+        }
+
+        /// <summary>
+        /// Creates a shallow copy of the current time serie collection and applies the map function to each of its entries
+        /// </summary>
+        /// <param name="locations">The locations to look for in this collection</param>
+        /// <param name="parameterId">The parameter to look for in this collection</param>
+        /// <param name="function">The function to apply</param>
+        /// <returns>A sequence of new time series with the applied function to its entries</returns>
+        public IEnumerable<TimeSerie> Map(IEnumerable<string> locations, string parameterId, Func<TimeSerie, TimeSerie> function)
+        {
+            return Map(locations, parameterId, new List<Func<TimeSerie, TimeSerie>> { function });
+        }
+
+        /// <summary>
+        /// Creates a shallow copy of the current time serie collection and applies the map function to each of its entries
+        /// </summary>
+        public IEnumerable<TimeSerie> Map(string locationId, string parameterId, Func<TimeSerie, TimeSerie> function)
+        {
+            return Map(new List<string> { locationId }, parameterId, function);
+        }
+
+        /// <summary>
+        /// Searches for a time series matching the location and parameter id. There should be only 1 or none (null)
+        /// </summary>
+        /// <param name="parameterId">The parameter id.</param>
+        /// <param name="locationId">The location id.</param>
+        /// <returns>The time series matching the criterium</returns>
+        public TimeSerie FindSerie(string parameterId, string locationId)
+        {
+            return (from series in this.Series
+                    where series.ParameterId.Equals(parameterId, StringComparison.InvariantCultureIgnoreCase) &&
+                          series.LocationId.Equals(locationId, StringComparison.InvariantCultureIgnoreCase)
+                    select series).SingleOrDefault();
+        }
+
+        /// <summary>
+        /// Gets all the time series with the given parameter id.
+        /// </summary>
+        /// <param name="parameterId">The parameter id.</param>
+        /// <returns>The time series matching the criteria</returns>
+        public IEnumerable<TimeSerie> GetSeriesByParameterId(string parameterId)
+        {
+            return from series in this.Series
+                   where series.ParameterId.Equals(parameterId, StringComparison.InvariantCultureIgnoreCase)
+                   select series;
+        }
+
+        /// <summary>
+        /// Gets all the series with the given location id.
+        /// </summary>
+        /// <param name="locationId">The location id.</param>
+        /// <returns>The time series matching the criteria</returns>
+        public IEnumerable<TimeSerie> GetSeriesByLocationId(string locationId)
+        {
+            return from series in this.Series
+                   where series.LocationId.Equals(locationId, StringComparison.InvariantCultureIgnoreCase)
+                   select series;
+        }
+
+
+        /// <summary>
+        /// Gets the series containing location id and parameter id.
+        /// </summary>
+        /// <param name="locationId">The location id.</param>
+        /// <param name="parameterId">The parameter id.</param>
+        /// <returns>The time series matching the criteria</returns>
+        public IEnumerable<TimeSerie> GetSeriesByLocationIdAndParameterId(string locationId, string parameterId)
+        {
+            return from series in this.Series
+                   where series.LocationId.Equals(locationId, StringComparison.InvariantCultureIgnoreCase) && 
+                         series.ParameterId.Equals(parameterId, StringComparison.InvariantCultureIgnoreCase)
+                   select series;
+        }
+
+        /// <summary>
+        /// Gets all the series containing the combined gage and location id. (using the gage_id/location_id pattern)
+        /// </summary>
+        /// <param name="combinedGageAndLocationId">The combined gage and location id.</param>
+        /// <returns></returns>
+        public IEnumerable<TimeSerie> GetSeriesByGageIdAndLocationId(string combinedGageAndLocationId)
+        {
+            var resultSeries = new List<TimeSerie>();
+            foreach (var serie in this.Series)
+            {
+                string gaugeLocationId = serie.LocationId.Split('/')[0];
+                if (combinedGageAndLocationId.Equals(gaugeLocationId, StringComparison.InvariantCultureIgnoreCase))
+                {
+                    resultSeries.Add(serie);
+                }
+            }
+            return resultSeries;
+        }
+
+        public TimeSerieCollection GetShallowCopy()
+        {
+            var copy = new TimeSerieCollection
+                           {
+                               Version = Version,
+                               TimeZone = TimeZone
+                           };
+
+            copy.Series.Clear();
+            return copy;
+        }
+
+        /// <summary>
+        /// Clears the time series.
+        /// </summary>
+        public void Clear()
+        {
+            Series.Clear();
+        }
+
+        public TimeSerie AddNewSeries(string locationId)
+        {
+            var series = TimeSerie.CreateTimeSerie(locationId);
+            this.Series.Add(series);
+            return series;
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/AttributeMissingException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/AttributeMissingException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/AttributeMissingException.cs	(revision 3305)
@@ -0,0 +1,43 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Deltares.Maps
+{
+    [Serializable]
+    public class AttributeMissingException : Exception
+    {
+        private const string MessagePattern =
+            "Attribute {0} is missing or not supported. Check the mapping with the column in the ShapeFile";
+
+        public AttributeMissingException(string attributeName) : base(string.Format(MessagePattern, attributeName))
+        {
+        }
+
+        protected AttributeMissingException(
+            SerializationInfo info,
+            StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CalculationParameters.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CalculationParameters.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CalculationParameters.cs	(revision 3305)
@@ -0,0 +1,70 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.IO;
+using System.Xml.Linq;
+using Deltares.Dam.Data.Assemblers;
+
+namespace Deltares.Dam.Data
+{
+    using System;
+
+    public class CalculationModules
+    {
+        public bool StabilityInside { get; set; }
+        public bool StabilityOutside { get; set; }
+        public bool PipingWti { get; set; }
+        public bool PipingBligh { get; set; }
+        public bool PipingSellmeijer { get; set; }
+    }
+
+    public class CalculationParameters
+    {
+        public string WorkingPath { get; set; }
+        public string StabilityWorkingPath { get; set; }
+        public string PipingWorkingPath { get; set; }
+        public string StabilityExePath { get; set; }
+
+        public bool CalculateAllAtOnce
+        {
+            get { return MStabParameters == null || MStabParameters.IsCalculateAllStabilityProjectsAtOnce; }
+            set { MStabParameters.IsCalculateAllStabilityProjectsAtOnce = value; }
+        }
+
+        public static CalculationParameters LoadFromFile(FileInfo xmlFile)
+        {
+            return LoadFromFile(xmlFile.FullName);
+        }
+
+        public static CalculationParameters LoadFromFile(string xmlFileName)
+        {
+            if (string.IsNullOrWhiteSpace(xmlFileName)) throw new ArgumentException("xmlFileName");
+
+            XDocument calculationParametersFileDocument = XDocument.Load(xmlFileName);
+            var assembler = new CalculationParametersAssembler();
+            assembler.FileName = xmlFileName;
+            return assembler.CreateDomainObject(calculationParametersFileDocument);
+        }
+
+        public CalculationModules CalculationModules { get; set; }
+        public MStabParameters MStabParameters { get; set; }        
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/GreaterThanOrEqualToSpecification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/GreaterThanOrEqualToSpecification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/GreaterThanOrEqualToSpecification.cs	(revision 3305)
@@ -0,0 +1,56 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+
+namespace Deltares.Standard.Specifications
+{
+    /// <summary>
+    /// Defines a greater then of equal to specification
+    /// </summary>
+    /// <typeparam name="TCandidate">The type of the candidate.</typeparam>
+    /// <typeparam name="TValue">The type of the value.</typeparam>
+    public class GreaterThanOrEqualToSpecification<TCandidate, TValue> : ValueBoundSpecification<TCandidate, TValue> where TValue : IComparable
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GreaterThanOrEqualToSpecification&lt;TCandidate, TValue&gt;"/> class.
+        /// </summary>
+        /// <param name="attributeName">Name of the attribute.</param>
+        /// <param name="attributeValue">The attribute value.</param>
+        public GreaterThanOrEqualToSpecification(string attributeName, TValue attributeValue)
+            : base(attributeName, attributeValue)
+        {
+        }
+
+        /// <summary>
+        /// Determines whether the candidate satisfies the specification.
+        /// </summary>
+        /// <param name="candidate">The candidate to test.</param>
+        /// <returns>
+        ///   <c>true</c> if the candidate satisfies the specification otherwise, <c>false</c>.
+        /// </returns>
+        public override bool IsSatisfiedBy(TCandidate candidate)
+        {
+            var actual = this.GetCandidateTValue(candidate) as IComparable;
+            return (actual.CompareTo(this.AttributeValue) >= 0);
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamHelperFunctions.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamHelperFunctions.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamHelperFunctions.cs	(revision 3305)
@@ -0,0 +1,110 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Globalization;
+using System.IO;
+using System.Reflection;
+using System.Text.RegularExpressions;
+
+namespace Deltares.Dam.Data
+{
+    public class DamHelperFunctions
+    {
+        /// <summary>
+        /// Determine a filename based on the different inout parameters
+        /// </summary>
+        /// <param name="locationName">Name of the location.</param>
+        /// <param name="scenarioName">Name of the scenario.</param>
+        /// <param name="soilGeometryName">Name of the soil geometry.</param>
+        /// <param name="iterationIndex">Index of the iteration.</param>
+        /// <returns></returns>
+        public static string DetermineCalculationFilename(string locationName, string scenarioName,
+            string soilGeometryName, int iterationIndex)
+        {
+            string calculationName;
+            if (iterationIndex < 0)
+            {
+                calculationName = String.Format("Loc({0})_Sce({1})_Pro({2})", locationName, scenarioName,
+                    soilGeometryName);
+            }
+            else
+            {
+                calculationName = String.Format("Loc({0})_Sce({1})_Pro({2})_Ite({3})", locationName, scenarioName,
+                    soilGeometryName, iterationIndex);
+            }
+            return Regex.Replace(calculationName, @"[\\\/:\*\?""'<>|.]", "_");
+        }
+
+        /// <summary>
+        /// Convert Date to time stamp as needed by TNO AnySense.
+        /// </summary>
+        /// <param name="dateTime">The date time.</param>
+        /// <returns></returns>
+        public static string DateToTimeStamp(DateTime dateTime)
+        {
+            // Following 2 lines is an example how to handle customization of this format.
+            // TNO at the last moment decided they did not need this change so we change it back to 
+            // the default format
+            //   string customFormat = "yyyy-MM-dd_HH-mm-ss";
+            //   return dateTime.ToString(customFormat);
+            return dateTime.ToString("s", DateTimeFormatInfo.InvariantInfo);
+        }
+
+        /// <summary>
+        /// Determine name of Stability project file
+        /// </summary>
+        internal static string GetProjectFileName(string dikeName, Location location, int? jobCount, MStabModelType? model, string stabilityWorkingPath, DateTime? dateTime)
+        {
+            string calculationName = String.Format("Dik({0})_Loc({1})", dikeName, location.Name);
+            if (jobCount != null)
+            {
+                calculationName = calculationName + String.Format("_Stp({0})", jobCount);
+            }
+            if (model != null)
+            {
+                calculationName = calculationName + String.Format("_Mdl({0})", model);
+            }
+            if (dateTime != null)
+            {
+                calculationName = calculationName + "_" + DateToTimeStamp(dateTime.Value);
+            }
+            calculationName = Regex.Replace(calculationName, @"[\\\/:\*\?""'<>|.]", "_");
+            // assemble the target project file name
+            return Path.Combine(stabilityWorkingPath, calculationName + ".sti");
+        }
+
+        /// <summary>
+        /// Gets the D-GeoStability executable path.
+        /// </summary>
+        /// <value>
+        /// The m stab executable path.
+        /// </value>
+        public static string MStabExePath
+        {
+            get
+            {
+                return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),
+                    @"DGeoStability.exe");
+            }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilProfileDataSet.xss
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilProfileDataSet.xss	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilProfileDataSet.xss	(revision 3305)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--<autogenerated>
+     This code was generated by a tool to store the dataset designer's layout information.
+     Changes to this file may cause incorrect behavior and will be lost if
+     the code is regenerated.
+</autogenerated>-->
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="158" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+  <Shapes>
+    <Shape ID="DesignTable:ODGEOMETRIES" ZOrder="9" X="19" Y="172" Height="224" Width="235" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" />
+    <Shape ID="DesignTable:ODGEOLAYERS" ZOrder="8" X="280" Y="168" Height="241" Width="227" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="194" />
+    <Shape ID="DesignTable:MATERIALS" ZOrder="7" X="554" Y="208" Height="139" Width="208" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="92" />
+    <Shape ID="DesignTable:PARAMETERNAMES" ZOrder="6" X="559" Y="596" Height="105" Width="253" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="58" />
+    <Shape ID="DesignTable:PARAMETERVALUES" ZOrder="5" X="556" Y="420" Height="139" Width="256" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="92" />
+  </Shapes>
+  <Connectors>
+    <Connector ID="DesignRelation:ODGEOMETRIES_ODGEOLAYERS" ZOrder="4" LineWidth="11">
+      <RoutePoints>
+        <GeometryPoint>
+          <X>254</X>
+          <Y>283</Y>
+        </GeometryPoint>
+        <GeometryPoint>
+          <X>280</X>
+          <Y>283</Y>
+        </GeometryPoint>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:ODGEOLAYERS_MATERIALS" ZOrder="3" LineWidth="11">
+      <RoutePoints>
+        <GeometryPoint>
+          <X>554</X>
+          <Y>275</Y>
+        </GeometryPoint>
+        <GeometryPoint>
+          <X>507</X>
+          <Y>275</Y>
+        </GeometryPoint>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:PARAMETERVALUES_MATERIALS" ZOrder="2" LineWidth="11">
+      <RoutePoints>
+        <GeometryPoint>
+          <X>659</X>
+          <Y>347</Y>
+        </GeometryPoint>
+        <GeometryPoint>
+          <X>659</X>
+          <Y>420</Y>
+        </GeometryPoint>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:PARAMETERNAMES_PARAMETERVALUES" ZOrder="1" LineWidth="11">
+      <RoutePoints>
+        <GeometryPoint>
+          <X>685</X>
+          <Y>596</Y>
+        </GeometryPoint>
+        <GeometryPoint>
+          <X>685</X>
+          <Y>559</Y>
+        </GeometryPoint>
+      </RoutePoints>
+    </Connector>
+  </Connectors>
+</DiagramLayout>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Gauge.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Gauge.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Gauge.cs	(revision 3305)
@@ -0,0 +1,40 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+
+namespace Deltares.Dam.Data
+{
+
+    public class Gauge
+    {
+        public virtual string Name { get; set; }
+        public virtual Location Location{ get; set; }
+        public virtual double LocalX { get; set; }
+
+        public double? Value { get; set; }
+
+        public override string ToString()
+        {
+            return String.Format("{0} @ Location {1} | Local X={2}", this.Name, this.Location != null ? this.Location.Name : "?", this.LocalX);
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/LocationResult.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/LocationResult.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/LocationResult.cs	(revision 3305)
@@ -0,0 +1,58 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Standard.Attributes;
+using Deltares.Standard.EventPublisher;
+
+namespace Deltares.Dam.Data
+{
+    public class LocationResult
+    {
+        private TimeSerie stabilityTimeSerie = new TimeSerie();
+        private TimeSerie pipingTimeSerie = new TimeSerie();
+        
+        public LocationResult()
+        {
+        }
+
+        public virtual TimeSerie StabilityTimeSerie
+        {
+            get { return stabilityTimeSerie; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "StabilityTimeSerie");
+                stabilityTimeSerie = value;
+                DataEventPublisher.AfterChange(this, "StabilityTimeSerie");
+            }
+        }
+
+        public TimeSerie PipingTimeSerie
+        {
+            get { return pipingTimeSerie; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "PipingTimeSerie");
+                pipingTimeSerie = value;
+                DataEventPublisher.AfterChange(this, "PipingTimeSerie");
+            }
+        }        
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationPropertyImporter.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationPropertyImporter.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationPropertyImporter.cs	(revision 3305)
@@ -0,0 +1,334 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using Deltares.Dam.Data.CsvImporters;
+using Deltares.Maps;
+using Deltares.Standard;
+using NetTopologySuite.Geometries;
+using DataAttribute = Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute;
+
+namespace Deltares.Dam.Data.Importers
+{
+    public class LocationPropertyImporterException : Exception
+    {
+        public LocationPropertyImporterException(string message)
+            : base(message)
+        {
+        }
+    }
+
+    // ReSharper disable ClassWithVirtualMembersNeverInherited.Global
+    public class LocationPropertyImporter
+    // ReSharper restore ClassWithVirtualMembersNeverInherited.Global
+    {
+        private readonly IDictionary<string, ICollection<LocationAttributeMapping>> filesToImportFrom;
+        private readonly PolygonAttributeImporter<CsvImporterLocations.LocationRecord> polygonAttributeImporter;
+        private readonly LineAttributeImporter<CsvImporterLocations.LocationRecord> lineAttributeImporter;
+        private List<string> improperAttributeMessages = new List<string>();
+        private IEnumerable<CsvImporterLocations.LocationRecord> targets;
+
+        public LocationPropertyImporter()
+        {
+            this.filesToImportFrom = new Dictionary<string, ICollection<LocationAttributeMapping>>();
+
+            this.polygonAttributeImporter = new PolygonAttributeImporter<CsvImporterLocations.LocationRecord>
+                                {
+                                    XGetter = (t) => t.GeoX.Value,
+                                    YGetter = (t) => t.GeoY.Value
+                                };
+
+            this.lineAttributeImporter = new LineAttributeImporter<CsvImporterLocations.LocationRecord>();
+        }
+
+        public List<string> ImproperAttributeMessages
+        {
+            get { return improperAttributeMessages; }
+        }
+
+        public LocationPropertyImporter(string dataLocation, IEnumerable<DataAttribute> dataAttributes) : this()
+        {
+            this.DataFileLocation = dataLocation;
+            improperAttributeMessages.Clear();
+            // Register configured property attributes
+            foreach (var dataAttribute in dataAttributes)
+            {
+                if (LocationShapeFileAttributeMap.IsPropertyAttribute(dataAttribute.AttributeId))
+                    RegisterAttributeMapping(dataAttribute.AttributeId, dataAttribute.AttributeName, dataAttribute.DataSource);
+            }
+
+            if (improperAttributeMessages.Count > 0)
+            {
+                var message = Environment.NewLine + "The following attribute id's are supported:" + Environment.NewLine +
+                           string.Join(", ", LocationShapeFileAttributeMap.AttributePropertyMap.Keys.OrderBy(k => k).ToArray());
+
+                message += Environment.NewLine + "Please change the id in the shape file or remove the shape for this attribute from the defx.";
+                improperAttributeMessages.Add(message);
+            }
+            // Should throw an exception when more then one crosssection is defined..
+            RegisterCrossSectionAttribute(dataAttributes);
+        }
+
+        public string DataFileLocation { private get; set; }
+
+        public IEnumerable<Exception> ImportErrors
+        {
+            get { return this.polygonAttributeImporter.Errors.Concat(this.lineAttributeImporter.Errors); }
+        }
+
+        public IEnumerable<CsvImporterLocations.LocationRecord> Targets
+        {
+            set { this.targets = value; }
+        }
+
+        private void RegisterCrossSectionAttribute(IEnumerable<DataAttribute> dataAttributes)
+        {
+            DataAttribute crossSectionConfig = dataAttributes.SingleOrDefault(a => a.AttributeId.Equals(LocationShapeFileAttributeMap.CrossSectionAttributId, StringComparison.InvariantCultureIgnoreCase));
+            
+            LocationAttributeMapping mapping = crossSectionConfig != null ?
+                LocationShapeFileAttributeMap.GetAttributeMapping(crossSectionConfig) :
+                LocationShapeFileAttributeMap.GetAttributeMapping(LocationShapeFileAttributeMap.CrossSectionAttributId);
+
+            RegisterCrossSectionAttribute(mapping.Name, mapping.File);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="customAttributeName"></param>
+        /// <param name="customFileName"></param>
+        public void RegisterCrossSectionAttribute(string customAttributeName, string customFileName)
+        {
+            if (!IsValidString(customAttributeName))
+                throw new ArgumentException("customAttributeName");
+
+            if (!IsValidString(customFileName))
+                throw new ArgumentException("customFileName");
+
+            var file = GetFile(customFileName);
+            this.lineAttributeImporter.CrossSectionRepository = GetCrossSectionRepository(file);
+            this.lineAttributeImporter.LocationIDAttributeName = GetAttributeName(customAttributeName);
+        }
+
+        // method is used for test purpose
+        // a cleaner class design should not have this method public
+        // todo: fix this
+        public virtual string GetAttributeName(string name)
+        {
+            return name;
+        }
+
+        // method is used for test purpose
+        // a cleaner class design should not have this method public
+        // todo: fix this
+        public virtual IFeatureRepository GetCrossSectionRepository(ShapeFileLocation file)
+        {
+            return FeatureRepository.CreateFromShapeFile(file.FullPath);
+        }
+
+        // for now this method is only used for test purposes
+        internal void RegisterAttributeMapping(string attributeId)
+        {
+            RegisterAttributeMapping(attributeId, null);
+        }
+
+        /// <summary>
+        /// Registers a shape file attribute/column mapping to local id's. The attribute names are set to default names.         
+        /// </summary>
+        /// <param name="attributeId">Required argument. Use this argument to refer to a known attribute in the set of supported attributes (declared in this class). For example: TRAFLOAD. </param>
+        /// <param name="dataFileName">The name of the Shape file that contains the data attribute</param>
+        /// <exception cref="NotSupportedException">When the attribute id is unknown (not in the set declared here) this exception is thrown</exception>
+        /// <exception cref="ArgumentException">When the attribute id is null or empty this exception is thrown</exception>
+        public void RegisterAttributeMapping(string attributeId, string dataFileName)
+        {
+            RegisterAttributeMapping(attributeId, null, dataFileName);
+        }
+
+        /// <summary>
+        /// Registers a shape file attribute to local id's
+        /// </summary>
+        /// <remarks>
+        /// The Shape file attributes/columns are in the Dbf file
+        /// </remarks>
+        /// <param name="attributeId">Required argument. Use this argument to refer to a known attribute in the set of supported attributes (declared in this class). For example: TRAFLOAD. </param>
+        /// <param name="customAttributeName">The name of the attribute in the Shape file to map to. For example TRAFLOAD can be mapped to the TrafficLoad column in the Shape file. If the name is null or Empty the default name will be used. For TRAFLOAD this will be TRAFLOAD.</param>
+        /// <param name="dataFileName">The name of the Shape file that contains the data attribute</param>
+        /// <exception cref="NotSupportedException">If the attribute id is unknown (not in the set declared here) this exception is thrown</exception>
+        /// <exception cref="ArgumentException">If the attribute id is null or empty this exception is thrown</exception>
+        /// <exception cref="FileNotFoundException">If the file is not found this exceptions will be thrown</exception>
+        public void RegisterAttributeMapping(string attributeId, string customAttributeName, string dataFileName)
+        {
+            if (!IsValidString(attributeId))
+                throw new ArgumentException("attributeId");
+
+            if (!LocationShapeFileAttributeMap.IsAttributeIdSupported(attributeId))
+            {
+                string message = string.Format("The attribute id '{0}' is not supported by this importer.", 
+                    attributeId);
+                improperAttributeMessages.Add(message);
+            }
+            else
+            {
+                LocationAttributeMapping mapping = LocationShapeFileAttributeMap.GetAttributeMapping(attributeId);
+                string attrName = string.IsNullOrEmpty(customAttributeName) || customAttributeName.Trim() == ""
+                    ? mapping.Name // return the default shape file colum name
+                    : customAttributeName;
+
+                if (!IsValidString(dataFileName)) // not a valid file location? use the default file
+                    dataFileName = mapping.File;
+
+                Action<CsvImporterLocations.LocationRecord, object> action = mapping.Action;
+
+                // Build a map to data (shape) files and attributes contained in the dbf file
+                // if a file is already added to the map a new attribute will be added
+                // to support the concept that multiple attributes can be contained in a single (shape) file
+                // ie. { somedatashapefile.shp, { TRAFFLOAD, PENLENGTH, .. } }
+
+                ShapeFileLocation file = GetFile(dataFileName);
+
+                string key = file.FullPath;
+
+                if (!this.filesToImportFrom.ContainsKey(key))
+                    this.filesToImportFrom.Add(key, new List<LocationAttributeMapping>());
+
+                this.filesToImportFrom[key].Add(new LocationAttributeMapping
+                {
+                    Action = action,
+                    Name = attrName
+                });
+            }
+        }
+
+        // used for testing purposes...
+        public virtual ShapeFileLocation GetFile(string dataFileName)
+        {
+            var file = new ShapeFileLocation(this.DataFileLocation, dataFileName);
+            if (!file.Exists)
+                throw new FileNotFoundException(string.Format("The file '{0}' is not found", file.FullPath));
+            return file;
+        }
+
+        // used for testing purposes...
+
+        // ReSharper disable MemberCanBeProtected.Global
+        public virtual IFeatureRepository CreateFromShapeFile(string fileName)
+        // ReSharper restore MemberCanBeProtected.Global
+        {
+            return FeatureRepository.CreateFromShapeFile(new ShapeFileLocation(fileName));
+        }
+
+        /// <summary>
+        /// Imports the specified progress.
+        /// </summary>
+        /// <param name="progress">The progress.</param>
+        /// <exception cref="System.InvalidOperationException">No target locations set</exception>
+        /// <exception cref="Deltares.Dam.Data.Importers.LocationPropertyImporterException"></exception>
+        /// <exception cref="ImportException">
+        /// The file " + fileName + " does not exist so can not be imported.
+        /// or
+        /// Had problems reading attribute values from file: " + fileName
+        /// </exception>
+        public void Import(DamEngine.Data.Standard.Calculation.ProgressDelegate progress)
+        {
+            if (this.targets == null)
+                throw new InvalidOperationException("No target locations set");
+
+            try
+            {
+                this.polygonAttributeImporter.Targets = this.targets;
+                this.lineAttributeImporter.Targets = this.targets;
+            }
+            catch (LineAttributeImporterException e)
+            {
+                throw new LocationPropertyImporterException(String.Format("Error finding locations in crossections, {0}", e.Message));
+            }
+
+#if DEBUG
+            int targetCount = targets.Count();
+            int crossSectionCount = lineAttributeImporter != null && lineAttributeImporter.CrossSectionRepository != null ? lineAttributeImporter.CrossSectionRepository.Count : 0;
+#endif
+            // use the file / name attribute mapping table to retrieve the 
+            // the actual value from the data (shape) file
+            var progressStep = 0.6*(1.0 /this.filesToImportFrom.Count);
+            var curProgress = 0.30;
+ 
+            foreach (var file in this.filesToImportFrom)
+            {
+                string fileName = file.Key;
+                if (!File.Exists(fileName))
+                {
+                    throw new ImportException("The file " + fileName + " does not exist so can not be imported.");
+                }
+
+#if DEBUG
+                Debug.WriteLine(new string('=', 80));
+                Debug.WriteLine(fileName);
+                var stopwatch = new Stopwatch();
+                stopwatch.Start();
+#endif
+                
+                IFeatureRepository attributeRepository = CreateFromShapeFile(fileName);
+                var feature = attributeRepository.Features.FirstOrDefault();
+                bool isPolygonTypeRepository = false;
+                if (feature != null)
+                {                    
+                    isPolygonTypeRepository = feature.Geometry is Polygon || feature.Geometry is MultiPolygon;
+                    IAttributeImporter<CsvImporterLocations.LocationRecord> importer = isPolygonTypeRepository ? 
+                        this.polygonAttributeImporter as IAttributeImporter<CsvImporterLocations.LocationRecord> : 
+                        this.lineAttributeImporter as IAttributeImporter<CsvImporterLocations.LocationRecord>;
+                    importer.FileName = fileName;
+                    importer.AttributeRepository = attributeRepository;
+                    importer.AttributeMappings = file.Value.OfType<AttributeMapping<CsvImporterLocations.LocationRecord>>();
+
+                    try
+                    {
+                        importer.Import();
+                    }
+                    catch (AttributeMissingException attributeMissingException)
+                    {
+                        importer.AddError(attributeMissingException);
+                    }
+                    catch(Exception e)
+                    {
+                        throw new ImportException("Had problems reading attribute values from file: " + fileName, e);
+                    }
+                }
+                curProgress += progressStep;
+                if (progress != null) progress(curProgress);
+#if DEBUG
+                stopwatch.Stop();
+                Debug.WriteLine(string.Format("Number of source features: {0}", isPolygonTypeRepository ? targetCount : crossSectionCount));
+                Debug.WriteLine(string.Format("Number of target features: {0}", attributeRepository.Count));
+                Debug.WriteLine(string.Format("Time elapsed: {0}s", stopwatch.Elapsed.TotalSeconds));
+#endif
+            }
+        }
+
+        private static bool IsValidString(string value)
+        {
+            return !(string.IsNullOrEmpty(value) || value.Trim() == string.Empty);
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Domain/FeatureTest.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Domain/FeatureTest.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Domain/FeatureTest.cs	(revision 3305)
@@ -0,0 +1,105 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of the application DAM - UI.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+
+using NetTopologySuite.Geometries;
+
+using NUnit.Framework;
+
+namespace Deltares.Maps.Tests.Domain
+{
+    [TestFixture]
+    public class FeatureTest
+    {
+        private Feature feature;
+
+        #region Setup
+
+        [TestFixtureSetUp]
+        public void FixtureSetup()
+        {
+        }
+
+        [TestFixtureTearDown]
+        public void FixtureTearDown()
+        {
+        }
+
+        [SetUp]
+        public void TestSetup()
+        {
+        }
+
+        [TearDown]
+        public void TestTearDown()
+        {
+        }
+
+        #endregion
+
+        [Test]
+        public void FeatureCreation_NormalScenario_CreatesFeatureInstance()
+        {
+            const string geometryWkt = "POINT (0.1 0.2)";
+            feature = Feature.Create(geometryWkt);
+            Assert.IsNotNull(feature);
+            Assert.AreEqual(geometryWkt, feature.WktFormat);
+
+            feature = Feature.Create(geometryWkt);
+            Assert.IsNotNull(feature);
+            Assert.AreEqual(geometryWkt, feature.WktFormat);
+            Assert.IsInstanceOf(typeof(Point), feature.Geometry);
+        }
+
+        [Test]
+        //[ExpectedException(typeof(ArgumentException), ExpectedMessage = "There was an error parsing the WKT geometry string, maybe due to an incorrect culture format conversion")]
+        // NB This test fails when you change the decimal separator to a point in Dutch regional settings on your computer
+        [ExpectedException(typeof(ArgumentException))]
+        public void FeatueCreation_DutchCultureWktStringFormat_Throws()
+        {
+            Action test =
+                () =>
+                {
+                    string geometryWkt = string.Format("MULTIPOINT ({0} {1},{2} {3})", 0.1, 0.2, 0.3, 0.4);
+                    feature = Feature.Create(geometryWkt);
+                };
+
+            CultureHelper.InvokeWithDutchCulture(test);
+        }
+
+        [Test]
+        public void FeatureCreation_DutchCulture_FeatureIsCreatedWithoutExceptions()
+        {
+            Action test =
+                () =>
+                {
+                    const string geometryWkt = "MULTIPOINT (0.0 0.1,0.2 0.3)";
+                    feature = Feature.Create(geometryWkt);
+                    Assert.IsNotNull(feature);
+                    Assert.AreEqual(geometryWkt, feature.WktFormat);
+                    Assert.IsInstanceOf(typeof(MultiPoint), feature.Geometry);
+                };
+
+            CultureHelper.InvokeWithDutchCulture(test);
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/JobResultInterpreter.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/JobResultInterpreter.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/JobResultInterpreter.cs	(revision 3305)
@@ -0,0 +1,86 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Drawing;
+
+namespace Deltares.Dam.Data
+{
+    public class JobResultInterpreter
+    {
+        public static JobResult GetJobResult(double result, double demand, bool smaller)
+        {
+            if (result >= DamGlobalConstants.NoRunValue)
+            {
+                return JobResult.NoRun;
+            }
+            else if (result < 0 ||  double.IsNaN(result))
+            {
+                return JobResult.Failed;
+            }
+            else if (smaller)
+            {
+                if (result < demand)
+                {
+                    return JobResult.Bad;
+                }
+                else
+                {
+                    return JobResult.Good;
+                }
+            }
+            else
+            {
+                if (result > demand)
+                {
+                    return JobResult.Bad;
+                }
+                else
+                {
+                    return JobResult.Good;
+                }
+            }
+        }
+
+        public static Color GetJobResultColor(double result, double demand, bool smaller)
+        {
+            switch (GetJobResult(result, demand, smaller))
+            {
+                case JobResult.NoRun: return Color.Gray;
+                case JobResult.Failed: return Color.White;
+                case JobResult.Good: return Color.Lime;
+                case JobResult.Bad: return Color.Red;
+                default: return Color.Pink;
+            }
+        }
+
+        public static Color GetJobResultColor(JobResult jobResult)
+        {
+            switch (jobResult)
+            {
+                case JobResult.NoRun: return Color.Gray;
+                case JobResult.Failed: return Color.White;
+                case JobResult.Good: return Color.Lime;
+                case JobResult.Bad: return Color.Red;
+                default: return Color.Pink;
+            }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/Assemblers/FileIdentificationAssembler.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/Assemblers/FileIdentificationAssembler.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/Assemblers/FileIdentificationAssembler.cs	(revision 3305)
@@ -0,0 +1,130 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Xml.Linq;
+using Deltares.Standard.IO.DtoAssembler;
+
+namespace Deltares.Standard
+{
+    public class FileIdentificationAssembler : IDtoAssembler<FileIdentification>
+    {
+        private const string elementName = "FileIdentification";
+        private const string elementNamespace = "http://deltares.nl/2008/FileIdentificationDefinition";
+
+        private readonly DtoPropertyAttributeMap map = new DtoPropertyAttributeMap();
+
+        public FileIdentificationAssembler()
+        {
+            const string attApplication = "Application";
+            this.map.Add(attApplication, new DtoPropertyAttriubteMapping()
+                                             {
+                                                 PropertyName = attApplication,
+                                                 AttributeName = attApplication,
+                                                 Importance = DtoPropertyImportance.Required
+                                             });
+
+            const string attVersion = "Version";
+            this.map.Add(attVersion, new DtoPropertyAttriubteMapping()
+                                         {
+                                             PropertyName = attVersion,
+                                             AttributeName = attVersion,
+                                             Importance = DtoPropertyImportance.Required
+                                         });
+
+            const string attCreated = "Created";
+            this.map.Add(attCreated, new DtoPropertyAttriubteMapping()
+                                         {
+                                             PropertyName = attCreated,
+                                             AttributeName = attCreated,
+                                             Importance = DtoPropertyImportance.Required
+                                         });
+
+            const string attCompany = "Company";
+            this.map.Add(attCompany, new DtoPropertyAttriubteMapping()
+                                         {
+                                             PropertyName = attCompany,
+                                             AttributeName = attCompany,
+                                             Importance = DtoPropertyImportance.Required
+                                         });
+
+            const string attLicense = "License";
+            this.map.Add(attLicense, new DtoPropertyAttriubteMapping()
+                                         {
+                                             PropertyName = attLicense,
+                                             AttributeName = attLicense,
+                                             Importance = DtoPropertyImportance.Optional
+                                         });
+
+            const string attDescription = "Description";
+            this.map.Add(attDescription, new DtoPropertyAttriubteMapping()
+                                             {
+                                                 PropertyName = attDescription,
+                                                 AttributeName = attDescription,
+                                                 Importance = DtoPropertyImportance.Optional
+                                             });
+        }
+
+        /// <summary>
+        /// Gets or sets the namespace value for the element
+        /// </summary>
+        public string ElementNamespace
+        {
+            get { return elementNamespace; }
+        }
+
+        #region IDtoAssembler<FileIdentification> Members
+
+        /// <summary>
+        /// Gets the xml element name
+        /// </summary>
+        public string ElementName
+        {
+            get { return elementName; }
+        }
+
+        /// <summary>
+        /// Assembles a FieldIdentification object from an Dto (XElement)
+        /// </summary>
+        /// <param name="dtoObj">The data transfer object</param>
+        /// <returns>The materialized domain object</returns>
+        public FileIdentification CreateDomainObject(XElement dtoObj)
+        {
+            return new FileIdentification()
+                .Materialize(dtoObj);
+        }
+
+        public XElement CreateDataTransferObject(FileIdentification domainObj)
+        {
+            XElement el = new XElement(elementName)
+                .Materialize(domainObj, this.map);
+
+            return el;
+        }
+
+        #endregion
+
+        public XElement CreateDataTransferObject(FileIdentification domainObj, XNamespace elementNamespace)
+        {
+            return new XElement(elementNamespace + elementName)
+                .Materialize(domainObj, this.map);
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/ParameterizedSpecification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/ParameterizedSpecification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/ParameterizedSpecification.cs	(revision 3305)
@@ -0,0 +1,33 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Standard.Specifications
+{
+    public abstract class ParameterSpecification<TCandidate, TParameter> : SpecificationBase<TCandidate>
+    {
+        protected readonly TParameter ParameterValue;
+
+        protected ParameterSpecification(TParameter parameterValue)
+        {
+            this.ParameterValue = parameterValue;
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/app.config
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/app.config	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/app.config	(revision 3305)
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Stichting Deltares 2019. All rights reserved.
+
+This file is part of the DAM - Clients Library.
+
+The DAM - UI is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+<configuration>
+    <configSections>
+        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="Deltares.Dam.Data.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+        </sectionGroup>
+    </configSections>
+    <applicationSettings>
+        <Deltares.Dam.Data.Properties.Settings>
+            <setting name="SegmentImportFileName" serializeAs="String">
+                <value>segments</value>
+            </setting>
+            <setting name="LocationImportFileName" serializeAs="String">
+                <value>locations</value>
+            </setting>
+            <setting name="SoilProfileImportFileName" serializeAs="String">
+                <value>soilprofiles</value>
+            </setting>
+            <setting name="SurfaceLineImportFileName" serializeAs="String">
+                <value>surfacelines</value>
+            </setting>
+            <setting name="CharacteristicPointsImportFileName" serializeAs="String">
+                <value>characteristicpoints</value>
+            </setting>
+            <setting name="ImportFileExtension" serializeAs="String">
+                <value>csv</value>
+            </setting>
+            <setting name="SoilDatabaseFile" serializeAs="String">
+                <value>Soilbase\soilbase.mdb</value>
+            </setting>
+            <setting name="ModelParametersImportFileName" serializeAs="String">
+                <value>modelparameters</value>
+            </setting>
+            <setting name="IJkdijkPipingLengthPredictionParameter" serializeAs="String">
+                <value>0.66</value>
+            </setting>
+            <setting name="PL1LineImportFileName" serializeAs="String">
+                <value>pl1lines</value>
+            </setting>
+            <setting name="GaugesImportFileName" serializeAs="String">
+                <value>gauges</value>
+            </setting>
+            <setting name="MStabExePath" serializeAs="String">
+                <value>.\DGeoStability.exe</value>
+            </setting>
+            <setting name="SlopeWExePath" serializeAs="String">
+                <value>.\GeoStudio.exe</value>
+            </setting>
+            <setting name="SlipCircleGridSizeDetermination" serializeAs="String">
+                <value>Automatic</value>
+            </setting>
+            <setting name="SlipCircleUpliftVanLeftGridVerticalPointCount" serializeAs="String">
+                <value>36</value>
+            </setting>
+            <setting name="SlipCircleUpliftVanLeftGridVerticalPointDistance" serializeAs="String">
+                <value>2</value>
+            </setting>
+            <setting name="SlipCircleUpliftVanLeftGridHorizontalPointCount" serializeAs="String">
+                <value>14</value>
+            </setting>
+            <setting name="SlipCircleUpliftVanLeftGridHorizontalPointDistance" serializeAs="String">
+                <value>2</value>
+            </setting>
+            <setting name="SlipCircleUpliftVanRightGridVerticalPointCount" serializeAs="String">
+                <value>3</value>
+            </setting>
+            <setting name="SlipCircleUpliftVanRightGridVerticalPointDistance" serializeAs="String">
+                <value>2</value>
+            </setting>
+            <setting name="SlipCircleUpliftVanRightGridHorizontalPointCount" serializeAs="String">
+                <value>6</value>
+            </setting>
+            <setting name="SlipCircleUpliftVanRightGridHorizontalPointDistance" serializeAs="String">
+                <value>2</value>
+            </setting>
+            <setting name="SlipCircleBishopGridVerticalPointCount" serializeAs="String">
+                <value>10</value>
+            </setting>
+            <setting name="SlipCircleBishopGridVerticalPointDistance" serializeAs="String">
+                <value>2.5</value>
+            </setting>
+            <setting name="SlipCircleBishopGridHorizontalPointCount" serializeAs="String">
+                <value>10</value>
+            </setting>
+            <setting name="SlipCircleBishopGridHorizontalPointDistance" serializeAs="String">
+                <value>2.5</value>
+            </setting>
+            <setting name="SlipCircleUpliftVanTangentLinesDefinition" serializeAs="String">
+                <value>OnBoundaryLines</value>
+            </setting>
+            <setting name="SlipCircleUpliftVanTangentLinesDistance" serializeAs="String">
+                <value>0.25</value>
+            </setting>
+            <setting name="SlipCircleBishopTangentLinesDefinition" serializeAs="String">
+                <value>OnBoundaryLines</value>
+            </setting>
+            <setting name="SlipCircleBishopTangentLinesDistance" serializeAs="String">
+                <value>0.25</value>
+            </setting>
+        </Deltares.Dam.Data.Properties.Settings>      
+    </applicationSettings>
+  <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup>
+</configuration>
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs	(revision 3305)
@@ -0,0 +1,1375 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using System.Configuration;
+using Deltares.DamEngine.Io.XmlInput;
+using Deltares.DamEngine.Io.XmlOutput;
+using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
+using Deltares.Standard;
+using Deltares.Standard.Extensions;
+using Deltares.Standard.Logging;
+using CharacteristicPointType = Deltares.Geotechnics.SurfaceLines.CharacteristicPointType;
+
+namespace Deltares.Dam.Data.DamEngineIo
+{
+    /// <summary>
+    /// Converts types from Dam Engine class to Input serializer class and vice versa
+    /// </summary>
+    public static class ConversionHelper
+    {
+        /// <summary>
+        /// Converts the type DamProjectType from input object type to Dam Engine type.
+        /// </summary>
+        /// <param name="inputDamProjectType">Type of the input object.</param>
+        /// <returns>Dam Engine type</returns>
+        public static DamProjectType ConvertToDamProjectType(InputDamProjectType inputDamProjectType)
+        {
+            var translationTable = new Dictionary<InputDamProjectType, DamProjectType>()
+                                               {
+                                                   {InputDamProjectType.Design, DamProjectType.Design},
+                                                   {InputDamProjectType.Operational, DamProjectType.Calamity}
+                                               };
+            return translationTable[inputDamProjectType];
+        }
+
+        /// <summary>
+        /// Converts the type DamProjectType from Dam Engine type to input object type.
+        /// </summary>
+        /// <param name="damProjectType">Type of the dam project.</param>
+        /// <returns>Type of the input object.</returns>
+        public static InputDamProjectType ConvertToInputDamProjectType(DamProjectType damProjectType)
+        {
+            if (damProjectType == DamProjectType.DamLiveConfiguration)
+                damProjectType = DamProjectType.Calamity;
+            var translationTable = new Dictionary<DamProjectType, InputDamProjectType>()
+                                               {
+                                                   {DamProjectType.Design, InputDamProjectType.Design},
+                                                   {DamProjectType.Calamity, InputDamProjectType.Operational},
+                                               };
+            return translationTable[damProjectType];
+        }
+
+        /// <summary>
+        /// Converts the type PLLineCreationMethod from Dam Engine type to input object type.
+        /// </summary>
+        /// <param name="plLineCreationMethod">Type of the dam project.</param>
+        /// <returns>
+        /// Type of the input object.
+        /// </returns>
+        public static LocationWaternetOptionsPhreaticLineCreationMethod ConvertToInputPhreaticLineCreationMethod(PLLineCreationMethod plLineCreationMethod)
+        {
+            var translationTable = new Dictionary<PLLineCreationMethod, LocationWaternetOptionsPhreaticLineCreationMethod>()
+                                               {
+                                                   {PLLineCreationMethod.ExpertKnowledgeLinearInDike, LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeLinearInDike},
+                                                   {PLLineCreationMethod.ExpertKnowledgeRRD, LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeRRD},
+                                                   {PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD, LocationWaternetOptionsPhreaticLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD},
+                                                   {PLLineCreationMethod.Sensors, LocationWaternetOptionsPhreaticLineCreationMethod.Sensors},
+                                                   {PLLineCreationMethod.None, LocationWaternetOptionsPhreaticLineCreationMethod.None}
+                                               };
+            return translationTable[plLineCreationMethod];
+        }
+
+        /// <summary>
+        /// Converts the type PLLineCreationMethod from input object type to Dam Engine type.
+        /// </summary>
+        /// <param name="inputPhreaticLineCreationMethod">Type of the input object.</param>
+        /// <returns>
+        /// Type of the dam object.
+        /// </returns>
+        public static PLLineCreationMethod ConvertToPhreaticLineCreationMethod(LocationWaternetOptionsPhreaticLineCreationMethod inputPhreaticLineCreationMethod)
+        {
+            var translationTable = new Dictionary<LocationWaternetOptionsPhreaticLineCreationMethod, PLLineCreationMethod>()
+                                               {
+                                                   {LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeLinearInDike,PLLineCreationMethod.ExpertKnowledgeLinearInDike},
+                                                   {LocationWaternetOptionsPhreaticLineCreationMethod.ExpertKnowledgeRRD, PLLineCreationMethod.ExpertKnowledgeRRD},
+                                                   {LocationWaternetOptionsPhreaticLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD, PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD},
+                                                   {LocationWaternetOptionsPhreaticLineCreationMethod.Sensors, PLLineCreationMethod.Sensors},
+                                                   {LocationWaternetOptionsPhreaticLineCreationMethod.None, PLLineCreationMethod.None}
+                                               };
+            return translationTable[inputPhreaticLineCreationMethod];
+        }
+
+        /// <summary>
+        /// Converts the type IntrusionVerticalWaterPressureType from Dam Engine type to input object type.
+        /// </summary>
+        /// <param name="intrusionVerticalWaterPressureType">Type of the dam project.</param>
+        /// <returns>
+        /// Type of the input object.
+        /// </returns>
+        public static LocationWaternetOptionsIntrusionVerticalWaterPressure ConvertToInputIntrusionVerticalWaterPressure(IntrusionVerticalWaterPressureType intrusionVerticalWaterPressureType)
+        {
+            var translationTable = new Dictionary<IntrusionVerticalWaterPressureType, LocationWaternetOptionsIntrusionVerticalWaterPressure>()
+                                               {
+                                                   {IntrusionVerticalWaterPressureType.FullHydroStatic, LocationWaternetOptionsIntrusionVerticalWaterPressure.FullHydroStatic},
+                                                   {IntrusionVerticalWaterPressureType.HydroStatic, LocationWaternetOptionsIntrusionVerticalWaterPressure.HydroStatic},
+                                                   {IntrusionVerticalWaterPressureType.Linear, LocationWaternetOptionsIntrusionVerticalWaterPressure.Linear},
+                                                   {IntrusionVerticalWaterPressureType.SemiTimeDependent, LocationWaternetOptionsIntrusionVerticalWaterPressure.SemiTimeDependent},
+                                                   {IntrusionVerticalWaterPressureType.Standard, LocationWaternetOptionsIntrusionVerticalWaterPressure.Standard}
+                                               };
+            return translationTable[intrusionVerticalWaterPressureType];
+        }
+
+        /// <summary>
+        /// Converts the type IntrusionVerticalWaterPressureType from input object type to Dam Engine type.
+        /// </summary>
+        /// <param name="inputIntrusionVerticalWaterPressure">Type of the input object.</param>
+        /// <returns>
+        /// Type of the dam object.
+        /// </returns>
+        public static IntrusionVerticalWaterPressureType ConvertToIntrusionVerticalWaterPressure(LocationWaternetOptionsIntrusionVerticalWaterPressure inputIntrusionVerticalWaterPressure)
+        {
+            var translationTable = new Dictionary<LocationWaternetOptionsIntrusionVerticalWaterPressure, IntrusionVerticalWaterPressureType>()
+                                               {
+                                                   {LocationWaternetOptionsIntrusionVerticalWaterPressure.FullHydroStatic, IntrusionVerticalWaterPressureType.FullHydroStatic},
+                                                   {LocationWaternetOptionsIntrusionVerticalWaterPressure.HydroStatic, IntrusionVerticalWaterPressureType.HydroStatic},
+                                                   {LocationWaternetOptionsIntrusionVerticalWaterPressure.Linear, IntrusionVerticalWaterPressureType.Linear},
+                                                   {LocationWaternetOptionsIntrusionVerticalWaterPressure.SemiTimeDependent, IntrusionVerticalWaterPressureType.SemiTimeDependent},
+                                                   {LocationWaternetOptionsIntrusionVerticalWaterPressure.Standard, IntrusionVerticalWaterPressureType.Standard}
+                                               };
+            return translationTable[inputIntrusionVerticalWaterPressure];
+        }
+
+        public const int CpNone = 0;//
+        public const int CpSurfaceLevelOutside = 1; // Maaiveld buitenwaarts
+        public const int CpDikeToeAtRiver = 5; // Teen dijk buitenwaarts
+        public const int CpShoulderTopOutside = 6; // Kruin buitenberm
+        public const int CpShoulderBaseOutside = 7; // Insteek buitenberm
+        public const int CpDikeTopAtRiver = 8; // Kruin buitentalud
+        public const int CpDikeLine = 9; // referentielijn
+        public const int CpTrafficLoadOutside = 10; // Verkeersbelasting kant buitenwaarts
+        public const int CpTrafficLoadInside = 11; // Verkeersbelasting kant binnenwaarts
+        public const int CpDikeTopAtPolder = 12; // Kruin binnentalud
+        public const int CpShoulderBaseInside = 13; // Insteek binnenberm
+        public const int CpShoulderTopInside = 14; // Kruin binnenberm
+        public const int CpDikeToeAtPolder = 15; // Teen dijk binnenwaarts
+        public const int CpDitchDikeSide = 16; // Insteek sloot dijkzijde
+        public const int CpBottomDitchDikeSide = 17; // Slootbodem dijkzijde
+        public const int CpBottomDitchPolderSide = 18; // Slootbodem polderzijde
+        public const int CpDitchPolderSide = 19; // Insteek sloot polderzijde
+        public const int CpSurfaceLevelInside = 25; // Maaiveld binnenwaarts        
+
+        /// <summary>
+        /// Converts the type of to dam point.
+        /// </summary>
+        /// <param name="inputPointType">Type of the input point.</param>
+        /// <returns></returns>
+        public static CharacteristicPointType ConvertToDamPointType(int inputPointType)
+        {
+            var translationTable = new Dictionary<int, CharacteristicPointType>()
+                                               {
+                                                    {CpNone, CharacteristicPointType.None},
+                                                    {CpSurfaceLevelOutside, CharacteristicPointType.SurfaceLevelOutside},
+                                                    {CpDikeToeAtRiver, CharacteristicPointType.DikeToeAtRiver},
+                                                    {CpShoulderTopOutside, CharacteristicPointType.ShoulderTopOutside},
+                                                    {CpShoulderBaseOutside, CharacteristicPointType.ShoulderBaseOutside},
+                                                    {CpDikeTopAtRiver, CharacteristicPointType.DikeTopAtRiver},
+                                                    {CpDikeLine, CharacteristicPointType.DikeLine},
+                                                    {CpTrafficLoadOutside, CharacteristicPointType.TrafficLoadOutside},
+                                                    {CpTrafficLoadInside, CharacteristicPointType.TrafficLoadInside},
+                                                    {CpDikeTopAtPolder, CharacteristicPointType.DikeTopAtPolder},
+                                                    {CpShoulderBaseInside, CharacteristicPointType.ShoulderBaseInside},
+                                                    {CpShoulderTopInside, CharacteristicPointType.ShoulderTopInside},
+                                                    {CpDikeToeAtPolder, CharacteristicPointType.DikeToeAtPolder},
+                                                    {CpDitchDikeSide, CharacteristicPointType.DitchDikeSide},
+                                                    {CpBottomDitchDikeSide, CharacteristicPointType.BottomDitchDikeSide},
+                                                    {CpBottomDitchPolderSide, CharacteristicPointType.BottomDitchPolderSide},
+                                                    {CpDitchPolderSide, CharacteristicPointType.DitchPolderSide},
+                                                    {CpSurfaceLevelInside, CharacteristicPointType.SurfaceLevelInside}
+                                               };
+            return translationTable[inputPointType];
+        }
+
+        /// <summary>
+        /// Converts the type of to input point.
+        /// </summary>
+        /// <param name="characteristicPointType">Type of the characteristic point.</param>
+        /// <returns></returns>
+        public static int ConvertToInputPointType(CharacteristicPointType characteristicPointType)
+        {
+            var translationTable = new Dictionary<CharacteristicPointType, int>()
+                                               {
+                                                    // The following types do not have a meaning in DAM, so should be mapped to CpNone
+                                                    {CharacteristicPointType.BottomRiverChannel, CpNone},
+                                                    {CharacteristicPointType.InsertRiverChannel, CpNone},
+                                                    {CharacteristicPointType.ForelandStart, CpNone},
+                                                    {CharacteristicPointType.DunesBoundaryProfile, CpNone},
+                                                    {CharacteristicPointType.DunesTransectLocation, CpNone},
+                                                    // The following types are DAM related, so should be translated
+                                                    {CharacteristicPointType.None, CpNone},
+                                                    {CharacteristicPointType.SurfaceLevelOutside, CpSurfaceLevelOutside},
+                                                    {CharacteristicPointType.DikeToeAtRiver, CpDikeToeAtRiver},
+                                                    {CharacteristicPointType.ShoulderTopOutside, CpShoulderTopOutside},
+                                                    {CharacteristicPointType.ShoulderBaseOutside, CpShoulderBaseOutside},
+                                                    {CharacteristicPointType.DikeTopAtRiver, CpDikeTopAtRiver},
+                                                    {CharacteristicPointType.DikeLine, CpDikeLine},
+                                                    {CharacteristicPointType.TrafficLoadOutside, CpTrafficLoadOutside},
+                                                    {CharacteristicPointType.TrafficLoadInside, CpTrafficLoadInside},
+                                                    {CharacteristicPointType.DikeTopAtPolder, CpDikeTopAtPolder},
+                                                    {CharacteristicPointType.ShoulderBaseInside, CpShoulderBaseInside},
+                                                    {CharacteristicPointType.ShoulderTopInside, CpShoulderTopInside},
+                                                    {CharacteristicPointType.DikeToeAtPolder, CpDikeToeAtPolder},
+                                                    {CharacteristicPointType.DitchDikeSide, CpDitchDikeSide},
+                                                    {CharacteristicPointType.BottomDitchDikeSide, CpBottomDitchDikeSide},
+                                                    {CharacteristicPointType.BottomDitchPolderSide, CpBottomDitchPolderSide},
+                                                    {CharacteristicPointType.DitchPolderSide, CpDitchPolderSide},
+                                                    {CharacteristicPointType.SurfaceLevelInside, CpSurfaceLevelInside}
+                                               };
+            return translationTable[characteristicPointType];
+        }
+
+        /// <summary>
+        /// Converts to calculation result.
+        /// </summary>
+        /// <param name="calculationResult">The calculation result.</param>
+        /// <returns></returns>
+        public static CalculationResult ConvertToCalculationResult(int calculationResult)
+        {
+            var translationTable = new Dictionary<int, CalculationResult>()
+                                               {
+                                                   {0, CalculationResult.NoRun},
+                                                   {1, CalculationResult.Succeeded},
+                                                   {2, CalculationResult.NoInput},
+                                                   {3, CalculationResult.NoLicense},
+                                                   {4, CalculationResult.UserAbort},
+                                                   {5, CalculationResult.InvalidInputStructure},
+                                                   {6, CalculationResult.InvalidInputData},
+                                                   {7, CalculationResult.RunFailed},
+                                                   {8, CalculationResult.UnexpectedError}
+                                               };
+            return translationTable[calculationResult];
+        }
+
+        /// <summary>
+        /// Converts to output calculation result.
+        /// </summary>
+        /// <param name="calculationResult">Type of the dam project.</param>
+        /// <returns></returns>
+        public static int ConvertToOutputCalculationResult(CalculationResult calculationResult)
+        {
+            var translationTable = new Dictionary<CalculationResult, int>()
+                                               {
+                                                   {CalculationResult.NoRun, 0},
+                                                   {CalculationResult.Succeeded, 1},
+                                                   {CalculationResult.NoInput, 2},
+                                                   {CalculationResult.NoLicense, 3},
+                                                   {CalculationResult.UserAbort, 4},
+                                                   {CalculationResult.InvalidInputStructure, 5},
+                                                   {CalculationResult.InvalidInputData, 6},
+                                                   {CalculationResult.RunFailed, 7},
+                                                   {CalculationResult.UnexpectedError, 8}
+                                               };
+            return translationTable[calculationResult];
+        }
+
+        /// <summary>
+        /// Converts to waterpressure interpolation model.
+        /// </summary>
+        /// <param name="inputWaterpressureInterpolationModel">The input waterpressure interpolation model.</param>
+        /// <returns></returns>
+        public static WaterpressureInterpolationModel ConvertToWaterpressureInterpolationModel(int inputWaterpressureInterpolationModel)
+        {
+            var translationTable = new Dictionary<int, WaterpressureInterpolationModel>()
+                                               {
+                                                   {0, WaterpressureInterpolationModel.Automatic},
+                                                   {1, WaterpressureInterpolationModel.Hydrostatic}
+                                               };
+            return translationTable[inputWaterpressureInterpolationModel];
+        }
+
+        /// <summary>
+        /// Converts to input waterpressure interpolation model.
+        /// </summary>
+        /// <param name="waterpressureInterpolationModel">The waterpressure interpolation model.</param>
+        /// <returns></returns>
+        public static int ConvertToInputWaterpressureInterpolationModel(WaterpressureInterpolationModel waterpressureInterpolationModel)
+        {
+            var translationTable = new Dictionary<WaterpressureInterpolationModel, int>()
+                                               {
+                                                   {WaterpressureInterpolationModel.Automatic, 0},
+                                                   {WaterpressureInterpolationModel.Hydrostatic, 1}
+                                               };
+            return translationTable[waterpressureInterpolationModel];
+        }
+
+        /// <summary>
+        /// Converts the Dam profile type to the input profile type
+        /// </summary>
+        /// <param name="soilProfileType">Type of the soil geometry.</param>
+        /// <returns></returns>
+        public static int ConvertToInputSoilProfileType(SoilProfileType soilProfileType)
+        {
+            var translationTable = new Dictionary<SoilProfileType, int>()
+                                               {
+                                                   {SoilProfileType.SoilProfile1D, 0},
+                                                   {SoilProfileType.SoilProfile2D, 1},
+                                                   {SoilProfileType.SoilGeometryStiFile, 2}
+                                               };
+            return translationTable[soilProfileType];
+        }
+
+        /// <summary>
+        /// Converts the input profile type to the Dam profile type
+        /// </summary>
+        /// <param name="soilProfileType">Type of the soil geometry.</param>
+        /// <returns></returns>
+        public static SoilProfileType ConvertToSoilProfileType(int soilProfileType)
+        {
+            var translationTable = new Dictionary<int, SoilProfileType>()
+                                               {
+                                                   {0, SoilProfileType.SoilProfile1D},
+                                                   {1, SoilProfileType.SoilProfile2D},
+                                                   {2, SoilProfileType.SoilGeometryStiFile}
+                                               };
+            return translationTable[soilProfileType];
+        }
+
+        /// <summary>The enumerated constants for input failure mechanism stability inside</summary>
+        public const int InputFailureMechanismStabilityInside = 0;
+        public const int InputFailureMechanismStabilityOutside = 1;
+        public const int InputFailureMechanismPiping = 2;
+        public const int InputFailureMechanismHorizontalBalance = 3;
+        public const int InputFailureMechanismFlowSlide = 4;
+
+        /// <summary>
+        /// Converts the Dam failure mechanism type to the input failure mechanism type .
+        /// </summary>
+        /// <param name="segmentFailureMechanismType">Type of the segment failure mechanism.</param>
+        /// <returns></returns>
+        public static int ConvertToInputFailureMechanismSystemType(FailureMechanismSystemType segmentFailureMechanismType)
+        {
+            var translationTable = new Dictionary<FailureMechanismSystemType, int>()
+                                               {
+                                                   {FailureMechanismSystemType.StabilityInside, InputFailureMechanismStabilityInside},
+                                                   {FailureMechanismSystemType.StabilityOutside, InputFailureMechanismStabilityOutside},
+                                                   {FailureMechanismSystemType.Piping, InputFailureMechanismPiping},
+                                                   {FailureMechanismSystemType.HorizontalBalance, InputFailureMechanismHorizontalBalance},
+                                                   {FailureMechanismSystemType.FlowSlide, InputFailureMechanismFlowSlide}
+                                               };
+            return translationTable[segmentFailureMechanismType];
+        }
+
+        /// <summary>
+        /// Converts the input failure mechanism type to the Dam failure mechanism type .
+        /// </summary>
+        /// <param name="failureMechanismSystemType">Type of the failure mechanism system.</param>
+        /// <returns></returns>
+        public static FailureMechanismSystemType ConvertToFailureMechanismSystemType(int failureMechanismSystemType)
+        {
+            var translationTable = new Dictionary<int, FailureMechanismSystemType>()
+                                               {
+                                                   {InputFailureMechanismStabilityInside, FailureMechanismSystemType.StabilityInside},
+                                                   {InputFailureMechanismStabilityOutside, FailureMechanismSystemType.StabilityOutside},
+                                                   {InputFailureMechanismPiping, FailureMechanismSystemType.Piping},
+                                                   {InputFailureMechanismHorizontalBalance, FailureMechanismSystemType.HorizontalBalance},
+                                                   {InputFailureMechanismFlowSlide, FailureMechanismSystemType.FlowSlide},
+                                               };
+            return translationTable[failureMechanismSystemType];
+        }
+
+        /// <summary>The enumerated constants for input segment failure mechanism stability inside</summary>
+        public const int InputSegmentFailureMechanismAll = 0;
+        public const int InputSegmentFailureMechanismStability = 1;
+        public const int InputSegmentFailureMechanismPiping = 2;
+        public const int InputSegmentFailureMechanismLiquefaction = 3;
+
+        /// <summary>
+        /// Converts the Dam segment failure mechanism type to the input segment failure mechanism type .
+        /// </summary>
+        /// <param name="segmentFailureMechanismType">Type of the segment failure mechanism.</param>
+        /// <returns></returns>
+        public static int ConvertToInputSegmentFailureMechanismType(FailureMechanismSystemType segmentFailureMechanismType)
+        {
+            var translationTable = new Dictionary<FailureMechanismSystemType, int>()
+                                               {
+                                                   {FailureMechanismSystemType.StabilityInside, InputSegmentFailureMechanismStability},
+                                                   {FailureMechanismSystemType.StabilityOutside, InputSegmentFailureMechanismStability},
+                                                   {FailureMechanismSystemType.Piping, InputSegmentFailureMechanismPiping},
+                                                   {FailureMechanismSystemType.FlowSlide, InputSegmentFailureMechanismLiquefaction},
+                                                   {FailureMechanismSystemType.HorizontalBalance, InputSegmentFailureMechanismStability}
+                                               };
+            return translationTable[segmentFailureMechanismType];
+        }
+
+        /// <summary>
+        /// Converts the input segment failure mechanism type to the Dam segment failure mechanism type .
+        /// </summary>
+        /// <param name="failureMechanismSystemType">Type of the failure mechanism system.</param>
+        /// <returns></returns>
+        public static FailureMechanismSystemType ConvertToSegmentFailureMechanismType(int failureMechanismSystemType)
+        {
+            if (failureMechanismSystemType == InputSegmentFailureMechanismAll)
+            {
+                throw new ConversionException(typeof(FailureMechanismSystemType), failureMechanismSystemType);
+            }
+            var translationTable = new Dictionary<int, FailureMechanismSystemType>()
+                                               {
+                                                   {InputSegmentFailureMechanismStability, FailureMechanismSystemType.StabilityInside},
+                                                   {InputSegmentFailureMechanismPiping, FailureMechanismSystemType.Piping},
+                                                   {InputSegmentFailureMechanismLiquefaction, FailureMechanismSystemType.FlowSlide},
+                                               };
+            return translationTable[failureMechanismSystemType];
+        }
+        
+        /// <summary>
+        /// Converts the Dam piping model to the input piping model.
+        /// </summary>
+        /// <param name="pipingModelType">Type of the piping model.</param>
+        /// <returns></returns>
+        public static InputPipingModelType ConvertToInputPipingModelType(PipingModelType pipingModelType)
+        {
+            var translationTable = new Dictionary<PipingModelType, InputPipingModelType>()
+                                               {
+                                                   {PipingModelType.Bligh, InputPipingModelType.Bligh},
+                                                   {PipingModelType.Sellmeijer, InputPipingModelType.SellmeijerVnk},
+                                                   {PipingModelType.Sellmeijer4Forces, InputPipingModelType.Sellmeijer4Forces},
+                                                   {PipingModelType.Wti2017, InputPipingModelType.WtiSellmeijerRevised}
+                                               };
+            return translationTable[pipingModelType];
+        }
+
+        /// <summary>
+        /// Converts the input piping model to the Dam piping model.
+        /// </summary>
+        /// <param name="inputPipingModelType">Type of the input piping model.</param>
+        /// <returns></returns>
+        public static PipingModelType ConvertToPipingModelType(InputPipingModelType inputPipingModelType)
+        {
+            var translationTable = new Dictionary<InputPipingModelType, PipingModelType>()
+                                               {
+                                                   {InputPipingModelType.Bligh, PipingModelType.Bligh},
+                                                   {InputPipingModelType.SellmeijerVnk, PipingModelType.Sellmeijer},
+                                                   {InputPipingModelType.Sellmeijer4Forces, PipingModelType.Sellmeijer4Forces},
+                                                   {InputPipingModelType.WtiSellmeijerRevised, PipingModelType.Wti2017}
+                                               };
+            return translationTable[inputPipingModelType];
+        }
+
+        /// <summary>
+        /// Converts the Dam stability model to the input stability model.
+        /// </summary>
+        /// <param name="stabilityModelType">Type of the stability model.</param>
+        /// <returns></returns>
+        public static InputStabilityModelType ConvertToInputStabilityModelType(MStabModelType stabilityModelType)
+        {
+            var translationTable = new Dictionary<MStabModelType, InputStabilityModelType>()
+                                               {
+                                                   {MStabModelType.Bishop, InputStabilityModelType.Bishop},
+                                                   {MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan},
+                                                   {MStabModelType.BishopUpliftVan,InputStabilityModelType.BishopUpliftVan}
+                                               };
+            return translationTable[stabilityModelType];
+        }
+        
+        /// <summary>
+        /// Converts the input stability model to the Dam stability model.
+        /// </summary>
+        /// <param name="inputStabilityModelType">Type of the input stability model.</param>
+        /// <returns></returns>
+        public static MStabModelType ConvertToStabilityModelType(InputStabilityModelType inputStabilityModelType)
+        {
+            var translationTable = new Dictionary<InputStabilityModelType, MStabModelType>()
+                                               {
+                                                   {InputStabilityModelType.Bishop, MStabModelType.Bishop},
+                                                   {InputStabilityModelType.UpliftVan, MStabModelType.UpliftVan},
+                                                   {InputStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan}
+                                               };
+            return translationTable[inputStabilityModelType];
+        }
+
+        /// <summary>
+        /// Converts the Dam stability model to the output stability model.
+        /// </summary>
+        /// <param name="stabilityModelType">Type of the stability model.</param>
+        /// <returns></returns>
+        public static DesignResultStabilityDesignResultsStabilityModelType ConvertToOutputStabilityModelType(MStabModelType stabilityModelType)
+        {
+            var translationTable = new Dictionary<MStabModelType, DesignResultStabilityDesignResultsStabilityModelType>()
+            {
+                {MStabModelType.Bishop, DesignResultStabilityDesignResultsStabilityModelType.Bishop},
+                {MStabModelType.UpliftVan, DesignResultStabilityDesignResultsStabilityModelType.UpliftVan},
+                {MStabModelType.BishopUpliftVan, DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan}
+            };
+            return translationTable[stabilityModelType];
+        }
+
+        /// <summary>
+        /// Converts the output stability model to the Dam stability model.
+        /// </summary>
+        /// <param name="outputStabilityModelType">Type of the output stability model.</param>
+        /// <returns></returns>
+        public static MStabModelType ConvertToStabilityModelType(DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType)
+        {
+            var translationTable = new Dictionary<DesignResultStabilityDesignResultsStabilityModelType, MStabModelType>()
+            {
+                {DesignResultStabilityDesignResultsStabilityModelType.Bishop, MStabModelType.Bishop},
+                {DesignResultStabilityDesignResultsStabilityModelType.UpliftVan, MStabModelType.UpliftVan},
+                {DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan, MStabModelType.BishopUpliftVan}
+            };
+            return translationTable[outputStabilityModelType];
+        }
+
+        /// <summary>
+        /// Converts the Dam analysis type to the input analysis type.
+        /// </summary>
+        /// <param name="analysisType">Type of the analysis.</param>
+        /// <returns></returns>
+        public static InputAnalysisType ConvertToInputAnalysisType(AnalysisType analysisType)
+        {
+            var translationTable = new Dictionary<AnalysisType, InputAnalysisType>()
+                                               {
+                                                   {AnalysisType.NoAdaption, InputAnalysisType.NoAdaption},
+                                                   {AnalysisType.AdaptGeometry, InputAnalysisType.AdaptGeometry}
+                                               };
+            return translationTable[analysisType];
+        }
+        
+        /// <summary>
+        /// Converts the input analysis type to the Dam analysis type.
+        /// </summary>
+        /// <param name="inputAnalysisType">Type of the input analysis.</param>
+        /// <returns></returns>
+        public static AnalysisType ConvertToAnalysisType(InputAnalysisType inputAnalysisType)
+        {
+            var translationTable = new Dictionary<InputAnalysisType, AnalysisType>()
+                                               {
+                                                   {InputAnalysisType.NoAdaption, AnalysisType.NoAdaption},
+                                                   {InputAnalysisType.AdaptGeometry, AnalysisType.AdaptGeometry}
+                                               };
+            return translationTable[inputAnalysisType];
+        }
+
+        /// <summary>
+        /// The input zone type no zones
+        /// </summary>
+        public const int InputZoneTypeNoZones = 0;
+        /// <summary>
+        /// The input zone type zone areas
+        /// </summary>
+        public const int InputZoneTypeZoneAreas = 1;
+        /// <summary>
+        /// The input zone types forbidden zones
+        /// </summary>
+        public const int InputZoneTypesForbiddenZones = 2;
+
+        /// <summary>
+        /// Converts the type of to input zone.
+        /// </summary>
+        /// <param name="zoneType">Type of the zone.</param>
+        /// <returns></returns>
+        public static int ConvertToInputZoneType(MStabZonesType zoneType)
+        {
+            var translationTable = new Dictionary<MStabZonesType, int>()
+                                               {
+                                                   {MStabZonesType.NoZones, InputZoneTypeNoZones},
+                                                   {MStabZonesType.ZoneAreas, InputZoneTypeZoneAreas},
+                                                   {MStabZonesType.ForbiddenZone, InputZoneTypesForbiddenZones}
+                                               };
+            return translationTable[zoneType];
+        }
+
+        /// <summary>
+        /// Converts the type of to zone.
+        /// </summary>
+        /// <param name="inputZoneType">Type of the input zone.</param>
+        /// <returns></returns>
+        public static MStabZonesType ConvertToZoneType(int inputZoneType)
+        {
+            var translationTable = new Dictionary<int, MStabZonesType>()
+                                               {
+                                                   {InputZoneTypeNoZones, MStabZonesType.NoZones},
+                                                   {InputZoneTypeZoneAreas, MStabZonesType.ZoneAreas},
+                                                   {InputZoneTypesForbiddenZones, MStabZonesType.ForbiddenZone}
+                                               };
+            return translationTable[inputZoneType];
+        }
+        
+        /// <summary>
+        /// Converts the Dam message type to the input message type.
+        /// </summary>
+        /// <param name="messageType">Type of the message.</param>
+        /// <returns></returns>
+        public static MessageMessageType ConvertToInputMessageType(LogMessageType messageType)
+        {
+            var translationTable = new Dictionary<LogMessageType, MessageMessageType>()
+                                               {
+                                                   {LogMessageType.Warning, MessageMessageType.Warning},
+                                                   {LogMessageType.Debug, MessageMessageType.Info},
+                                                   {LogMessageType.Error, MessageMessageType.Error},
+                                                   {LogMessageType.FatalError, MessageMessageType.Error},
+                                                   {LogMessageType.Info, MessageMessageType.Info},
+                                                   {LogMessageType.Trace, MessageMessageType.Info}
+                                               };
+            return translationTable[messageType];
+        }
+
+        /// <summary>
+        /// Converts the input message type to the Dam message type.
+        /// </summary>
+        /// <param name="validationResultMessageType">Type of the validation result message.</param>
+        /// <returns></returns>
+        public static LogMessageType ConvertToMessageType(MessageMessageType validationResultMessageType)
+        {
+            var translationTable = new Dictionary<MessageMessageType, LogMessageType>()
+                                               {
+                                                   {MessageMessageType.Warning, LogMessageType.Warning},
+                                                   {MessageMessageType.Error, LogMessageType.Error},
+                                                   {MessageMessageType.Info, LogMessageType.Info}
+                                               };
+            return translationTable[validationResultMessageType];
+        }
+
+        /// <summary>
+        /// The input search method grid
+        /// </summary>
+        public const int InputSearchMethodGrid = 0;
+
+        /// <summary>
+        /// The input search method genetic
+        /// </summary>
+        public const int InputSearchMethodGenetic = 1;
+
+        /// <summary>
+        /// Converts to input search method.
+        /// </summary>
+        /// <param name="searchMethod">The search method.</param>
+        /// <returns></returns>
+        public static int ConvertToInputSearchMethod(MStabSearchMethod searchMethod)
+        {
+            var translationTable = new Dictionary<MStabSearchMethod, int>()
+            {
+                {
+                    MStabSearchMethod.Grid, InputSearchMethodGrid
+                },
+                {
+                    MStabSearchMethod.GeneticAlgorithm, InputSearchMethodGenetic
+                }
+            };
+            return translationTable[searchMethod];
+        }
+
+        /// <summary>
+        /// Converts to search method.
+        /// </summary>
+        /// <param name="searchMethod">The search method.</param>
+        /// <returns></returns>
+        public static MStabSearchMethod ConvertToSearchMethod(int searchMethod)
+        {
+            var translationTable = new Dictionary<int, MStabSearchMethod>()
+            {
+                {
+                    InputSearchMethodGrid, MStabSearchMethod.Grid
+                },
+                {
+                    InputSearchMethodGenetic, MStabSearchMethod.GeneticAlgorithm
+                }
+            };
+            return translationTable[searchMethod];
+        }
+
+        /// <summary>
+        /// The input grid type automatic
+        /// </summary>
+        public const int InputGridTypeAutomatic = 0;
+
+        /// <summary>
+        /// The input grid type specified
+        /// </summary>
+        public const int InputGridTypeSpecified = 1;
+
+        /// <summary>
+        /// Converts to input grid determination.
+        /// </summary>
+        /// <param name="gridType">Type of the grid.</param>
+        /// <returns></returns>
+        public static int ConvertToInputGridDetermination(GridSizeDetermination gridType)
+        {
+            var translationTable = new Dictionary<GridSizeDetermination, int>()
+            {
+                {
+                    GridSizeDetermination.Automatic, InputGridTypeAutomatic
+                },
+                {
+                    GridSizeDetermination.Specified, InputGridTypeSpecified
+                }
+            };
+
+            return translationTable[gridType];
+        }
+
+        /// <summary>
+        /// Converts to grid determination.
+        /// </summary>
+        /// <param name="gridType">Type of the grid.</param>
+        /// <returns></returns>
+        public static GridSizeDetermination ConvertToGridDetermination(int gridType)
+        {
+            var translationTable = new Dictionary<int, GridSizeDetermination>()
+            {
+                {
+                    InputGridTypeAutomatic, GridSizeDetermination.Automatic
+                },
+                {
+                    InputGridTypeSpecified, GridSizeDetermination.Specified
+                }
+            };
+            return translationTable[gridType];
+        }
+
+        /// <summary>
+        /// The input tangent lines on boundaty lines
+        /// </summary>
+        public const int InputTangentLinesOnBoundatyLines = 0;
+
+        /// <summary>
+        /// The input tangent lines specified
+        /// </summary>
+        public const int InputTangentLinesSpecified = 1;
+
+        /// <summary>
+        /// Converts to input tangent lines definition.
+        /// </summary>
+        /// <param name="tangentLineType">Type of the tangent line.</param>
+        /// <returns></returns>
+        public static int ConvertToInputTangentLinesDefinition(TangentLinesDefinition tangentLineType)
+        {
+            var translationTable = new Dictionary<TangentLinesDefinition, int>()
+            {
+                {
+                    TangentLinesDefinition.OnBoundaryLines, InputGridTypeAutomatic
+                },
+                {
+                    TangentLinesDefinition.Specified, InputGridTypeSpecified
+                }
+            };
+            return translationTable[tangentLineType];
+        }
+
+        /// <summary>
+        /// Converts to tangent lines definition.
+        /// </summary>
+        /// <param name="tangentLineType">Type of the tangent line.</param>
+        /// <returns></returns>
+        public static TangentLinesDefinition ConvertToTangentLinesDefinition(int tangentLineType)
+        {
+            var translationTable = new Dictionary<int, TangentLinesDefinition>()
+            {
+                {
+                    InputGridTypeAutomatic, TangentLinesDefinition.OnBoundaryLines
+                },
+                {
+                    InputGridTypeSpecified, TangentLinesDefinition.Specified
+                }
+            };
+            return translationTable[tangentLineType];
+        }
+
+        /// <summary>
+        /// Converts the shear strength model to soil shear strength model.
+        /// </summary>
+        /// <param name="shearStrengthModel">The shear strength model.</param>
+        /// <returns></returns>
+        public static SoilShearStrengthModel ConvertToSoilShearStrengthModel(ShearStrengthModel shearStrengthModel)
+        {
+            var translationTable = new Dictionary<ShearStrengthModel, SoilShearStrengthModel>()
+                                               {
+                                                   {ShearStrengthModel.None, SoilShearStrengthModel.None},
+                                                   {ShearStrengthModel.CPhi, SoilShearStrengthModel.CPhi},
+                                                   {ShearStrengthModel.StressTable, SoilShearStrengthModel.StressTable},
+                                                   {ShearStrengthModel.PseudoValues, SoilShearStrengthModel.PseudoValues},
+                                                   {ShearStrengthModel.CuMeasured, SoilShearStrengthModel.SuMeasured},
+                                                   {ShearStrengthModel.CuCalculated, SoilShearStrengthModel.SuCalculated},
+                                                   {ShearStrengthModel.CuGradient, SoilShearStrengthModel.SuGradient},
+                                                   {ShearStrengthModel.CuCalculatedYield, SoilShearStrengthModel.SuCalculatedWithYield},
+                                                   {ShearStrengthModel.CPhiOrCuCalculated, SoilShearStrengthModel.CPhiOrSuCalculated},
+                                               };
+            return translationTable[shearStrengthModel];
+        }
+
+        /// <summary>
+        /// Converts the soil shear strength model to shear strength model.
+        /// </summary>
+        /// <param name="soilShearStrengthModel">The soil shear strength model.</param>
+        /// <returns></returns>
+        public static ShearStrengthModel ConvertToShearStrengthModel(SoilShearStrengthModel soilShearStrengthModel)
+        {
+            var translationTable = new Dictionary<SoilShearStrengthModel, ShearStrengthModel>()
+                                               {
+                                                   {SoilShearStrengthModel.None, ShearStrengthModel.None},
+                                                   {SoilShearStrengthModel.CPhi, ShearStrengthModel.CPhi},
+                                                   {SoilShearStrengthModel.StressTable, ShearStrengthModel.StressTable},
+                                                   {SoilShearStrengthModel.PseudoValues, ShearStrengthModel.PseudoValues},
+                                                   {SoilShearStrengthModel.SuMeasured, ShearStrengthModel.CuMeasured},
+                                                   {SoilShearStrengthModel.SuCalculated, ShearStrengthModel.CuCalculated},
+                                                   {SoilShearStrengthModel.SuGradient, ShearStrengthModel.CuGradient},
+                                                   {SoilShearStrengthModel.SuCalculatedWithYield, ShearStrengthModel.CuCalculatedYield},
+                                                   {SoilShearStrengthModel.CPhiOrSuCalculated, ShearStrengthModel.CPhiOrCuCalculated},
+                                               };
+            return translationTable[soilShearStrengthModel];
+        }
+
+        /// <summary>
+        /// Converts the dilatancy type to soil dilatancy dilatancy.
+        /// </summary>
+        /// <param name="dilatancyType">Type of the dilatancy.</param>
+        /// <returns></returns>
+        public static SoilDilatancyType ConvertToSoilDilatancyType(DilatancyType dilatancyType)
+        {
+            var translationTable = new Dictionary<DilatancyType, SoilDilatancyType>()
+                                               {
+                                                   {DilatancyType.Zero, SoilDilatancyType.Zero},
+                                                   {DilatancyType.Phi, SoilDilatancyType.Phi},
+                                                   {DilatancyType.MinusPhi, SoilDilatancyType.MinusPhi},
+                                               };
+            return translationTable[dilatancyType];
+        }
+
+        /// <summary>
+        /// Converts the soil dilatancy type to dilatancy type.
+        /// </summary>
+        /// <param name="soilDilatancyType">Type of the soil dilatancy.</param>
+        /// <returns></returns>
+        public static DilatancyType ConvertToDilatancyType(SoilDilatancyType soilDilatancyType)
+        {
+            var translationTable = new Dictionary<SoilDilatancyType, DilatancyType>()
+                                               {
+                                                   {SoilDilatancyType.Zero, DilatancyType.Zero},
+                                                   {SoilDilatancyType.Phi, DilatancyType.Phi},
+                                                   {SoilDilatancyType.MinusPhi, DilatancyType.MinusPhi},
+                                               };
+            return translationTable[soilDilatancyType];
+        }
+
+        /// <summary>
+        /// Converts the input StabilityDesignMethod to the Dam StabilityDesignMethod.
+        /// </summary>
+        /// <param name="stabilityDesignMethod">The stability design method.</param>
+        /// <returns></returns>
+        public static StabilityDesignMethod ConvertToDamStabilityDesignMethod(LocationDesignOptionsStabilityDesignMethod stabilityDesignMethod)
+        {
+            var translationTable = new Dictionary<LocationDesignOptionsStabilityDesignMethod, StabilityDesignMethod>()
+            {
+                {LocationDesignOptionsStabilityDesignMethod.OptimizedSlopeAndShoulderAdaption, StabilityDesignMethod.OptimizedSlopeAndShoulderAdaption},
+                {LocationDesignOptionsStabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption, StabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption}
+            };
+            return translationTable[stabilityDesignMethod];
+        }
+
+        /// <summary>
+        /// Converts the Dam StabilityDesignMethod to the input StabilityDesignMethod.
+        /// </summary>
+        /// <param name="stabilityDesignMethod">The stability design method.</param>
+        /// <returns></returns>
+        public static LocationDesignOptionsStabilityDesignMethod ConvertToInputStabilityDesignMethod(StabilityDesignMethod stabilityDesignMethod)
+        {
+            var translationTable = new Dictionary<StabilityDesignMethod, LocationDesignOptionsStabilityDesignMethod>()
+            {
+                {StabilityDesignMethod.OptimizedSlopeAndShoulderAdaption, LocationDesignOptionsStabilityDesignMethod.OptimizedSlopeAndShoulderAdaption},
+                {StabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption, LocationDesignOptionsStabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption}
+            };
+            return translationTable[stabilityDesignMethod];
+        }
+
+        /// <summary>
+        /// The load situation dry
+        /// </summary>
+        public const int LoadSituationDry = 0;
+
+        /// <summary>
+        /// The load situation wet
+        /// </summary>
+        public const int LoadSituationWet = 1;
+
+        /// <summary>
+        /// Converts to Load Situation.
+        /// </summary>
+        /// <param name="inputLoadSituation">The input Load Situation.</param>
+        /// <returns></returns>
+        public static LoadSituation ConvertToLoadSituation(int inputLoadSituation)
+        {
+            var translationTable = new Dictionary<int, LoadSituation>()
+            {
+                {LoadSituationDry, LoadSituation.Dry},
+                {LoadSituationWet, LoadSituation.Wet}
+            };
+            return translationTable[inputLoadSituation];
+        }
+
+        /// <summary>
+        /// Converts to output LoadSituation.
+        /// </summary>
+        /// <param name="loadSituation">The Load Situation.</param>
+        /// <returns></returns>
+        public static int ConvertToOutputLoadSituation(LoadSituation loadSituation)
+        {
+            var translationTable = new Dictionary<LoadSituation, int>()
+            {
+                {LoadSituation.Dry, LoadSituationDry},
+                {LoadSituation.Wet, LoadSituationWet}
+            };
+            return translationTable[loadSituation];
+        }
+
+        /// <summary>
+        /// The dike dry sensitivity none
+        /// </summary>
+        public const int DikeDrySensitivityNone = 0;
+
+        /// <summary>
+        /// The dike dry sensitivity dry
+        /// </summary>
+        public const int DikeDrySensitivityDry = 1;
+
+        /// <summary>
+        /// The hydraulic shortcut type hydraulic shortcut
+        /// </summary>
+        public const int HydraulicShortcutTypeHydraulicShortcut = 0;
+
+        /// <summary>
+        /// The hydraulic shortcut type no hydraulic shortcut
+        /// </summary>
+        public const int HydraulicShortcutTypeNoHydraulicShortcut = 1;
+
+        /// <summary>
+        /// The uplift type uplift
+        /// </summary>
+        public const int UpliftTypeUplift = 0;
+
+        /// <summary>
+        /// The uplift type no uplift
+        /// </summary>
+        public const int UpliftTypeNoUplift = 1;
+
+        /// <summary>
+        /// Converts to Uplift Type.
+        /// </summary>
+        /// <param name="inputUpliftType">The input UpliftType.</param>
+        /// <returns></returns>
+        public static UpliftType ConvertToUpliftType(int inputUpliftType)
+        {
+            var translationTable = new Dictionary<int, UpliftType>()
+            {
+                {UpliftTypeUplift, UpliftType.Uplift},
+                {UpliftTypeNoUplift, UpliftType.NoUplift}
+            };
+            return translationTable[inputUpliftType];
+        }
+
+        /// <summary>
+        /// Converts to output Uplift Type.
+        /// </summary>
+        /// <param name="upliftType">The UpliftType.</param>
+        /// <returns></returns>
+        public static int ConvertToOutputUpliftType(UpliftType upliftType)
+        {
+            var translationTable = new Dictionary<UpliftType, int>()
+            {
+                {UpliftType.Uplift, UpliftTypeUplift},
+                {UpliftType.NoUplift, UpliftTypeNoUplift}
+            };
+            return translationTable[upliftType];
+        }
+
+        /// <summary>
+        /// The m stab model type bishop
+        /// </summary>
+        public const int MStabModelTypeBishop = 0;
+
+        /// <summary>
+        /// The m stab model type spencer
+        /// </summary>
+        public const int MStabModelTypeSpencer = 1;
+
+        /// <summary>
+        /// The m stab model type fellenius
+        /// </summary>
+        public const int MStabModelTypeFellenius = 2;
+
+        /// <summary>
+        /// The m stab model type uplift van
+        /// </summary>
+        public const int MStabModelTypeUpliftVan = 3;
+
+        /// <summary>
+        /// The m stab model type uplift spencer
+        /// </summary>
+        public const int MStabModelTypeUpliftSpencer = 4;
+
+        /// <summary>
+        /// The m stab model type bishop random field
+        /// </summary>
+        public const int MStabModelTypeBishopRandomField = 5;
+
+        /// <summary>
+        /// The m stab model type horizontal balance
+        /// </summary>
+        public const int MStabModelTypeHorizontalBalance = 6;
+
+        /// <summary>
+        /// The m stab model type bishop uplift van
+        /// </summary>
+        public const int MStabModelTypeBishopUpliftVan = 7;
+
+        /// <summary>
+        /// The m stab model type spencer high
+        /// </summary>
+        public const int MStabModelTypeSpencerHigh = 8;
+
+        /// <summary>
+        /// The m stab model type spencer low
+        /// </summary>
+        public const int MStabModelTypeSpencerLow = 9;
+
+        /// <summary>
+        /// Converts to MStab Model Type.
+        /// </summary>
+        /// <param name="inputMStabModelType">The input MStabModelType.</param>
+        /// <returns></returns>
+        public static MStabModelType ConvertToMStabModelType(int inputMStabModelType)
+        {
+            var translationTable = new Dictionary<int, MStabModelType>()
+            {
+                {MStabModelTypeBishop, MStabModelType.Bishop},
+                {MStabModelTypeSpencer, MStabModelType.Spencer},
+                {MStabModelTypeFellenius, MStabModelType.Fellenius},
+                {MStabModelTypeUpliftVan, MStabModelType.UpliftVan},
+                {MStabModelTypeUpliftSpencer, MStabModelType.UpliftSpencer},
+                {MStabModelTypeBishopRandomField, MStabModelType.BishopRandomField},
+                {MStabModelTypeHorizontalBalance, MStabModelType.HorizontalBalance},
+                {MStabModelTypeBishopUpliftVan, MStabModelType.BishopUpliftVan},
+                {MStabModelTypeSpencerHigh, MStabModelType.SpencerHigh},
+                {MStabModelTypeSpencerLow, MStabModelType.SpencerLow}                
+            };
+            return translationTable[inputMStabModelType];
+        }
+
+        /// <summary>
+        /// Converts to output MStabModelType.
+        /// </summary>
+        /// <param name="mStabModelType">The UpliftType.</param>
+        /// <returns></returns>
+        public static int ConvertToOutputMStabModelType(MStabModelType mStabModelType)
+        {
+            var translationTable = new Dictionary<MStabModelType, int>()
+            {
+                {MStabModelType.Bishop, MStabModelTypeBishop},
+                {MStabModelType.Spencer, MStabModelTypeSpencer},
+                {MStabModelType.Fellenius, MStabModelTypeFellenius},
+                {MStabModelType.UpliftVan, MStabModelTypeUpliftVan},
+                {MStabModelType.UpliftSpencer, MStabModelTypeUpliftSpencer},
+                {MStabModelType.BishopRandomField, MStabModelTypeBishopRandomField},
+                {MStabModelType.HorizontalBalance, MStabModelTypeHorizontalBalance},
+                {MStabModelType.BishopUpliftVan, MStabModelTypeBishopUpliftVan},
+                {MStabModelType.SpencerHigh, MStabModelTypeSpencerHigh},
+                {MStabModelType.SpencerLow, MStabModelTypeSpencerLow}
+            };
+            return translationTable[mStabModelType];
+        }
+
+        /// <summary>
+        /// The scenario type scenario01
+        /// </summary>
+        public const int ScenarioTypeScenario01 = 0;
+
+        /// <summary>
+        /// The scenario type scenario02
+        /// </summary>
+        public const int ScenarioTypeScenario02 = 1;
+
+        /// <summary>
+        /// The scenario type scenario03
+        /// </summary>
+        public const int ScenarioTypeScenario03 = 2;
+
+        /// <summary>
+        /// The scenario type scenario04
+        /// </summary>
+        public const int ScenarioTypeScenario04 = 3;
+
+        /// <summary>
+        /// The scenario type scenario05
+        /// </summary>
+        public const int ScenarioTypeScenario05 = 4;
+
+        /// <summary>
+        /// The scenario type scenario06
+        /// </summary>
+        public const int ScenarioTypeScenario06 = 5;
+
+        /// <summary>
+        /// The scenario type scenario07
+        /// </summary>
+        public const int ScenarioTypeScenario07 = 6;
+
+        /// <summary>
+        /// The scenario type scenario08
+        /// </summary>
+        public const int ScenarioTypeScenario08 = 7;
+
+        /// <summary>
+        /// The scenario type scenario09
+        /// </summary>
+        public const int ScenarioTypeScenario09 = 8;
+
+        /// <summary>
+        /// The scenario type scenario10
+        /// </summary>
+        public const int ScenarioTypeScenario10 = 9;
+
+        /// <summary>
+        /// The scenario type scenario11
+        /// </summary>
+        public const int ScenarioTypeScenario11 = 10;
+
+        /// <summary>
+        /// The piping model type bligh
+        /// </summary>
+        public const int PipingModelTypeBligh = 0;
+
+        /// <summary>
+        /// The piping model type sellmeijer
+        /// </summary>
+        public const int PipingModelTypeSellmeijer = 1;
+
+        /// <summary>
+        /// The piping model type sellmeijer4 forces
+        /// </summary>
+        public const int PipingModelTypeSellmeijer4Forces = 2;
+
+        /// <summary>
+        /// The piping model type wti2017
+        /// </summary>
+        public const int PipingModelTypeWti2017 = 3;
+
+        /// <summary>
+        /// Converts to Piping Model Type.
+        /// </summary>
+        /// <param name="inputPipingModelType">The input PipingModelType.</param>
+        /// <returns></returns>
+        public static PipingModelType ConvertToPipingModelType(int inputPipingModelType)
+        {
+            var translationTable = new Dictionary<int, PipingModelType>()
+            {
+                {PipingModelTypeBligh, PipingModelType.Bligh},
+                {PipingModelTypeSellmeijer, PipingModelType.Sellmeijer},
+                {PipingModelTypeSellmeijer4Forces, PipingModelType.Sellmeijer4Forces},
+                {PipingModelTypeWti2017, PipingModelType.Wti2017}
+            };
+            return translationTable[inputPipingModelType];
+        }
+
+        /// <summary>
+        /// Converts to output PipingModelType.
+        /// </summary>
+        /// <param name="pipingModelType">The UpliftType.</param>
+        /// <returns></returns>
+        public static int ConvertToOutputPipingModelType(PipingModelType pipingModelType)
+        {
+            var translationTable = new Dictionary<PipingModelType, int>()
+            {
+                {PipingModelType.Bligh, PipingModelTypeBligh},
+                {PipingModelType.Sellmeijer, PipingModelTypeSellmeijer},
+                {PipingModelType.Sellmeijer4Forces, PipingModelTypeSellmeijer4Forces},
+                {PipingModelType.Wti2017, PipingModelTypeWti2017}
+            };
+            return translationTable[pipingModelType];
+        }
+
+        /// <summary>
+        /// Constants for translating to Enums TimeStepUnit
+        /// </summary>
+        public const uint TimeStepUnitSecond = 0;
+        public const uint TimeStepUnitMinute = 1;
+        public const uint TimeStepUnitHour = 2;
+        public const uint TimeStepUnitDay = 3;
+        public const uint TimeStepUnitMonth = 4;
+        public const uint TimeStepUnitWeek = 5;
+        public const uint TimeStepUnitYear = 6;
+        public const uint TimeStepUnitNonequidistant = 7;
+
+        /// <summary>
+        /// Converts the input TimeStepUnit to the TimeStepUnit.
+        /// </summary>
+        /// <param name="timeStepUnit">The time step unit.</param>
+        /// <returns></returns>
+        public static TimeStepUnit ConvertToTimeStepUnit(uint timeStepUnit)
+        {
+            var translationTable = new Dictionary<uint, TimeStepUnit>()
+            {
+                {TimeStepUnitSecond, TimeStepUnit.Second},
+                {TimeStepUnitMinute, TimeStepUnit.Minute},
+                {TimeStepUnitHour, TimeStepUnit.Hour},
+                {TimeStepUnitDay, TimeStepUnit.Day},
+                {TimeStepUnitMonth, TimeStepUnit.Month},
+                {TimeStepUnitWeek, TimeStepUnit.Week},
+                {TimeStepUnitYear, TimeStepUnit.Year},
+                {TimeStepUnitNonequidistant, TimeStepUnit.Nonequidistant},
+            };
+            return translationTable[timeStepUnit];
+        }
+
+        /// <summary>
+        /// Converts the TimeStepUnit to the input TimeStepUnit.
+        /// </summary>
+        /// <param name="timeStepUnit">The time step unit.</param>
+        /// <returns></returns>
+        public static uint ConvertToInputTimeStepUnit(TimeStepUnit timeStepUnit)
+        {
+            var translationTable = new Dictionary<TimeStepUnit, uint>()
+            {
+                {TimeStepUnit.Second, TimeStepUnitSecond},
+                {TimeStepUnit.Minute, TimeStepUnitMinute},
+                {TimeStepUnit.Hour, TimeStepUnitHour},
+                {TimeStepUnit.Day, TimeStepUnitDay},
+                {TimeStepUnit.Month, TimeStepUnitMonth},
+                {TimeStepUnit.Week, TimeStepUnitWeek},
+                {TimeStepUnit.Year, TimeStepUnitYear},
+                {TimeStepUnit.Nonequidistant, TimeStepUnitNonequidistant},
+            };
+            return translationTable[timeStepUnit];
+        }
+
+        /// <summary>
+        /// Constants for translating to Enums PlLineType
+        /// </summary>
+        public const uint PlLineTypePl1 = 1;
+        public const uint PlLineTypePl2 = 2;
+        public const uint PlLineTypePl3 = 3;
+        public const uint PlLineTypePl4 = 4;
+
+        /// <summary>
+        /// Converts the input plLineType to Dam plLineType.
+        /// </summary>
+        /// <param name="plLineType">Type of the pl line.</param>
+        /// <returns>plLineType</returns>
+        public static PLLineType ConvertToPlLineType(uint plLineType)
+        {
+            var translationTable = new Dictionary<uint, PLLineType>()
+            {
+                {PlLineTypePl1, PLLineType.PL1},
+                {PlLineTypePl2, PLLineType.PL2},
+                {PlLineTypePl3, PLLineType.PL3},
+                {PlLineTypePl4, PLLineType.PL4}
+            };
+            return translationTable[plLineType];
+        }
+
+        /// <summary>
+        /// Converts the Dam plLineType to input plLineType.
+        /// </summary>
+        /// <param name="plLineType">Type of the pl line.</param>
+        /// <returns>plLineType as integer</returns>
+        public static uint ConvertToInputPlLineType(PLLineType plLineType)
+        {
+            var translationTable = new Dictionary<PLLineType, uint>()
+            {
+                {PLLineType.PL1, PlLineTypePl1},
+                {PLLineType.PL2, PlLineTypePl2},
+                {PLLineType.PL3, PlLineTypePl3},
+                {PLLineType.PL4, PlLineTypePl4}
+            };
+            return translationTable[plLineType];
+        }
+
+        /// <summary>
+        /// Constants for translating to Enums SensorType
+        /// </summary>
+        public const uint SensorTypePiezometricHead = 0;
+        public const uint SensorTypeWaterLevel = 1;
+        public const uint SensorTypePolderLevel = 2;
+
+        /// <summary>
+        /// Converts the Dam sensorType to input sensorType.
+        /// </summary>
+        /// <param name="sensorType">Type of the sensor.</param>
+        /// <returns>sensorType</returns>
+        public static SensorType ConvertToSensorType(uint sensorType)
+        {
+            var translationTable = new Dictionary<uint, SensorType>()
+            {
+                {SensorTypePiezometricHead, SensorType.PiezometricHead},
+                {SensorTypePolderLevel, SensorType.PolderLevel},
+                {SensorTypeWaterLevel, SensorType.WaterLevel}
+            };
+            return translationTable[sensorType];
+        }
+
+        /// <summary>
+        /// Converts the Dam sensorType to input sensorType.
+        /// </summary>
+        /// <param name="sensorType">Type of the sensor.</param>
+        /// <returns>sensorType as integer</returns>
+        public static uint ConvertToInputSensorType(SensorType sensorType)
+        {
+            var translationTable = new Dictionary<SensorType, uint>()
+            {
+                {SensorType.PiezometricHead, SensorTypePiezometricHead},
+                {SensorType.PolderLevel, SensorTypePolderLevel},
+                {SensorType.WaterLevel, SensorTypeWaterLevel}
+            };
+            return translationTable[sensorType];
+        }
+
+        /// <summary>
+        /// Constants for translating to Enums DataSourceTypeSensors
+        /// </summary>
+        public const uint DataSourceTypeSensorsIgnore = 0;
+        public const uint DataSourceTypeSensorsLocationData = 1;
+        public const uint DataSourceTypeSensorsSensor = 2;
+
+        /// <summary>
+        /// Converts the Dam DataSourceTypeSensors to input DataSourceTypeSensors.
+        /// </summary>
+        /// <param name="dataSourceTypeSensors">The data source type sensors.</param>
+        /// <returns>
+        /// DataSourceTypeSensors
+        /// </returns>
+        public static DataSourceTypeSensors ConvertToDataSourceTypeSensors(uint dataSourceTypeSensors)
+        {
+            var translationTable = new Dictionary<uint, DataSourceTypeSensors>()
+            {
+                {DataSourceTypeSensorsIgnore, DataSourceTypeSensors.Ignore},
+                {DataSourceTypeSensorsLocationData, DataSourceTypeSensors.LocationData},
+                {DataSourceTypeSensorsSensor, DataSourceTypeSensors.Sensor}
+            };
+            return translationTable[dataSourceTypeSensors];
+        }
+
+        /// <summary>
+        /// Converts the Dam DataSourceType to input DataSourceType.
+        /// </summary>
+        /// <param name="dataSourceTypeSensors">The data source type sensors.</param>
+        /// <returns>
+        /// DataSourceType as integer
+        /// </returns>
+        public static uint ConvertToInputDataSourceTypeSensors(DataSourceTypeSensors dataSourceTypeSensors)
+        {
+            var translationTable = new Dictionary<DataSourceTypeSensors, uint>()
+            {
+                {DataSourceTypeSensors.Ignore, DataSourceTypeSensorsIgnore},
+                {DataSourceTypeSensors.LocationData, DataSourceTypeSensorsLocationData},
+                {DataSourceTypeSensors.Sensor, DataSourceTypeSensorsSensor}
+            };
+            return translationTable[dataSourceTypeSensors];
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/FailureMechanismeParamatersMStabXmlHandler.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/FailureMechanismeParamatersMStabXmlHandler.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/FailureMechanismeParamatersMStabXmlHandler.cs	(revision 3305)
@@ -0,0 +1,99 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Deltares.Geotechnics;
+using Deltares.Geotechnics.Converter;
+using Deltares.Geotechnics.SurfaceLines;
+using Deltares.Standard.IO.Xml;
+using Deltares.Standard.Reflection;
+
+namespace Deltares.Dam.Data.IO
+{
+    /// <summary>
+    /// This handler is responsible for handling an object which has been created with the SurfaceLine type.
+    /// Since the old SurfaceLine has been refactored, this handler will convert the old SurfaceLine to a SurfaceLine2.
+    /// </summary>
+    public class FailureMechanismeParamatersMStabXmlHandler : IXmlHandler
+    {
+        public void SetVersion(string version)
+        {
+        }
+
+
+        /// <summary>
+        /// This method returns true for a <see cref="FailureMechanismeParamatersMStab"/> type and the <see cref="FailureMechanismeParamatersMStab.SurfaceLine"/>
+        /// property.
+        /// </summary>
+        /// <param name="type">The type to check for.</param>
+        /// <param name="property">The property of the type to check for</param>
+        /// <returns>True if type is <see cref="Location"/> and property is "SurfaceLine"</returns>
+        public bool CanHandle(Type type, string property)
+        {
+            return type == typeof(FailureMechanismeParamatersMStab) && property == StaticReflection.GetMemberName<FailureMechanismeParamatersMStab>(x => x.SurfaceLine);
+        }
+
+        /// <summary>
+        /// Not implemented for this class.
+        /// </summary>
+        /// <param name="target"></param>
+        /// <param name="value"></param>
+        /// <param name="objects"></param>
+        public void Handle(object target, string value, object[] objects)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// If the <paramref name="value"/> is an old <see cref="BaseSurfaceLine"/> and the <paramref name="target"/> is a
+        /// <see cref="FailureMechanismeParamatersMStab"/>, the <paramref name="value"/> will be converted to the new <see cref="SurfaceLine2"/> 
+        /// and the <see cref="FailureMechanismeParamatersMStab.SurfaceLine"/> property is set for the target.
+        /// </summary>
+        /// <param name="target">The target to set the handle the value for</param>
+        /// <param name="value">The value to handle</param>
+        public void HandleObject(object target, object value)
+        {
+            var oldSurfaceLine = value as BaseSurfaceLine;
+            if (null != oldSurfaceLine)
+            {
+                ((FailureMechanismeParamatersMStab)target).SurfaceLine = (new OldSurfaceLineToNewConverter()).Convert(oldSurfaceLine);
+            }
+        }
+
+        public bool CanHandle(Type type)
+        {
+            return false;
+        }
+
+        public Type GetFormerPropertyType(Type type, string property)
+        {
+            return null;
+        }
+
+        public void Handle(object target, string property, object value, object[] objects)
+        {
+        }
+
+        public void Upgrade(object[] targets)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/AttributeWrongValueException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/AttributeWrongValueException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/AttributeWrongValueException.cs	(revision 3305)
@@ -0,0 +1,44 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Deltares.Maps
+{
+    [Serializable]
+    public class AttributeWrongValueException : Exception
+    {
+        private const string MessagePattern =
+            "The value {0} of attribute {1} is wrong (beyond its limits ({2} - {3})). Please check the specified value(s).";
+
+        public AttributeWrongValueException(string attributeName, double value, double min, double max) :
+            base(string.Format(MessagePattern, value, attributeName, min, max))
+        {
+        }
+
+        protected AttributeWrongValueException(
+            SerializationInfo info,
+            StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/NonExistentLocationException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/NonExistentLocationException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/NonExistentLocationException.cs	(revision 3305)
@@ -0,0 +1,39 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+
+namespace Deltares.Dam.Data
+{
+
+    [Serializable]
+    public class NonExistentLocationException : Exception
+    {
+        public NonExistentLocationException()
+        {
+        }
+
+        public NonExistentLocationException(string locationId, string messageFormat)
+            : base(string.Format(messageFormat, locationId))
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/Configuration/DataAttribute.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/Configuration/DataAttribute.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/Configuration/DataAttribute.cs	(revision 3305)
@@ -0,0 +1,46 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Xml.Serialization;
+
+namespace Deltares.Dam.Data.DataPlugins.Configuration
+{
+    public class DataAttribute
+    {
+        [XmlAttribute("Id")]
+        public string AttributeId { get; set; }
+
+        [XmlAttribute("Name")]
+        public string AttributeName { get; set; }
+
+        [XmlAttribute("DataSource")]
+        public string DataSource { get; set; }
+
+        public override string ToString()
+        {
+            return AttributeId + "|" + AttributeName + "|" + DataSource;
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IFeatureCollection.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IFeatureCollection.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IFeatureCollection.cs	(revision 3305)
@@ -0,0 +1,49 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+
+namespace Deltares.Maps
+{
+    public interface IFeatureCollection
+    {
+        void Add(IFeature feature);
+
+        void Add(IEnumerable<IFeature> features);
+
+        void Remove(IFeature feature);
+
+        void Clear();
+
+        // Gets the feature count
+        int Count { get; }
+    }
+
+    public interface IFeatureCollection<T> : IFeatureCollection
+        where T : IFeature
+    {
+        void Add(T feature);
+
+        void Add(IEnumerable<T> features);
+
+        void Remove(T feature);
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/ParameterMissingException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/ParameterMissingException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/ParameterMissingException.cs	(revision 3305)
@@ -0,0 +1,48 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Deltares.Dam.Data
+{
+
+    [Serializable]
+    public class ParameterMissingException : Exception
+    {
+        public ParameterMissingException(string messageFormat)
+            : base(messageFormat, null)
+        {
+        }
+
+        public ParameterMissingException(string messageFormat, Exception inner)
+            : base(string.Format(messageFormat), inner)
+        {
+        }
+
+        protected ParameterMissingException(
+            SerializationInfo info,
+            StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvParser.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvParser.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvParser.cs	(revision 3305)
@@ -0,0 +1,237 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.IO;
+using System.Text.RegularExpressions;
+
+namespace Deltares.Dam.Data
+{
+
+    public static class CsvParser
+    {
+        /// <summary>
+        /// Parses the header of an csv import file
+        /// </summary>
+        /// <param name="header">The header string</param>
+        /// <param name="splitter">The regular expression</param>
+        /// <returns>An array of strings containing the header names</returns>
+        public static string[] ParseHeader(string header, Regex splitter)
+        {
+            ThrowHelper.ThrowIfStringArgumentNullOrEmpty(header, StringResourceNames.CsvHeaderNullOrEmpty);
+            ThrowHelper.ThrowIfArgumentNull(splitter, "splitter", StringResourceNames.CsvSplitterPatternNotValid);
+            ThrowHelper.ThrowIfStringArgumentNullOrEmpty(splitter.ToString(), StringResourceNames.CsvSplitterPatternNotValid);
+
+            return splitter.Split(header);
+        }
+
+        /// <summary>
+        /// This regex splits comma or semicolon separated lists of optionally quoted strings. It handles quoted delimiters and escaped quotes. 
+        /// Whitespace inside quotes is preserved, outside is eaten.
+        /// See: http://regexlib.com/REDetails.aspx?regexp_id=1325
+        /// </summary>
+        public static string CsvSplitPatternCommaAndSemicolonCombined =
+            @"\s*[;,]\s*(?!(?<=(?:^|[;,])\s*""(?:[^""]|""""|\\"")*[;,]\s*)(?:[^""]|""""|\\"")*""\s*(?:[;,]|$))";
+
+        public static string CsvSplitPatternSemicolonOnly =
+           @"\s*[;]\s*(?!(?<=(?:^|[;])\s*""(?:[^""]|""""|\\"")*[;]\s*)(?:[^""]|""""|\\"")*""\s*(?:[;]|$))";
+
+        public static string CsvSplitPatternCommaOnly =
+            @"\s*[,]\s*(?!(?<=(?:^|[,])\s*""(?:[^""]|""""|\\"")*[,]\s*)(?:[^""]|""""|\\"")*""\s*(?:[,]|$))";
+
+        /// <summary>
+        /// Loads entities of an specific type from a csv file
+        /// </summary>
+        /// <typeparam name="T">The type to construct</typeparam>
+        /// <param name="setter">The object materializer (property setters)</param>
+        /// <param name="fileName">The file name to parse</param>
+        /// <returns>A sequance containing materialized intances of the type to construct from the csv data</returns> 
+        public static IEnumerable<T> LoadFromCsvFile<T>(this ObjectMaterializer<T> setter, string fileName)
+            where T : new()
+        {
+            return LoadFromCsvFile(setter, fileName, true);
+        }
+
+        /// <summary>
+        /// Loads entities of an specific type from a csv file. Also returns the parsed headers
+        /// </summary>
+        /// <typeparam name="T">The type to construct</typeparam>
+        /// <param name="setter">The object materializer (property setters)</param>
+        /// <param name="fileName">The file name to parse</param>
+        /// <returns>A sequance containing materialized intances of the type to construct from the csv data</returns> 
+        public static IEnumerable<T> LoadFromCsvFile<T>(this ObjectMaterializer<T> setter, string fileName, ref string[] headers)
+            where T : new()
+        {
+            // Assemble headers that are available in headerline
+            headers = new string[] { };
+            var headerInfoHasBeenParsed = false;
+            var splitter = new Regex(CsvSplitPatternSemicolonOnly, RegexOptions.IgnoreCase | RegexOptions.Compiled);
+            using (var sr = new StreamReader(fileName))
+            {
+                while (!sr.EndOfStream && !headerInfoHasBeenParsed)
+                {
+                    if (!headerInfoHasBeenParsed)
+                    {
+                        headers = ParseHeader(sr.ReadLine(), splitter);
+                        headerInfoHasBeenParsed = true;
+                        continue;
+                    }
+                }
+            }
+
+            // Do the actual load of the data
+            return LoadFromCsvFile(setter, fileName, true);
+        }
+
+        /// <summary>
+        /// Loads entities of an specific type from a csv file
+        /// </summary>
+        /// <typeparam name="T">The type to construct</typeparam>
+        /// <param name="setter">The object materializer (property setters)</param>
+        /// <param name="fileName">The file name to parse</param>
+        /// <param name="splitPattern">The regular expression for splitting the items in a string</param>
+        /// <returns>A sequance containing materialized intances of the type to construct from the csv data</returns> 
+        public static IEnumerable<T> LoadFromCsvFile<T>(this ObjectMaterializer<T> setter, string fileName, string splitPattern)
+            where T : new()
+        {
+            return LoadFromCsvFile(setter, fileName, true, splitPattern);
+        }
+
+        /// <summary>
+        /// Loads entities of an specific type from a csv file
+        /// </summary>
+        /// <typeparam name="T">The type to construct</typeparam>
+        /// <param name="setter">The object materializer (property setters)</param>
+        /// <param name="fileName">The file name to parse</param>
+        /// <param name="headerInfoInFirstLine">Indicates if the first line in the csv file contains the header info</param>
+        /// <returns>A sequance containing materialized intances of the type to construct from the csv data</returns> 
+        public static IEnumerable<T> LoadFromCsvFile<T>(this ObjectMaterializer<T> setter, string fileName, bool headerInfoInFirstLine)
+            where T : new()
+        {
+            return LoadFromCsvFile(setter, fileName, true, CsvSplitPatternSemicolonOnly);
+        }
+
+        /// <summary>
+        /// Loads entities of an specific type from a csv file
+        /// </summary>
+        /// <typeparam name="T">The type to construct</typeparam>
+        /// <param name="materializer">The object materializer (property setters)</param>
+        /// <param name="fileName">The file name to parse</param>
+        /// <param name="headerInfoInFirstLine">Indicates if the first line in the csv file contains the header info</param>
+        /// <param name="splitPattern">The regular expression for splitting the items in a string</param>
+        /// <returns>A sequance containing materialized intances of the type to construct from the csv data</returns> 
+        public static IEnumerable<T> LoadFromCsvFile<T>(this ObjectMaterializer<T> materializer, string fileName, bool headerInfoInFirstLine, string splitPattern)
+            where T : new()
+        {
+            ThrowHelper.ThrowIfStringArgumentNullOrEmpty(fileName, StringResourceNames.CsvFileNotValid);
+            ThrowHelper.ThrowIfFileNotExist(fileName, StringResourceNames.CsvFileNotFound);
+            ThrowHelper.ThrowIfStringArgumentNullOrEmpty(splitPattern, StringResourceNames.CsvSplitterPatternNotValid);
+            ThrowHelper.ThrowIfArgumentNull(materializer, nameof(materializer), StringResourceNames.CsvObjectMaterializerNotValid);
+            ThrowHelper.ThrowWhenConditionIsTrue(
+                materializer,
+                StringResourceNames.CsvObjectMaterializerNotValid,
+                c => materializer.Count == 0,
+                r => new CsvParserException(ThrowHelper.GetResourceString(r)));
+
+
+            var splitter = new Regex(splitPattern, RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
+            using (var sr = new StreamReader(fileName))
+            {
+                var headers = new string[] { };
+                var headerInfoHasBeenParsed = false;
+
+                // the first line item count will be used as an extra check for each 
+                // next row to parse. If the count doesn match 
+                var firstLineItemCount = 0;
+                while (!sr.EndOfStream)
+                {
+                    if (headerInfoInFirstLine && !headerInfoHasBeenParsed)
+                    {
+                        headers = ParseHeader(sr.ReadLine(), splitter);
+                        headerInfoHasBeenParsed = true;
+                        firstLineItemCount = headers.Length;
+
+                        foreach (string key in materializer.MappingKeys)
+                        {
+                            if (materializer.IsRequired(key) && !headers.Contains(key))
+                                throw new CsvParserException(string.Format("The mapped key '{0}' doesn't exist in the header of csv file '{1}'", key, fileName));
+                        }
+
+                        continue;
+                    }
+
+                    var items = splitter.Split(sr.ReadLine());
+                    if (firstLineItemCount == 0)
+                        firstLineItemCount = items.Length;
+
+                    // TODO: Add a message to some log that this line could not be parsed
+                    // For now just throw an exception
+                    if (items.Length != firstLineItemCount)
+                        throw new CsvParserException(string.Format("The number of items parsed in the current line don't match with the number of the first line in csv file '{0}'", fileName));
+
+                    var entity = new T();
+                    try
+                    {
+                        if (headers.Length > 0)
+                        {
+                            for (var i = 0; i < items.Length; i++)
+                            {
+                                // Only call the materializer when the is a match between the 
+                                // columns declared in the csv and the materializer
+                                if (materializer.MappingKeys.Contains(headers[i]))
+                                    materializer[headers[i]](entity, items[i]);
+                            }
+                        }
+                        else
+                        {
+                            for (var i = 0; i < items.Length; i++)
+                            {
+                                materializer[i](entity, items[i]);
+                            }
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        throw new CsvParserException(String.Format("Error parsing CSV file. Check if no empty lines or columns are defined in file '{0}. (Parser error is: '{1}')", fileName, e.Message));
+                    }
+
+                    yield return entity;
+                }
+            }
+        }
+
+        public static IEnumerable<string> Lines(this StreamReader source)
+        {
+            string line;
+
+            if (source == null)
+                throw new ArgumentNullException("source");
+
+            while ((line = source.ReadLine()) != null)
+            {
+                yield return line;
+            }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/ModelFactors.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/ModelFactors.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/ModelFactors.cs	(revision 3305)
@@ -0,0 +1,53 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Xml.Serialization;
+
+namespace Deltares.Dam.Data
+{
+    public class ModelFactors
+    {
+        private double defaultSafetyFactorStabilityInnerSlope = 1.0;
+        private double defaultSafetyFactorStabilityOuterSlope = 1.0;
+        private double defaultSafetyFactorPiping = 1.0;
+        private double defaultUpliftCriterionStability = 1.2;
+        private double defaultUpliftCriterionPiping = 1.2;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public ModelFactors()
+        {
+            RequiredSafetyFactorStabilityInnerSlope = defaultSafetyFactorStabilityInnerSlope;
+            RequiredSafetyFactorStabilityOuterSlope = defaultSafetyFactorStabilityOuterSlope;
+            RequiredSafetyFactorPiping = defaultSafetyFactorPiping;
+            UpliftCriterionStability = defaultUpliftCriterionStability;
+            UpliftCriterionPiping = defaultUpliftCriterionPiping;
+        }
+
+        public double RequiredSafetyFactorStabilityInnerSlope { get; set; }
+        public double RequiredSafetyFactorStabilityOuterSlope { get; set; }
+        public double RequiredSafetyFactorPiping { get; set; }
+        public double UpliftCriterionStability { get; set; }
+        public double UpliftCriterionPiping { get; set; }
+
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/TestData/Gemeenten.prj
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/TestData/Gemeenten.prj	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/TestData/Gemeenten.prj	(revision 3305)
@@ -0,0 +1 @@
+PROJCS["Rijksdriehoekstelsel_New",GEOGCS["GCS_Amersfoort",DATUM["D_Amersfoort",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Double_Stereographic"],PARAMETER["False_Easting",155000.0],PARAMETER["False_Northing",463000.0],PARAMETER["Central_Meridian",5.38763888888889],PARAMETER["Scale_Factor",0.9999079],PARAMETER["Latitude_Of_Origin",52.15616055555555],UNIT["Meter",1.0]]
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/SurfaceLineCsvColumnNames.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/SurfaceLineCsvColumnNames.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/SurfaceLineCsvColumnNames.cs	(revision 3305)
@@ -0,0 +1,37 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Dam.Data.CsvImporters
+{
+    /// <summary>
+    /// Defines column name definitions used for importing csv data surfacelines
+    /// </summary>
+    public static class SurfaceLineCsvColumnNames
+    {
+        // The following 2 fields point to the same data
+        // location_id is the preferred columnname
+        // Profielnaam is used for backward compatiblity
+        public const string LocationColumnName = "LocationId";
+        public const string ProfileNameColumnName = "Profielnaam";
+
+        public const string FirstXColumnName = "X1";
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Properties/AssemblyInfo.cs.svn
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Properties/AssemblyInfo.cs.svn	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Properties/AssemblyInfo.cs.svn	(revision 3305)
@@ -0,0 +1,16 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Deltares.Dam.Data")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+
+[assembly: ComVisible(false)]
+[assembly: Guid("a6184ba6-b126-4783-b437-e987b511e09b")]
+
+[assembly: AssemblyVersion("17.1.0.SVNREV")]
+[assembly: AssemblyFileVersion("17.1.0.SVNREV")]
+
+[assembly: InternalsVisibleTo("Deltares.Dam.Tests")]
+[assembly: InternalsVisibleTo("Deltares.Dam.IntegrationTests")]
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/ShapeFileCreator.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/ShapeFileCreator.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/ShapeFileCreator.cs	(revision 3305)
@@ -0,0 +1,101 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+using NetTopologySuite.IO;
+
+namespace Deltares.Maps
+{
+    /// <summary>
+    ///     Wrapper class for writing repository data to ShapeFiles.
+    /// </summary>
+    public static class ShapeFileCreator
+    {
+        /// <summary>
+        ///     Creates the three (mandatory) files (.dbf, .shx, .shp) belonging to shape files
+        ///     and writes the feature data contained in the repository
+        /// </summary>
+        /// <param name="path">The output folder</param>
+        /// <param name="name">The name of the file/layer (without extension)</param>
+        /// <param name="repository">The repository containing all data to be written to shapefiles</param>
+        /// <remarks>
+        ///     If the files already exist they will be overriden
+        /// </remarks>
+        /// <exception cref="DirectoryNotFoundException" />
+        /// <exception cref="ArgumentNullException">
+        ///     When the name is empty or null. A valid name is required.
+        /// </exception>
+        /// <exception cref="ArgumentException">
+        ///     When the repository does not contain features.
+        /// </exception>
+        /// <exception cref="NotSupportedException">
+        ///     When more then one geometry types is found in the repository
+        ///     When the repository contains types which are currently not supported:
+        ///     OgcGeometryType.Curve
+        ///     OgcGeometryType.MultiCurve
+        ///     OgcGeometryType.Surface
+        ///     OgcGeometryType.MultiSurface
+        ///     OgcGeometryType.Polygon
+        ///     OgcGeometryType.MultiPolygon
+        ///     OgcGeometryType.Geometry
+        ///     OgcGeometryType.GeometryCollection
+        /// </exception>
+        public static void Create(string path, string name, IFeatureRepository repository)
+        {
+            if (string.IsNullOrEmpty(name) || name.Trim() == string.Empty)
+            {
+                throw new ArgumentNullException("name");
+            }
+
+            path = string.IsNullOrEmpty(path) || path.Trim() == "" || path.Trim() == "."
+                ? Directory.GetCurrentDirectory()
+                : path;
+
+            if (!Directory.Exists(path))
+            {
+                throw new DirectoryNotFoundException(path);
+            }
+
+            if (repository.Features.Count() == 0)
+            {
+                throw new ArgumentException(
+                    "The feature repository doesn't contain features. It should contain at least one feature");
+            }
+
+            IFeature firstFeature = repository.Features.First();
+            var feature = new NetTopologySuite.Features.Feature(firstFeature.Geometry, firstFeature.Attributes);
+            List<NetTopologySuite.Features.Feature> coll = repository.Features
+                .Select(f => new NetTopologySuite.Features.Feature(f.Geometry, f.Attributes))
+                .ToList();
+
+            DbaseFileHeader header = ShapefileDataWriter.GetHeader(feature, repository.Count);
+            var writer = new ShapefileDataWriter(path + name)
+            {
+                Header = header
+            };
+            writer.Write(coll);
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Resources.Designer.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Resources.Designer.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Resources.Designer.cs	(revision 3305)
@@ -0,0 +1,639 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Deltares.Dam.Data.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Deltares.Dam.Data.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The column index of {0} defined on property {1} in the CSV export object class already exists.
+        /// </summary>
+        internal static string CsvColumnIndexAlreadyExists {
+            get {
+                return ResourceManager.GetString("CsvColumnIndexAlreadyExists", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Couldn&apos;t find the csv data file {0}.
+        /// </summary>
+        internal static string CsvFileNotFound {
+            get {
+                return ResourceManager.GetString("CsvFileNotFound", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The file name is not valid or empty.
+        /// </summary>
+        internal static string CsvFileNotValid {
+            get {
+                return ResourceManager.GetString("CsvFileNotValid", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The header in the import file is not valid.
+        /// </summary>
+        internal static string CsvHeaderNotValid {
+            get {
+                return ResourceManager.GetString("CsvHeaderNotValid", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The header in the import file is not valid.
+        /// </summary>
+        internal static string CsvHeaderNullOrEmpty {
+            get {
+                return ResourceManager.GetString("CsvHeaderNullOrEmpty", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The object materializer is not valid.
+        /// </summary>
+        internal static string CsvObjectMaterializerNotValid {
+            get {
+                return ResourceManager.GetString("CsvObjectMaterializerNotValid", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The given pattern to split the data values of the CSV files is not valid.
+        /// </summary>
+        internal static string CsvSplitterPatternNotValid {
+            get {
+                return ResourceManager.GetString("CsvSplitterPatternNotValid", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The data import argument is not valid.
+        /// </summary>
+        internal static string DataImportArgumentNull {
+            get {
+                return ResourceManager.GetString("DataImportArgumentNull", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The project should contain exactly 1 dike.
+        /// </summary>
+        internal static string DikeShouldContainExactly1Dike {
+            get {
+                return ResourceManager.GetString("DikeShouldContainExactly1Dike", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Cannot create or add the entity with the the given id because it already exist.
+        /// </summary>
+        internal static string EntityAlreadyExist {
+            get {
+                return ResourceManager.GetString("EntityAlreadyExist", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The factory argument is null but is a required.
+        /// </summary>
+        internal static string EntityFactoryArgumentNull {
+            get {
+                return ResourceManager.GetString("EntityFactoryArgumentNull", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The file name is not valid. Maybe due to a null or empty string and or invalid characters. Please use a valid file name.
+        /// </summary>
+        internal static string FileNameNotValid {
+            get {
+                return ResourceManager.GetString("FileNameNotValid", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The gauge id value is null or empty which is not allowed.
+        /// </summary>
+        internal static string GaugeIdArgumentNullOrEmpty {
+            get {
+                return ResourceManager.GetString("GaugeIdArgumentNullOrEmpty", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The imported data is not valid. Reason: {0}.
+        /// </summary>
+        internal static string ImportDataNotValid {
+            get {
+                return ResourceManager.GetString("ImportDataNotValid", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to This location does not have a soilprofile.
+        /// </summary>
+        internal static string ImportedLocationDoesntHaveSoilprofile {
+            get {
+                return ResourceManager.GetString("ImportedLocationDoesntHaveSoilprofile", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No points in location PL1 line. Please check if the PL1 line ID defined in the locations import file matches the ID&apos;s in the PL1 line import file.
+        /// </summary>
+        internal static string ImportedLocationDoesntHaveValidPL1Lines {
+            get {
+                return ResourceManager.GetString("ImportedLocationDoesntHaveValidPL1Lines", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No dike points in location surface line. Please check if the surface line ID defined in the locations import file matches the ID&apos;s in the surface line import file.
+        /// </summary>
+        internal static string ImportedLocationDoesntHaveValidSurfaceLines {
+            get {
+                return ResourceManager.GetString("ImportedLocationDoesntHaveValidSurfaceLines", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The import file {0} couldn&apos;t be found. This file is required..
+        /// </summary>
+        internal static string ImportFileNotExist {
+            get {
+                return ResourceManager.GetString("ImportFileNotExist", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The file which are required for the import are not validated.
+        /// </summary>
+        internal static string ImportFilesNotValidated {
+            get {
+                return ResourceManager.GetString("ImportFilesNotValidated", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The import folder {0} does not exist.
+        /// </summary>
+        internal static string ImportFolderNotExist {
+            get {
+                return ResourceManager.GetString("ImportFolderNotExist", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The import folder is not valid.
+        /// </summary>
+        internal static string ImportFolderNullOrEmpty {
+            get {
+                return ResourceManager.GetString("ImportFolderNullOrEmpty", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Location &apos;{0}&apos; has no segment..
+        /// </summary>
+        internal static string LocationHasNoSegment {
+            get {
+                return ResourceManager.GetString("LocationHasNoSegment", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The location id value is null or empty which is not allowed.
+        /// </summary>
+        internal static string LocationIdArgumentNullOrEmpty {
+            get {
+                return ResourceManager.GetString("LocationIdArgumentNullOrEmpty", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Location has an invalid name {0}.
+        /// </summary>
+        internal static string LocationInvalidName {
+            get {
+                return ResourceManager.GetString("LocationInvalidName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Couldn&apos;t find the MStab executable at location {0}.
+        /// </summary>
+        internal static string MStabExecutableFileNameNotFound {
+            get {
+                return ResourceManager.GetString("MStabExecutableFileNameNotFound", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No calculation type specified.
+        /// </summary>
+        internal static string NoCalculationTypeSpecified {
+            get {
+                return ResourceManager.GetString("NoCalculationTypeSpecified", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No dike defined in this project.
+        /// </summary>
+        internal static string NoDikeDefined {
+            get {
+                return ResourceManager.GetString("NoDikeDefined", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No locations defined in this project.
+        /// </summary>
+        internal static string NoLocationsDefined {
+            get {
+                return ResourceManager.GetString("NoLocationsDefined", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Location &apos;{0}&apos; does not exist in the location collection..
+        /// </summary>
+        internal static string NonExistentLocation {
+            get {
+                return ResourceManager.GetString("NonExistentLocation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Location &apos;{0}&apos;, scenario &apos;{1}&apos; has no river level.
+        /// </summary>
+        internal static string NoRiverLevel {
+            get {
+                return ResourceManager.GetString("NoRiverLevel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Location &apos;{0}&apos;, scenario &apos;{1}&apos; has no river level low.
+        /// </summary>
+        internal static string NoRiverLevelLow {
+            get {
+                return ResourceManager.GetString("NoRiverLevelLow", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No scenarios defined in location.
+        /// </summary>
+        internal static string NoScenariosDefinedInLocation {
+            get {
+                return ResourceManager.GetString("NoScenariosDefinedInLocation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No soil profiles have been defined for location &apos;{0}&apos;..
+        /// </summary>
+        internal static string NoSoilProfileDefinedForLocation {
+            get {
+                return ResourceManager.GetString("NoSoilProfileDefinedForLocation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No soilprofiles1D defined in this project.
+        /// </summary>
+        internal static string NoSoilprofiles1DDefinedInProject {
+            get {
+                return ResourceManager.GetString("NoSoilprofiles1DDefinedInProject", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No soils defined in this project.
+        /// </summary>
+        internal static string NoSoilsDefinedInProject {
+            get {
+                return ResourceManager.GetString("NoSoilsDefinedInProject", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No surfacelines defined in this project.
+        /// </summary>
+        internal static string NoSurfaceLines {
+            get {
+                return ResourceManager.GetString("NoSurfaceLines", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Couldn&apos;t parse the file because it has no valid content.
+        /// </summary>
+        internal static string OutputFileHasNoContent {
+            get {
+                return ResourceManager.GetString("OutputFileHasNoContent", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The file name is not valid.
+        /// </summary>
+        internal static string OutputFileNameNotValid {
+            get {
+                return ResourceManager.GetString("OutputFileNameNotValid", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Couldn&apos;t find the output file {0}.
+        /// </summary>
+        internal static string OutputFileNotExist {
+            get {
+                return ResourceManager.GetString("OutputFileNotExist", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to PL1 has not been created.
+        /// </summary>
+        internal static string PL1NotCreated {
+            get {
+                return ResourceManager.GetString("PL1NotCreated", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Project file name is not valid.
+        /// </summary>
+        internal static string ProjectFileNameNullOrEmpty {
+            get {
+                return ResourceManager.GetString("ProjectFileNameNullOrEmpty", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Project file not found .
+        /// </summary>
+        internal static string ProjectFileNotExist {
+            get {
+                return ResourceManager.GetString("ProjectFileNotExist", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The required entity &apos;{0}&apos; with ID &apos;{1}&apos; doesn&apos;t exist.
+        /// </summary>
+        internal static string RequiredEntityDoesNotExist {
+            get {
+                return ResourceManager.GetString("RequiredEntityDoesNotExist", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The required parameter {0} which should be contained in object {1} is missing.
+        /// </summary>
+        internal static string RequiredParameterMissing {
+            get {
+                return ResourceManager.GetString("RequiredParameterMissing", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The segment id value is null or empty which is not allowed.
+        /// </summary>
+        internal static string SegmentIdArgumentNullOrEmpty {
+            get {
+                return ResourceManager.GetString("SegmentIdArgumentNullOrEmpty", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Segment has an invalid name {0}.
+        /// </summary>
+        internal static string SegmentInvalidName {
+            get {
+                return ResourceManager.GetString("SegmentInvalidName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Couldn&apos;t find the SlopeW (GeoStudio) executable at location {0}.
+        /// </summary>
+        internal static string SlopeWExecutableFileNameNotFound {
+            get {
+                return ResourceManager.GetString("SlopeWExecutableFileNameNotFound", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The soil material in the layer could not be converted to local type.
+        /// </summary>
+        internal static string SoilAttachedToLayerNotValid {
+            get {
+                return ResourceManager.GetString("SoilAttachedToLayerNotValid", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Soildatabase &apos;{0}&apos; is not found.
+        /// </summary>
+        internal static string SoildatabaseNotFound {
+            get {
+                return ResourceManager.GetString("SoildatabaseNotFound", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Soil has an invalid name {0}.
+        /// </summary>
+        internal static string SoilInvalidName {
+            get {
+                return ResourceManager.GetString("SoilInvalidName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The soil list is not yet created..
+        /// </summary>
+        internal static string SoilListIsNull {
+            get {
+                return ResourceManager.GetString("SoilListIsNull", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The soil profile name or id value is null or empty which is not allowed.
+        /// </summary>
+        internal static string SoilProfileIdArgumentNullOrEmpty {
+            get {
+                return ResourceManager.GetString("SoilProfileIdArgumentNullOrEmpty", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Soilprofile has an invalid name {0}.
+        /// </summary>
+        internal static string SoilProfileInvalidName {
+            get {
+                return ResourceManager.GetString("SoilProfileInvalidName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The soilprofile is not assigned.
+        /// </summary>
+        internal static string SoilProfileNotAssigned {
+            get {
+                return ResourceManager.GetString("SoilProfileNotAssigned", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Surfaceline &apos;{0}&apos; has no characteristic points.
+        /// </summary>
+        internal static string SurfaceLineHasNoCharacteristicPoints {
+            get {
+                return ResourceManager.GetString("SurfaceLineHasNoCharacteristicPoints", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Surfaceline &apos;{0}&apos; has no points.
+        /// </summary>
+        internal static string SurfaceLineHasNoPoints {
+            get {
+                return ResourceManager.GetString("SurfaceLineHasNoPoints", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The surface line id argument is null or empty but it is required.
+        /// </summary>
+        internal static string SurfaceLineIdArgumentNullOrEmpty {
+            get {
+                return ResourceManager.GetString("SurfaceLineIdArgumentNullOrEmpty", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Surfaceline has an invalid name {0}.
+        /// </summary>
+        internal static string SurfaceLineInvalidName {
+            get {
+                return ResourceManager.GetString("SurfaceLineInvalidName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Surfaceline is not inside soil profile.
+        /// </summary>
+        internal static string SurfacelineIsNotInsideSoilprofile {
+            get {
+                return ResourceManager.GetString("SurfacelineIsNotInsideSoilprofile", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The surfaceline is not assigned.
+        /// </summary>
+        internal static string SurfaceLineNotAssigned {
+            get {
+                return ResourceManager.GetString("SurfaceLineNotAssigned", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The required characteristic point type &apos;{0}&apos; with coordinate &apos;{1}&apos; does not exist in the point collection of surfaceline &apos;{2}&apos;.
+        /// </summary>
+        internal static string SurfaceLinePointNotExtists {
+            get {
+                return ResourceManager.GetString("SurfaceLinePointNotExtists", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The top layer to be evaluated is not inside the soil profile.
+        /// </summary>
+        internal static string TopLayerToBeEvaluatedNotInsideSoilprofile {
+            get {
+                return ResourceManager.GetString("TopLayerToBeEvaluatedNotInsideSoilprofile", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Two sandlayers are mandatory in soil profile.
+        /// </summary>
+        internal static string TwoSandlayersRequiredInSoilProfile {
+            get {
+                return ResourceManager.GetString("TwoSandlayersRequiredInSoilProfile", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The water level input file is not null or empty.
+        /// </summary>
+        internal static string WaterLevelInputFileNullOrEmpty {
+            get {
+                return ResourceManager.GetString("WaterLevelInputFileNullOrEmpty", resourceCulture);
+            }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/NotEqualSpecification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/NotEqualSpecification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/NotEqualSpecification.cs	(revision 3305)
@@ -0,0 +1,44 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Standard.Specifications
+{
+    public class NotEqualSpecification<TCandidate, TValue> : ValueBoundSpecification<TCandidate, TValue>
+    {
+        public NotEqualSpecification(string attributeName, TValue attributeValue)
+            : base(attributeName, attributeValue)
+        {
+        }
+
+        /// <summary>
+        /// Determines whether the candidate satisfies the specification.
+        /// </summary>
+        /// <param name="candidate">The candidate to test.</param>
+        /// <returns>
+        ///   <c>true</c> if the candidate satisfies the specification otherwise, <c>false</c>.
+        /// </returns>
+        public override bool IsSatisfiedBy(TCandidate candidate)
+        {
+            TValue actual = this.GetCandidateTValue(candidate);
+            return !(actual.Equals(this.AttributeValue));
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/CoverageFunction.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/CoverageFunction.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/CoverageFunction.cs	(revision 3305)
@@ -0,0 +1,143 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using NetTopologySuite.Geometries;
+
+namespace Deltares.Maps
+{
+    public static class CoverageFunction
+    {
+        public static IEnumerable<IFeature> GetFeaturesCovering(this IFeatureRepository repository, double x, double y)
+        {
+            var pointToTest = new Point(x, y);
+            /*
+            return (from feature in repository.Features
+                    let target = feature.Geometry
+                    where (pointToTest.Within(target) || pointToTest.Touches(target)) || pointToTest.Intersects(target)
+                    select feature);
+*/
+
+            /*
+            var e = pointToTest.EnvelopeInternal;
+            const int delta = 1;
+            var bbox = new Envelope(e.MinX - delta, e.MinY - delta, e.MaxX + delta, e.MaxY + delta);
+            
+            var possibleMatches = repository.Query(bbox);
+
+            foreach (var feature in possibleMatches)
+            {
+                if (pointToTest.Within(feature.Geometry) || pointToTest.Touches(feature.Geometry) || pointToTest.Intersects(feature.Geometry))
+                {
+                    yield return feature;
+                }
+            }
+*/
+
+            return repository
+                .Query(pointToTest)
+                .Where(feature =>
+                    pointToTest.Within(feature.Geometry) ||
+                    pointToTest.Touches(feature.Geometry) ||
+                    pointToTest.Intersects(feature.Geometry));
+        }
+
+        public static Func<string, double, double, object> GetCoverageFunc(this IFeatureRepository repository)
+        {
+            return GetCoverageFunc(repository, repository.SupportedAttributes);
+        }
+
+        public static Func<double, double, object> GetCoverageFunc(this IFeatureRepository repository, string attributeName)
+        {
+            return GetCoverageFunc(repository, attributeName, repository.SupportedAttributes);
+        }
+
+        public static Func<double, double, object> GetCoverageFunc(this IFeatureRepository repository, string attributeName,
+            IEnumerable<string> supportedAttributeNames)
+        {
+            Func<string, double, double, object> func = GetCoverageFunc(repository, supportedAttributeNames);
+            return (x, y) => func(attributeName, x, y);
+        }
+
+        public static Func<string, double, double, object> GetCoverageFunc(IFeatureRepository repository,
+            IEnumerable<string> supportedAttributeNames)
+        {
+            if (repository == null)
+            {
+                throw new ArgumentNullException("repository");
+            }
+
+            if (supportedAttributeNames == null)
+            {
+                throw new ArgumentNullException("supportedAttributeNames");
+            }
+
+            if (!supportedAttributeNames.Any())
+            {
+                throw new ArgumentException("The supported attribute list should at least contain one attribute",
+                    "supportedAttributeNames");
+            }
+
+            int index = 0;
+            foreach (string attributeName in supportedAttributeNames)
+            {
+                if (string.IsNullOrEmpty(attributeName))
+                {
+                    throw new ArgumentException(string.Format("An invalid attribute found at index {0}", index));
+                }
+                index++;
+            }
+
+            IEnumerable<string> supportedAttributes = supportedAttributeNames.Select(a => a.ToLowerInvariant());
+
+            return (attributeName, x, y) =>
+            {
+                if (string.IsNullOrEmpty(attributeName))
+                {
+                    throw new ArgumentNullException("attributeName");
+                }
+
+                string attrName = attributeName.ToLowerInvariant();
+                if (!supportedAttributes.Contains(attrName))
+                {
+                    throw new AttributeMissingException(attributeName);
+                }
+
+                IEnumerable<IFeature> matches = GetFeaturesCovering(repository, x, y);
+
+                if (!matches.Any())
+                {
+                    throw new FeatureCoverageException(string.Format("No geometries found covering point ({0} {1})", x, y));
+                }
+
+                if (matches.Count() > 1)
+                {
+                    throw new FeatureCoverageException(string.Format("Multiple geometries found covering point ({0} {1})", x, y));
+                }
+
+                return matches.First().Attributes[attrName];
+            };
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/TestData/Gemeenten.qix
===================================================================
diff -u
Binary files differ
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/TestData/Gemeenten.sbx
===================================================================
diff -u
Binary files differ
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(revision 3305)
@@ -0,0 +1,2393 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Xml.Serialization;
+using Deltares.Dam.Data.Sensors;
+using Deltares.Geographic;
+using Deltares.Geometry;
+using Deltares.Geotechnics.Converter;
+using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.SurfaceLines;
+using Deltares.Geotechnics.Validation;
+using Deltares.Soilbase;
+using Deltares.Standard;
+using Deltares.Standard.Attributes;
+using Deltares.Standard.EventPublisher;
+using Deltares.Standard.Language;
+using Deltares.Standard.Units;
+using Deltares.Standard.Validation;
+
+namespace Deltares.Dam.Data
+{
+    internal static class LocationParameterNames
+    {
+        public const string DikeRingId = "DikeRingId";
+        public const string Description = "Description";
+        public const string XRd = "XRd";
+        public const string YRd = "YRd";
+        public const string SegmentId = "SegmentId";
+        public const string SurfaceLineId = "SurfaceLineId";
+        public const string PL1LineId = "PL1LineId";
+        public const string XSoilGeometry2DOrigin = "XSoilGeometry2DOrigin";
+        public const string DikeEmbankmentMaterial = "DikeEmbankmentMaterial";
+        public const string ShoulderEmbankmentMaterial = "ShoulderEmbankmentMaterial";
+        public const string DampingFactorPL3 = "DampingFactorPL3";
+        public const string DampingFactorPL4 = "DampingFactorPL4";
+        public const string PenetrationLength = "PenetrationLength";
+        public const string TrafficLoad = "TrafficLoad";
+        public const string TL_DegreeOfConsolidation = "TL_DegreeOfConsolidation";
+        public const string PLLineCreationMethod = "PLLineCreationMethod";
+        public const string StabilityShoulderGrowSlope = "StabilityShoulderGrowSlope";
+        public const string StabilityShoulderGrowDeltaX = "StabilityShoulderGrowDeltaX";
+        public const string StabilitySlopeAdaptionDeltaX = "StabilitySlopeAdaptionDeltaX";
+        public const string MinimalCircleDepth = "MinimalCircleDepth";
+        public const string DistanceToEntryPoint = "DistanceToEntryPoint";
+        public const string StabilityZoneType = "StabilityZoneType";
+        public const string ForbiddenZoneFactor = "ForbiddenZoneFactor";
+        public const string ZoneAreaRestSlopeCrestWidth = "ZoneAreaRestSlopeCrestWidth";
+        public const string StabilityDesignMethod = "StabilityDesignMethod";
+        public const string SlopeAdaptionStartCotangent = "SlopeAdaptionStartCotangent";
+        public const string SlopeAdaptionEndCotangent = "SlopeAdaptionEndCotangent";
+        public const string SlopeAdaptionStepCotangent = "SlopeAdaptionStepCotangent";
+        public const string SlopeDampingPiezometricHeightPolderSide = "SlopeDampingPiezometricHeightPolderSide";
+        public const string NewDepthDitch = "NewDepthDitch";
+        public const string NewDikeSlopeInside = "NewDikeSlopeInside";
+        public const string NewDikeSlopeOutside = "NewDikeSlopeOutside";
+        public const string NewDikeTopWidth = "NewDikeTopWidth";
+        public const string NewMaxHeightShoulderAsFraction = "NewMaxHeightShoulderAsFraction";
+        public const string NewMinDistanceDikeToeStartDitch = "NewMinDistanceDikeToeStartDitch";
+        public const string NewShoulderBaseSlope = "NewShoulderBaseSlope";
+        public const string NewShoulderTopSlope = "NewShoulderTopSlope";
+        public const string NewSlopeAngleDitch = "NewSlopeAngleDitch";
+        public const string NewWidthDitchBottom = "NewWidthDitchBottom";
+        public const string UseNewDikeSlopeInside = "UseNewDikeSlopeInside";
+        public const string UseNewDikeSlopeOutside = "UseNewDikeSlopeOutside";
+        public const string UseNewDikeTopWidth = "UseNewDikeTopWidth";
+        public const string UseNewDitchDefinition = "UseNewDitchDefinition";
+        public const string UseNewMaxHeightShoulderAsFraction = "UseNewMaxHeightShoulderAsFraction";
+        public const string UseNewMinDistanceDikeToeStartDitch = "UseNewMinDistanceDikeToeStartDitch";
+        public const string UseNewShoulderBaseSlope = "UseNewShoulderBaseSlope";
+        public const string UseNewShoulderTopSlope = "UseNewShoulderTopSlope";
+        public const string IntrusionVerticalWaterPressure = "IntrusionVerticalWaterPressure";
+    }
+
+    [TrackChanges]
+    public class Location : IVisibleEnabled, IGeographicPoint, IRepairer, IDomain, IDisposable
+    {
+        // Added initial value as these properties must be tested for real values on import
+        public const string AllCategory = "MainItems";
+        public const string DikeCategory = "Dike";
+        public const string WaterCategory = "Water levels";
+        public const string DesignCategory = "Design";
+        private const double newDikeTopWidthMinValue = 0.1;
+        private const double newDikeSlopeInsideMinValue = 0.01;
+        private const double newDikeSlopeOutsideMinValue = 0.01;
+        private const double penetrationLenghtMinValue = 0.00;
+        private static DamProjectType damProjectType = DamProjectType.Calamity;
+        private readonly List<Scenario> scenarios = new List<Scenario>();
+        private bool areLocalXZObjectsCreated = false;
+        
+        // ATTENTION !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+        //
+        // When adding properties below do not forget to add these properties to SetParameterFromNameValuePair and GetParametersAsNameValuePairs
+        //
+        // ATTENTION !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+        private double dampingFactorPL3 = 0;
+        private double dampingFactorPL4 = 0;
+        private string description = "";
+        private string dikeEmbankmentMaterial = "";
+        private string dikeRingId = "";
+        private double distanceToEntryPoint = 0;
+        private double forbiddenZoneFactor = 1.0;
+        private IList<GaugePLLine> gaugePLLines = new List<GaugePLLine>();
+        private IList<Gauge> gauges = new List<Gauge>();
+        // Start of parameters that are also defined in modelparameters
+        private PL1Line localXZPL1Line;
+        private SurfaceLine2 localXzSurfaceLine;
+        private string mapForSoilGeometries2D = "";
+        private double minimalCircleDepth = 0;
+        private string name = "";
+        private double newDepthDitch = 1.0;
+        private double newDikeSlopeInside = 1.0/3.0; // as tangent
+        private double newDikeSlopeOutside = 1.0/3.0; // as tangent
+        private double newDikeTopWidth = 5.0;
+        private double newMaxHeightShoulderAsFraction = 2.0/3.0; // as tangent
+        private double newMinDistanceDikeToeStartDitch = 5.0;
+        private double newShoulderBaseSlope = 1.0/3.0; // as tangent
+        private double newShoulderTopSlope = 1.0/20.0; // as tangent
+        private double newSlopeAngleDitch = 1.0/0.5; // as tangent
+        private double newWidthDitchBottom = 1.0;
+        private PL1Line pL1Line;
+        private PLLineCreationMethod pLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD;
+        private double penetrationLength = 0;
+        private bool redesignDikeHeight = true;
+        private bool redesignDikeShoulder = true;
+        private Segment segment;
+        private SensorLocation sensorLocation;
+        private string shoulderEmbankmentMaterial = "";
+        private double slopeAdaptionEndCotangent = 6.0;
+        private double slopeAdaptionStartCotangent = 3.0;
+        private double slopeAdaptionStepCotangent = 0.5;
+        private double slopeDampingPiezometricHeightPolderSide = 0.0;
+        private SoilSurfaceProfile soilSurfaceProfile = null;
+        private string soildatabaseName = "";
+        private StabilityDesignMethod stabilityDesignMethod = StabilityDesignMethod.OptimizedSlopeAndShoulderAdaption;
+        private double stabilityShoulderGrowDeltaX = 2.0;
+        private double stabilityShoulderGrowSlope = 1.0/3;
+        private double stabilitySlopeAdaptionDeltaX = 2.0;
+        private MStabZonesType stabilityZoneType = MStabZonesType.NoZones;
+
+        private SurfaceLine2 surfaceLine2;
+        private string surfaceLineId = "";
+        private double trafficLoad = 0;
+        private double? degreeOfConsolidation;
+        private bool useNewDikeSlopeInside;
+        private bool useNewDikeSlopeOutside;
+        private bool useNewDikeTopWidth;
+        private bool useNewDitchDefinition;
+        private bool useNewMaxHeightShoulderAsFraction;
+        private bool useNewMinDistanceDikeToeStartDitch;
+        private bool useNewShoulderBaseSlope;
+        private bool useNewShoulderTopSlope;
+        private double xRdDikeLine;
+        private double xSoilGeometry2DOrigin = 0;
+        private double xrd = 0;
+        private double yrd = 0;
+        private double zoneAreaRestSlopeCrestWidth = 3.0;
+       
+        private IntrusionVerticalWaterPressureType? intrusionVerticalWaterPressure = IntrusionVerticalWaterPressureType.Standard;
+
+        public Location()
+        {
+            SoilList = null;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Location"/> class.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        public Location(string name) : this()
+        {
+            this.name = name;
+        }
+
+        public bool HasSensorData
+        {
+            get
+            {
+                return sensorLocation != null;
+            }
+        }
+
+        [Browsable(false)]
+        [XmlOldName("SensorData")]
+        public virtual SensorLocation SensorLocation
+        {
+            get
+            {
+                return sensorLocation;
+            }
+            set
+            {
+                sensorLocation = value;
+                sensorLocation.Location = this;
+            }
+        }
+
+        [Browsable(false)]
+        public virtual bool AreLocalXZObjectsCreated
+        {
+            get
+            {
+                return areLocalXZObjectsCreated;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "AreLocalXZObjectsCreated");
+                areLocalXZObjectsCreated = value;
+                DataEventPublisher.AfterChange(this, "AreLocalXZObjectsCreated");
+            }
+        }
+
+        [Label("Name")]
+        [PropertyOrder(0, 1)]
+        [ReadOnly(true)]
+        [Category(AllCategory)]
+        public virtual string Name
+        {
+            get
+            {
+                return name;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "Name");
+                name = value;
+                DataEventPublisher.AfterChange(this, "Name");
+            }
+        }
+
+        [Label("Description")]
+        [Category(DikeCategory)]
+        [PropertyOrder(1, 10)]
+        public virtual string Description
+        {
+            get
+            {
+                return description;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "Description");
+                description = value;
+                DataEventPublisher.AfterChange(this, "Description");
+            }
+        }
+
+        [Unit(UnitType.Length)]
+        [Label("X location (RDS)")]
+        [Description("Location according to Rijksdriehoekstelsel")]
+        [Format("F3")]
+        [ReadOnly(true)]
+        [PropertyOrder(1, 1)]
+        [Category(AllCategory)]
+        public virtual double XRd
+        {
+            get
+            {
+                return xrd;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "XRd");
+                xrd = value;
+                DataEventPublisher.AfterChange(this, "XRd");
+            }
+        }
+
+        [Unit(UnitType.Length)]
+        [Label("Y location (RDS)")]
+        [Description("Location according to Rijksdriehoekstelsel")]
+        [Format("F3")]
+        [ReadOnly(true)]
+        [PropertyOrder(1, 1)]
+        [Category(AllCategory)]
+        public virtual double YRd
+        {
+            get
+            {
+                return yrd;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "YRd");
+                yrd = value;
+                DataEventPublisher.AfterChange(this, "YRd");
+            }
+        }
+
+        public virtual double XRdDikeLine
+        {
+            get
+            {
+                return xRdDikeLine;
+            }
+            set
+            {
+                this.SetAndNotify2(out xRdDikeLine, value, x => x.XRdDikeLine);
+            }
+        }
+
+        [Browsable(false)]
+        public virtual double XSoilGeometry2DOrigin
+        {
+            get
+            {
+                return xSoilGeometry2DOrigin;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "XSoilGeometry2DOrigin");
+                xSoilGeometry2DOrigin = value;
+                DataEventPublisher.AfterChange(this, "XSoilGeometry2DOrigin");
+            }
+        }
+
+        [Unit(UnitType.PressurePerLength)]
+        [Label("Traffic load")]
+        [Description("Traffic load")]
+        [Format("F3")]
+        [Category(DikeCategory)]
+        [PropertyOrder(1, 20)]
+        public virtual double TrafficLoad
+        {
+            get
+            {
+                return trafficLoad;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "TrafficLoad");
+                trafficLoad = value;
+                DataEventPublisher.AfterChange(this, "TrafficLoad");
+            }
+        }
+
+        [Unit(UnitType.Percentage)]
+        [Format("F3")]
+        [Category(DikeCategory)]
+        [PropertyOrder(1, 21)]
+        public virtual double? TL_DegreeOfConsolidation
+        {
+            get
+            {
+                return degreeOfConsolidation;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "TL_DegreeOfConsolidation");
+                degreeOfConsolidation = value;
+                DataEventPublisher.AfterChange(this, "TL_DegreeOfConsolidation");
+            }
+        }
+
+        [Browsable(false)]
+        public virtual PL1Line PL1Line
+        {
+            get
+            {
+                return pL1Line;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "PL1Line");
+                pL1Line = value;
+                DataEventPublisher.AfterChange(this, "PL1Line");
+            }
+        }
+
+        [Browsable(false)]
+        public virtual PL1Line LocalXZPL1Line
+        {
+            get
+            {
+                return localXZPL1Line;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "LocalXZPL1Line");
+                localXZPL1Line = value;
+                DataEventPublisher.AfterChange(this, "LocalXZPL1Line");
+            }
+        }
+
+        /// <summary>
+        /// TODO
+        /// </summary>
+        /// <remarks>Composite relationship.</remarks>
+        [Validate]
+        public virtual SurfaceLine2 LocalXZSurfaceLine2
+        {
+            get
+            {
+                return localXzSurfaceLine;
+            }
+            set
+            {
+                this.SetAndNotify2(out localXzSurfaceLine, value, l => l.LocalXZSurfaceLine2);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Segment
+        /// </summary>
+        [PropertyOrder(1, 6)]
+        [Label("Segment")]
+        [Category(DikeCategory)]
+        [ReadOnly(true)]
+        public virtual string SegmentId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Segment
+        /// </summary>
+        [Browsable(false)]
+        public virtual Segment Segment
+        {
+            get
+            {
+                return segment;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "Segment");
+                segment = value;
+                DataEventPublisher.AfterChange(this, "Segment");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the surface line 
+        /// </summary>
+        [Browsable(false)]
+        public virtual SurfaceLine2 SurfaceLine2
+        {
+            get
+            {
+                return surfaceLine2;
+            }
+            set
+            {
+                this.SetAndNotify2(out surfaceLine2, value, l => l.SurfaceLine2);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [Unit(UnitType.Length)]
+        [Label("Minimum circle depth")]
+        [Format("F2")]
+        [PropertyOrder(4, 4)]
+        [Minimum(0)]
+        [Maximum(10000)]
+        [Category(DikeCategory)]
+        public virtual double MinimalCircleDepth
+        {
+            get
+            {
+                return minimalCircleDepth;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "MinimalCircleDepth");
+                minimalCircleDepth = value;
+                DataEventPublisher.AfterChange(this, "MinimalCircleDepth");
+            }
+        }
+
+        [Unit(UnitType.Length)]
+        [Label("Distance to Entrypoint")]
+        [Description("Distance from toe of dike to entry point of river in deep sandlayer")]
+        [Format("F2")]
+        [PropertyOrder(2, 12)]
+        public virtual double DistanceToEntryPoint
+        {
+            get
+            {
+                return distanceToEntryPoint;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "DistanceToEntryPoint");
+                distanceToEntryPoint = value;
+                DataEventPublisher.AfterChange(this, "DistanceToEntryPoint");
+            }
+        }
+
+        [Label("Slope damping factor")]
+        [Description("The tangent of the slope damping for piezometric height polderSide (for PL3 and PL4)")]
+        [Format("F3")]
+        [Category(WaterCategory)]
+        [PropertyOrder(2, 14)]
+        public virtual double SlopeDampingPiezometricHeightPolderSide
+        {
+            get
+            {
+                return slopeDampingPiezometricHeightPolderSide;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "SlopeDampingPiezometricHeightPolderSide");
+                slopeDampingPiezometricHeightPolderSide = value;
+                DataEventPublisher.AfterChange(this, "SlopeDampingPiezometricHeightPolderSide");
+            }
+        }
+
+        [Label("Dike")]
+        [ReadOnly(true)]
+        [Category(DikeCategory)]
+        [PropertyOrder(1, 4)]
+        public string DikeRingId
+        {
+            get
+            {
+                return dikeRingId;
+            }
+            set
+            {
+                dikeRingId = value;
+            }
+        }
+
+        [Browsable(false)]
+        public string SurfaceLineId
+        {
+            get
+            {
+                return surfaceLineId;
+            }
+            set
+            {
+                surfaceLineId = value;
+            }
+        }
+
+        [Browsable(false)]
+        public string SoildatabaseName
+        {
+            get
+            {
+                return soildatabaseName;
+            }
+            set
+            {
+                soildatabaseName = value;
+            }
+        }
+
+        [Browsable(false)]
+        public SoilList SoilList { get; set; }
+
+        [Browsable(false)]
+        [XmlIgnore]
+        public SoilbaseDB SoilbaseDB
+        {
+            get
+            {
+                if (SoildatabaseName == null || !File.Exists(SoildatabaseName))
+                {
+                    throw new DikeException(String.Format("The soil database '{0}' cannot be found", SoildatabaseName));
+                }
+                return SoilbaseDB.Create(SoildatabaseName);
+            }
+        }
+
+        [Browsable(false)]
+        public string MapForSoilGeometries2D
+        {
+            get
+            {
+                return mapForSoilGeometries2D;
+            }
+            set
+            {
+                mapForSoilGeometries2D = value;
+            }
+        }
+
+        [Browsable(false)]
+        public virtual IList<Gauge> Gauges
+        {
+            get
+            {
+                return gauges;
+            }
+            set
+            {
+                gauges = value;
+            }
+        }
+
+        [Browsable(false)]
+        public virtual IList<GaugePLLine> GaugePLLines
+        {
+            get
+            {
+                return gaugePLLines;
+            }
+            set
+            {
+                gaugePLLines = value;
+            }
+        }
+
+        [Browsable(false)]
+        public bool UsesGauges
+        {
+            get
+            {
+                return GaugePLLines != null && GaugePLLines.Count > 0 && Gauges != null;
+            }
+        }
+
+        [Browsable(false)]
+        public double GaugeMissVal { get; set; }
+        
+        [Label("Redesign dike height")]
+        [PropertyOrder(7, 1)]
+        [Category(DesignCategory)]
+        public bool RedesignDikeHeight
+        {
+            get
+            {
+                return redesignDikeHeight;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "RedesignDikeHeight");
+                redesignDikeHeight = value;
+                DataEventPublisher.AfterChange(this, "RedesignDikeHeight");
+            }
+        }
+
+        [Label("Redesign dike shoulder")]
+        [PropertyOrder(7, 2)]
+        [Category(DesignCategory)]
+        public bool RedesignDikeShoulder
+        {
+            get
+            {
+                return redesignDikeShoulder;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "RedesignDikeShoulder");
+                redesignDikeShoulder = value;
+                DataEventPublisher.AfterChange(this, "RedesignDikeShoulder");
+            }
+        }
+
+        [Label("Stability design method")]
+        [PropertyOrder(7, 3)]
+        [Category(DesignCategory)]
+        public StabilityDesignMethod StabilityDesignMethod
+        {
+            get
+            {
+                return stabilityDesignMethod;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "StabilityDesignMethod");
+                stabilityDesignMethod = value;
+                DataEventPublisher.AfterChange(this, "StabilityDesignMethod");
+            }
+        }
+
+        [Label("Start value for design of slope")]
+        [PropertyOrder(7, 4)]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        public double SlopeAdaptionStartCotangent
+        {
+            get
+            {
+                return slopeAdaptionStartCotangent;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "SlopeAdaptionStartCotangent");
+                slopeAdaptionStartCotangent = value;
+                DataEventPublisher.AfterChange(this, "SlopeAdaptionStartCotangent");
+            }
+        }
+
+        [Label("End value for design of slope")]
+        [PropertyOrder(7, 5)]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        public double SlopeAdaptionEndCotangent
+        {
+            get
+            {
+                return slopeAdaptionEndCotangent;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "SlopeAdaptionEndCotangent");
+                slopeAdaptionEndCotangent = value;
+                DataEventPublisher.AfterChange(this, "SlopeAdaptionEndCotangent");
+            }
+        }
+
+        [Label("Step value for design of slope")]
+        [PropertyOrder(7, 6)]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        public double SlopeAdaptionStepCotangent
+        {
+            get
+            {
+                return slopeAdaptionStepCotangent;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "SlopeAdaptionStepCotangent");
+                slopeAdaptionStepCotangent = value;
+                DataEventPublisher.AfterChange(this, "SlopeAdaptionStepCotangent");
+            }
+        }
+
+        [Description("Use the value for new width of dike top")]
+        [PropertyOrder(7, 7)]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        public bool UseNewDikeTopWidth
+        {
+            get
+            {
+                return useNewDikeTopWidth;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "UseNewDikeTopWidth");
+                useNewDikeTopWidth = value;
+                DataEventPublisher.AfterChange(this, "UseNewDikeTopWidth");
+            }
+        }
+
+        [Description("Value for new width of dike top")]
+        [PropertyOrder(7, 8)]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        public double NewDikeTopWidth
+        {
+            get
+            {
+                return newDikeTopWidth;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "NewDikeTopWidth");
+                newDikeTopWidth = value;
+                DataEventPublisher.AfterChange(this, "NewDikeTopWidth");
+            }
+        }
+
+        [Description("Use the value for new angle of the inside slope")]
+        [PropertyOrder(7, 9)]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        public bool UseNewDikeSlopeInside
+        {
+            get
+            {
+                return useNewDikeSlopeInside;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "UseNewDikeSlopeInside");
+                useNewDikeSlopeInside = value;
+                DataEventPublisher.AfterChange(this, "UseNewDikeSlopeInside");
+            }
+        }
+
+        [Description("Value for new angle of the inside slope")]
+        [PropertyOrder(7, 10)]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        public double NewDikeSlopeInside
+        {
+            get
+            {
+                return newDikeSlopeInside;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "NewDikeSlopeInside");
+                newDikeSlopeInside = value;
+                DataEventPublisher.AfterChange(this, "NewDikeSlopeInside");
+            }
+        }
+
+        [Description("Use the value for new angle of the outside slope")]
+        [PropertyOrder(7, 11)]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        public bool UseNewDikeSlopeOutside
+        {
+            get
+            {
+                return useNewDikeSlopeOutside;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "UseNewDikeSlopeOutside");
+                useNewDikeSlopeOutside = value;
+                DataEventPublisher.AfterChange(this, "UseNewDikeSlopeOutside");
+            }
+        }
+
+        [Description("Value for new angle of the outside slope")]
+        [PropertyOrder(7, 12)]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        public double NewDikeSlopeOutside
+        {
+            get
+            {
+                return newDikeSlopeOutside;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "NewDikeSlopeOutside");
+                newDikeSlopeOutside = value;
+                DataEventPublisher.AfterChange(this, "NewDikeSlopeOutside");
+            }
+        }
+
+        [Description("Use the value for new angle of the top slope of shoulder")]
+        [PropertyOrder(7, 13)]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        public bool UseNewShoulderTopSlope
+        {
+            get
+            {
+                return useNewShoulderTopSlope;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "UseNewShoulderTopSlope");
+                useNewShoulderTopSlope = value;
+                DataEventPublisher.AfterChange(this, "UseNewShoulderTopSlope");
+            }
+        }
+
+        [Description("Value for new angle of the top slope of shoulder")]
+        [PropertyOrder(7, 14)]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        public double NewShoulderTopSlope
+        {
+            get
+            {
+                return newShoulderTopSlope;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "NewShoulderTopSlope");
+                newShoulderTopSlope = value;
+                DataEventPublisher.AfterChange(this, "NewShoulderTopSlope");
+            }
+        }
+
+        [Description("Use the value for new angle of the base slope of shoulder")]
+        [PropertyOrder(7, 15)]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        public bool UseNewShoulderBaseSlope
+        {
+            get
+            {
+                return useNewShoulderBaseSlope;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "UseNewShoulderBaseSlope");
+                useNewShoulderBaseSlope = value;
+                DataEventPublisher.AfterChange(this, "UseNewShoulderBaseSlope");
+            }
+        }
+
+        [Description("Value for new angle of the base slope of shoulder")]
+        [PropertyOrder(7, 16)]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        public double NewShoulderBaseSlope
+        {
+            get
+            {
+                return newShoulderBaseSlope;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "NewShoulderBaseSlope");
+                newShoulderBaseSlope = value;
+                DataEventPublisher.AfterChange(this, "NewShoulderBaseSlope");
+            }
+        }
+
+        [Label("Use the value for new allowed height of shoulder as fraction of dike height")]
+        [PropertyOrder(7, 17)]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        public bool UseNewMaxHeightShoulderAsFraction
+        {
+            get
+            {
+                return useNewMaxHeightShoulderAsFraction;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "UseNewMaxHeightShoulderAsFraction");
+                useNewMaxHeightShoulderAsFraction = value;
+                DataEventPublisher.AfterChange(this, "UseNewMaxHeightShoulderAsFraction");
+            }
+        }
+
+        [Description("Value for new allowed height of shoulder as fraction of dike height")]
+        [PropertyOrder(7, 18)]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        public double NewMaxHeightShoulderAsFraction
+        {
+            get
+            {
+                return newMaxHeightShoulderAsFraction;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "NewMaxHeightShoulderAsFraction");
+                newMaxHeightShoulderAsFraction = value;
+                DataEventPublisher.AfterChange(this, "NewMaxHeightShoulderAsFraction");
+            }
+        }
+
+        [Description("Use the value for new minimum distance dike toe - start ditch")]
+        [PropertyOrder(7, 19)]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        public bool UseNewMinDistanceDikeToeStartDitch
+        {
+            get
+            {
+                return useNewMinDistanceDikeToeStartDitch;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "UseNewMinDistanceDikeToeStartDitch");
+                useNewMinDistanceDikeToeStartDitch = value;
+                DataEventPublisher.AfterChange(this, "UseNewMinDistanceDikeToeStartDitch");
+            }
+        }
+
+        [Description("Value for new minimum distance dike toe - start ditch")]
+        [PropertyOrder(7, 20)]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        public double NewMinDistanceDikeToeStartDitch
+        {
+            get
+            {
+                return newMinDistanceDikeToeStartDitch;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "NewMinDistanceDikeToeStartDitch");
+                newMinDistanceDikeToeStartDitch = value;
+                DataEventPublisher.AfterChange(this, "NewMinDistanceDikeToeStartDitch");
+            }
+        }
+
+        [Description("Use the values for new ditch definition")]
+        [PropertyOrder(7, 21)]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        public bool UseNewDitchDefinition
+        {
+            get
+            {
+                return useNewDitchDefinition;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "UseNewDitchDefinition");
+                useNewDitchDefinition = value;
+                DataEventPublisher.AfterChange(this, "UseNewDitchDefinition");
+            }
+        }
+
+        [Description("Value for new width of ditch bottom")]
+        [PropertyOrder(7, 22)]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        public double NewWidthDitchBottom
+        {
+            get
+            {
+                return newWidthDitchBottom;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "NewWidthDitchBottom");
+                newWidthDitchBottom = value;
+                DataEventPublisher.AfterChange(this, "NewWidthDitchBottom");
+            }
+        }
+
+        [Description("Value for new angle of ditch slopes")]
+        [PropertyOrder(7, 23)]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        public double NewSlopeAngleDitch
+        {
+            get
+            {
+                return newSlopeAngleDitch;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "newSlopeAngleDitch");
+                newSlopeAngleDitch = value;
+                DataEventPublisher.AfterChange(this, "newSlopeAngleDitch");
+            }
+        }
+
+        [Description("Value for new depth of ditch bottom")]
+        [PropertyOrder(7, 24)]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        public double NewDepthDitch
+        {
+            get
+            {
+                return newDepthDitch;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "NewDepthDitch");
+                newDepthDitch = value;
+                DataEventPublisher.AfterChange(this, "NewDepthDitch");
+            }
+        }
+
+        [ReadOnly(true)]
+        [Validate]
+        public List<Scenario> Scenarios
+        {
+            get
+            {
+                return scenarios;
+            }
+        }
+
+        [Browsable(false)]
+        [XmlIgnore]
+        public static DamProjectType DamProjectType
+        {
+            get
+            {
+                return damProjectType;
+            }
+            set
+            {
+                damProjectType = value;
+            }
+        }
+
+        #region IGeographic Members
+
+        [Label("Zone type")]
+        [Description("Type of zone to be used in stability calculations")]
+        [PropertyOrder(4, 10)]
+        [Category(AllCategory)]
+        public MStabZonesType StabilityZoneType
+        {
+            get
+            {
+                return stabilityZoneType;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "StabilityZoneType");
+                stabilityZoneType = value;
+                DataEventPublisher.AfterChange(this, "StabilityZoneType");
+            }
+        }
+
+        [Label("Forbidden Zone Factor")]
+        [Description("Factor of zone to be used in stability calculations")]
+        [Format("F2")]
+        [Unit(UnitType.None)]
+        [Minimum(0.0)]
+        [Maximum(1.0)]
+        [PropertyOrder(4, 11)]
+        [Category(AllCategory)]
+        public double ForbiddenZoneFactor
+        {
+            get
+            {
+                return forbiddenZoneFactor;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "ForbiddenZoneFactor");
+                forbiddenZoneFactor = value;
+                DataEventPublisher.AfterChange(this, "ForbiddenZoneFactor");
+            }
+        }
+
+        [Label("Zone Area Rest Slope Crest Width")]
+        [Description("Zone Area Rest Slope Crest Width")]
+        [Format("F2")]
+        [Unit(UnitType.Length)]
+        [Minimum(0.1)]
+        [PropertyOrder(4, 12)]
+        [Category(AllCategory)]
+        public double ZoneAreaRestSlopeCrestWidth
+        {
+            get
+            {
+                return zoneAreaRestSlopeCrestWidth;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "ZoneAreaRestSlopeCrestWidth");
+                zoneAreaRestSlopeCrestWidth = value;
+                DataEventPublisher.AfterChange(this, "ZoneAreaRestSlopeCrestWidth");
+            }
+        }
+
+        [XmlIgnore]
+        [Browsable(false)]
+        public double X
+        {
+            get
+            {
+                return XRd;
+            }
+            set
+            {
+                XRd = value;
+            }
+        }
+
+        [XmlIgnore]
+        [Browsable(false)]
+        public double Y
+        {
+            get
+            {
+                return YRd;
+            }
+            set
+            {
+                YRd = value;
+            }
+        }
+
+        /// <summary>
+        /// Checks whether the required safety (stability inner slope) is given as that is needed to work with zone areas.
+        /// </summary>
+        /// <returns></returns>
+        [Validate]
+        public ValidationResult[] IsRequiredSafetySetForZoneTypeArea()
+        {
+            if (stabilityZoneType == MStabZonesType.ZoneAreas)
+            {
+                // For design projects, the safetey must be defined per scenario, not per location
+                if (DamProjectType == DamProjectType.Design && scenarios != null && scenarios.Count > 0)
+                {
+                    foreach (var scenario in scenarios)
+                    {
+                        if (scenario.RequiredSafetyFactorStabilityInnerSlope == null)
+                        return new[]
+                        {
+                            new ValidationResult(ValidationResultType.Error,
+                                                 LocalizationManager.GetTranslatedText(this, "NoRequiredSafetyForZonesScenario"),
+                                                 scenario, "StabilityZoneType", "ZoneTypeSafety", null)
+                        };
+                    }
+                }
+            }
+            return new ValidationResult[0];
+        }
+
+        [Validate]
+        public ValidationResult[] ValidateDikeEmbankmentMaterial()
+        {
+            if (DamProjectType == DamProjectType.Design &&
+                DamProjectCalculationSpecification.SelectedAnalysisType == AnalysisType.AdaptGeometry &&
+                !HasValidDikeEmbankmentMaterial())
+            {
+                return new[]
+                {
+                    new ValidationResult(ValidationResultType.Error,
+                                         LocalizationManager.GetTranslatedText(this, "NoDikeEmbankmentMaterial"),
+                                         this)
+                };
+            }
+            else
+            {
+                return new ValidationResult[0];
+            }
+        }
+
+        [Validate]
+        public ValidationResult[] ValidateLocationNewDikeTopWidth()
+        {
+            if (DamProjectType == DamProjectType.Design)
+            {
+                if ((UseNewDikeTopWidth) && (NewDikeTopWidth < newDikeTopWidthMinValue))
+                {
+                    return new[]
+                    {
+                        new ValidationResult(ValidationResultType.Error,
+                                             String.Format(LocalizationManager.GetTranslatedText(this, "NewDikeTopWidthRangeError"), newDikeTopWidthMinValue), this, "NewDikeTopWidth", "AssignMinValue", this)
+                    };
+                }
+            }
+            return new ValidationResult[0];
+        }
+
+        [Validate]
+        public ValidationResult[] ValidateLocationNewDikeSlopeInside()
+        {
+            if (DamProjectType == DamProjectType.Design)
+            {
+                if ((UseNewDikeSlopeInside) && (NewDikeSlopeInside < newDikeSlopeInsideMinValue))
+                {
+                    return new[]
+                    {
+                        new ValidationResult(ValidationResultType.Error,
+                                             String.Format(LocalizationManager.GetTranslatedText(this, "NewDikeSlopeInsideRangeError"), newDikeSlopeInsideMinValue), this, "NewDikeSlopeInside", "AssignMinValue", this)
+                    };
+                }
+            }
+            return new ValidationResult[0];
+        }
+
+
+        [Validate]
+        public ValidationResult[] ValidateLocationNewDikeSlopeOutside()
+        {
+            if (DamProjectType == DamProjectType.Design)
+            {
+                if ((UseNewDikeSlopeOutside) && (NewDikeSlopeOutside < newDikeSlopeOutsideMinValue))
+                {
+                    return new[]
+                    {
+                        new ValidationResult(ValidationResultType.Error,
+                                             String.Format(LocalizationManager.GetTranslatedText(this, "NewDikeSlopeOutsideRangeError"), newDikeSlopeOutsideMinValue), this, "NewDikeSlopeOutside", "AssignMinValue", this)
+                    };
+                }
+            }
+            return new ValidationResult[0];
+        }
+
+        /// <summary>
+        /// Validates the use of the penetration length. 
+        /// </summary>
+        /// <returns>Validation result</returns>
+        [Validate]
+        public ValidationResult[] ValidateLocationUseOfPenetrationLength()
+        {
+            if (PenetrationLength > 0)
+            {
+                // It may be used on 1D geometries
+                if (!String.IsNullOrEmpty(this.Segment.GetMostProbableGeometry2DName(FailureMechanismSystemType.StabilityInside)))
+                {
+                    // It may be used on 2D geometries only if condition below  is true
+                    if (this.IntrusionVerticalWaterPressure != IntrusionVerticalWaterPressureType.SemiTimeDependent)
+                    {
+                        return new[]
+                        {
+                            new ValidationResult(ValidationResultType.Error, String.Format(LocalizationManager.GetTranslatedText(this, "UseOfPenetrationLengthError"), penetrationLenghtMinValue), this, "PenetrationLength", "AssignMinValue", this)
+                        };
+                    }
+                }
+            }
+            return new ValidationResult[0];
+        }
+
+        [Validate]
+        public ValidationResult[] ValidateShoulderEmbankmentMaterial()
+        {
+            if (DamProjectType == DamProjectType.Design &&
+                DamProjectCalculationSpecification.SelectedAnalysisType == AnalysisType.AdaptGeometry &&
+                !HasValidShoulderEmbankmentMaterial())
+            {
+                return new[]
+                {
+                    new ValidationResult(ValidationResultType.Error, LocalizationManager.GetTranslatedText(this, "NoShoulderEmbankmentMaterial"), this)
+                };
+            }
+            else
+            {
+                return new ValidationResult[0];
+            }
+        }
+
+        /// <summary>
+        /// Validates the location has segment.
+        /// </summary>
+        /// <returns></returns>
+        [Validate]
+        public ValidationResult[] ValidateLocationHasSegment()
+        {
+            if (Segment == null)
+            {
+                return new[]
+                {
+                    new ValidationResult(ValidationResultType.Error,
+                                         LocalizationManager.GetTranslatedText(this, "LocationHasNoSegment"),
+                                         this)
+                };
+            }
+            else
+            {
+                return new ValidationResult[0];
+            }
+        }
+
+        [Validate]
+        public ValidationResult[] ValidateDikeEmbankmentMaterialDefinedIfSurfacelineAboveSoilProfile()
+        {
+            if (IsSurfaceLineAboveSoilProfile() && !HasValidDikeEmbankmentMaterial())
+            {
+                return new[]
+                {
+                    new ValidationResult(ValidationResultType.Error,
+                                         LocalizationManager.GetTranslatedText(this, "NoDikeEmbankmentMaterialAndNeeded"),
+                                         this)
+                };
+            }
+            else
+            {
+                return new ValidationResult[0];
+            }
+        }
+
+        /// <summary>
+        /// Check if DikeEmbankmentMaterial is defined and is available as soil
+        /// </summary>
+        /// <returns></returns>
+        private bool HasValidDikeEmbankmentMaterial()
+        {
+            return !String.IsNullOrEmpty(DikeEmbankmentMaterial) && GetDikeEmbankmentSoil() != null;
+        }
+
+        /// <summary>
+        /// Check if ShoulderEmbankmentMaterial is defined and is available as soil
+        /// </summary>
+        /// <returns></returns>
+        private bool HasValidShoulderEmbankmentMaterial()
+        {
+            return !String.IsNullOrEmpty(ShoulderEmbankmentMaterial) && GetShoulderEmbankmentSoil() != null;
+        }
+
+        /// <summary>
+        /// Determine if surfaceline is higher than any of the 1D soilprofiles
+        /// </summary>
+        /// <returns></returns>
+        private bool IsSurfaceLineAboveSoilProfile()
+        {
+            bool isSurfaceLineAboveSoilProfile = false;
+            if (Segment != null)
+            {
+                foreach (var soilGeometryProbability in Segment.SoilProfileProbabilities)
+                {
+                    SoilProfile1D soilProfile = soilGeometryProbability.SoilProfile;
+                    if (soilProfile != null)
+                    {
+                        isSurfaceLineAboveSoilProfile = isSurfaceLineAboveSoilProfile || (LocalXZSurfaceLine2.Geometry.GetMaxZ() > soilGeometryProbability.SoilProfile.TopLevel);
+                    }
+                }
+            }
+            return isSurfaceLineAboveSoilProfile;
+        }
+
+        #endregion
+
+        #region Design parameters
+
+        [Label("Dike emb. material")]
+        [Description("Dike embankment material")]
+        [Category(AllCategory)]
+        [PropertyOrder(5, 1)]
+        public virtual string DikeEmbankmentMaterial
+        {
+            get
+            {
+                return dikeEmbankmentMaterial;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "DikeEmbankmentMaterial");
+                dikeEmbankmentMaterial = value;
+                DataEventPublisher.AfterChange(this, "DikeEmbankmentMaterial");
+            }
+        }
+
+        [Label("Shoulder emb. material")]
+        [Description("Shoulder embankment material")]
+        [Category(DesignCategory)]
+        [PropertyOrder(5, 2)]
+        public virtual string ShoulderEmbankmentMaterial
+        {
+            get
+            {
+                return shoulderEmbankmentMaterial;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "ShoulderEmbankmentMaterial");
+                shoulderEmbankmentMaterial = value;
+                DataEventPublisher.AfterChange(this, "ShoulderEmbankmentMaterial");
+            }
+        }
+
+        [Unit(UnitType.None)]
+        [Label("Shoulder growth slope")]
+        [Description("Shoulder growth slope for stability design")]
+        [Format("F4")]
+        [Category(DesignCategory)]
+        [PropertyOrder(5, 3)]
+        public virtual double StabilityShoulderGrowSlope
+        {
+            get
+            {
+                return stabilityShoulderGrowSlope;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "StabilityShoulderGrowSlope");
+                stabilityShoulderGrowSlope = value;
+                DataEventPublisher.AfterChange(this, "StabilityShoulderGrowSlope");
+            }
+        }
+
+        [Unit(UnitType.Length)]
+        [Label("Shoulder growth delta X")]
+        [Description("Shoulder growth delta X for stability design")]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        [PropertyOrder(5, 4)]
+        public virtual double StabilityShoulderGrowDeltaX
+        {
+            get
+            {
+                return stabilityShoulderGrowDeltaX;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "StabilityShoulderGrowDeltaX");
+                stabilityShoulderGrowDeltaX = value
+                    ;
+                DataEventPublisher.AfterChange(this, "StabilityShoulderGrowDeltaX");
+            }
+        }
+
+        [Unit(UnitType.Length)]
+        [Label("Slope adaption delta X")]
+        [Description("Slope adaption delta X for stability design")]
+        [Format("F2")]
+        [Category(DesignCategory)]
+        [PropertyOrder(5, 5)]
+        public virtual double StabilitySlopeAdaptionDeltaX
+        {
+            get
+            {
+                return stabilitySlopeAdaptionDeltaX;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "StabilitySlopeAdaptionDeltaX");
+                stabilitySlopeAdaptionDeltaX = value;
+                DataEventPublisher.AfterChange(this, "StabilitySlopeAdaptionDeltaX");
+            }
+        }
+
+        #endregion
+
+        #region PLLine creation parameters
+
+        /// <summary>
+        /// Gets or sets the pl line creation method.
+        /// </summary>
+        /// <value>
+        /// The pl line creation method.
+        /// </value>
+        [Unit(UnitType.None)]
+        [Label("PL-Line creation")]
+        [Description("PL-Line creation method")]
+        [Format("F3")]
+        [Category(WaterCategory)]
+        [PropertyOrder(3, 1)]
+        public virtual PLLineCreationMethod PLLineCreationMethod
+        {
+            get
+            {
+                return pLLineCreationMethod;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "PLLineCreationMethod");
+                pLLineCreationMethod = value;
+                DataEventPublisher.AfterChange(this, "PLLineCreationMethod");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the damping factor pl 3.
+        /// </summary>
+        /// <value>
+        /// The damping factor pl 3.
+        /// </value>
+        [Unit(UnitType.None)]
+        [Label("Damping factor PL3")]
+        [Description("Damping factor PL3")]
+        [Format("F3")]
+        [Category(WaterCategory)]
+        [PropertyOrder(2, 11)]
+        [Minimum(0.0)]
+        [Maximum(1.0)]
+        public virtual double DampingFactorPL3
+        {
+            get
+            {
+                return dampingFactorPL3;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "DampingFactorPL3");
+                dampingFactorPL3 = value;
+                DataEventPublisher.AfterChange(this, "DampingFactorPL3");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the damping factor pl 4.
+        /// </summary>
+        /// <value>
+        /// The damping factor pl 4.
+        /// </value>
+        [Unit(UnitType.None)]
+        [Label("Damping factor PL4")]
+        [Description("Damping factor PL4")]
+        [Format("F3")]
+        [Category(WaterCategory)]
+        [PropertyOrder(2, 12)]
+        [Minimum(0.0)]
+        [Maximum(1.0)]
+        public virtual double DampingFactorPL4
+        {
+            get
+            {
+                return dampingFactorPL4;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "DampingFactorPL4");
+                dampingFactorPL4 = value;
+                DataEventPublisher.AfterChange(this, "DampingFactorPL4");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the length of the penetration.
+        /// </summary>
+        /// <value>
+        /// The length of the penetration.
+        /// </value>
+        [Unit(UnitType.Length)]
+        [Label("Penetration length")]
+        [Description("Penetration Length (for PL4)")]
+        [Format("F3")]
+        [Category(WaterCategory)]
+        [Minimum(0.0)]
+        [PropertyOrder(2, 13)]
+        public virtual double PenetrationLength
+        {
+            get
+            {
+                return penetrationLength;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "PenetrationLength");
+                penetrationLength = value;
+                DataEventPublisher.AfterChange(this, "PenetrationLength");
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the intrusion vertical water pressure.
+        /// </summary>
+        /// <value>
+        /// The intrusion vertical water pressure.
+        /// </value>
+        [Category(WaterCategory)]
+        [PropertyOrder(3, 18)]
+        public IntrusionVerticalWaterPressureType? IntrusionVerticalWaterPressure
+        {
+            get { return intrusionVerticalWaterPressure; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, x => x.IntrusionVerticalWaterPressure);
+                intrusionVerticalWaterPressure = value;
+                DataEventPublisher.AfterChange(this, x => x.IntrusionVerticalWaterPressure);
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// Sets the default values
+        /// </summary>
+        public void SetDefaultValues()
+        {
+            zoneAreaRestSlopeCrestWidth = 3.0;            
+        }
+
+        /// <summary>
+        /// Assemble a list of key/value pairs with the relevant parameters for the location
+        /// </summary>
+        /// <returns></returns>
+        public Dictionary<string, string> GetParametersAsNameValuePairs()
+        {
+            var numberFormatInfo = new NumberFormatInfo();
+            numberFormatInfo.NumberDecimalSeparator = ".";
+            var nameValuePairs = new Dictionary<string, string>();
+            nameValuePairs.Add(LocationParameterNames.DikeRingId, DikeRingId);
+            nameValuePairs.Add(LocationParameterNames.SurfaceLineId, SurfaceLineId);
+            nameValuePairs.Add(LocationParameterNames.Description, Description);
+            nameValuePairs.Add(LocationParameterNames.XRd, XRd.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.YRd, YRd.ToString(numberFormatInfo));
+            if (Segment != null)
+            {
+                nameValuePairs.Add(LocationParameterNames.SegmentId, Segment.Name);
+            }
+            else
+            {
+                nameValuePairs.Add(LocationParameterNames.SegmentId, SegmentId);
+            }
+            if (SurfaceLine2 != null)
+            {
+                nameValuePairs[LocationParameterNames.SurfaceLineId] = SurfaceLine2.Name;
+            }
+            if (PL1Line != null)
+            {
+                nameValuePairs.Add(LocationParameterNames.PL1LineId, PL1Line.Name);
+            }
+            nameValuePairs.Add(LocationParameterNames.XSoilGeometry2DOrigin, XSoilGeometry2DOrigin.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.DikeEmbankmentMaterial, DikeEmbankmentMaterial);
+            nameValuePairs.Add(LocationParameterNames.ShoulderEmbankmentMaterial, ShoulderEmbankmentMaterial);
+            nameValuePairs.Add(LocationParameterNames.DampingFactorPL3, DampingFactorPL3.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.DampingFactorPL4, DampingFactorPL4.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.PenetrationLength, PenetrationLength.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.PLLineCreationMethod, PLLineCreationMethod.ToString());
+            if (IntrusionVerticalWaterPressure.HasValue)
+            {
+                nameValuePairs.Add(LocationParameterNames.IntrusionVerticalWaterPressure,
+                                   IntrusionVerticalWaterPressure.Value.ToString());
+            }
+            nameValuePairs.Add(LocationParameterNames.StabilityShoulderGrowSlope, StabilityShoulderGrowSlope.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.StabilityShoulderGrowDeltaX, StabilityShoulderGrowDeltaX.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.StabilitySlopeAdaptionDeltaX, StabilitySlopeAdaptionDeltaX.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.TrafficLoad, TrafficLoad.ToString(numberFormatInfo));
+            if (TL_DegreeOfConsolidation.HasValue)
+            {
+                nameValuePairs.Add(LocationParameterNames.TL_DegreeOfConsolidation, TL_DegreeOfConsolidation.Value.ToString(numberFormatInfo));
+            }
+            nameValuePairs.Add(LocationParameterNames.MinimalCircleDepth, MinimalCircleDepth.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.DistanceToEntryPoint, DistanceToEntryPoint.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.StabilityZoneType, StabilityZoneType.ToString());
+            nameValuePairs.Add(LocationParameterNames.ForbiddenZoneFactor, ForbiddenZoneFactor.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.ZoneAreaRestSlopeCrestWidth, ZoneAreaRestSlopeCrestWidth.ToString(numberFormatInfo));
+
+            nameValuePairs.Add(LocationParameterNames.SlopeDampingPiezometricHeightPolderSide, SlopeDampingPiezometricHeightPolderSide.ToString(numberFormatInfo));
+
+            nameValuePairs.Add(LocationParameterNames.StabilityDesignMethod, StabilityDesignMethod.ToString());
+            nameValuePairs.Add(LocationParameterNames.SlopeAdaptionStartCotangent, SlopeAdaptionStartCotangent.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.SlopeAdaptionEndCotangent, SlopeAdaptionEndCotangent.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.SlopeAdaptionStepCotangent, SlopeAdaptionStepCotangent.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.NewDepthDitch, NewDepthDitch.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.NewDikeSlopeInside, NewDikeSlopeInside.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.NewDikeSlopeOutside, NewDikeSlopeOutside.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.NewDikeTopWidth, NewDikeTopWidth.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.NewMaxHeightShoulderAsFraction, NewMaxHeightShoulderAsFraction.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.NewMinDistanceDikeToeStartDitch, NewMinDistanceDikeToeStartDitch.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.NewShoulderBaseSlope, NewShoulderBaseSlope.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.NewShoulderTopSlope, NewShoulderTopSlope.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.NewSlopeAngleDitch, NewSlopeAngleDitch.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.NewWidthDitchBottom, NewWidthDitchBottom.ToString(numberFormatInfo));
+            nameValuePairs.Add(LocationParameterNames.UseNewDikeSlopeInside, UseNewDikeSlopeInside.ToString());
+            nameValuePairs.Add(LocationParameterNames.UseNewDikeSlopeOutside, UseNewDikeSlopeOutside.ToString());
+            nameValuePairs.Add(LocationParameterNames.UseNewDikeTopWidth, UseNewDikeTopWidth.ToString());
+            nameValuePairs.Add(LocationParameterNames.UseNewDitchDefinition, UseNewDitchDefinition.ToString());
+            nameValuePairs.Add(LocationParameterNames.UseNewMaxHeightShoulderAsFraction, UseNewMaxHeightShoulderAsFraction.ToString());
+            nameValuePairs.Add(LocationParameterNames.UseNewMinDistanceDikeToeStartDitch, UseNewMinDistanceDikeToeStartDitch.ToString());
+            nameValuePairs.Add(LocationParameterNames.UseNewShoulderBaseSlope, UseNewShoulderBaseSlope.ToString());
+            nameValuePairs.Add(LocationParameterNames.UseNewShoulderTopSlope, UseNewShoulderTopSlope.ToString());
+            return nameValuePairs;
+        }
+
+        public void AddNewSensorData()
+        {
+            var factory = new SensorFactory();
+            SensorLocation = factory.CreateSensorLocation(this);
+        }
+
+        [Validate]
+        public ValidationResult[] AscendingLocalXZSurfaceLine()
+        {
+            if (LocalXZSurfaceLine2 != null)
+            {
+                return new SurfaceLine2Validator().ValidateCharacteristicPointsAreOrdered(LocalXZSurfaceLine2).ToArray();
+            }
+            else
+            {
+                return new ValidationResult[0];
+            }
+        }
+
+        /// <summary>
+        /// Gets the dike embankment soil.
+        /// </summary>
+        /// <returns></returns>
+        public Soil GetDikeEmbankmentSoil()
+        {
+            if (String.IsNullOrEmpty(SoildatabaseName) || String.IsNullOrEmpty(DikeEmbankmentMaterial))
+            {
+                return null;
+            }
+            else
+            {
+                return SoilList.GetSoilByName(DikeEmbankmentMaterial);
+            }
+        }
+
+        /// <summary>
+        /// Gets the shoulder embankment soil.
+        /// </summary>
+        /// <returns></returns>
+        public Soil GetShoulderEmbankmentSoil()
+        {
+            if (String.IsNullOrEmpty(SoildatabaseName) || String.IsNullOrEmpty(ShoulderEmbankmentMaterial))
+            {
+                return null;
+            }
+            else
+            {
+                return SoilList.GetSoilByName(ShoulderEmbankmentMaterial);
+            }
+        }
+
+        /// <summary>
+        /// Gets the most probable profile. If there are no elements in the it returns null
+        /// and leave the handling over to the caller
+        /// </summary>
+        /// <returns>The soil profile</returns>
+        public SoilProfile1D GetMostProbableProfile(FailureMechanismSystemType? segmentFailureMechanismType)
+        {
+            if (Segment == null)
+            {
+                throw new ArgumentNullException(String.Format(ThrowHelper.GetResourceString(StringResourceNames.LocationHasNoSegment), Name));
+            }
+
+            return Segment.GetMostProbableProfile(segmentFailureMechanismType);
+        }
+
+        /// <summary>
+        /// Gets the most probable profile. If there are no elements in the it returns null
+        /// and leave the handling over to the caller
+        /// </summary>
+        /// <returns>The soil profile</returns>
+        public string GetMostProbableGeometry2DName(FailureMechanismSystemType? segmentFailureMechanismType)
+        {
+            if (Segment == null)
+            {
+                throw new ArgumentNullException(String.Format(ThrowHelper.GetResourceString(StringResourceNames.LocationHasNoSegment), Name));
+            }
+
+            return Segment.GetMostProbableGeometry2DName(segmentFailureMechanismType);
+        }
+
+        /// <summary>
+        /// Gets the soil profile probability.
+        /// </summary>
+        /// <param name="soilProfile">The soil profile.</param>
+        /// <param name="segmentFailureMechanismType">Type of the segment failure mechanism.</param>
+        /// <returns></returns>
+        /// <exception cref="System.ArgumentNullException"></exception>
+        public double? GetSoilProfileProbability(SoilProfile1D soilProfile, FailureMechanismSystemType? segmentFailureMechanismType)
+        {
+            if (Segment == null)
+            {
+                throw new ArgumentNullException(String.Format(ThrowHelper.GetResourceString(StringResourceNames.LocationHasNoSegment), Name));
+            }
+
+            return Segment.GetSoilProfileProbability(soilProfile, segmentFailureMechanismType);
+        }
+
+        /// <summary>
+        /// Gets the soil geometry2 d probability.
+        /// </summary>
+        /// <param name="soilGeometry2DName">Name of the soil geometry2 d.</param>
+        /// <param name="segmentFailureMechanismType">Type of the segment failure mechanism.</param>
+        /// <returns></returns>
+        /// <exception cref="System.ArgumentNullException"></exception>
+        public double? GetSoilGeometry2DProbability(string soilGeometry2DName, FailureMechanismSystemType? segmentFailureMechanismType)
+        {
+            if (Segment == null)
+            {
+                throw new ArgumentNullException(String.Format(ThrowHelper.GetResourceString(StringResourceNames.LocationHasNoSegment), Name));
+            }
+
+            return Segment.GetSoilGeometry2DProbability(soilGeometry2DName, segmentFailureMechanismType);
+        }
+
+        /// <summary>
+        /// Gets a sorted list of soil geometry probabilities for a certain failure mechanism type
+        /// </summary>
+        /// <param name="failureMechanismType">The failure mechanism type</param>
+        /// <returns>List of geometry probabilities</returns>
+        public List<SoilGeometryProbability> GetGeometryProbabilities(FailureMechanismSystemType failureMechanismType)
+        {
+            var geometryProbabilities = new List<SoilGeometryProbability>();
+            if (Segment != null)
+            {
+                foreach (var existingGeometryProbability in Segment.SoilProfileProbabilities)
+                {
+                    if (existingGeometryProbability.SegmentFailureMechanismType.HasValue && existingGeometryProbability.SegmentFailureMechanismType.Value == failureMechanismType)
+                    {
+                        geometryProbabilities.Add(existingGeometryProbability);
+                    }
+                }
+
+                geometryProbabilities.Sort();
+            }
+            return geometryProbabilities;
+        }
+
+        /// <summary>
+        /// Gets the combination of the surface line and soil profile for a given failure mechanism and index
+        /// </summary>
+        /// <param name="failureMechanismType">Failure mechanism type</param>
+        /// <param name="index">The index indicates the ranking in probability</param>
+        /// <param name="probability">The probability of the soil surface profile</param>
+        /// <returns>The soil surface profile</returns>
+        public SoilSurfaceProfile GetSoilSurfaceProfile(FailureMechanismSystemType failureMechanismType, int index, out double probability)
+        {
+            List<SoilGeometryProbability> soilGeometryProbabilities = GetGeometryProbabilities(failureMechanismType);
+            SoilGeometryProbability soilGeometryProbability = index < soilGeometryProbabilities.Count ? soilGeometryProbabilities[index] : null;
+
+            SoilProfile1D originalProfile = soilGeometryProbability != null ? soilGeometryProbability.SoilProfile : null;
+            probability = soilGeometryProbability != null ? soilGeometryProbability.Probability : 0;
+
+            if (soilSurfaceProfile == null || originalProfile == null ||
+                !(soilSurfaceProfile.SoilProfile.Name == originalProfile.Name &&
+                soilSurfaceProfile.SoilProfile.LayerCount == originalProfile.LayerCount) ||
+                !(soilSurfaceProfile.SurfaceLine2.Name == LocalXZSurfaceLine2.Name &&
+                soilSurfaceProfile.SurfaceLine2.CharacteristicPoints.Count == LocalXZSurfaceLine2.CharacteristicPoints.Count))
+            {
+                Soil dikeSoil = SoilList.GetSoilByName(DikeEmbankmentMaterial);
+
+                if (soilSurfaceProfile == null)
+                {
+                    soilSurfaceProfile = new SoilSurfaceProfile();
+                }
+                // Do not assign the orginal soilprofile, because it will be changed in the class SoilSurfaceProfile
+                SoilProfile1D soilProfile1D;
+                if (originalProfile == null)
+                {
+                    soilProfile1D = new SoilProfile1D(SurfaceLine2.Geometry.GetMaxZ(), -10, dikeSoil);
+                }
+                else
+                {
+                    soilProfile1D = new SoilProfile1D();
+                    soilProfile1D.Assign(originalProfile);
+                }
+                soilSurfaceProfile.SoilProfile = soilProfile1D;
+                soilSurfaceProfile.SurfaceLine2 = LocalXZSurfaceLine2;
+                soilSurfaceProfile.DikeEmbankmentMaterial = GetDikeEmbankmentSoil();
+
+                foreach (SoilLayer2D layer in soilSurfaceProfile.Surfaces)
+                {
+                    if (layer.Soil == null)
+                    {
+                        layer.Soil = dikeSoil;
+                    }
+                }
+            }
+
+            return soilSurfaceProfile;
+        }
+
+        public void AlignBoundaryPointsOfPL1LineWithAdaptedSurfaceLine(SurfaceLine2 adaptedSurfaceLine)
+        {
+            if ((LocalXZPL1Line != null) && (LocalXZPL1Line.Points.Count > 1))
+            {
+                GeometryPoint lastPointPL1Line = LocalXZPL1Line.Points.Last();
+                GeometryPoint lastPointSurfaceLine = adaptedSurfaceLine.Geometry.Points.Last();
+                lastPointPL1Line.X = lastPointSurfaceLine.X;
+                GeometryPoint firstPointPL1Line = LocalXZPL1Line.Points.First();
+                GeometryPoint firstPointSurfaceLine = adaptedSurfaceLine.Geometry.Points.First();
+                firstPointPL1Line.X = firstPointSurfaceLine.X;
+            }
+        }
+
+        public void SetParameterFromNameValuePair(string parameterName, string parameterValue)
+        {
+            var numberFormatInfo = new NumberFormatInfo();
+            numberFormatInfo.NumberDecimalSeparator = ".";
+            if (parameterName.Equals(LocationParameterNames.DikeRingId))
+            {
+                DikeRingId = parameterValue;
+            }
+            if (parameterName.Equals(LocationParameterNames.Description))
+            {
+                Description = parameterValue;
+            }
+            if (parameterName.Equals(LocationParameterNames.XRd))
+            {
+                XRd = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.YRd))
+            {
+                YRd = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.SegmentId))
+            {
+                SegmentId = parameterValue;
+            }
+            if (parameterName.Equals(LocationParameterNames.SurfaceLineId))
+            {
+                SurfaceLineId = parameterValue;
+            }
+            if (parameterName.Equals(LocationParameterNames.XSoilGeometry2DOrigin))
+            {
+                XSoilGeometry2DOrigin = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.DikeEmbankmentMaterial))
+            {
+                DikeEmbankmentMaterial = parameterValue;
+            }
+            if (parameterName.Equals(LocationParameterNames.ShoulderEmbankmentMaterial))
+            {
+                ShoulderEmbankmentMaterial = parameterValue;
+            }
+            if (parameterName.Equals(LocationParameterNames.DampingFactorPL3))
+            {
+                DampingFactorPL3 = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.DampingFactorPL4))
+            {
+                DampingFactorPL4 = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.PenetrationLength))
+            {
+                PenetrationLength = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.PLLineCreationMethod))
+            {
+                PLLineCreationMethod = (PLLineCreationMethod) Enum.Parse(typeof(PLLineCreationMethod), parameterValue);
+            }
+            if (parameterName.Equals(LocationParameterNames.IntrusionVerticalWaterPressure))
+            {
+                IntrusionVerticalWaterPressure =
+                    (IntrusionVerticalWaterPressureType)
+                        Enum.Parse(typeof (IntrusionVerticalWaterPressureType), parameterValue);
+                
+            }
+            if (parameterName.Equals(LocationParameterNames.StabilityShoulderGrowSlope))
+            {
+                StabilityShoulderGrowSlope = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.StabilityShoulderGrowDeltaX))
+            {
+                StabilityShoulderGrowDeltaX = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.StabilitySlopeAdaptionDeltaX))
+            {
+                StabilitySlopeAdaptionDeltaX = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.TrafficLoad))
+            {
+                TrafficLoad = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.TL_DegreeOfConsolidation))
+            {
+                TL_DegreeOfConsolidation = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.MinimalCircleDepth))
+            {
+                MinimalCircleDepth = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.DistanceToEntryPoint))
+            {
+                DistanceToEntryPoint = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.StabilityZoneType))
+            {
+                StabilityZoneType = (MStabZonesType) Enum.Parse(typeof(MStabZonesType), parameterValue);
+            }
+            if (parameterName.Equals(LocationParameterNames.ForbiddenZoneFactor))
+            {
+                ForbiddenZoneFactor = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.ZoneAreaRestSlopeCrestWidth))
+            {
+                ZoneAreaRestSlopeCrestWidth = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+
+            if (parameterName.Equals(LocationParameterNames.SlopeDampingPiezometricHeightPolderSide))
+            {
+                SlopeDampingPiezometricHeightPolderSide = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+
+            if (parameterName.Equals(LocationParameterNames.StabilityDesignMethod))
+            {
+                StabilityDesignMethod = (StabilityDesignMethod) Enum.Parse(typeof(StabilityDesignMethod), parameterValue);
+            }
+            if (parameterName.Equals(LocationParameterNames.SlopeAdaptionStartCotangent))
+            {
+                SlopeAdaptionStartCotangent = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.SlopeAdaptionEndCotangent))
+            {
+                SlopeAdaptionEndCotangent = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.SlopeAdaptionStepCotangent))
+            {
+                SlopeAdaptionStepCotangent = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+
+            if (parameterName.Equals(LocationParameterNames.NewDepthDitch))
+            {
+                NewDepthDitch = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.NewDikeSlopeInside))
+            {
+                NewDikeSlopeInside = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.NewDikeSlopeOutside))
+            {
+                NewDikeSlopeOutside = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.NewDikeTopWidth))
+            {
+                NewDikeTopWidth = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.NewMaxHeightShoulderAsFraction))
+            {
+                NewMaxHeightShoulderAsFraction = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.NewMinDistanceDikeToeStartDitch))
+            {
+                NewMinDistanceDikeToeStartDitch = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.NewShoulderBaseSlope))
+            {
+                NewShoulderBaseSlope = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.NewShoulderTopSlope))
+            {
+                NewShoulderTopSlope = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.NewSlopeAngleDitch))
+            {
+                NewSlopeAngleDitch = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.NewWidthDitchBottom))
+            {
+                NewWidthDitchBottom = Convert.ToDouble(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.UseNewDikeSlopeInside))
+            {
+                UseNewDikeSlopeInside = Convert.ToBoolean(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.UseNewDikeSlopeOutside))
+            {
+                UseNewDikeSlopeOutside = Convert.ToBoolean(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.UseNewDikeTopWidth))
+            {
+                UseNewDikeTopWidth = Convert.ToBoolean(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.UseNewDitchDefinition))
+            {
+                UseNewDitchDefinition = Convert.ToBoolean(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.UseNewMaxHeightShoulderAsFraction))
+            {
+                UseNewMaxHeightShoulderAsFraction = Convert.ToBoolean(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.UseNewMinDistanceDikeToeStartDitch))
+            {
+                UseNewMinDistanceDikeToeStartDitch = Convert.ToBoolean(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.UseNewShoulderBaseSlope))
+            {
+                UseNewShoulderBaseSlope = Convert.ToBoolean(parameterValue, numberFormatInfo);
+            }
+            if (parameterName.Equals(LocationParameterNames.UseNewShoulderTopSlope))
+            {
+                UseNewShoulderTopSlope = Convert.ToBoolean(parameterValue, numberFormatInfo);
+            }
+        }
+
+        #region IVisibleEnabled Members
+
+        public bool IsEnabled(string property)
+        {
+            return true;
+        }
+
+        public bool IsVisible(string property)
+        {
+            var isDesign = IsDesign();
+            
+            // TODO: These string literals below should be replaced with the constants defined in LocationParameterNames
+            switch (property)
+            {
+                case "ShoulderEmbankmentMaterial":
+                    return isDesign;
+                case "StabilityShoulderGrowSlope":
+                    return isDesign;
+                case "StabilityShoulderGrowDeltaX":
+                    return isDesign;
+                case "StabilitySlopeAdaptionDeltaX":
+                    return isDesign;
+                case "IntrusionVerticalWaterPressure":
+                    return true;
+                case "RedesignDikeHeight":
+                    return isDesign;
+                case "RedesignDikeShoulder":
+                    return isDesign;
+
+                // these will always be shown
+                case "StabilityDesignMethod":
+                    return true;
+                case "SlopeAdaptionStartCotangent":
+                    return true;
+                case "SlopeAdaptionEndCotangent":
+                    return true;
+                case "SlopeAdaptionStepCotangent":
+                    return true;
+                case "Name":
+                    return true;
+                case "XRd":
+                    return true;
+                case "YRd":
+                    return true;
+                case "DikeRingId":
+                    return true;
+                case "SegmentId":
+                    return true;
+                case "Description":
+                    return true;
+                case "TrafficLoad":
+                    return true;
+                case "TL_DegreeOfConsolidation":
+                    return true;
+                case "DampingFactorPL3":
+                    return true;
+                case "DampingFactorPL4":
+                    return true;
+                case "PenetrationLength":
+                    return true;
+                case "SlopeDampingPiezometricHeightPolderSide":
+                    return true;
+                case "PLLineCreationMethod":
+                    return true;
+                case "MinimalCircleDepth":
+                    return true;
+                case "StabilityZoneType":
+                    return true;
+                case "DikeEmbankmentMaterial":
+                    return true;
+
+                case "DistanceToEntryPoint":
+                    return isDesign;
+                case "HasSensorData":
+                    return false;
+                case "XRdDikeLine":
+                    return false;
+                // The following design parameters are only visible for design option and when that design option does not involve the special Rijnland option.
+                case "NewDikeTopWidth":
+                case "UseNewDikeTopWidth":
+                case "NewDikeSlopeInside":
+                case "UseNewDikeSlopeInside":
+                case "NewDikeSlopeOutside":
+                case "UseNewDikeSlopeOutside":
+                case "NewShoulderTopSlope":
+                case "UseNewShoulderTopSlope":
+                case "NewShoulderBaseSlope":
+                case "UseNewShoulderBaseSlope":
+                case "NewMaxHeightShoulderAsFraction":
+                case "UseNewMaxHeightShoulderAsFraction":
+                case "NewMinDistanceDikeToeStartDitch":
+                case "UseNewMinDistanceDikeToeStartDitch":
+                case "UseNewDitchDefinition":
+                case "NewWidthDitchBottom":
+                case "NewDepthDitch":
+                case "NewSlopeAngleDitch":
+                    return isDesign && StabilityDesignMethod != StabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption;
+                default:
+                    return true;
+            }
+        }
+
+        private bool IsDesign()
+        {
+            bool isDesign = (DamProjectType == DamProjectType.Design);
+            return isDesign;
+        }
+
+        private bool ArePlLineCreationExpertKnowledgeParametersNeeded()
+        {
+            bool arePlLineCreationExpertKnowledgeParametersNeeded = PLLineCreationMethod ==
+                                                                    PLLineCreationMethod.ExpertKnowledgeRRD ||
+                                                                    PLLineCreationMethod ==
+                                                                    PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD;
+            return arePlLineCreationExpertKnowledgeParametersNeeded;
+        }
+
+        #endregion
+
+        public override string ToString()
+        {
+            return Name;
+        }
+
+        public void Dispose()
+        {
+            if (surfaceLine != null)
+            {
+                surfaceLine.Dispose();
+            }
+            if (LocalXZSurfaceLine2 != null)
+            {
+                LocalXZSurfaceLine2.Dispose();
+            }
+        }
+
+        public ICollection GetDomain(string property)
+        {
+            switch (property)
+            {
+                case "PLLineCreationMethod":
+                    return new[]
+                    {
+                        PLLineCreationMethod.ExpertKnowledgeRRD,
+                        PLLineCreationMethod.ExpertKnowledgeLinearInDike,                            
+                    };                                        
+                case "IntrusionVerticalWaterPressure":
+                    return new[]
+                    {
+                        this.Translate("Standard"),
+                        this.Translate("Linear"),
+                        this.Translate("FullHydroStatic"),
+                        this.Translate("HydroStatic"),
+                        this.Translate("SemiTimeDependent")
+                    };
+                default:
+                    return null;
+            }
+        }
+
+        public void Repair(object subject, string property, string id)
+        {
+            if (subject is Location)
+            {
+                if (id == "AssignMinValue" && property == "NewDikeTopWidth")
+                {
+                    NewDikeTopWidth = newDikeTopWidthMinValue;
+                }
+                if (id == "AssignMinValue" && property == "NewDikeSlopeInside")
+                {
+                    NewDikeSlopeInside = newDikeSlopeInsideMinValue;
+                }
+                if (id == "AssignMinValue" && property == "NewDikeSlopeOutside")
+                {
+                    NewDikeSlopeOutside = newDikeSlopeOutsideMinValue;
+                }
+                if (id == "AssignMinValue" && property == "PenetrationLength")
+                {
+                    PenetrationLength = penetrationLenghtMinValue;
+                }
+            }
+        }
+
+        public string GetRepairDescription(object subject, string property, string id)
+        {
+            if (id == "ZoneTypeSafety" && property == "StabilityZoneType")
+            {
+                return LocalizationManager.GetTranslatedText(this, "NoRequiredSafetyForZonesRepair");
+            }
+            if (id == "AssignMinValue")
+            {
+                return LocalizationManager.GetTranslatedText(this, "AssignMinValue");
+            }
+            if (id == "AssignMaxValue")
+            {
+                return LocalizationManager.GetTranslatedText(this, "AssignMaxValue");
+            }
+            return "";
+        }
+
+        #region Backwards compatibility
+
+        private SurfaceLine surfaceLine;
+
+        [Obsolete("Do not use this property; Only exists for backwards compatibility.", true)]
+        [Browsable(false)]
+        public virtual SurfaceLine LocalXZSurfaceLine
+        {
+            get
+            {
+                return null;
+            }
+            set
+            {
+                // Convert persisted 'old style surfaceline' into the new format, and discard the old one.
+                LocalXZSurfaceLine2 = new OldSurfaceLineToNewConverter().Convert(value);
+                value.Dispose();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the surface line 
+        /// </summary>
+        /// <remarks>Aggregate relationship from <see cref="Dike.SurfaceLines"/>.</remarks>
+        [Browsable(false)]
+        [Obsolete("Do not use this property; Exists only for backwards compatibility.", true)]
+        public virtual SurfaceLine SurfaceLine
+        {
+            get
+            {
+                return surfaceLine;
+            }
+            set
+            {
+                surfaceLine = value;
+            }
+        }
+
+        /// <summary>
+        /// Allows this location instance to update its <see cref="Location.SurfaceLine2"/>
+        /// property if an old-style surfaceline was persisted.
+        /// </summary>
+        /// <param name="otherSurfaceline">The potential replacement candidate for a persisted
+        /// old-style surfaceline.</param>
+        public void SetNewSurfaceLineIfMatchesWithOldPersistedSurfaceLine(SurfaceLine2 otherSurfaceline)
+        {
+            if (surfaceLine != null && Equals(otherSurfaceline.Name, surfaceLine.Name))
+            {
+                SurfaceLine2 = otherSurfaceline;
+
+                surfaceLine.Dispose();
+                surfaceLine = null;
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/TimeSeriesProcessor.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/TimeSeriesProcessor.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/TimeSeriesProcessor.cs	(revision 3305)
@@ -0,0 +1,199 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using Deltares.Standard.Application;
+
+namespace Deltares.Dam.Data
+{
+    public abstract class TimeSeriesProcessor
+    {
+        internal readonly static LogHelper Logger = LogHelper.Create("Time Series Processor");
+
+        #region Constants
+
+        /// <summary>
+        /// Defines the default output file 
+        /// </summary>
+        private const string DefaultOutputFileName = "output.xml";
+
+        /// <summary>e
+        /// Defines the water level location id used in the FEWS time serie
+        /// </summary>
+        public const string WaterLevelInputLocationID = "outside";
+
+        /// <summary>
+        /// Defines the parameter id of the water level defined in the FEWS time serie
+        /// </summary>
+        public const string WaterLevelInputParameterID = "Waterlevel";
+
+        /// <summary>
+        /// Defines the parameter id for water pressure used in the FEWS time serie
+        /// </summary>
+        public const string WaterPressureParameterID = "Waterpressure";
+
+        /// <summary>
+        /// Defines the sensor state missing value
+        /// </summary>
+        internal const double MissingValue = -999;
+
+        #endregion
+
+        public ICalculator Calculator { protected get; set; }
+
+        /// <summary>
+        /// Gets or sets the output parameter ID.
+        /// </summary>
+        /// <remarks>This name or ID is used in the output (FEWS) time series</remarks>
+        /// <value>
+        /// The output parameter ID.
+        /// </value>
+        public IEnumerable<string> OutputParameters { get; set; }
+
+        /// <summary>
+        /// Sets the input time series, used in the calculations
+        /// </summary>
+        public TimeSerieCollection InputTimeSeriesCollection { protected get; set; }
+
+        /// <summary>
+        /// Gets or sets the output location ID colletion used for creating the output time series
+        /// </summary>
+        public virtual IEnumerable<string> OutputLocations { get; set; }
+
+        /// <summary>
+        /// Gets or the output time series
+        /// </summary>
+        public TimeSerieCollection OutputTimeSeriesCollection { get; set; }
+
+        /// <summary>
+        /// Resets the monitoring point list
+        /// </summary>
+        public virtual void Initialize()
+        {
+            if (OutputTimeSeriesCollection == null)
+                OutputTimeSeriesCollection = InputTimeSeriesCollection.GetShallowCopy();
+            else
+                OutputTimeSeriesCollection.Clear();
+        }
+
+        /// <summary>
+        /// Loads the input time series.
+        /// </summary>
+        /// <param name="fileName">Name of the file.</param>
+        public void LoadInputTimeSeries(string fileName)
+        {
+            ThrowHelper.ThrowIfFileNameNullOrEmpty(fileName);
+            try
+            {
+                // load the input time serie containing all water levels
+                InputTimeSeriesCollection = TimeSerieCollection.LoadFromFile(fileName);
+            }
+            catch (Exception e)
+            {
+                throw new InvalidOperationException("There was an error loading the input time series", e);
+            }
+        }
+
+        /// <summary>
+        /// Saves the output time series to the specified file
+        /// </summary>
+        /// <param name="fileName">
+        /// The output file that will contain the monitored and calculated results for each time entry</param>
+        public void SaveResultsToFile(string fileName)
+        {
+            if (OutputTimeSeriesCollection == null)
+                throw new InvalidOperationException("No output time series collection to write");
+
+            if (string.IsNullOrWhiteSpace(fileName))
+            {
+                fileName = DefaultOutputFileName;
+            }
+
+            // save the time serie to the output file
+            OutputTimeSeriesCollection.Save(fileName);
+        }
+
+        /// <summary>
+        /// Processes the FEWS input time series files to ouput 
+        /// time series
+        /// </summary>        
+        public virtual void Process()
+        {
+            if (InputTimeSeriesCollection == null)
+                return;
+
+            if (OutputTimeSeriesCollection == null)
+                throw new InvalidOperationException("No output time series set to write the results to");            
+
+            if (OutputLocations == null)
+                throw new InvalidOperationException("No output locations set. Set or override OutputLocations");
+
+            if (OutputParameters == null)
+                throw new InvalidOperationException("No output parameters set. Set or override OutputParameters");
+            
+            try
+            {
+                // Process the time series entries for each sensor and set the 
+                // value in the output time series
+                CreateOutputSeries();
+            }
+            catch (Exception e)
+            {
+                const string message = "There was an error processing the time series";
+                Logger.LogFatal(message, e);                
+                throw new InvalidOperationException(message, e);                
+            }
+        }
+
+        /// <summary>
+        /// Processes the actual input to the output collection. This is a template method which will 
+        /// be called in the public ProcessSeries() method (if not overriden)
+        /// </summary>
+        protected virtual void CreateOutputSeries()
+        {
+            foreach (var timeSeries in InputTimeSeriesCollection.Series)
+            {
+                foreach (var location in OutputLocations)
+                {
+                    foreach (var parameter in OutputParameters)
+                    {
+                        var copyOfSeries = timeSeries.GetShallowCopy();
+                        foreach (var entry in timeSeries.Entries)
+                        {
+                            // get copy of the input entry
+                            var copyOfEntry = entry.GetShallowCopy();
+                            // calculate its value
+                            copyOfEntry.Value = Calculator.Calculate(location, parameter) ?? MissingValue;
+
+                            // set parameter and location id's and add the projected entry to the output
+                            copyOfSeries.LocationId = location;
+                            copyOfSeries.ParameterId = parameter;
+                            copyOfSeries.Entries.Add(copyOfEntry);
+                        }
+                        // add the output series to the output collection
+                        OutputTimeSeriesCollection.Series.Add(copyOfSeries);                        
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/CalculationParametersDefinition.xsd
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/CalculationParametersDefinition.xsd	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/CalculationParametersDefinition.xsd	(revision 3305)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) Stichting Deltares 2019. All rights reserved.
+
+This file is part of the DAM - Clients Library.
+
+The DAM - UI is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+
+<!-- Created with Liquid XML Studio 1.0.8.0 (http://www.liquid-technologies.com) -->
+<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:simpleType name="MStabCalculationModel">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Bishop" />
+      <xs:enumeration value="Spencer" />
+      <xs:enumeration value="Fellenius" />
+      <xs:enumeration value="UpliftVan" />
+      <xs:enumeration value="UpliftSpencer" />
+      <xs:enumeration value="BishopRandomField" />
+      <xs:enumeration value="HorizontalBalance" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="MStabSearchMethod">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Grid" />
+      <xs:enumeration value="GeneticAlgorithm" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:element name="CalculationParameters">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="CalculationModules">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element minOccurs="0" name="StabilityInside" type="xs:boolean" />
+              <xs:element minOccurs="0" name="StabilityOutside" type="xs:boolean" />
+              <xs:element minOccurs="0" name="PipingWti" type="xs:boolean" />
+              <xs:element minOccurs="0" name="PipingBligh" type="xs:boolean" />
+              <xs:element minOccurs="0" name="PipingSellmeijer" type="xs:boolean" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element minOccurs="0" name="MStabParameters">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element minOccurs="0" name="CalculationModel" type="MStabCalculationModel" />
+              <xs:element name="SearchMethod" type="MStabSearchMethod" />
+              <xs:element name="UseZones">
+                <xs:simpleType>
+                  <xs:restriction base="xs:integer">
+                    <xs:minInclusive value="0" />
+                    <xs:maxInclusive value="2" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="IsCalculateAllStabilityProjectsAtOnce" type="xs:boolean" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs	(revision 3305)
@@ -0,0 +1,1204 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.ComponentModel;
+using System.Globalization;
+using Deltares.Standard;
+using Deltares.Standard.EventPublisher;
+using Deltares.Standard.Language;
+using System.Collections.Generic;
+using System;
+using System.Collections.Specialized;
+using System.Linq.Expressions;
+using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.SurfaceLines;
+using Deltares.Standard.Attributes;
+using Deltares.Standard.Units;
+using Deltares.Standard.Validation;
+
+namespace Deltares.Dam.Data
+{
+
+    /// <summary>
+    /// Does uplift occur or not
+    /// </summary>
+    public struct UpliftSituation
+    {
+        public bool IsUplift;
+        public double Pl3MinUplift;
+        public double Pl3HeadAdjusted;
+        public double Pl3LocationXMinUplift;
+        public double Pl4MinUplift;
+        public double Pl4HeadAdjusted;
+        public double Pl4LocationXMinUplift;
+    }
+
+    [Serializable]
+    public class ScenarioException : Exception
+    {
+        public ScenarioException(string message) : base(message)
+        {
+        }
+    }
+
+    /// <summary>
+    /// Calculation scenario class
+    /// </summary>
+    public class Scenario : IVisibleEnabled, IRepairer
+    {
+        #region Performance optimization: Extract expression so it only has to be generated once.
+
+        private static readonly Expression<Func<Scenario, object>> ExpressionLocationScenarioId = x => x.LocationScenarioID;
+        private static readonly Expression<Func<Scenario, object>> ExpressionRiverLevel = x => x.RiverLevel;
+        private static readonly Expression<Func<Scenario, object>> ExpressionRiverLevelLow = x => x.RiverLevelLow;
+        private static readonly Expression<Func<Scenario, object>> ExpressionDikeTableHeight = x => x.DikeTableHeight;
+        private static readonly Expression<Func<Scenario, object>> ExpressionRequiredSafetyFactorStabilityInnerSlope = x => x.RequiredSafetyFactorStabilityInnerSlope;
+        private static readonly Expression<Func<Scenario, object>> ExpressionRequiredSafetyFactorStabilityOuterSlope = x => x.RequiredSafetyFactorStabilityOuterSlope;
+        private static readonly Expression<Func<Scenario, object>> ExpressionRequiredSafetyFactorPiping = x => x.RequiredSafetyFactorPiping;
+        private static readonly Expression<Func<Scenario, object>> ExpressionUpliftCriterionPiping = x => x.UpliftCriterionPiping;
+        private static readonly Expression<Func<Scenario, object>> ExpressionUpliftCriterionStability = x => x.UpliftCriterionStability;
+        private static readonly Expression<Func<Scenario, object>> ExpressionPlLineOffsetBelowDikeTopAtRiver = x => x.PlLineOffsetBelowDikeTopAtRiver;
+        private static readonly Expression<Func<Scenario, object>> ExpressionPlLineOffsetBelowDikeTopAtPolder = x => x.PlLineOffsetBelowDikeTopAtPolder;
+        private static readonly Expression<Func<Scenario, object>> ExpressionPlLineOffsetBelowShoulderBaseInside = x => x.PlLineOffsetBelowShoulderBaseInside;
+        private static readonly Expression<Func<Scenario, object>> ExpressionPlLineOffsetBelowDikeToeAtPolder = x => x.PlLineOffsetBelowDikeToeAtPolder;
+        private static readonly Expression<Func<Scenario, object>> ExpressionUsePlLineOffsetBelowDikeCrestMiddle = x => x.UsePlLineOffsetBelowDikeCrestMiddle;
+        private static readonly Expression<Func<Scenario, object>> ExpressionPlLineOffsetBelowDikeCrestMiddle = x => x.PlLineOffsetBelowDikeCrestMiddle;
+        private static readonly Expression<Func<Scenario, object>> ExpressionUsePlLineOffsetFactorBelowShoulderCrest = x => x.UsePlLineOffsetFactorBelowShoulderCrest;
+        private static readonly Expression<Func<Scenario, object>> ExpressionPlLineOffsetFactorBelowShoulderCrest = x => x.PlLineOffsetFactorBelowShoulderCrest;
+        private static readonly Expression<Func<Scenario, object>> ExpressionHeadPl3 = x => x.HeadPl3;
+        private static readonly Expression<Func<Scenario, object>> ExpressionHeadPl4 = x => x.HeadPl4;
+        private static readonly Expression<Func<Scenario, object>> ExpressionPolderLevel = x => x.PolderLevel;
+        private static readonly Expression<Func<Scenario, object>> ExpressionHeadPl2 = x => x.HeadPl2;
+
+        #endregion
+
+        private CalculationResult calculationResult = CalculationResult.NoRun;
+        private Location location = null;
+        private readonly List<CsvExportData> calculationResults = new List<CsvExportData>();
+
+        private Dictionary<Object, UpliftSituation?> stabilityUpliftSituations;
+        private Dictionary<Object, PipingResults?> pipingResults;
+        private Dictionary<Object, double?> safetyFactorsPiping;
+        private Dictionary<Object, SurfaceLine2> redesignedSurfaceLines;
+        private Dictionary<Object, string> resultMessages;
+        
+        private string locationScenarioId;
+        private double? riverLevel;
+        private double? riverLevelLow;
+        private double? dikeTableHeight;
+        private double plLineOffsetBelowDikeTopAtRiver = 0.5;
+        private double plLineOffsetBelowDikeTopAtPolder = 1.5;
+        private double plLineOffsetBelowShoulderBaseInside = 0.1;
+        private double plLineOffsetBelowDikeToeAtPolder = 0.1;
+        private bool? usePlLineOffsetBelowDikeCrestMiddle;
+        private double? plLineOffsetBelowDikeCrestMiddle;
+        private bool? usePlLineOffsetFactorBelowShoulderCrest;
+        private double? plLineOffsetFactorBelowShoulderCrest;
+        private double? headPl2;
+        private double? headPl3;
+        private double? headPl4;
+        private double polderLevel;
+
+        [Browsable(false)]
+        public CalculationResult CalculationResult
+        {
+            get { return calculationResult; }
+            set { calculationResult = value; }
+        }
+
+        [Browsable(false)]
+        public List<CsvExportData> CalculationResults
+        {
+            get { return calculationResults; }
+        }
+        
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public Scenario()
+        {
+            ClearResults();
+            ClearErrors();
+            ClearstabilityUpliftSituations();
+            ModelFactors = new ModelFactors();
+        }
+
+        /// <summary>
+        /// Clears the results
+        /// </summary>
+        public void ClearstabilityUpliftSituations()
+        {
+            stabilityUpliftSituations = new Dictionary<Object, UpliftSituation?>();
+        }
+
+        /// <summary>
+        /// Clears the errors.
+        /// </summary>
+        public void ClearErrors()
+        {
+            Errors = new StringCollection();
+        }
+        /// <summary>
+        /// Clears the results
+        /// </summary>
+        public void ClearResults()
+        {
+            calculationResult = CalculationResult.NoRun;
+            pipingResults = new Dictionary<Object, PipingResults?>();
+            safetyFactorsPiping = new Dictionary<Object, double?>();
+            resultMessages = new Dictionary<Object, string>();
+            redesignedSurfaceLines = new Dictionary<Object, SurfaceLine2>();
+            calculationResults.Clear(); 
+        }
+
+        /// <summary>
+        /// Gets or sets the location scenario identifier.
+        /// </summary>
+        /// <value>
+        /// The location scenario identifier.
+        /// </value>
+        [Browsable(true)]
+        [PropertyOrder(0, 1)]
+        [ReadOnly(true)]
+        public string LocationScenarioID 
+        {
+            get
+            {
+                return locationScenarioId;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionLocationScenarioId);
+                locationScenarioId = value;
+                DataEventPublisher.AfterChange(this, ExpressionLocationScenarioId);
+            }
+        }
+
+        [Browsable(false)]
+        public StringCollection Errors { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the river level.
+        /// </summary>
+        /// <value>
+        /// The river level.
+        /// </value>
+        [PropertyOrder(1, 1)]
+        [Unit(UnitType.Length)]
+        [Format("F2")]
+        [Label("River level")]
+        [Description("River level")]
+        public double? RiverLevel
+        {
+            get
+            {
+                return riverLevel;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionRiverLevel);
+                riverLevel = value;
+                DataEventPublisher.AfterChange(this, ExpressionRiverLevel);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the river level low.
+        /// </summary>
+        /// <value>
+        /// The river level low.
+        /// </value>
+        [PropertyOrder(1, 2)]
+        [Unit(UnitType.Length)]
+        [Format("F2")]
+        [Label("River level low")]
+        [Description("River level low")]
+        public double? RiverLevelLow
+        {
+            get
+            {
+                return riverLevelLow;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionRiverLevelLow);
+                riverLevelLow = value;
+                DataEventPublisher.AfterChange(this, ExpressionRiverLevelLow);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the height of the dike table.
+        /// </summary>
+        /// <value>
+        /// The height of the dike table.
+        /// </value>
+        [PropertyOrder(1, 3)]
+        [Unit(UnitType.Length)]
+        [Format("F2")]
+        [Label("Dike table height")]
+        [Description("Dike table height")]
+        public double? DikeTableHeight
+        {
+            get
+            {
+                return dikeTableHeight;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionDikeTableHeight);
+                dikeTableHeight = value;
+                DataEventPublisher.AfterChange(this, ExpressionDikeTableHeight);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the polder level.
+        /// </summary>
+        /// <value>
+        /// The polder level.
+        /// </value>
+        [PropertyOrder(1, 4)]
+        [Unit(UnitType.Length)]
+        [Format("F2")]
+        public double PolderLevel
+        {
+            get
+            {
+                return polderLevel;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionPolderLevel);
+                polderLevel = value;
+                DataEventPublisher.AfterChange(this, ExpressionPolderLevel);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the uplift criterion piping.
+        /// </summary>
+        /// <value>
+        /// The uplift criterion piping.
+        /// </value>
+        [PropertyOrder(1, 5)]
+        [Format("F2")]
+        [Label("Uplift criterion piping")]
+        [Description("Uplift criterion piping")]
+        public double UpliftCriterionPiping
+        {
+            get { return ModelFactors.UpliftCriterionPiping; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionUpliftCriterionPiping);
+                ModelFactors.UpliftCriterionPiping = value;
+                DataEventPublisher.AfterChange(this, ExpressionUpliftCriterionPiping);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the uplift criterion stability.
+        /// </summary>
+        /// <value>
+        /// The uplift criterion stability.
+        /// </value>
+        [PropertyOrder(1, 6)]
+        [Format("F2")]
+        [Label("Uplift criterion stability")]
+        [Description("Uplift criterion stability")]
+        public double UpliftCriterionStability
+        {
+            get { return ModelFactors.UpliftCriterionStability; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionUpliftCriterionStability);
+                ModelFactors.UpliftCriterionStability = value;
+                DataEventPublisher.AfterChange(this, ExpressionUpliftCriterionStability);
+            }
+        }
+
+        [PropertyOrder(1, 7)]
+        [Unit(UnitType.Length)]
+        [Format("F2")]
+        public double PlLineOffsetBelowDikeTopAtRiver
+        {
+            get
+            {
+                return plLineOffsetBelowDikeTopAtRiver;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionPlLineOffsetBelowDikeTopAtRiver);
+                plLineOffsetBelowDikeTopAtRiver = value;
+                DataEventPublisher.AfterChange(this, ExpressionPlLineOffsetBelowDikeTopAtRiver);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the pl line offset below dike top at polder.
+        /// </summary>
+        /// <value>
+        /// The pl line offset below dike top at polder.
+        /// </value>
+        [PropertyOrder(1, 8)]
+        [Unit(UnitType.Length)]
+        [Format("F2")]
+        public double PlLineOffsetBelowDikeTopAtPolder
+        {
+            get
+            {
+                return plLineOffsetBelowDikeTopAtPolder;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionPlLineOffsetBelowDikeTopAtPolder);
+                plLineOffsetBelowDikeTopAtPolder = value;
+                DataEventPublisher.AfterChange(this, ExpressionPlLineOffsetBelowDikeTopAtPolder);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the pl line offset below shoulder base inside.
+        /// </summary>
+        /// <value>
+        /// The pl line offset below shoulder base inside.
+        /// </value>
+        [PropertyOrder(1, 9)]
+        [Unit(UnitType.Length)]
+        [Format("F2")]
+        public double PlLineOffsetBelowShoulderBaseInside
+        {
+            get
+            {
+                return plLineOffsetBelowShoulderBaseInside;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionPlLineOffsetBelowShoulderBaseInside);
+                plLineOffsetBelowShoulderBaseInside = value;
+                DataEventPublisher.AfterChange(this, ExpressionPlLineOffsetBelowShoulderBaseInside);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the pl line offset below dike toe at polder.
+        /// </summary>
+        /// <value>
+        /// The pl line offset below dike toe at polder.
+        /// </value>
+        [PropertyOrder(1, 10)]
+        [Unit(UnitType.Length)]
+        [Format("F2")]
+        public double PlLineOffsetBelowDikeToeAtPolder
+        {
+            get
+            {
+                return plLineOffsetBelowDikeToeAtPolder;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionPlLineOffsetBelowDikeToeAtPolder);
+                plLineOffsetBelowDikeToeAtPolder = value;
+                DataEventPublisher.AfterChange(this, ExpressionPlLineOffsetBelowDikeToeAtPolder);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the use pl line offset below dike crest middle.
+        /// </summary>
+        /// <value>
+        /// The use pl line offset below dike crest middle.
+        /// </value>
+        [PropertyOrder(1, 11)]
+        [Unit(UnitType.None)]
+        [Clearable]
+        public bool? UsePlLineOffsetBelowDikeCrestMiddle
+        {
+            get
+            {
+                return usePlLineOffsetBelowDikeCrestMiddle;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionUsePlLineOffsetBelowDikeCrestMiddle);
+                usePlLineOffsetBelowDikeCrestMiddle = value;
+                DataEventPublisher.AfterChange(this, ExpressionUsePlLineOffsetBelowDikeCrestMiddle);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the pl line offset below dike crest middle.
+        /// </summary>
+        /// <value>
+        /// The pl line offset below dike crest middle.
+        /// </value>
+        [PropertyOrder(1, 12)]
+        [Unit(UnitType.Length)]
+        [Format("F2")]
+        public double? PlLineOffsetBelowDikeCrestMiddle
+        {
+            get { return plLineOffsetBelowDikeCrestMiddle; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionPlLineOffsetBelowDikeCrestMiddle);
+                plLineOffsetBelowDikeCrestMiddle = value;
+                DataEventPublisher.AfterChange(this, ExpressionPlLineOffsetBelowDikeCrestMiddle);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the use pl line offset factor below shoulder crest.
+        /// </summary>
+        /// <value>
+        /// The use pl line offset factor below shoulder crest.
+        /// </value>
+        [PropertyOrder(1, 13)]
+        [Unit(UnitType.None)]
+        [Clearable]
+        public bool? UsePlLineOffsetFactorBelowShoulderCrest
+        {
+            get
+            {
+                return usePlLineOffsetFactorBelowShoulderCrest;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionUsePlLineOffsetFactorBelowShoulderCrest);
+                usePlLineOffsetFactorBelowShoulderCrest = value;
+                DataEventPublisher.AfterChange(this, ExpressionUsePlLineOffsetFactorBelowShoulderCrest);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the pl line offset factor below shoulder crest.
+        /// </summary>
+        /// <value>
+        /// The pl line offset factor below shoulder crest.
+        /// </value>
+        [PropertyOrder(1, 14)]
+        [Unit(UnitType.Fractions)]
+        [Format("F2")]
+        public double? PlLineOffsetFactorBelowShoulderCrest
+        {
+            get { return plLineOffsetFactorBelowShoulderCrest; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionPlLineOffsetFactorBelowShoulderCrest);
+                plLineOffsetFactorBelowShoulderCrest = value;
+                DataEventPublisher.AfterChange(this, ExpressionPlLineOffsetFactorBelowShoulderCrest);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the head PL2.
+        /// </summary>
+        /// <value>
+        /// The head PL2.
+        /// </value>
+        [PropertyOrder(1, 15)]
+        [Unit(UnitType.Length)]
+        [Format("F2")]
+        public double? HeadPl2 {
+            get { return headPl2; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionHeadPl2);
+                headPl2 = value;
+                DataEventPublisher.AfterChange(this, ExpressionHeadPl2);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the head PL3.
+        /// </summary>
+        /// <value>
+        /// The head PL3.
+        /// </value>
+        [PropertyOrder(1, 16)]
+        [Unit(UnitType.Length)]
+        [Format("F2")]
+        public double? HeadPl3
+        {
+            get
+            {
+                return headPl3;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionHeadPl3);
+                headPl3 = value;
+                DataEventPublisher.AfterChange(this, ExpressionHeadPl3);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the head PL4.
+        /// </summary>
+        /// <value>
+        /// The head PL4.
+        /// </value>
+        [PropertyOrder(1, 17)]
+        [Unit(UnitType.Length)]
+        [Format("F2")]
+        public double? HeadPl4
+        {
+            get
+            {
+                return headPl4;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionHeadPl4);
+                headPl4 = value;
+                DataEventPublisher.AfterChange(this, ExpressionHeadPl4);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the required safety factor stability inner slope.
+        /// </summary>
+        /// <value>
+        /// The required safety factor stability inner slope.
+        /// </value>
+        [PropertyOrder(1, 18)]
+        [Format("F2")]
+        [Label("Required safety factor stability inner slope")]
+        [Description("Required safety factor stability inner slope")]
+        public double RequiredSafetyFactorStabilityInnerSlope
+        {
+            get { return ModelFactors.RequiredSafetyFactorStabilityInnerSlope; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionRequiredSafetyFactorStabilityInnerSlope);
+                ModelFactors.RequiredSafetyFactorStabilityInnerSlope = value;
+                DataEventPublisher.AfterChange(this, ExpressionRequiredSafetyFactorStabilityInnerSlope);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the required safety factor stability outer slope.
+        /// </summary>
+        /// <value>
+        /// The required safety factor stability outer slope.
+        /// </value>
+        [PropertyOrder(1, 19)]
+        [Format("F2")]
+        [Label("Required safety factor stability outer slope")]
+        [Description("Required safety factor stability outer slope")]
+        public double RequiredSafetyFactorStabilityOuterSlope
+        {
+            get { return ModelFactors.RequiredSafetyFactorStabilityOuterSlope; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionRequiredSafetyFactorStabilityOuterSlope);
+                ModelFactors.RequiredSafetyFactorStabilityOuterSlope = value;
+                DataEventPublisher.AfterChange(this, ExpressionRequiredSafetyFactorStabilityOuterSlope);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the required safety factor piping.
+        /// </summary>
+        /// <value>
+        /// The required safety factor piping.
+        /// </value>
+        [PropertyOrder(1, 20)]
+        [Format("F2")]
+        [Label("Required safety factor piping")]
+        [Description("Required safety factor piping")]
+        public double RequiredSafetyFactorPiping
+        {
+            get { return ModelFactors.RequiredSafetyFactorPiping; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionRequiredSafetyFactorPiping);
+                ModelFactors.RequiredSafetyFactorPiping = value;
+                DataEventPublisher.AfterChange(this, ExpressionRequiredSafetyFactorPiping);
+            }
+        }
+
+        [Browsable(false)]
+        public ModelFactors ModelFactors { get; set; }
+
+        /// <remarks>Aggregation relationship.</remarks>
+        [Browsable(false)]
+        public Location Location
+        {
+            get { return location; }
+            set { location = value; }
+        }
+
+        /// <summary>
+        /// Get uplift criterion for this scenario; return default value if not available
+        /// </summary>
+        /// <param name="defaultUpliftCriterionStability">default value if not available</param>
+        /// <returns>uplift criterion for this scenario</returns>
+        public double GetUpliftCriterionStability(double? defaultUpliftCriterionStability)
+        {
+            if ((defaultUpliftCriterionStability == null) && (ModelFactors.UpliftCriterionStability == null))
+            {
+                throw new ScenarioException(String.Format(LocalizationManager.GetTranslatedText(this, "NoUpliftCriterionForStability"), Location.Name, ToString()));
+                
+            }
+            return (ModelFactors.UpliftCriterionStability == null ? defaultUpliftCriterionStability.Value
+                        : ModelFactors.UpliftCriterionStability);
+        }
+
+        /// <summary>
+        /// Get uplift criterion for this scenario; return default value if not available
+        /// </summary>
+        /// <param name="defaultUpliftCriterionPiping">default value if not available</param>
+        /// <returns>uplift criterion for this scenario</returns>
+        public double GetUpliftCriterionPiping(double? defaultUpliftCriterionPiping)
+        {
+            if ((defaultUpliftCriterionPiping == null) && (ModelFactors.UpliftCriterionPiping == null))
+            {
+                throw new ScenarioException(String.Format(LocalizationManager.GetTranslatedText(this, "NoUpliftCriterionForPiping"), Location.Name, ToString()));
+            }
+            return (ModelFactors.UpliftCriterionPiping == null ? defaultUpliftCriterionPiping.Value : ModelFactors.UpliftCriterionPiping);
+        }
+
+        /// <summary>
+        /// Get required safety factor for this scenario; return default value if not available
+        /// </summary>
+        /// <param name="defaultRequiredSafetyFactorPiping">default value if not available</param>
+        /// <returns>uplift criterion for this scenario</returns>
+        public double GetRequiredSafetyFactorPiping(double? defaultRequiredSafetyFactorPiping)
+        {
+            if ((defaultRequiredSafetyFactorPiping == null) && (ModelFactors.RequiredSafetyFactorPiping == null))
+            {
+                throw new ScenarioException(String.Format(LocalizationManager.GetTranslatedText(this, "NoRequiredSafetyFactorPiping"), Location.Name, ToString()));
+            }
+            return (ModelFactors.RequiredSafetyFactorPiping == null ? defaultRequiredSafetyFactorPiping.Value : ModelFactors.RequiredSafetyFactorPiping);
+        }
+
+        /// <summary>
+        /// Determines whether [is pl line offset factor below shoulder crest valid].
+        /// </summary>
+        /// <returns></returns>
+        [Validate]
+        public ValidationResult[] IsPlLineOffsetFactorBelowShoulderCrestValid()
+        {
+            if (UsePlLineOffsetFactorBelowShoulderCrest.HasValue && UsePlLineOffsetFactorBelowShoulderCrest.Value &&
+                PlLineOffsetFactorBelowShoulderCrest.HasValue)
+            {
+                if (PlLineOffsetFactorBelowShoulderCrest.Value < DamGlobalConstants.PlLineOffsetFactorBelowShoulderCrestMinValue)
+                {
+                    return new[]
+                        {
+                            new ValidationResult(ValidationResultType.Error,
+                                                 LocalizationManager.GetTranslatedText(this, "PlLineOffsetFactorBelowShoulderCrestTooSmall"),
+                                                 this, "PlLineOffsetFactorBelowShoulderCrest", "AssignMinValue", (IRepairer) this)
+                        };
+                }
+                if (PlLineOffsetFactorBelowShoulderCrest.Value > DamGlobalConstants.PlLineOffsetFactorBelowShoulderCrestMaxValue)
+                {
+                    return new[]
+                        {
+                            new ValidationResult(ValidationResultType.Error,
+                                                 LocalizationManager.GetTranslatedText(this, "PlLineOffsetFactorBelowShoulderCrestTooLarge"),
+                                                 this, "PlLineOffsetFactorBelowShoulderCrest", "AssignMaxValue", (IRepairer) this)
+                        };
+                }
+            }
+            return new ValidationResult[0];
+        }
+
+        /// <summary>
+        /// Get stability uplift situation
+        /// </summary>
+        /// <param name="objectAsKey"></param>
+        /// <returns></returns>
+        private UpliftSituation? GetStabilityUpliftSituation(Object objectAsKey)
+        {
+            return objectAsKey != null && stabilityUpliftSituations.ContainsKey(objectAsKey) ? stabilityUpliftSituations[objectAsKey] : null;
+        }
+
+        /// <summary>
+        /// Get stability uplift situation
+        /// </summary>
+        /// <param name="soilProfile"></param>
+        /// <param name="soilGeometry2DName"></param>
+        /// <returns></returns>
+        public UpliftSituation? GetStabilityUpliftSituation(SoilProfile1D soilProfile, string soilGeometry2DName)
+        {
+            Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
+            return GetStabilityUpliftSituation(objectAsKey);
+        }
+
+        /// <summary>
+        ///  Set stability uplift situation
+        /// </summary>
+        /// <param name="objectAsKey"></param>
+        /// <param name="upliftSituation"></param>
+        private void SetStabilityUpliftSituation(Object objectAsKey, UpliftSituation upliftSituation)
+        {
+            stabilityUpliftSituations[objectAsKey] = upliftSituation;
+        }
+
+        /// <summary>
+        /// Set stability uplift situation
+        /// </summary>
+        /// <param name="soilProfile"></param>
+        /// <param name="soilGeometry2DName"></param>
+        /// <param name="upliftSituation"></param>
+        public void SetStabilityUpliftSituation(SoilProfile1D soilProfile, string soilGeometry2DName, UpliftSituation upliftSituation)
+        {
+            Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
+            SetStabilityUpliftSituation(objectAsKey, upliftSituation);
+        }
+
+        /// <summary>
+        /// Get PipingResults
+        /// </summary>
+        /// <param name="objectAsKey"></param>
+        /// <returns></returns>
+        private PipingResults? GetPipingResults(Object objectAsKey)
+        {
+            if (objectAsKey != null)
+            {
+                return pipingResults.ContainsKey(objectAsKey) ? pipingResults[objectAsKey] : null;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Get PipingResults
+        /// </summary>
+        /// <param name="soilProfile"></param>
+        /// <param name="soilGeometry2DName"></param>
+        /// <returns></returns>
+        public PipingResults? GetPipingResults(SoilProfile1D soilProfile, string soilGeometry2DName)
+        {
+            Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
+            return GetPipingResults(objectAsKey);
+        }
+
+        /// <summary>
+        /// Set PipingResults
+        /// </summary>
+        /// <param name="objectAsKey"></param>
+        /// <param name="pipingResults"></param>
+        private void SetPipingResults(Object objectAsKey, PipingResults? pipingResults)
+        {
+            this.pipingResults[objectAsKey] = pipingResults;
+        }
+
+        /// <summary>
+        /// Set PipingResults
+        /// </summary>
+        /// <param name="soilProfile"></param>
+        /// <param name="soilGeometry2DName"></param>
+        /// <param name="pipingResults"></param>
+        public void SetPipingResults(SoilProfile1D soilProfile, string soilGeometry2DName, PipingResults? pipingResults)
+        {
+            Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
+            SetPipingResults(objectAsKey, pipingResults);
+        }
+
+        /// <summary>
+        /// Get Safety Factor Piping
+        /// </summary>
+        /// <param name="objectAsKey"></param>
+        /// <returns></returns>
+        private double? GetSafetyFactorPiping(Object objectAsKey)
+        {
+            if (objectAsKey != null)
+            {
+                return safetyFactorsPiping.ContainsKey(objectAsKey) ? safetyFactorsPiping[objectAsKey] : null;
+            }
+            return null;
+        }
+
+        /// <summary>
+        ///  Get Safety Factor Piping
+        /// </summary>
+        /// <param name="soilProfile"></param>
+        /// <param name="soilGeometry2DName"></param>
+        /// <returns></returns>
+        public double? GetSafetyFactorPiping(SoilProfile1D soilProfile, string soilGeometry2DName)
+        {
+            Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
+            return GetSafetyFactorPiping(objectAsKey);
+        }
+
+        /// <summary>
+        /// Get Result Message
+        /// </summary>
+        /// <param name="objectAsKey"></param>
+        /// <returns></returns>
+        private string GetResultMessage(Object objectAsKey)
+        {
+            if (objectAsKey != null)
+            {
+                return resultMessages.ContainsKey(objectAsKey) ? resultMessages[objectAsKey] : null;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Get Result Message
+        /// </summary>
+        /// <param name="soilProfile"></param>
+        /// <param name="soilGeometry2DName"></param>
+        /// <returns></returns>
+        public string GetResultMessage(SoilProfile1D soilProfile, string soilGeometry2DName)
+        {
+            Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
+            return GetResultMessage(objectAsKey);
+        }
+
+        /// <summary>
+        /// Set Result Message
+        /// </summary>
+        /// <param name="objectAsKey"></param>
+        /// <param name="resultMessage"></param>
+        private void SetResultMessage(Object objectAsKey, string resultMessage)
+        {
+            resultMessages[objectAsKey] = resultMessage;
+        }
+
+        /// <summary>
+        /// Set Result Message
+        /// </summary>
+        /// <param name="soilProfile"></param>
+        /// <param name="soilGeometry2DName"></param>
+        /// <param name="resultMessage"></param>
+        public void SetResultMessage(SoilProfile1D soilProfile, string soilGeometry2DName, string resultMessage)
+        {
+            Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
+            SetResultMessage(objectAsKey, resultMessage);
+        }
+
+        /// <summary>
+        /// Get Redesigned surfaceline
+        /// </summary>
+        /// <param name="objectAsKey"></param>
+        /// <returns></returns>
+        private SurfaceLine2 GetRedesignedSurfaceLine(Object objectAsKey)
+        {
+            if (objectAsKey != null)
+            {
+                return redesignedSurfaceLines.ContainsKey(objectAsKey) ? redesignedSurfaceLines[objectAsKey] : null;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Get Redesigned surfaceline
+        /// </summary>
+        /// <param name="soilProfile"></param>
+        /// <param name="soilGeometry2DName"></param>
+        /// <returns></returns>
+        public SurfaceLine2 GetRedesignedSurfaceLine(SoilProfile1D soilProfile, string soilGeometry2DName)
+        {
+            Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
+            return GetRedesignedSurfaceLine(objectAsKey);
+        }
+
+        /// <summary>
+        /// Set Redesigned surfaceline
+        /// </summary>
+        /// <param name="objectAsKey"></param>
+        /// <param name="surfaceLine"></param>
+        private void SetRedesignedSurfaceLine(Object objectAsKey, SurfaceLine2 surfaceLine)
+        {
+            redesignedSurfaceLines[objectAsKey] = surfaceLine;
+        }
+
+        /// <summary>
+        /// Set Redesigned surfaceline
+        /// </summary>
+        /// <param name="soilProfile"></param>
+        /// <param name="soilGeometry2DName"></param>
+        /// <param name="surfaceLine"></param>
+        public void SetRedesignedSurfaceLine(SoilProfile1D soilProfile, string soilGeometry2DName, SurfaceLine2 surfaceLine)
+        {
+            Object objectAsKey = GetObjectAsKey(soilProfile, soilGeometry2DName);
+            SetRedesignedSurfaceLine(objectAsKey, surfaceLine);
+        }
+
+        /// <summary>
+        /// Get Most recent surfaceline
+        /// </summary>
+        /// <param name="objectAsKey"></param>
+        /// <returns></returns>
+        private SurfaceLine2 GetMostRecentSurfaceLine(Object objectAsKey)
+        {
+            if (objectAsKey != null)
+            {
+                return redesignedSurfaceLines.ContainsKey(objectAsKey) ? redesignedSurfaceLines[objectAsKey] ?? Location.LocalXZSurfaceLine2 : Location.LocalXZSurfaceLine2;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Get Most recent surfaceline
+        /// </summary>
+        /// <param name="soilProfile"></param>
+        /// <param name="soilGeometry2DName"></param>
+        /// <returns></returns>
+        public SurfaceLine2 GetMostRecentSurfaceLine(SoilProfile soilProfile, string soilGeometry2DName)
+        {
+            var profile1D = soilProfile as SoilProfile1D;
+            Object objectAsKey = GetObjectAsKey(profile1D, soilGeometry2DName);
+            return GetMostRecentSurfaceLine(objectAsKey);
+        }
+
+        /// <summary>
+        /// Determine object key based on either 1d-soilprofile or 2d-geometry
+        /// 
+        /// </summary>
+        /// <param name="soilProfile"></param>
+        /// <param name="soilGeometry2DName"></param>
+        /// <returns></returns>
+        private Object GetObjectAsKey(SoilProfile1D soilProfile, string soilGeometry2DName)
+        {
+            if (soilProfile != null)
+            {
+                return soilProfile;
+            }
+            return soilGeometry2DName;
+        }
+
+        /// <summary>
+        /// Implementation of ToString
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            return String.Format("Location={0}, ID={1} RiverLevel={2} RiverLevelLow={3} DikeTableHeight={4} RequiredSafetyFactorStabilityInnerSlope={5} RequiredSafetyFactorStabilityOuterSlope={6} PlLineOffsetBelowDikeTopAtRiver={7} PlLineOffsetBelowDikeToeAtPolder={8} PlLineOffsetBelowDikeTopAtPolder={9} PlLineOffsetBelowShoulderBaseInside={10} UsePlLineOffsetBelowDikeCrestMiddle {11} PlLineOffsetBelowDikeCrestMiddle {12} UsePlLineOffsetFactorBelowShoulderCrest {13} PlLineOffsetFactorBelowShoulderCrest {14} HeadPl3={15} HeadPl4={16} PolderLevel={17} HeadPl2={18}",
+                                 Location.Name, LocationScenarioID, RiverLevel,
+                                 RiverLevelLow.HasValue ? RiverLevelLow.Value.ToString(CultureInfo.InvariantCulture) : "?",
+                                 DikeTableHeight.HasValue ? DikeTableHeight.Value.ToString(CultureInfo.InvariantCulture) : "?",
+                                 ModelFactors.RequiredSafetyFactorStabilityInnerSlope.ToString(CultureInfo.InvariantCulture),
+                                 ModelFactors.RequiredSafetyFactorStabilityOuterSlope.ToString(CultureInfo.InvariantCulture),
+                                 PlLineOffsetBelowDikeTopAtRiver.ToString(CultureInfo.InvariantCulture),
+                                 PlLineOffsetBelowDikeToeAtPolder.ToString(CultureInfo.InvariantCulture),
+                                 PlLineOffsetBelowDikeTopAtPolder.ToString(CultureInfo.InvariantCulture),
+                                 PlLineOffsetBelowShoulderBaseInside.ToString(CultureInfo.InvariantCulture),
+                                 UsePlLineOffsetBelowDikeCrestMiddle.HasValue ? 
+                                     UsePlLineOffsetBelowDikeCrestMiddle.Value.ToString(CultureInfo.InvariantCulture) : "?",
+                                 PlLineOffsetBelowDikeCrestMiddle.HasValue ? 
+                                     PlLineOffsetBelowDikeCrestMiddle.Value.ToString(CultureInfo.InvariantCulture) : "?",
+                                 UsePlLineOffsetFactorBelowShoulderCrest.HasValue ? 
+                                     UsePlLineOffsetFactorBelowShoulderCrest.Value.ToString(CultureInfo.InvariantCulture) : "?",
+                                 PlLineOffsetFactorBelowShoulderCrest.HasValue ? 
+                                     PlLineOffsetFactorBelowShoulderCrest.Value.ToString(CultureInfo.InvariantCulture) : "?",
+                                 HeadPl3.HasValue ? HeadPl3.Value.ToString(CultureInfo.InvariantCulture) : "?",
+                                 HeadPl4.HasValue ? HeadPl4.Value.ToString(CultureInfo.InvariantCulture) : "?",
+                                 PolderLevel.ToString(CultureInfo.InvariantCulture),
+                                 HeadPl2.HasValue ? HeadPl2.Value.ToString(CultureInfo.InvariantCulture) : "?");
+        }
+
+        public Dictionary<string, string> GetParametersAsNameValuePairs()
+        {
+            var numberFormatInfo = new NumberFormatInfo();
+            numberFormatInfo.NumberDecimalSeparator = ".";
+            var nameValuePairs = new Dictionary<string, string>();
+            nameValuePairs.Add(ScenarioParameterNames.LocationScenarioId, LocationScenarioID);
+            if (RiverLevel != null)
+            {
+                nameValuePairs.Add(ScenarioParameterNames.RiverLevel, RiverLevel.Value.ToString(numberFormatInfo));
+            }
+            if (RiverLevelLow != null)
+            {
+                nameValuePairs.Add(ScenarioParameterNames.RiverLevelLow, RiverLevelLow.Value.ToString(numberFormatInfo));
+            }
+            if (DikeTableHeight != null)
+            {
+                nameValuePairs.Add(ScenarioParameterNames.DikeTableHeight, DikeTableHeight.Value.ToString(numberFormatInfo));
+            }
+            if (ModelFactors != null)
+            {
+                nameValuePairs.Add(ScenarioParameterNames.RequiredSafetyFactorStabilityInnerSlope, ModelFactors.RequiredSafetyFactorStabilityInnerSlope.ToString(numberFormatInfo));
+                nameValuePairs.Add(ScenarioParameterNames.RequiredSafetyFactorStabilityOuterSlope, ModelFactors.RequiredSafetyFactorStabilityOuterSlope.ToString(numberFormatInfo));
+                nameValuePairs.Add(ScenarioParameterNames.RequiredSafetyFactorPiping, ModelFactors.RequiredSafetyFactorPiping.ToString(numberFormatInfo));
+                nameValuePairs.Add(ScenarioParameterNames.UpliftCriterionPiping, ModelFactors.UpliftCriterionPiping.ToString(numberFormatInfo));
+                nameValuePairs.Add(ScenarioParameterNames.UpliftCriterionStability, ModelFactors.UpliftCriterionStability.ToString(numberFormatInfo));
+            }
+            nameValuePairs.Add(ScenarioParameterNames.PlLineOffsetBelowDikeTopAtRiver, PlLineOffsetBelowDikeTopAtRiver.ToString(numberFormatInfo));
+            nameValuePairs.Add(ScenarioParameterNames.PlLineOffsetBelowDikeTopAtPolder, PlLineOffsetBelowDikeTopAtPolder.ToString(numberFormatInfo));
+            nameValuePairs.Add(ScenarioParameterNames.PlLineOffsetBelowShoulderBaseInside, PlLineOffsetBelowShoulderBaseInside.ToString(numberFormatInfo));
+            nameValuePairs.Add(ScenarioParameterNames.PlLineOffsetBelowDikeToeAtPolder, PlLineOffsetBelowDikeToeAtPolder.ToString(numberFormatInfo));
+            if (PlLineOffsetBelowDikeCrestMiddle != null)
+            {
+                nameValuePairs.Add(ScenarioParameterNames.PlLineOffsetBelowDikeCrestMiddle, PlLineOffsetBelowDikeCrestMiddle.Value.ToString(numberFormatInfo));
+            }
+            if (PlLineOffsetFactorBelowShoulderCrest != null)
+            {
+                nameValuePairs.Add(ScenarioParameterNames.PlLineOffsetFactorBelowShoulderCrest, PlLineOffsetFactorBelowShoulderCrest.Value.ToString(numberFormatInfo));
+            }
+            if (UsePlLineOffsetBelowDikeCrestMiddle != null)
+            {
+                nameValuePairs.Add(ScenarioParameterNames.UsePlLineOffsetBelowDikeCrestMiddle, UsePlLineOffsetBelowDikeCrestMiddle.Value.ToString());
+            }
+            if (UsePlLineOffsetFactorBelowShoulderCrest != null)
+            {
+                nameValuePairs.Add(ScenarioParameterNames.UsePlLineOffsetFactorBelowShoulderCrest, UsePlLineOffsetFactorBelowShoulderCrest.Value.ToString());
+            }
+            if (HeadPl3 != null)
+            {
+                nameValuePairs.Add(ScenarioParameterNames.HeadPl3, HeadPl3.Value.ToString(numberFormatInfo));
+            }
+            if (HeadPl4 != null)
+            {
+                nameValuePairs.Add(ScenarioParameterNames.HeadPl4, HeadPl4.Value.ToString(numberFormatInfo));
+            }
+            nameValuePairs.Add(ScenarioParameterNames.PolderLevel, PolderLevel.ToString(numberFormatInfo));
+            
+            if (HeadPl2 != null)
+            {
+                nameValuePairs.Add(ScenarioParameterNames.HeadPl2, HeadPl2.Value.ToString(numberFormatInfo));
+            }
+
+            return nameValuePairs;
+        }
+
+        public void SetParameterFromNameValuePair(string parameterName, string parameterValue)
+        {
+            var numberFormatInfo = new NumberFormatInfo();
+            numberFormatInfo.NumberDecimalSeparator = ".";
+            if (parameterName.Equals(ScenarioParameterNames.LocationScenarioId))
+                LocationScenarioID = parameterValue;
+            if (parameterName.Equals(ScenarioParameterNames.RiverLevel))
+                RiverLevel = Convert.ToDouble(parameterValue, numberFormatInfo);
+            if (parameterName.Equals(ScenarioParameterNames.RiverLevelLow))
+                RiverLevelLow = Convert.ToDouble(parameterValue, numberFormatInfo);
+            if (parameterName.Equals(ScenarioParameterNames.DikeTableHeight))
+                DikeTableHeight = Convert.ToDouble(parameterValue, numberFormatInfo);
+            if (parameterName.Equals(ScenarioParameterNames.RequiredSafetyFactorStabilityInnerSlope))
+                ModelFactors.RequiredSafetyFactorStabilityInnerSlope = Convert.ToDouble(parameterValue, numberFormatInfo);
+            if (parameterName.Equals(ScenarioParameterNames.RequiredSafetyFactorStabilityOuterSlope))
+                ModelFactors.RequiredSafetyFactorStabilityOuterSlope = Convert.ToDouble(parameterValue, numberFormatInfo);
+            if (parameterName.Equals(ScenarioParameterNames.RequiredSafetyFactorPiping))
+                ModelFactors.RequiredSafetyFactorPiping = Convert.ToDouble(parameterValue, numberFormatInfo);
+            if (parameterName.Equals(ScenarioParameterNames.UpliftCriterionPiping))
+                ModelFactors.UpliftCriterionPiping = Convert.ToDouble(parameterValue, numberFormatInfo);
+            if (parameterName.Equals(ScenarioParameterNames.UpliftCriterionStability))
+                ModelFactors.UpliftCriterionStability = Convert.ToDouble(parameterValue, numberFormatInfo);
+            if (parameterName.Equals(ScenarioParameterNames.PlLineOffsetBelowDikeTopAtRiver))
+                PlLineOffsetBelowDikeTopAtRiver = Convert.ToDouble(parameterValue, numberFormatInfo);
+            if (parameterName.Equals(ScenarioParameterNames.PlLineOffsetBelowDikeTopAtPolder))
+                PlLineOffsetBelowDikeTopAtPolder = Convert.ToDouble(parameterValue, numberFormatInfo);
+            if (parameterName.Equals(ScenarioParameterNames.PlLineOffsetBelowShoulderBaseInside))
+                PlLineOffsetBelowShoulderBaseInside = Convert.ToDouble(parameterValue, numberFormatInfo);
+            if (parameterName.Equals(ScenarioParameterNames.PlLineOffsetBelowDikeToeAtPolder))
+                PlLineOffsetBelowDikeToeAtPolder = Convert.ToDouble(parameterValue, numberFormatInfo);
+            if (parameterName.Equals(ScenarioParameterNames.PlLineOffsetBelowDikeCrestMiddle))
+                PlLineOffsetBelowDikeCrestMiddle = Convert.ToDouble(parameterValue, numberFormatInfo);
+            if (parameterName.Equals(ScenarioParameterNames.PlLineOffsetFactorBelowShoulderCrest))
+                PlLineOffsetFactorBelowShoulderCrest = Convert.ToDouble(parameterValue, numberFormatInfo);
+            if (parameterName.Equals(ScenarioParameterNames.UsePlLineOffsetBelowDikeCrestMiddle))
+                UsePlLineOffsetBelowDikeCrestMiddle = Convert.ToBoolean(parameterValue);
+            if (parameterName.Equals(ScenarioParameterNames.UsePlLineOffsetFactorBelowShoulderCrest))
+                UsePlLineOffsetFactorBelowShoulderCrest = Convert.ToBoolean(parameterValue);
+            if (parameterName.Equals(ScenarioParameterNames.HeadPl3))
+                HeadPl3 = Convert.ToDouble(parameterValue, numberFormatInfo);
+            if (parameterName.Equals(ScenarioParameterNames.HeadPl4))
+                HeadPl4 = Convert.ToDouble(parameterValue, numberFormatInfo);
+            if (parameterName.Equals(ScenarioParameterNames.PolderLevel))
+                PolderLevel = Convert.ToDouble(parameterValue, numberFormatInfo);
+            if (parameterName.Equals(ScenarioParameterNames.HeadPl2))
+                HeadPl2 = Convert.ToDouble(parameterValue, numberFormatInfo);
+        }
+
+        public bool IsVisible(string property)
+        {
+            switch (property)
+            {
+                default: return true;
+            }
+        }
+
+        public bool IsEnabled(string property)
+        {
+            return true;
+        }
+
+        /// <summary>
+        /// Repairs the specified subject.
+        /// </summary>
+        /// <param name="subject">The subject.</param>
+        /// <param name="property">The property.</param>
+        /// <param name="id">The identifier.</param>
+        public void Repair(object subject, string property, string id)
+        {
+            if (subject is Scenario)
+            {
+                if (id == "AssignMinValue" && property == "PlLineOffsetFactorBelowShoulderCrest")
+                {
+                    PlLineOffsetFactorBelowShoulderCrest = DamGlobalConstants.PlLineOffsetFactorBelowShoulderCrestMinValue;
+                }
+                if (id == "AssignMaxValue" && property == "PlLineOffsetFactorBelowShoulderCrest")
+                {
+                    PlLineOffsetFactorBelowShoulderCrest = DamGlobalConstants.PlLineOffsetFactorBelowShoulderCrestMaxValue;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the repair description.
+        /// </summary>
+        /// <param name="subject">The subject.</param>
+        /// <param name="property">The property.</param>
+        /// <param name="id">The identifier.</param>
+        /// <returns></returns>
+        public string GetRepairDescription(object subject, string property, string id)
+        {
+            if (id == "AssignMinValue")
+            {
+                return LocalizationManager.GetTranslatedText(this, "AssignMinValue");
+            }
+            if (id == "AssignMaxValue")
+            {
+                return LocalizationManager.GetTranslatedText(this, "AssignMaxValue");
+            }
+            return "";
+        }
+    }
+
+    public static class ScenarioParameterNames
+    {
+        public const string LocationScenarioId = "LocationScenarioId";
+        public const string RiverLevel = "RiverLevel";
+        public const string RiverLevelLow = "RiverLevelLow";
+        public const string DikeTableHeight = "DikeTableHeight";
+        
+        public const string RequiredSafetyFactorStabilityInnerSlope = "RequiredSafetyFactorStabilityInnerSlope";
+        public const string RequiredSafetyFactorStabilityOuterSlope = "RequiredSafetyFactorStabilityOuterSlope";
+        public const string RequiredSafetyFactorPiping = "RequiredSafetyFactorPiping";
+        public const string UpliftCriterionPiping = "UpliftCriterionPiping";
+        public const string UpliftCriterionStability = "UpliftCriterionStability";
+        public const string PlLineOffsetBelowDikeTopAtRiver = "PlLineOffsetBelowDikeTopAtRiver";
+        public const string PlLineOffsetBelowDikeTopAtPolder = "PlLineOffsetBelowDikeTopAtPolder";
+        public const string PlLineOffsetBelowShoulderBaseInside = "PlLineOffsetBelowShoulderBaseInside";
+        public const string PlLineOffsetBelowDikeToeAtPolder = "PlLineOffsetBelowDikeToeAtPolder";
+        public const string PlLineOffsetBelowDikeCrestMiddle = "PlLineOffsetBelowDikeCrestMiddle";
+        public const string PlLineOffsetFactorBelowShoulderCrest = "PlLineOffsetFactorBelowShoulderCrest";
+        public const string UsePlLineOffsetBelowDikeCrestMiddle = "UsePlLineOffsetBelowDikeCrestMiddle";
+        public const string UsePlLineOffsetFactorBelowShoulderCrest = "UsePlLineOffsetFactorBelowShoulderCrest";
+        public const string HeadPl3 = "HeadPL3";
+        public const string HeadPl4 = "HeadPL4";
+        public const string PolderLevel = "PolderLevel";
+        public const string HeadPl2 = "HeadPL2";
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Geometry2DSectionParameters.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Geometry2DSectionParameters.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Geometry2DSectionParameters.cs	(revision 3305)
@@ -0,0 +1,57 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Standard;
+using Deltares.Geotechnics.Soils;
+
+namespace Deltares.Dam.Data
+{
+
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public class Geometry2DSectionParameters : ICloneable<Geometry2DSectionParameters>
+    {
+        public Geometry2DSectionParameters()
+        {
+        }
+
+        public string SoilGeometry2DName { get; set; }
+        public double XCoordinateSection { get; set; }
+        public SoilProfile1D SoilProfile { get; set; }
+
+        public void Assign(Geometry2DSectionParameters geometry2DSectionParameters)
+        {
+            this.SoilGeometry2DName = geometry2DSectionParameters.SoilGeometry2DName;
+            this.XCoordinateSection = geometry2DSectionParameters.XCoordinateSection;
+        }
+
+        public Geometry2DSectionParameters Clone()
+        {
+            Geometry2DSectionParameters geometry2DSectionParameters = new Geometry2DSectionParameters();
+
+            geometry2DSectionParameters.Assign(this);
+
+            return geometry2DSectionParameters;
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/DamProjectVersionXmlHandler.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/DamProjectVersionXmlHandler.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/DamProjectVersionXmlHandler.cs	(revision 3305)
@@ -0,0 +1,134 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Deltares.Standard.IO.Xml;
+
+namespace Deltares.Dam.Data.IO
+{
+    /// <summary>
+    /// This class is added to be able to retrieve the proper version from the damx xml file via the xmlHandler interface.
+    /// So the only useful methods are GetDamProjectVersion and SetVersion (interface).
+    /// </summary>
+    /// <seealso cref="Deltares.Standard.IO.Xml.IXmlHandler" />
+    public class DamProjectVersionXmlHandler: IXmlHandler
+    {
+        private string damProjectVersion;
+
+        /// <summary>
+        /// Gets the dam project version.
+        /// </summary>
+        /// <returns></returns>
+        public string GetDamProjectVersion()
+        {
+            return damProjectVersion;
+        }
+
+        /// <summary>
+        /// Sets the version of the file to be deserialized
+        /// </summary>
+        /// <param name="version">Version of the xml file</param>
+        public void SetVersion(string version)
+        {
+            damProjectVersion = version;
+        }
+
+        /// <summary>
+        /// This method returns true if the <paramref name="type" /> can be handled by this XmlHandler
+        /// </summary>
+        /// <param name="type">Type of the objects</param>
+        /// <returns>
+        /// True if the type can be handled, false otherwise
+        /// </returns>
+        public bool CanHandle(Type type)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// This method returns true if the <paramref name="type" /> and property can be handled by this XmlHandler
+        /// </summary>
+        /// <param name="type">Type of the objects</param>
+        /// <param name="property">Indicates whether the property can be handled</param>
+        /// <returns>
+        /// True if the type can be handled, false otherwise
+        /// </returns>
+        public bool CanHandle(Type type, string property)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Indicates the type of the property which should be created
+        /// </summary>
+        /// <param name="type">The type in which the property is or was defined</param>
+        /// <param name="property">The name of the property</param>
+        /// <returns>
+        /// The type of the property
+        /// </returns>
+        /// <exception cref="System.NotImplementedException"></exception>
+        /// <remarks>
+        /// If null is returned, the property type is left over to reflection
+        /// </remarks>
+        public Type GetFormerPropertyType(Type type, string property)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// When the handler can handle the property, this method can be called to actually perform
+        /// the handling of the value for a specific target.
+        /// </summary>
+        /// <param name="target">The object for which the value is handled</param>
+        /// <param name="property">The property which should be handled</param>
+        /// <param name="value">The value which is handled</param>
+        /// <param name="objects">The deserialized objects list</param>
+        /// <exception cref="System.NotImplementedException"></exception>
+        public void Handle(object target, string property, object value, object[] objects)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// When the handler can handle the property, this method can be called to actually perform
+        /// the handling of the value of the specific target. The value, in this case, can be
+        /// altered before it is set to the target. It is the implementing class' responsibility
+        /// to assign the value to the correct property of the target.
+        /// </summary>
+        /// <param name="target">The target object to assign the value for.</param>
+        /// <param name="value">The value to assign to the target</param>
+        /// <exception cref="System.NotImplementedException"></exception>
+        public void HandleObject(object target, object value)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Allows the xml handler to post process each created object, which it can handle
+        /// </summary>
+        /// <param name="target">The object to be post processed</param>
+        /// <exception cref="System.NotImplementedException"></exception>
+        public void Upgrade(object[] target)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/FeatureImporter.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/FeatureImporter.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/FeatureImporter.cs	(revision 3305)
@@ -0,0 +1,93 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+
+namespace Deltares.Maps
+{
+    public class FeatureImporter : IFeatureImporter
+    {
+        private readonly IFeatureRepository repository;
+        private IReader<IFeature> reader;
+
+        public FeatureImporter(IFeatureRepository repository, IReader<IFeature> reader)
+        {
+            if (repository == null)
+            {
+                throw new ArgumentNullException("repository");
+            }
+            if (reader == null)
+            {
+                throw new ArgumentNullException("reader");
+            }
+
+            this.repository = repository;
+            this.reader = reader;
+        }
+
+        #region Implementation of IGeometryRepositoryImporter
+
+        public IFeatureRepository Repository
+        {
+            get { return repository; }
+        }
+
+        public IReader<IFeature> Reader
+        {
+            set { reader = value; }
+        }
+
+        public void Import()
+        {
+            repository.Add(reader.Read());
+        }
+
+        #endregion
+
+        public static void ImportFromShapeFile(ShapeFileLocation shapeFileLocation, IFeatureRepository featureRepository,
+            bool ignoreAttributeData = false)
+        {
+            if (shapeFileLocation == null)
+            {
+                throw new ArgumentNullException("shapeFileLocation");
+            }
+            if (featureRepository == null)
+            {
+                throw new ArgumentNullException("featureRepository");
+            }
+
+            try
+            {
+                IReader<IFeature> reader = new ShapeFileReader(shapeFileLocation)
+                {
+                    IgnoreAttributeData = ignoreAttributeData
+                };
+
+                IFeatureImporter importer = new FeatureImporter(featureRepository, reader);
+                importer.Import();
+            }
+            catch (Exception e)
+            {
+                throw new FeatureImportException(shapeFileLocation.FullPath, e);
+            }
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoCollectionAssembler.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoCollectionAssembler.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoCollectionAssembler.cs	(revision 3305)
@@ -0,0 +1,186 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Linq;
+using Deltares.Standard.IO.DtoAssembler;
+
+namespace Deltares.Standard
+{
+    /// <summary>
+    /// Base class for a data transfer collection assembler
+    /// </summary>
+    /// <typeparam name="T">The type of class to be assembled</typeparam>
+    public abstract class DtoCollectionAssembler<TDomainObject> : IDtoCollectionAssembler<TDomainObject>
+        where TDomainObject : new()
+    {
+        /// <summary>
+        /// Holds a reference to the entity assembler
+        /// </summary>
+        private DtoAssembler<TDomainObject> entityAssembler;
+
+        public DtoCollectionAssembler(DtoAssembler<TDomainObject> entityAssembler, string elementName)
+        {
+            this.entityAssembler = entityAssembler;
+            this.ElementName = elementName;
+        }
+
+        #region IDtoCollectionAssembler<TDomainObject> Members
+
+        /// <summary>
+        /// Gets the entity assembler
+        /// </summary>
+        public IDtoAssembler<TDomainObject> EntityAssembler
+        {
+            get { return this.entityAssembler; }
+        }
+
+        /// <summary>
+        /// Gets or sets the xml element name
+        /// </summary>
+        public string ElementName { get; private set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="dtoObjColl"></param>
+        /// <returns></returns>
+        public virtual IEnumerable<TDomainObject> CreateDomainObjectCollection(XElement dtoSequenceElement)
+        {
+            IEnumerable<XElement> dto = from x in dtoSequenceElement.Descendants()
+                                        where x.Name.LocalName == this.EntityAssembler.ElementName && x.Parent.Name.LocalName == this.ElementName
+                                        select x;
+
+            return dto.ToDomainObjectIterator(this.entityAssembler);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="domainObjColl"></param>
+        /// <returns></returns>
+        public virtual XElement CreateDataTransferObject(IEnumerable<TDomainObject> domainObjColl)
+        {
+            if (!this.ElementName.HasValidStringValue())
+                throw new DtoAssemblerException("There is no element name specified");
+
+            if (this.entityAssembler == null)
+            {
+                // TODO: need to support serialization based on reflection
+            }
+
+            // is there a schema attached to the assembler so we can 
+            // validate the collection?
+            XDocument schema = this.entityAssembler.Schema;
+            if (schema != null)
+            {
+                if (this.entityAssembler == null)
+                {
+                    // TODO: need to support serialization based on reflection
+                }
+                else
+                {
+                    // get the collection rules (min and max requirements) (if any)
+                    var collRules = from x in schema.Descendants()
+                                    where x.Name.LocalName == "element" && x.Attribute("name").Value == this.entityAssembler.ElementName
+                                    select new
+                                               {
+                                                   MinOccurs = x.AttributeAs<string>("minOccurs") == "unbounded" ? 0 : x.AttributeAs<int>("minOccurs"),
+                                                   MaxOccurs = x.AttributeAs<string>("maxOccurs") == "unbounded" ? -1 : x.AttributeAs<int>("maxOccurs")
+                                               };
+
+                    if (collRules.Any())
+                    {
+                        var rules = collRules.Single();
+                        // validate the min and max values of the collection according to the xsd
+                        int count = domainObjColl.Count();
+                        if (domainObjColl == null || (count == 0 && rules.MinOccurs > 0)
+                            || (count > 0 & rules.MaxOccurs >= 0 && count > rules.MaxOccurs))
+                        {
+                            throw new CollectionRequirementsNotSatisfiedException(this.ElementName, this.EntityAssembler.ElementName, domainObjColl);
+                        }
+                    }
+                }
+            }
+            else if (domainObjColl == null)
+            {
+                return null; // Use empty sequence instead?
+            }
+
+            return new XElement(this.ElementName, domainObjColl.ToDtoIterator(this.entityAssembler).ToArray());
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Creates a domain object collection from an xml document
+        /// </summary>
+        /// <param name="dtoObjColl"></param>
+        /// <returns></returns>
+        public IEnumerable<TDomainObject> CreateDomainObjectCollection(string xmlString)
+        {
+            XDocument doc = XDocument.Parse(xmlString);
+
+            // assemble the collection
+            return this.CreateDomainObjectCollection(doc);
+        }
+
+        /// <summary>
+        /// Creates a domain object collection from an xml document
+        /// </summary>
+        /// <param name="dtoObjColl"></param>
+        /// <returns></returns>
+        public IEnumerable<TDomainObject> CreateDomainObjectCollection(XDocument doc)
+        {
+            IEnumerable<XElement> dto = from x in doc.Descendants()
+                                        where x.Name.LocalName == this.EntityAssembler.ElementName && x.Parent.Name.LocalName == this.ElementName
+                                        select x;
+
+            // assemble the collection
+            return this.CreateDomainObjectCollection(dto);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="dtoObjColl"></param>
+        /// <returns></returns>
+        public IEnumerable<TDomainObject> CreateDomainObjectCollection(IEnumerable<XElement> dtoObjColl)
+        {
+            return dtoObjColl.ToDomainObjectIterator(this.entityAssembler);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="domainObjColl"></param>
+        /// <returns></returns>
+        public XElement CreateDataTransferObject(IEnumerable<TDomainObject> domainObjColl, XNamespace elementNamespace)
+        {
+            XElement el = this.CreateDataTransferObject(domainObjColl);
+            var nel = new XElement(elementNamespace + this.ElementName);
+            el.Name = nel.Name;
+
+            return el;
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/ValidationResult.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/ValidationResult.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/ValidationResult.cs	(revision 3305)
@@ -0,0 +1,71 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using Deltares.Standard.EventPublisher;
+using Deltares.Standard.Validation;
+
+namespace Deltares.Dam.Data.Specifications
+{
+    public class ValidationResult : IValidationResult
+    {
+        public ValidationResult()
+        {
+            MessageType = ValidationResultType.Error;
+        }
+
+        public ValidationResultType MessageType { get; set; }
+
+        public List<string> InvalidProperties { get { return new List<string>();} }
+
+        public Image Severity { get; set; }
+
+        string IValidationResult.Text { get; set; }
+
+        public object Subject { get; set; }
+
+        public List<string> ID { get { return new List<string>(); } }
+
+        public IRepairer Repairer
+        {
+            get; set;
+        }
+
+        public void Select()
+        {
+            DataEventPublisher.SelectionChanged(Subject);
+        }
+
+        public void Repair()
+        {
+        }
+
+        public void ClearValidationResult()
+        {
+        }
+
+        public Exception Error { get; set; }
+
+        public string Text { get { return Error.Message; } }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/ImportFilesNotValidatedException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/ImportFilesNotValidatedException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/ImportFilesNotValidatedException.cs	(revision 3305)
@@ -0,0 +1,48 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Deltares.Dam.Data.Importers
+{
+    [Serializable]
+    public class ImportFilesNotValidatedException : Exception
+    {
+        public ImportFilesNotValidatedException()
+        {
+        }
+
+        public ImportFilesNotValidatedException(string message) : base(message)
+        {
+        }
+
+        public ImportFilesNotValidatedException(string message, Exception inner) : base(message, inner)
+        {
+        }
+
+        protected ImportFilesNotValidatedException(
+            SerializationInfo info,
+            StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/Configuration/DataSource.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/Configuration/DataSource.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/Configuration/DataSource.cs	(revision 3305)
@@ -0,0 +1,37 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Dam.Data.DataPlugins.Configuration
+{
+    public class DataSource
+    {
+        public DataSourceType DataSourceType { get; set; }
+        public string DataLocation { get; set; }
+        public string DikeRingId { get; set; }
+
+        public override string ToString()
+        {
+            return DataSourceType.ToString() + "|" 
+                + (string.IsNullOrWhiteSpace(DikeRingId) ? "<no_id_specified>" : DikeRingId) 
+                + "|" + DataLocation;
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/PipingResults.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/PipingResults.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/PipingResults.cs	(revision 3305)
@@ -0,0 +1,42 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Dam.Data
+{
+    public struct PipingResults
+    {
+        public string CalculationName { get; set; }
+        public string CalculationSubDir { get; set; }
+        public double? BlighPipingFactor { get; set; }
+        public double? BlighHCritical { get; set; }
+        public double? Sellmeijer2ForcesPipingFactor { get; set; }
+        public double? Sellmeijer2ForcesHCritical { get; set; }
+        public double? Sellmeijer4ForcesPipingFactor { get; set; }
+        public double? Sellmeijer4ForcesHCritical { get; set; }
+        public double? SellmeijerPipingFactor { get; set; }
+        public double? SellmeijerHCritical { get; set; }
+        public double? Wti2017PipingFactor { get; set; }
+        public double? Wti2017HCritical { get; set; }
+        public double? PipingExitPointX { get; set; }
+        public double? UpliftFactor { get; set; }
+        public double? HeaveFactor { get; set; }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/Assemblers/InputOutputDocumentAssembler.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/Assemblers/InputOutputDocumentAssembler.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/Assemblers/InputOutputDocumentAssembler.cs	(revision 3305)
@@ -0,0 +1,33 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Standard
+{
+    public class InputOutputDocumentAssembler<TInput, TOutput> : DtoDocumentAssembler<TInput, TOutput>
+        where TInput : new()
+        where TOutput : new()
+    {
+        public InputOutputDocumentAssembler(string elementName, string elementNamespace, string xsdEmbeddedResourcePath, DtoAssembler<TInput> inputAssembler, DtoAssembler<TOutput> outputAssembler) :
+            base(elementName, elementNamespace, xsdEmbeddedResourcePath, inputAssembler, outputAssembler)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/PLLine.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/PLLine.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/PLLine.cs	(revision 3305)
@@ -0,0 +1,130 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using System;
+using System.Linq;
+using System.Xml.Serialization;
+using Deltares.Standard;
+using Deltares.Geometry;
+
+namespace Deltares.Dam.Data
+{
+
+    public class PLLinePoint : GeometryPoint
+    {
+        public PLLinePoint() : this (0, 0) { }
+
+        public PLLinePoint(double aX, double aZ) : base(aX, 0, aZ) 
+        {
+        }
+    }
+
+    public class PLLine : PolyLine<PLLinePoint>, ICloneable<PLLine>
+    {
+        private PLLineType plLineType;
+
+        [XmlIgnore]
+        public PLLineType PLLineType
+        {
+            get { return plLineType; }
+            set
+            {
+                plLineType = value;
+                PLLineTypeSpecified = true;
+            }
+        }
+
+        [XmlIgnore]
+        public bool PLLineTypeSpecified { get; private set; }
+
+
+        public bool IsPhreatic { get; set; }
+
+        public int BoundaryLayer { get; set; }
+
+        public PLLine Clone()
+        {
+            PLLine plLine = new PLLine() { IsPhreatic = this.IsPhreatic, BoundaryLayer = this.BoundaryLayer };
+            foreach (PLLinePoint point in this.Points)
+            {
+                PLLinePoint newPoint = new PLLinePoint() { X = point.X, Y = point.Y, Z = point.Z };
+                plLine.Points.Add(newPoint);
+            }
+            return plLine;
+        }
+
+        /// <summary>
+        /// Gets the points in the segment between starting x and ending x
+        /// </summary>
+        /// <remarks>
+        /// </remarks>
+        /// <param name="startX"></param>
+        /// <param name="endX"></param>
+        /// <returns></returns>
+        public IEnumerable<PLLinePoint> GetPointSegmentBetween(double startX, double endX)
+        {
+            if (endX < startX)
+                throw new ArgumentException("End value is smaller then the start value");
+
+            return from point in this.PointsOrderdByX
+                   where point != null && (point.X > startX && point.X < endX)
+                   orderby point.X ascending
+                   select point;
+        }
+
+        /// <summary>
+        /// Determines whether the given point is above, beneath or on the surfaceline.
+        /// </summary>
+        /// <param name="point"></param>
+        /// <returns></returns>
+        public PLLinePointPositionXzType PositionXzOfPointRelatedToPLLine(GeometryPoint point)
+        {
+            // if point is out of scope of the surface line, return beyond
+            if ((point.X < points[0].X) || (point.X > points[points.Count - 1].X))
+                return PLLinePointPositionXzType.BeyondPLLine;
+
+            double z = ZFromX(point.X);
+            if (Math.Abs(point.Z - z) < GeometryPoint.Precision)
+            {
+                return PLLinePointPositionXzType.OnPLLine;
+            }
+            else
+            {
+                if (point.Z > z)
+                {
+                    return PLLinePointPositionXzType.AbovePLLine;
+                }
+                else
+                {
+                    return PLLinePointPositionXzType.BelowPLLine;
+                }
+            }
+        }
+
+        private IEnumerable<PLLinePoint> PointsOrderdByX
+        {
+            get { return this.Points.OrderBy(p => p.X); }
+        }
+
+    }
+
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/RequiredImportFileNotExistException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/RequiredImportFileNotExistException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/RequiredImportFileNotExistException.cs	(revision 3305)
@@ -0,0 +1,48 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Deltares.Dam.Data
+{
+
+    [Serializable]
+    public class RequiredImportFileNotExistException : Exception
+    {
+        public RequiredImportFileNotExistException(string message)
+            : base(message)
+        {
+        }
+
+        public RequiredImportFileNotExistException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+
+        protected RequiredImportFileNotExistException(
+            SerializationInfo info,
+            StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/FeatureImportException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/FeatureImportException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/FeatureImportException.cs	(revision 3305)
@@ -0,0 +1,55 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Deltares.Maps
+{
+    [Serializable]
+    public class FeatureImportException : Exception
+    {
+        //
+        // For guidelines regarding the creation of new exception types, see
+        //    http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpgenref/html/cpconerrorraisinghandlingguidelines.asp
+        // and
+        //    http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dncscol/html/csharp07192001.asp
+        //
+
+        public FeatureImportException()
+        {
+        }
+
+        public FeatureImportException(string message) : base(message)
+        {
+        }
+
+        public FeatureImportException(string message, Exception inner) : base(message, inner)
+        {
+        }
+
+        protected FeatureImportException(
+            SerializationInfo info,
+            StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoAssemblerConversionException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoAssemblerConversionException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoAssemblerConversionException.cs	(revision 3305)
@@ -0,0 +1,56 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Deltares.Standard
+{
+    [Serializable]
+    public class DtoAssemblerConversionException : Exception
+    {
+        //
+        // For guidelines regarding the creation of new exception types, see
+        //    http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpgenref/html/cpconerrorraisinghandlingguidelines.asp
+        // and
+        //    http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dncscol/html/csharp07192001.asp
+        //
+
+        public DtoAssemblerConversionException()
+        {
+        }
+
+        public DtoAssemblerConversionException(string message) : base(message)
+        {
+        }
+
+        public DtoAssemblerConversionException(string message, Exception inner) : base(message, inner)
+        {
+        }
+
+        protected DtoAssemblerConversionException(
+            SerializationInfo info,
+            StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/TimeSerieEntry.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/TimeSerieEntry.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/TimeSerieEntry.cs	(revision 3305)
@@ -0,0 +1,86 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Deltares.Standard.Extensions;
+
+namespace Deltares.Dam.Data
+{
+
+
+    public class TimeSerieEntry
+    {
+        public TimeSerieEntry()
+        {
+        }
+
+        public TimeSerieEntry(DateTime dateTime, double value)
+        {
+            this.DateTime = dateTime;
+            this.Value = value;
+        }
+
+        public virtual DateTime DateTime { get; set; }
+        public virtual double Value { get; set; }
+        public virtual string BasisFileName { get; set; }
+        public string RelativeCalculationPathName { get; set; }
+        public Stochast StochastValue { get; set; }
+        public int Flag { get; set; }
+
+        public TimeSerieEntry GetShallowCopy()
+        {
+            return new TimeSerieEntry
+                       {
+                           DateTime = DateTime,
+                           Flag = Flag,                    
+                       };
+        }
+
+        public TimeSerieEntry Map(Func<TimeSerieEntry,double> function)
+        {
+            return Map(0, function);
+        }
+
+        public TimeSerieEntry Map(double missingValue, Func<TimeSerieEntry, double> function)
+        {
+            var entry = this.GetShallowCopy();
+            try
+            {
+                entry.Value = !this.Value.AlmostEquals(missingValue) ? function(this) : missingValue;
+            }
+            catch
+            {
+                entry.Value = missingValue;
+            }
+            return entry;
+        }
+
+        public void Assign(TimeSerieEntry entry)
+        {
+            this.DateTime = entry.DateTime;
+            this.Value = entry.Value;
+            this.BasisFileName = entry.BasisFileName;
+            this.StochastValue = entry.StochastValue;
+            this.Flag = entry.Flag;
+        }
+ 
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilbaseDataSet.xsc
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilbaseDataSet.xsc	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilbaseDataSet.xsc	(revision 3305)
@@ -0,0 +1 @@
+
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportSurfaceLine.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportSurfaceLine.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportSurfaceLine.cs	(revision 3305)
@@ -0,0 +1,79 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Globalization;
+using System.Text;
+using Deltares.Dam.Data.CsvImporters;
+using Deltares.Geometry;
+using Deltares.Geotechnics.SurfaceLines;
+
+namespace Deltares.Dam.Data
+{
+    public class CsvExportSurfaceLine
+    {
+
+        SurfaceLine2 surfaceLine;
+        CsvExportSurfaceLineIdentifiers csvExportSurfaceLineIdentifiers;
+        public CsvExportSurfaceLine(CsvExportSurfaceLineIdentifiers csvExportSurfaceLineIdentifiers, SurfaceLine2 surfaceLine)
+        {
+            this.surfaceLine = surfaceLine;
+            this.csvExportSurfaceLineIdentifiers = csvExportSurfaceLineIdentifiers;
+        }
+
+        // The following 5 properties are identifiers and should be the first columns. 
+        // Use negative identifers to add them as the first columns
+        [CsvExportColumn(SurfaceLineCsvColumnNames.LocationColumnName, -4)]
+        public string LocationId { get { return (csvExportSurfaceLineIdentifiers == null) ? "" : csvExportSurfaceLineIdentifiers.LocationId; } }
+
+        [CsvExportColumn(CsvExportSurfaceLineIdentifiers.CsvHeaderSoilProfileId, -3)]
+        public string SoilProfileId { get { return (csvExportSurfaceLineIdentifiers == null) ? "" : csvExportSurfaceLineIdentifiers.SoilProfileId; } }
+
+        [CsvExportColumn(CsvExportSurfaceLineIdentifiers.CsvHeaderScenario, -2)]
+        public string Scenario { get { return (csvExportSurfaceLineIdentifiers == null) ? "" : csvExportSurfaceLineIdentifiers.Scenario; } }
+
+        [CsvExportColumn(CsvExportSurfaceLineIdentifiers.CsvHeaderCalculationMechanism, -1)]
+        public string CalculationMechanism { get { return (csvExportSurfaceLineIdentifiers == null) ? "" : csvExportSurfaceLineIdentifiers.CalculationMechanism; } }
+
+        [CsvExportColumn(CsvExportSurfaceLineIdentifiers.CsvHeaderCalculationModel, 0)]
+        public string CalculationModel { get { return (csvExportSurfaceLineIdentifiers == null) ? "" : csvExportSurfaceLineIdentifiers.CalculationModel; } }
+
+        // The following properties are the real surfaceline data 
+
+        [CsvExportColumn("X1;Y1;Z1;.....;Xn;Yn;Zn;(Profiel)", 6)]
+        public string SurfaceLines
+        {
+            get
+            {
+                StringBuilder sb = new StringBuilder();
+                foreach (GeometryPoint point in surfaceLine.Geometry.Points)
+                {
+                    sb.Append(point.X.ToString("F3", CultureInfo.InvariantCulture));
+                    sb.Append(";");
+                    sb.Append(point.Y.ToString("F3", CultureInfo.InvariantCulture));
+                    sb.Append(";");
+                    sb.Append(point.Z.ToString("F3", CultureInfo.InvariantCulture));
+                    sb.Append(";");
+                }
+                return sb.ToString();
+            }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/AttributesDictionary.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/AttributesDictionary.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/AttributesDictionary.cs	(revision 3305)
@@ -0,0 +1,124 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using NetTopologySuite.Features;
+
+namespace Deltares.Maps
+{
+    public class AttributesDictionary : IAttributesTable
+    {
+        private readonly Dictionary<string, object> attributes;
+
+        public AttributesDictionary()
+        {
+            attributes = new Dictionary<string, object>();
+        }
+
+        #region Implementation of IAttributesTable
+
+        static void ThrowArgumentNullExceptionWhenAttributeIsNullOrEmpty(string attributeName)
+        {
+            if (string.IsNullOrEmpty(attributeName))
+            {
+                throw new ArgumentNullException("attributeName");
+            }
+        }
+
+        public void AddAttribute(string attributeName, object value)
+        {
+            ThrowArgumentNullExceptionWhenAttributeIsNullOrEmpty(attributeName);
+
+            if (value == null)
+            {
+                throw new ArgumentNullException("value");
+            }
+
+            string attrName = attributeName.ToUpper();
+            attributes.Add(attrName, value);
+        }
+
+        public void DeleteAttribute(string attributeName)
+        {
+            ThrowArgumentNullExceptionWhenAttributeIsNullOrEmpty(attributeName);
+
+            string attrName = attributeName.ToUpper();
+            if (attributes.ContainsKey(attrName))
+            {
+                attributes.Remove(attrName);
+            }
+        }
+
+        public Type GetType(string attributeName)
+        {
+            ThrowArgumentNullExceptionWhenAttributeIsNullOrEmpty(attributeName);
+
+            string attrName = attributeName.ToUpper();
+            return this[attrName].GetType();
+        }
+
+        public bool Exists(string attributeName)
+        {
+            ThrowArgumentNullExceptionWhenAttributeIsNullOrEmpty(attributeName);
+
+            string attrName = attributeName.ToUpper();
+            return attributes.ContainsKey(attrName);
+        }
+
+        public string[] GetNames()
+        {
+            return attributes.Keys.Select(key => key.ToUpper()).ToArray();
+        }
+
+        public object[] GetValues()
+        {
+            return attributes.Values.ToArray();
+        }
+
+        public object this[string attributeName]
+        {
+            get
+            {
+                ThrowArgumentNullExceptionWhenAttributeIsNullOrEmpty(attributeName);
+
+                string attrName = attributeName.ToUpper();
+                return attributes[attrName];
+            }
+            set
+            {
+                ThrowArgumentNullExceptionWhenAttributeIsNullOrEmpty(attributeName);
+
+                string attrName = attributeName.ToUpper();
+                attributes[attrName] = value;
+            }
+        }
+
+        public int Count
+        {
+            get { return attributes.Count; }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorCalculationArgument.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorCalculationArgument.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorCalculationArgument.cs	(revision 3305)
@@ -0,0 +1,29 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Dam.Data.Sensors
+{
+    public class SensorCalculationArgument
+    {
+        public string StabilityWorkingPath { get; set; }
+        public string StabilityExePath { get; set; }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/TimeSerieSchemaValidationException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/TimeSerieSchemaValidationException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/TimeSerieSchemaValidationException.cs	(revision 3305)
@@ -0,0 +1,47 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Deltares.Dam.Data
+{
+
+    [Serializable]
+    public class TimeSerieSchemaValidationException : Exception
+    {
+        public TimeSerieSchemaValidationException()
+        {
+        }
+
+        public TimeSerieSchemaValidationException(string message)
+            : base("Schema validation: " + message)
+        {
+        }
+
+        protected TimeSerieSchemaValidationException(
+            SerializationInfo info,
+            StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilbaseDataSet.xsd
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilbaseDataSet.xsd	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilbaseDataSet.xsd	(revision 3305)
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) Stichting Deltares 2019. All rights reserved.
+
+This file is part of the DAM - Clients Library.
+
+The DAM - UI is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+<xs:schema id="SoilbaseDataSet" targetNamespace="http://tempuri.org/SoilbaseDataSet.xsd" xmlns:mstns="http://tempuri.org/SoilbaseDataSet.xsd" xmlns="http://tempuri.org/SoilbaseDataSet.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" xmlns:msprop="urn:schemas-microsoft-com:xml-msprop" attributeFormDefault="qualified" elementFormDefault="qualified">
+  <xs:annotation>
+    <xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource">
+      <DataSource DefaultConnectionIndex="0" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+        <Connections>
+          <Connection ConnectionStringObject="Provider=Microsoft.Jet.OLEDB.4.0;Data Source=&quot;D:\DelphiWin32Projects\Trunk\MSoilbase\Install Version\Examples\Case A15.mdb&quot;" IsAppSettingsProperty="false" Modifier="Assembly" Name="Case A15ConnectionString" Provider="System.Data.OleDb" />
+        </Connections>
+        <Tables>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="MATERIALSTableAdapter" GeneratorDataComponentClassName="MATERIALSTableAdapter" Name="MATERIALS" UserDataComponentName="MATERIALSTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="Case A15ConnectionString" DbObjectName="MATERIALS" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+                <DeleteCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>DELETE FROM `MATERIALS` WHERE ((`MA_NR` = ?) AND ((? = 1 AND `MA_NAME` IS NULL) OR (`MA_NAME` = ?)) AND ((? = 1 AND `MA_DESCR` IS NULL) OR (`MA_DESCR` = ?)) AND ((? = 1 AND `MA_INDEX` IS NULL) OR (`MA_INDEX` = ?)))</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="Original_MA_NR" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="MA_NR" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="IsNull_MA_NAME" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="MA_NAME" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="StringFixedLength" Direction="Input" ParameterName="Original_MA_NAME" Precision="0" ProviderType="WChar" Scale="0" Size="0" SourceColumn="MA_NAME" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="IsNull_MA_DESCR" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="MA_DESCR" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="StringFixedLength" Direction="Input" ParameterName="Original_MA_DESCR" Precision="0" ProviderType="WChar" Scale="0" Size="0" SourceColumn="MA_DESCR" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="IsNull_MA_INDEX" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="MA_INDEX" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="Original_MA_INDEX" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="MA_INDEX" SourceColumnNullMapping="false" SourceVersion="Original" />
+                    </Parameters>
+                  </DbCommand>
+                </DeleteCommand>
+                <InsertCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>INSERT INTO `MATERIALS` (`MA_NAME`, `MA_DESCR`, `MA_INDEX`) VALUES (?, ?, ?)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="StringFixedLength" Direction="Input" ParameterName="MA_NAME" Precision="0" ProviderType="WChar" Scale="0" Size="0" SourceColumn="MA_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="StringFixedLength" Direction="Input" ParameterName="MA_DESCR" Precision="0" ProviderType="WChar" Scale="0" Size="0" SourceColumn="MA_DESCR" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="MA_INDEX" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="MA_INDEX" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </InsertCommand>
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>SELECT MA_NR, MA_NAME, MA_DESCR, MA_INDEX FROM MATERIALS</CommandText>
+                    <Parameters />
+                  </DbCommand>
+                </SelectCommand>
+                <UpdateCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>UPDATE `MATERIALS` SET `MA_NAME` = ?, `MA_DESCR` = ?, `MA_INDEX` = ? WHERE ((`MA_NR` = ?) AND ((? = 1 AND `MA_NAME` IS NULL) OR (`MA_NAME` = ?)) AND ((? = 1 AND `MA_DESCR` IS NULL) OR (`MA_DESCR` = ?)) AND ((? = 1 AND `MA_INDEX` IS NULL) OR (`MA_INDEX` = ?)))</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="StringFixedLength" Direction="Input" ParameterName="MA_NAME" Precision="0" ProviderType="WChar" Scale="0" Size="0" SourceColumn="MA_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="StringFixedLength" Direction="Input" ParameterName="MA_DESCR" Precision="0" ProviderType="WChar" Scale="0" Size="0" SourceColumn="MA_DESCR" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="MA_INDEX" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="MA_INDEX" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="Original_MA_NR" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="MA_NR" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="IsNull_MA_NAME" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="MA_NAME" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="StringFixedLength" Direction="Input" ParameterName="Original_MA_NAME" Precision="0" ProviderType="WChar" Scale="0" Size="0" SourceColumn="MA_NAME" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="IsNull_MA_DESCR" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="MA_DESCR" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="StringFixedLength" Direction="Input" ParameterName="Original_MA_DESCR" Precision="0" ProviderType="WChar" Scale="0" Size="0" SourceColumn="MA_DESCR" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="IsNull_MA_INDEX" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="MA_INDEX" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="Original_MA_INDEX" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="MA_INDEX" SourceColumnNullMapping="false" SourceVersion="Original" />
+                    </Parameters>
+                  </DbCommand>
+                </UpdateCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="MA_NR" DataSetColumn="MA_NR" />
+              <Mapping SourceColumn="MA_NAME" DataSetColumn="MA_NAME" />
+              <Mapping SourceColumn="MA_DESCR" DataSetColumn="MA_DESCR" />
+              <Mapping SourceColumn="MA_INDEX" DataSetColumn="MA_INDEX" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="PARAMETERVALUESTableAdapter" GeneratorDataComponentClassName="PARAMETERVALUESTableAdapter" Name="PARAMETERVALUES" UserDataComponentName="PARAMETERVALUESTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="Case A15ConnectionString" DbObjectName="PARAMETERVALUES" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+                <DeleteCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>DELETE FROM `PARAMETERVALUES` WHERE ((`PV_NR` = ?) AND ((? = 1 AND `MA_NR` IS NULL) OR (`MA_NR` = ?)) AND ((? = 1 AND `PN_NR` IS NULL) OR (`PN_NR` = ?)) AND ((? = 1 AND `PV_VALUE` IS NULL) OR (`PV_VALUE` = ?)))</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="Original_PV_NR" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="PV_NR" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="IsNull_MA_NR" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="MA_NR" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="Original_MA_NR" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="MA_NR" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="IsNull_PN_NR" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="PN_NR" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="Original_PN_NR" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="PN_NR" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="IsNull_PV_VALUE" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="PV_VALUE" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="Original_PV_VALUE" Precision="0" ProviderType="Double" Scale="0" Size="0" SourceColumn="PV_VALUE" SourceColumnNullMapping="false" SourceVersion="Original" />
+                    </Parameters>
+                  </DbCommand>
+                </DeleteCommand>
+                <InsertCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>INSERT INTO `PARAMETERVALUES` (`MA_NR`, `PN_NR`, `PV_VALUE`) VALUES (?, ?, ?)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="MA_NR" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="MA_NR" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="PN_NR" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="PN_NR" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="PV_VALUE" Precision="0" ProviderType="Double" Scale="0" Size="0" SourceColumn="PV_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </InsertCommand>
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>SELECT PV_NR, MA_NR, PN_NR, PV_VALUE FROM PARAMETERVALUES</CommandText>
+                    <Parameters />
+                  </DbCommand>
+                </SelectCommand>
+                <UpdateCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>UPDATE `PARAMETERVALUES` SET `MA_NR` = ?, `PN_NR` = ?, `PV_VALUE` = ? WHERE ((`PV_NR` = ?) AND ((? = 1 AND `MA_NR` IS NULL) OR (`MA_NR` = ?)) AND ((? = 1 AND `PN_NR` IS NULL) OR (`PN_NR` = ?)) AND ((? = 1 AND `PV_VALUE` IS NULL) OR (`PV_VALUE` = ?)))</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="MA_NR" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="MA_NR" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="PN_NR" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="PN_NR" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="PV_VALUE" Precision="0" ProviderType="Double" Scale="0" Size="0" SourceColumn="PV_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="Original_PV_NR" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="PV_NR" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="IsNull_MA_NR" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="MA_NR" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="Original_MA_NR" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="MA_NR" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="IsNull_PN_NR" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="PN_NR" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="Original_PN_NR" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="PN_NR" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="IsNull_PV_VALUE" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="PV_VALUE" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Double" Direction="Input" ParameterName="Original_PV_VALUE" Precision="0" ProviderType="Double" Scale="0" Size="0" SourceColumn="PV_VALUE" SourceColumnNullMapping="false" SourceVersion="Original" />
+                    </Parameters>
+                  </DbCommand>
+                </UpdateCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="PV_NR" DataSetColumn="PV_NR" />
+              <Mapping SourceColumn="MA_NR" DataSetColumn="MA_NR" />
+              <Mapping SourceColumn="PN_NR" DataSetColumn="PN_NR" />
+              <Mapping SourceColumn="PV_VALUE" DataSetColumn="PV_VALUE" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="PARAMETERNAMESTableAdapter" GeneratorDataComponentClassName="PARAMETERNAMESTableAdapter" Name="PARAMETERNAMES" UserDataComponentName="PARAMETERNAMESTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="Case A15ConnectionString" DbObjectName="PARAMETERNAMES" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+                <DeleteCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>DELETE FROM `PARAMETERNAMES` WHERE ((`PN_NR` = ?) AND ((? = 1 AND `PN_NAME` IS NULL) OR (`PN_NAME` = ?)))</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="Original_PN_NR" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="PN_NR" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="IsNull_PN_NAME" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="PN_NAME" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="StringFixedLength" Direction="Input" ParameterName="Original_PN_NAME" Precision="0" ProviderType="WChar" Scale="0" Size="0" SourceColumn="PN_NAME" SourceColumnNullMapping="false" SourceVersion="Original" />
+                    </Parameters>
+                  </DbCommand>
+                </DeleteCommand>
+                <InsertCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>INSERT INTO `PARAMETERNAMES` (`PN_NAME`) VALUES (?)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="StringFixedLength" Direction="Input" ParameterName="PN_NAME" Precision="0" ProviderType="WChar" Scale="0" Size="0" SourceColumn="PN_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </InsertCommand>
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>SELECT PN_NR, PN_NAME FROM PARAMETERNAMES</CommandText>
+                    <Parameters />
+                  </DbCommand>
+                </SelectCommand>
+                <UpdateCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>UPDATE `PARAMETERNAMES` SET `PN_NAME` = ? WHERE ((`PN_NR` = ?) AND ((? = 1 AND `PN_NAME` IS NULL) OR (`PN_NAME` = ?)))</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="StringFixedLength" Direction="Input" ParameterName="PN_NAME" Precision="0" ProviderType="WChar" Scale="0" Size="0" SourceColumn="PN_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="Original_PN_NR" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="PN_NR" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="IsNull_PN_NAME" Precision="0" ProviderType="Integer" Scale="0" Size="0" SourceColumn="PN_NAME" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="StringFixedLength" Direction="Input" ParameterName="Original_PN_NAME" Precision="0" ProviderType="WChar" Scale="0" Size="0" SourceColumn="PN_NAME" SourceColumnNullMapping="false" SourceVersion="Original" />
+                    </Parameters>
+                  </DbCommand>
+                </UpdateCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="PN_NR" DataSetColumn="PN_NR" />
+              <Mapping SourceColumn="PN_NAME" DataSetColumn="PN_NAME" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
+        </Tables>
+        <Sources />
+      </DataSource>
+    </xs:appinfo>
+  </xs:annotation>
+  <xs:element name="SoilbaseDataSet" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:Generator_DataSetName="SoilbaseDataSet" msprop:Generator_UserDSName="SoilbaseDataSet" msprop:EnableTableAdapterManager="true">
+    <xs:complexType>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element name="MATERIALS" msprop:Generator_UserTableName="MATERIALS" msprop:Generator_RowDeletedName="MATERIALSRowDeleted" msprop:Generator_TableClassName="MATERIALSDataTable" msprop:Generator_RowChangedName="MATERIALSRowChanged" msprop:Generator_RowClassName="MATERIALSRow" msprop:Generator_RowChangingName="MATERIALSRowChanging" msprop:Generator_RowEvArgName="MATERIALSRowChangeEvent" msprop:Generator_RowEvHandlerName="MATERIALSRowChangeEventHandler" msprop:Generator_TablePropName="MATERIALS" msprop:Generator_TableVarName="tableMATERIALS" msprop:Generator_RowDeletingName="MATERIALSRowDeleting">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="MA_NR" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="MA_NR" msprop:Generator_ColumnPropNameInRow="MA_NR" msprop:Generator_ColumnVarNameInTable="columnMA_NR" msprop:Generator_ColumnPropNameInTable="MA_NRColumn" type="xs:int" />
+              <xs:element name="MA_NAME" msprop:Generator_UserColumnName="MA_NAME" msprop:Generator_ColumnPropNameInRow="MA_NAME" msprop:Generator_ColumnVarNameInTable="columnMA_NAME" msprop:Generator_ColumnPropNameInTable="MA_NAMEColumn" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="128" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="MA_DESCR" msprop:Generator_UserColumnName="MA_DESCR" msprop:Generator_ColumnPropNameInRow="MA_DESCR" msprop:Generator_ColumnVarNameInTable="columnMA_DESCR" msprop:Generator_ColumnPropNameInTable="MA_DESCRColumn" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="240" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="MA_INDEX" msprop:Generator_UserColumnName="MA_INDEX" msprop:Generator_ColumnPropNameInRow="MA_INDEX" msprop:Generator_ColumnVarNameInTable="columnMA_INDEX" msprop:Generator_ColumnPropNameInTable="MA_INDEXColumn" type="xs:int" minOccurs="0" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="PARAMETERVALUES" msprop:Generator_UserTableName="PARAMETERVALUES" msprop:Generator_RowDeletedName="PARAMETERVALUESRowDeleted" msprop:Generator_TableClassName="PARAMETERVALUESDataTable" msprop:Generator_RowChangedName="PARAMETERVALUESRowChanged" msprop:Generator_RowClassName="PARAMETERVALUESRow" msprop:Generator_RowChangingName="PARAMETERVALUESRowChanging" msprop:Generator_RowEvArgName="PARAMETERVALUESRowChangeEvent" msprop:Generator_RowEvHandlerName="PARAMETERVALUESRowChangeEventHandler" msprop:Generator_TablePropName="PARAMETERVALUES" msprop:Generator_TableVarName="tablePARAMETERVALUES" msprop:Generator_RowDeletingName="PARAMETERVALUESRowDeleting">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="PV_NR" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="PV_NR" msprop:Generator_ColumnPropNameInRow="PV_NR" msprop:Generator_ColumnVarNameInTable="columnPV_NR" msprop:Generator_ColumnPropNameInTable="PV_NRColumn" type="xs:int" />
+              <xs:element name="MA_NR" msprop:Generator_UserColumnName="MA_NR" msprop:Generator_ColumnPropNameInRow="MA_NR" msprop:Generator_ColumnVarNameInTable="columnMA_NR" msprop:Generator_ColumnPropNameInTable="MA_NRColumn" type="xs:int" minOccurs="0" />
+              <xs:element name="PN_NR" msprop:Generator_UserColumnName="PN_NR" msprop:Generator_ColumnPropNameInRow="PN_NR" msprop:Generator_ColumnVarNameInTable="columnPN_NR" msprop:Generator_ColumnPropNameInTable="PN_NRColumn" type="xs:int" minOccurs="0" />
+              <xs:element name="PV_VALUE" msprop:Generator_UserColumnName="PV_VALUE" msprop:Generator_ColumnPropNameInRow="PV_VALUE" msprop:Generator_ColumnVarNameInTable="columnPV_VALUE" msprop:Generator_ColumnPropNameInTable="PV_VALUEColumn" type="xs:double" minOccurs="0" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="PARAMETERNAMES" msprop:Generator_UserTableName="PARAMETERNAMES" msprop:Generator_RowDeletedName="PARAMETERNAMESRowDeleted" msprop:Generator_TableClassName="PARAMETERNAMESDataTable" msprop:Generator_RowChangedName="PARAMETERNAMESRowChanged" msprop:Generator_RowClassName="PARAMETERNAMESRow" msprop:Generator_RowChangingName="PARAMETERNAMESRowChanging" msprop:Generator_RowEvArgName="PARAMETERNAMESRowChangeEvent" msprop:Generator_RowEvHandlerName="PARAMETERNAMESRowChangeEventHandler" msprop:Generator_TablePropName="PARAMETERNAMES" msprop:Generator_TableVarName="tablePARAMETERNAMES" msprop:Generator_RowDeletingName="PARAMETERNAMESRowDeleting">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="PN_NR" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="PN_NR" msprop:Generator_ColumnPropNameInRow="PN_NR" msprop:Generator_ColumnVarNameInTable="columnPN_NR" msprop:Generator_ColumnPropNameInTable="PN_NRColumn" type="xs:int" />
+              <xs:element name="PN_NAME" msprop:Generator_UserColumnName="PN_NAME" msprop:Generator_ColumnPropNameInRow="PN_NAME" msprop:Generator_ColumnVarNameInTable="columnPN_NAME" msprop:Generator_ColumnPropNameInTable="PN_NAMEColumn" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="64" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:choice>
+    </xs:complexType>
+    <xs:unique name="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:MATERIALS" />
+      <xs:field xpath="mstns:MA_NR" />
+    </xs:unique>
+    <xs:unique name="PARAMETERVALUES_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:PARAMETERVALUES" />
+      <xs:field xpath="mstns:PV_NR" />
+    </xs:unique>
+    <xs:unique name="PARAMETERNAMES_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:PARAMETERNAMES" />
+      <xs:field xpath="mstns:PN_NR" />
+    </xs:unique>
+  </xs:element>
+  <xs:annotation>
+    <xs:appinfo>
+      <msdata:Relationship name="FK_PARAMETE_RELATION__MATERIAL" msdata:parent="MATERIALS" msdata:child="PARAMETERVALUES" msdata:parentkey="MA_NR" msdata:childkey="MA_NR" msprop:Generator_UserRelationName="FK_PARAMETE_RELATION__MATERIAL" msprop:Generator_RelationVarName="relationFK_PARAMETE_RELATION__MATERIAL" msprop:Generator_UserChildTable="PARAMETERVALUES" msprop:Generator_UserParentTable="MATERIALS" msprop:Generator_ParentPropName="MATERIALSRow" msprop:Generator_ChildPropName="GetPARAMETERVALUESRows" />
+      <msdata:Relationship name="FK_PARAMETE_RELATION__PARAMETE" msdata:parent="PARAMETERNAMES" msdata:child="PARAMETERVALUES" msdata:parentkey="PN_NR" msdata:childkey="PN_NR" msprop:Generator_UserRelationName="FK_PARAMETE_RELATION__PARAMETE" msprop:Generator_RelationVarName="relationFK_PARAMETE_RELATION__PARAMETE" msprop:Generator_UserChildTable="PARAMETERVALUES" msprop:Generator_UserParentTable="PARAMETERNAMES" msprop:Generator_ParentPropName="PARAMETERNAMESRow" msprop:Generator_ChildPropName="GetPARAMETERVALUESRows" />
+    </xs:appinfo>
+  </xs:annotation>
+</xs:schema>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Deltares.Maps.Tests.csproj
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Deltares.Maps.Tests.csproj	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Deltares.Maps.Tests.csproj	(revision 3305)
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{E0820F33-3929-493D-821D-95E755F87D0B}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Deltares.Maps.Tests</RootNamespace>
+    <AssemblyName>Deltares.Maps.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\..\bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>..\..\..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Deltares.Standard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31fe100197c68040, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
+    </Reference>
+    <Reference Include="GeoAPI">
+      <HintPath>..\..\..\packages\GeoAPI.1.7.1.1\lib\net40-client\GeoAPI.dll</HintPath>
+    </Reference>
+    <Reference Include="NetTopologySuite">
+      <HintPath>..\..\..\packages\NetTopologySuite.1.13.1\lib\net40-client\NetTopologySuite.dll</HintPath>
+    </Reference>
+    <Reference Include="NetTopologySuite.IO.GeoTools">
+      <HintPath>..\..\..\packages\NetTopologySuite.IO.1.13.1\lib\net40-client\NetTopologySuite.IO.GeoTools.dll</HintPath>
+    </Reference>
+    <Reference Include="NetTopologySuite.IO.MsSqlSpatial">
+      <HintPath>..\..\..\packages\NetTopologySuite.IO.1.13.1\lib\net40-client\NetTopologySuite.IO.MsSqlSpatial.dll</HintPath>
+    </Reference>
+    <Reference Include="NetTopologySuite.IO.PostGis">
+      <HintPath>..\..\..\packages\NetTopologySuite.IO.1.13.1\lib\net40-client\NetTopologySuite.IO.PostGis.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="PowerCollections">
+      <HintPath>..\..\..\packages\NetTopologySuite.1.13.1\lib\net40-client\PowerCollections.dll</HintPath>
+    </Reference>
+    <Reference Include="Rhino.Mocks">
+      <HintPath>..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Domain\FeatureRepositoryTest.cs" />
+    <Compile Include="Domain\FeatureTest.cs" />
+    <Compile Include="FeatureRepositoryTests.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Services\FeatueRepositoryExtensionsTest.cs" />
+    <Compile Include="Services\PolygonAttributeImporterTest.cs" />
+    <Compile Include="Services\FeatureImporterTest.cs" />
+    <Compile Include="Domain\CoverageFunctionTest.cs" />
+    <Compile Include="Services\ShapeFileCreatorTest.cs" />
+    <Compile Include="Services\ShapeFileReaderTest.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Deltares.Maps.csproj">
+      <Project>{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}</Project>
+      <Name>Deltares.Maps</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\Copying.GPL.licenseheader">
+      <Link>Copying.GPL.licenseheader</Link>
+    </None>
+    <None Include="packages.config" />
+    <None Include="TestData\Gemeenten.dbf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Gemeenten.fix">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Gemeenten.prj">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Gemeenten.qix">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Gemeenten.sbn">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Gemeenten.sbx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Gemeenten.shp">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="TestData\Gemeenten.shx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="TestData\Gemeenten.shp.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Assemblers/TimeSeriesAssembler.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Assemblers/TimeSeriesAssembler.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Assemblers/TimeSeriesAssembler.cs	(revision 3305)
@@ -0,0 +1,332 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using Deltares.Standard;
+using System.Reflection;
+using System.Xml.Linq;
+using System.Xml.Schema;
+using System.IO;
+using System.Xml;
+using System.Globalization;
+using Deltares.Standard.IO.DtoAssembler;
+
+
+namespace Deltares.Dam.Data.Assemblers
+{
+    using Standard.Extensions;
+
+    public class TimeSeriesAssembler : DtoAssembler<TimeSerieCollection>
+    {
+        #region Constant declarations
+
+        /// <summary>
+        /// Holds the xml element name
+        /// </summary>
+        private const string XmlElementName = "TimeSeries";
+
+        /// <summary>
+        /// Holds the name of the xml schema
+        /// </summary>
+        private const string XmlSchemaName = "pi_timeseries";
+
+        private const string XmlSchemaNameSharedTypes = "pi_sharedtypes";
+
+        /// <summary>
+        /// Holds the xml namespace
+        /// </summary>
+        private const string XmlElementNamespace = "http://www.wldelft.nl/fews/PI";
+
+        /// <summary>
+        /// Holds the common part of the path to the embedded resource
+        /// </summary>
+        private const string EmbeddedResourcePath = "Deltares.Dam.Data.Xsd";
+
+        /// <summary>
+        /// Holds the xsd resource path 
+        /// </summary>
+        private const string XsdEmbeddedResourcePath = EmbeddedResourcePath + "." + XmlSchemaName + ".xsd";
+
+        private const string XsdEmbeddedResourcePathSharedTypes = EmbeddedResourcePath + "." + XmlSchemaNameSharedTypes + ".xsd";
+
+        public const string XmlVersionAttributeName = "version";
+        public const string XmlTimeZoneElementName = "timeZone";
+        public const string XmlSeriesElementName = "series";
+        public const string XmlHeaderElementName = "header";
+        public const string XmlTypeElementName = "type";
+        public const string XmlLocationIdElementName = "locationId";
+        public const string XmlParameterIdElementName = "parameterId";
+        public const string XmlTimeStepElementName = "timeStep";
+        public const string XmlStartDateElementName = "startDate";
+        public const string XmlEndDateElementName = "endDate";
+        public const string XmlForecastDateElementName = "forecastDate";
+        public const string XmlMissValElementName = "missVal";
+        public const string XmlLongNameElementName = "longName";
+        public const string XmlStationNameElementName = "stationName";
+        public const string XmlUnitsElementName = "units";
+        public const string XmlSourceOrganisationElementName = "sourceOrganisation";
+        public const string XmlSourceSystemElementName = "sourceSystem";
+        public const string XmlFileDescriptionElementName = "fileDescription";
+        public const string XmlCreationDateElementName = "creationDate";
+        public const string XmlCreationTimeElementName = "creationTime";
+        public const string XmlRegionElementName = "region";
+        public const string XmlUnitAttributeName = "unit";
+        public const string XmlDividerAttributeName = "divider";
+        public const string XmlMultiplierAttributeName = "multiplier";
+        public const string XmlDateAttributeName = "date";
+        public const string XmlTimeAttributeName = "time";
+        public const string XmlEntryElementName = "event";
+        public const string XmlValueAttributeName = "value";
+        public const string XmlFlagAttributeName = "flag";
+        public const string XMLCommentElementName = "comment";
+
+
+        #endregion
+
+        public TimeSeriesAssembler()
+            : base(XmlElementName, XmlElementNamespace, Assembly.GetExecutingAssembly().GetEmbeddedFile(XsdEmbeddedResourcePath))
+        {
+            AddOrUpdateMapping("Version", XmlVersionAttributeName);
+        }
+
+        public override TimeSerieCollection CreateDomainObject(XElement dtoObj)
+        {
+            TimeSerieCollection timeSerieCollection = base.CreateDomainObject(dtoObj);
+
+            XNamespace tns = this.ElementNamespace;
+
+            // Time zone
+            XElement timeZoneElement = dtoObj.Element(tns + TimeSeriesAssembler.XmlTimeZoneElementName);
+            if (timeZoneElement != null)
+            {
+                timeSerieCollection.TimeZone = Double.Parse(timeZoneElement.Value, CultureInfo.InvariantCulture);
+            }
+
+            // Series
+            IEnumerable<XElement> serieElementCollection = dtoObj.Elements(tns + TimeSeriesAssembler.XmlSeriesElementName);
+
+            foreach (XElement serieElement in serieElementCollection)
+            {
+                var timeSerie = new TimeSerie();
+
+                // Header
+                XElement headerElement = serieElement.Element(tns + TimeSeriesAssembler.XmlHeaderElementName);
+
+                timeSerie.Type = GetElementValue<string>(headerElement, tns + XmlTypeElementName);
+                timeSerie.LocationId = GetElementValue<string>(headerElement, tns + XmlLocationIdElementName);
+                timeSerie.ParameterId = GetElementValue<string>(headerElement, tns + XmlParameterIdElementName);
+
+                XElement timeStepElement = headerElement.Element(tns + TimeSeriesAssembler.XmlTimeStepElementName);
+                timeSerie.TimeStep.Unit = (TimeStepUnit)Enum.Parse(typeof(TimeStepUnit), timeStepElement.AttributeAs<string>(TimeSeriesAssembler.XmlUnitAttributeName), true);
+
+                timeSerie.TimeStep.Divider = timeStepElement.AttributeAs<uint>(TimeSeriesAssembler.XmlDividerAttributeName);
+
+                timeSerie.TimeStep.Multiplier = timeStepElement.AttributeAs<uint>(TimeSeriesAssembler.XmlMultiplierAttributeName);
+                XElement startDateElement = headerElement.Element(tns + TimeSeriesAssembler.XmlStartDateElementName);
+                timeSerie.StartDateTime = startDateElement.AttributeAs<DateTime>(TimeSeriesAssembler.XmlDateAttributeName).Date +
+                                          startDateElement.AttributeAs<DateTime>(TimeSeriesAssembler.XmlTimeAttributeName).TimeOfDay;
+                XElement endDateElement = headerElement.Element(tns + TimeSeriesAssembler.XmlEndDateElementName);
+                timeSerie.EndDateTime = endDateElement.AttributeAs<DateTime>(TimeSeriesAssembler.XmlDateAttributeName).Date +
+                                        endDateElement.AttributeAs<DateTime>(TimeSeriesAssembler.XmlTimeAttributeName).TimeOfDay;
+                XElement forecastDateElement = headerElement.Element(tns + TimeSeriesAssembler.XmlForecastDateElementName);
+
+                if (forecastDateElement != null)
+                {
+                    timeSerie.ForecastDateTime = forecastDateElement.AttributeAs<DateTime>(TimeSeriesAssembler.XmlDateAttributeName).Date +
+                                            forecastDateElement.AttributeAs<DateTime>(TimeSeriesAssembler.XmlTimeAttributeName).TimeOfDay;
+                }
+
+                timeSerie.MissVal = GetElementValue<double>(headerElement, tns + XmlMissValElementName);
+                timeSerie.LongName = GetElementValue<string>(headerElement, tns + XmlLongNameElementName);
+                timeSerie.StationName = GetElementValue<string>(headerElement, tns + XmlStationNameElementName);
+                timeSerie.Units = GetElementValue<string>(headerElement, tns + XmlUnitsElementName);
+                timeSerie.SourceOrganisation = GetElementValue<string>(headerElement, tns + XmlSourceOrganisationElementName);
+                timeSerie.SourceSystem = GetElementValue<string>(headerElement, tns + XmlSourceSystemElementName);
+                timeSerie.FileDescription = GetElementValue<string>(headerElement, tns + XmlFileDescriptionElementName);
+
+                XElement creationDateElement = headerElement.Element(tns + XmlCreationDateElementName);
+                XElement creationTimeElement = headerElement.Element(tns + XmlCreationTimeElementName);
+                if (creationDateElement != null)
+                {
+                    timeSerie.CreationDateTime = creationDateElement.Value.ToType<DateTime>().Date;
+                    if (creationTimeElement != null)
+                    {
+                        timeSerie.CreationDateTime += creationTimeElement.Value.ToType<DateTime>().TimeOfDay;
+                    }
+                }
+
+                timeSerie.Region = GetElementValue<string>(headerElement, tns + XmlRegionElementName);
+
+                // Entries
+                IEnumerable<XElement> entryElementCollection = serieElement.Elements(tns + TimeSeriesAssembler.XmlEntryElementName);
+
+                foreach (XElement entryElement in entryElementCollection)
+                {
+                    TimeSerieEntry entry = new TimeSerieEntry();
+                    entry.DateTime = entryElement.AttributeAs<DateTime>(XmlDateAttributeName).Date +
+                                              entryElement.AttributeAs<DateTime>(XmlTimeAttributeName).TimeOfDay;
+                    entry.Value = entryElement.AttributeAs<double>(XmlValueAttributeName);
+                    entry.Flag = entryElement.AttributeAs<int>(XmlFlagAttributeName);
+
+                    timeSerie.Entries.Add(entry);
+                }
+
+                // Comment
+                XElement commentElement = serieElement.Element(tns + XMLCommentElementName);
+                if (commentElement != null)
+                    timeSerie.Comment = commentElement.Value;
+
+                timeSerieCollection.Series.Add(timeSerie);
+            }
+
+            return timeSerieCollection;
+        }
+
+        private static T GetElementValue<T>(XContainer parent, XName name)
+        {
+            var element = parent.Element(name);
+            if (element != null)
+                return element.Value.ToType<T>();
+
+            return default(T);
+        }
+
+        public override XElement CreateDataTransferObject(TimeSerieCollection timeSerieCollection)
+        {
+            XElement rootElement = base.CreateDataTransferObject(timeSerieCollection);
+
+            XNamespace tns = ElementNamespace;
+
+            // Time zone
+            rootElement.Add(new XElement(tns + XmlTimeZoneElementName, timeSerieCollection.TimeZone));
+
+            // Series
+            foreach (TimeSerie timeSerie in timeSerieCollection.Series)
+            {
+                XElement serieElement = new XElement(tns + XmlSeriesElementName);
+
+                XElement headerElement = new XElement(tns + XmlHeaderElementName);
+                headerElement.Add(new XElement(tns + XmlTypeElementName, timeSerie.Type));
+                headerElement.Add(new XElement(tns + XmlLocationIdElementName, timeSerie.LocationId));
+                headerElement.Add(new XElement(tns + XmlParameterIdElementName, timeSerie.ParameterId));
+
+                headerElement.Add(new XElement(tns + XmlTimeStepElementName,
+                                               new XAttribute(XmlUnitAttributeName, timeSerie.TimeStep.Unit.ToString().ToLower()),
+                                               (timeSerie.TimeStep.MultiplierSpecified ? new XAttribute(XmlMultiplierAttributeName, timeSerie.TimeStep.Multiplier) : null),
+                                               (timeSerie.TimeStep.DividerSpecified ? new XAttribute(XmlDividerAttributeName, timeSerie.TimeStep.Divider) : null)
+                                               ));
+
+                headerElement.Add(new XElement(tns + XmlStartDateElementName,
+                                               new XAttribute(XmlDateAttributeName, timeSerie.StartDateTime.ToString("yyyy-MM-dd")),
+                                               new XAttribute(XmlTimeAttributeName, timeSerie.StartDateTime.ToString("HH:mm:ss"))));
+                headerElement.Add(new XElement(tns + XmlEndDateElementName,
+                                               new XAttribute(XmlDateAttributeName, timeSerie.EndDateTime.ToString("yyyy-MM-dd")),
+                                               new XAttribute(XmlTimeAttributeName, timeSerie.EndDateTime.ToString("HH:mm:ss"))));
+
+                if (!timeSerie.ForecastDateTime.Equals(DateTime.MinValue))
+                headerElement.Add(new XElement(tns + XmlForecastDateElementName,
+                                               new XAttribute(XmlDateAttributeName, timeSerie.ForecastDateTime.ToString("yyyy-MM-dd")),
+                                               new XAttribute(XmlTimeAttributeName, timeSerie.ForecastDateTime.ToString("HH:mm:ss"))));
+
+                headerElement.Add(new XElement(tns + XmlMissValElementName, timeSerie.MissVal));
+                if (timeSerie.LongName != null)
+                    headerElement.Add(new XElement(tns + XmlLongNameElementName, timeSerie.LongName));
+                if (timeSerie.StationName != null)
+                    headerElement.Add(new XElement(tns + XmlStationNameElementName, timeSerie.StationName));
+                if (timeSerie.Units != null)
+                    headerElement.Add(new XElement(tns + XmlUnitsElementName, timeSerie.Units));
+                if (timeSerie.SourceOrganisation != null)
+                    headerElement.Add(new XElement(tns + XmlSourceOrganisationElementName, timeSerie.SourceOrganisation));
+                if (timeSerie.SourceSystem != null)
+                    headerElement.Add(new XElement(tns + XmlSourceSystemElementName, timeSerie.SourceSystem));
+                if (timeSerie.FileDescription != null)
+                    headerElement.Add(new XElement(tns + XmlFileDescriptionElementName, timeSerie.FileDescription));
+                if (timeSerie.CreationDateTime != null)
+                {
+                    headerElement.Add(new XElement(tns + XmlCreationDateElementName, timeSerie.CreationDateTime.Value.ToString("yyyy-MM-dd")));
+                    headerElement.Add(new XElement(tns + XmlCreationTimeElementName, timeSerie.CreationDateTime.Value.ToString("HH:mm:ss")));
+                }
+                if (timeSerie.Region != null)
+                    headerElement.Add(new XElement(tns + XmlRegionElementName, timeSerie.Region));
+
+                serieElement.Add(headerElement);
+
+                // Entries
+                foreach (var entry in timeSerie.Entries)
+                {
+                    XElement entryElement = new XElement(tns + XmlEntryElementName,
+                                                         new XAttribute(XmlDateAttributeName, entry.DateTime.ToString("yyyy-MM-dd")),
+                                                         new XAttribute(XmlTimeAttributeName, entry.DateTime.ToString("HH:mm:ss")),
+                                                         new XAttribute(XmlValueAttributeName, entry.Value),
+                                                         new XAttribute(XmlFlagAttributeName, entry.Flag));
+                    serieElement.Add(entryElement);
+                }
+
+                // Comment
+                if (timeSerie.Comment != null)
+                {
+                    XElement commentElement = new XElement(tns + XMLCommentElementName, timeSerie.Comment);
+                    serieElement.Add(commentElement);
+                }
+
+                rootElement.Add(serieElement);
+            }
+
+            return rootElement;
+        }
+
+        public XDocument CreateDataTransferDocument(TimeSerieCollection timeSerieCollection)
+        {
+            XDocument doc = new XDocument(new XDeclaration("1.0", "utf-8", "yes"));
+
+            XNamespace xsi = "http://www.w3.org/2001/XMLSchema-instance";
+
+
+            XElement root = CreateDataTransferObject(timeSerieCollection);
+
+            doc.Add(root);
+
+            root.Add(new XAttribute(XNamespace.Xmlns + "xsi", xsi.NamespaceName));
+
+            return doc;
+        }
+
+        public bool ValidateSchema(XDocument doc, out string message)
+        {
+            bool result = true;
+            string errorMessage = String.Empty;
+
+            XmlSchemaSet schemas = new XmlSchemaSet();
+
+            Stream xsdStream = Assembly.GetExecutingAssembly().GetEmbeddedFile(XsdEmbeddedResourcePath);
+            schemas.Add(XmlElementNamespace, XmlReader.Create(xsdStream));
+            xsdStream = Assembly.GetExecutingAssembly().GetEmbeddedFile(XsdEmbeddedResourcePathSharedTypes);
+            schemas.Add(XmlElementNamespace, XmlReader.Create(xsdStream));
+
+            doc.Validate(schemas, (o, e) => { result = false; errorMessage = e.Message; }, true);
+
+            message = errorMessage;
+
+            return result;
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportSurfaceLineIdentifiers.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportSurfaceLineIdentifiers.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportSurfaceLineIdentifiers.cs	(revision 3305)
@@ -0,0 +1,37 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Dam.Data
+{
+    public class CsvExportSurfaceLineIdentifiers
+    {
+        public const string CsvHeaderSoilProfileId = "soilprofile_id";
+        public const string CsvHeaderScenario = "location_scenario_id";
+        public const string CsvHeaderCalculationMechanism = "calculation_mechanism";
+        public const string CsvHeaderCalculationModel = "calculation_model";
+
+        public string LocationId { get; set; }
+        public string SoilProfileId { get; set; }
+        public string Scenario { get; set; }
+        public string CalculationMechanism { get; set; }
+        public string CalculationModel { get; set; }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterHelper.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterHelper.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterHelper.cs	(revision 3305)
@@ -0,0 +1,49 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Deltares.Standard.Language;
+using LumenWorks.Framework.IO.Csv;
+
+namespace Deltares.Dam.Data.CsvImporters
+{
+    public class CsvImporterHelper
+    {
+        /// <summary>
+        /// Read field headers of csv file with improved error messages
+        /// </summary>
+        /// <param name="caller">the calling object</param>
+        /// <param name="csvReader">the scv reader</param>
+        /// <returns></returns>
+        static public string[] GetFieldHeaders(Object caller, CsvReader csvReader)
+        {
+            try
+            {
+                return csvReader.GetFieldHeaders();
+            }
+            catch (Exception exception)
+            {
+                string message = String.Format(LocalizationManager.GetTranslatedText(caller, "ErrorReadingCsvColumnNames"), exception.Message, caller.GetType());
+                throw new CsvImporterException(message);
+            }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs	(revision 3305)
@@ -0,0 +1,291 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections;
+using System.ComponentModel;
+using System.Xml.Serialization;
+using Deltares.Dam.Data.UISupport;
+using Deltares.Standard;
+using Deltares.Standard.Attributes;
+using Deltares.Standard.EventPublisher;
+using Deltares.Standard.Validation;
+
+namespace Deltares.Dam.Data
+{
+    using System;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public class DamFailureMechanismeCalculationSpecification: IDomain, IVisibleEnabled
+    {
+        private FailureMechanismSystemType failureMechanismSystemType;
+        private PipingModelType pipingModelType = PipingModelType.Sellmeijer4Forces;
+        private Enum calculationModel; 
+        private FailureMechanismeParamatersMStab failureMechanismeParamatersMStab;
+                private static DamProjectType damProjectType;
+        private StabilityKernelType stabilityKernelType = StabilityKernelType.DamClassicStability;
+        private Boolean firstTime = true;
+
+        public DamFailureMechanismeCalculationSpecification()
+        {
+            //Todo interface
+            failureMechanismSystemType = FailureMechanismSystemType.StabilityInside;
+            failureMechanismeParamatersMStab = new FailureMechanismeParamatersMStab();
+            CalculationModel = failureMechanismeParamatersMStab.MStabParameters.Model;
+            FailureMechanismeParamatersMStab.MStabParameters.GridPosition = MStabGridPosition.Right;
+            ReadUserSettingsSlipCircleDefinition();
+        }
+
+        [Browsable(false)]
+        [Validate]
+        public FailureMechanismeParamatersMStab FailureMechanismeParamatersMStab
+        {
+            get { return failureMechanismeParamatersMStab; } 
+            set { failureMechanismeParamatersMStab = value; }
+        }
+
+        [Label("Failure mechanism")]
+        [PropertyOrder(1, 0)]
+        public FailureMechanismSystemType FailureMechanismSystemType
+        {
+            get { return failureMechanismSystemType; }
+            set
+            {
+                // Make sure the set is done for the very first time too even when the value has not changed (MWDAM-1199).
+                if (failureMechanismSystemType != value || firstTime)
+                {
+                    firstTime = false;
+                    DataEventPublisher.BeforeChange(this, "FailureMechanismSystemType");
+                    failureMechanismSystemType = value;
+                    // To solve MWDAM-592, remember the current pipingmodeltype as this gets reset by setting the
+                    // calculationmodel. Only switch it back when needed.
+                    var oldPipingModelType = pipingModelType;
+                    foreach (Enum possibleModel in this.GetDomain("CalculationModel"))
+                    {
+                        this.CalculationModel = possibleModel;
+                        break;
+                    }
+                    switch (failureMechanismSystemType)
+                    {
+                        case FailureMechanismSystemType.StabilityInside:
+                            failureMechanismeParamatersMStab.MStabParameters.GridPosition = MStabGridPosition.Right;
+                            break;
+                        case FailureMechanismSystemType.StabilityOutside:
+                            failureMechanismeParamatersMStab.MStabParameters.GridPosition = MStabGridPosition.Left;
+                            break;
+                        case FailureMechanismSystemType.Piping:
+                            PipingModelType = oldPipingModelType;
+                            break;
+                    }   
+                    DataEventPublisher.AfterChange(this, "FailureMechanismSystemType");
+                }
+            }
+        }
+
+        [Browsable(false)]
+        public PipingModelType PipingModelType
+        {
+            get { return pipingModelType; }
+            set
+            {
+                pipingModelType = value;
+                if (failureMechanismSystemType == FailureMechanismSystemType.Piping)
+                {
+                    CalculationModel = pipingModelType;
+                }
+            }
+        }
+
+        [Browsable(false)]
+        public static DamProjectType DamProjectType
+        {
+            get { return damProjectType; }
+            set { damProjectType = value; }
+        }
+
+        /// <summary>
+        /// The calculationmodel is only needed to support the selection of the modeltype in the UI. The dropdownlist
+        /// in the UI depends on this. This set can be filled with any proper types (for piping, stabilty etc) for any 
+        /// mechanisme instead of the fixed types per mechanisme.
+        /// </summary>
+        [XmlIgnore]
+        [Label("Model")]
+        [PropertyOrder(1, 1)]
+        public Enum CalculationModel 
+        {
+            get { return calculationModel; } 
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "CalculationModel");
+                calculationModel = value;
+                if (value is PipingModelType)
+                {
+                    pipingModelType = (PipingModelType) value;
+                }
+                else
+                {
+                    failureMechanismeParamatersMStab.MStabParameters.Model = (MStabModelType)value;
+                }
+                DataEventPublisher.AfterChange(this, "CalculationModel");
+            }
+        }
+
+        [Browsable(false)]
+        public MStabModelType StabilityModelType
+        {
+            get { return failureMechanismeParamatersMStab.MStabParameters.Model; }
+            set
+            {
+                failureMechanismeParamatersMStab.MStabParameters.Model = value;
+                if (failureMechanismSystemType != FailureMechanismSystemType.Piping)
+                {
+                    CalculationModel = value;
+                }
+            }
+        }
+
+        [Browsable(false)]
+        public StabilityKernelType StabilityKernelType
+        {
+            get { return stabilityKernelType; }
+            set { stabilityKernelType = value; }
+        }
+
+        public void Assign(DamFailureMechanismeCalculationSpecification damFailureMechanismeCalculation)
+        {
+            failureMechanismSystemType = damFailureMechanismeCalculation.FailureMechanismSystemType;
+            calculationModel = damFailureMechanismeCalculation.CalculationModel;
+            pipingModelType = damFailureMechanismeCalculation.pipingModelType;
+            failureMechanismeParamatersMStab.Assign(damFailureMechanismeCalculation.FailureMechanismeParamatersMStab);
+            StabilityModelType = damFailureMechanismeCalculation.StabilityModelType;
+            stabilityKernelType = damFailureMechanismeCalculation.StabilityKernelType;
+            //assign interface
+        }
+
+        public DamFailureMechanismeCalculationSpecification Clone()
+        {
+            DamFailureMechanismeCalculationSpecification damFailureMechanismeCalculation = new DamFailureMechanismeCalculationSpecification();
+
+            damFailureMechanismeCalculation.Assign(this);
+
+            return damFailureMechanismeCalculation;
+        }
+
+        public override string ToString()
+        {
+            string description = "";
+            description += String.Format("{0}", StabilityKernelType);
+            description += String.Format("{0}", this.FailureMechanismSystemType);
+            if ((this.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside) ||
+              (this.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside))
+            {
+                //interface?
+                description += String.Format(" ({0})", this.FailureMechanismeParamatersMStab.MStabParameters.Model);
+            }
+
+            return description;
+        }
+
+        public ICollection GetDomain(string property)
+        {
+            switch (property)
+            {
+                case "CalculationModel":
+                    return (ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType, DamProjectType, failureMechanismSystemType));
+                case "PipingModelType":
+                    return (ConfigurationManager.Instance.GetAvailableMechanismModels(StabilityKernelType, DamProjectType, FailureMechanismSystemType.Piping));
+                case "FailureMechanismSystemType":
+                    return (ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType, DamProjectType));
+                case "StabilityKernelType":
+                    return (ConfigurationManager.Instance.GetAvailableFailureMechanisms(StabilityKernelType, DamProjectType));
+                default: return null;
+            }
+        }
+
+
+        public bool IsEnabled(string property)
+        {
+            return true;
+        }
+
+        public bool IsVisible(string property)
+        {
+            switch (property)
+            {
+                case "FailureMechanismeParamatersMStab":
+                    switch (this.FailureMechanismSystemType)
+                    {
+                        case Data.FailureMechanismSystemType.StabilityInside: return true;
+                        case Data.FailureMechanismSystemType.StabilityOutside: return true;
+                        case Data.FailureMechanismSystemType.HorizontalBalance: return false;
+                        case Data.FailureMechanismSystemType.Piping: return false;
+                        default: return true;
+                    }                
+                default: return true;
+            }
+        }
+
+        /// <summary>
+        /// Determines whether slip circle definition is undefined.
+        /// </summary>
+        /// <returns>
+        ///   <c>true</c> if [is slip circle definition undefined]; otherwise, <c>false</c>.
+        /// </returns>
+        public bool IsSlipCircleDefinitionUndefined()
+        {
+            bool isSlipCircleDefinitionUndefined = (failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition == null);
+            if (!isSlipCircleDefinitionUndefined)
+            {
+                isSlipCircleDefinitionUndefined = (failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridHorizontalPointCount == 0);
+            }
+            return isSlipCircleDefinitionUndefined;
+        }
+
+        /// <summary>
+        /// Reads the user settings.
+        /// </summary>
+        public void ReadUserSettingsSlipCircleDefinition()
+        {
+            if (failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition == null)
+            {
+                failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition = new SlipCircleDefinition();
+            }
+            failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanTangentLinesDefinition = Properties.Settings.Default.SlipCircleUpliftVanTangentLinesDefinition;
+            failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanTangentLinesDistance = Properties.Settings.Default.SlipCircleUpliftVanTangentLinesDistance;
+            failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.BishopTangentLinesDefinition = Properties.Settings.Default.SlipCircleBishopTangentLinesDefinition;
+            failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.BishopTangentLinesDistance = Properties.Settings.Default.SlipCircleBishopTangentLinesDistance;
+            failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.GridSizeDetermination = Properties.Settings.Default.SlipCircleGridSizeDetermination;
+            failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridVerticalPointCount = Properties.Settings.Default.SlipCircleUpliftVanLeftGridVerticalPointCount;
+            failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridVerticalPointDistance = Properties.Settings.Default.SlipCircleUpliftVanLeftGridVerticalPointDistance;
+            failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridHorizontalPointCount = Properties.Settings.Default.SlipCircleUpliftVanLeftGridHorizontalPointCount;
+            failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanLeftGridHorizontalPointDistance = Properties.Settings.Default.SlipCircleUpliftVanLeftGridHorizontalPointDistance;
+            failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanRightGridVerticalPointCount = Properties.Settings.Default.SlipCircleUpliftVanRightGridVerticalPointCount;
+            failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanRightGridVerticalPointDistance = Properties.Settings.Default.SlipCircleUpliftVanRightGridVerticalPointDistance;
+            failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanRightGridHorizontalPointCount = Properties.Settings.Default.SlipCircleUpliftVanRightGridHorizontalPointCount;
+            failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.UpliftVanRightGridHorizontalPointDistance = Properties.Settings.Default.SlipCircleUpliftVanRightGridHorizontalPointDistance;
+            failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.BishopGridVerticalPointCount = Properties.Settings.Default.SlipCircleBishopGridVerticalPointCount;
+            failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.BishopGridVerticalPointDistance = Properties.Settings.Default.SlipCircleBishopGridVerticalPointDistance;
+            failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.BishopGridHorizontalPointCount = Properties.Settings.Default.SlipCircleBishopGridHorizontalPointCount;
+            failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.BishopGridHorizontalPointDistance = Properties.Settings.Default.SlipCircleBishopGridHorizontalPointDistance;
+       }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.DamClientsLibrary.Version/GlobalAssembly.cs.svn
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.DamClientsLibrary.Version/GlobalAssembly.cs.svn	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.DamClientsLibrary.Version/GlobalAssembly.cs.svn	(revision 3305)
@@ -0,0 +1,13 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Deltares")]
+[assembly: AssemblyCopyright("Copyright © Deltares 2019")]
+[assembly: AssemblyProduct("DAM (Dijksterkte Analyse Module)")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: AssemblyVersion("19.1.0.SVNREV")]
+[assembly: AssemblyFileVersion("19.1.0.SVNREV")]
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/TestData/Gemeenten.fix
===================================================================
diff -u
Binary files differ
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactory.cs	(revision 3305)
@@ -0,0 +1,785 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Geometry;
+using Deltares.Geotechnics.GeotechnicalGeometry;
+using Deltares.Standard.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.SurfaceLines;
+using Deltares.Soilbase;
+
+namespace Deltares.Dam.Data
+{
+    public class EntityFactory
+    {
+        #region Private lookup tables (lists)
+
+        /// <summary>
+        /// Holds a reference to the (concrete) Location list
+        /// </summary>
+        private readonly IList<Location> locations = new List<Location>();
+
+        /// <summary>
+        /// Holds a reference to the (concrete) Segment list
+        /// </summary>
+        private readonly IList<Segment> segments = new List<Segment>();
+
+        /// <summary>
+        /// Holds a reference to the (concrete) SoilProfile list
+        /// </summary>
+        private readonly IList<SoilProfile1D> soilProfiles = new List<SoilProfile1D>();
+
+        /// <summary>
+        /// Holds a reference to the (concrete) SurfaceLine list
+        /// </summary>
+        private readonly IList<SurfaceLine2> surfaceLines = new List<SurfaceLine2>();
+
+        /// <summary>
+        /// Holds a reference to the (concrete) pl1Line list
+        /// </summary>
+        private readonly IList<PL1Line> pl1Lines = new List<PL1Line>();
+
+        private readonly IList<Gauge> gauges = new List<Gauge>();
+
+        /// <summary>
+        /// Holds a reference to the (concrete) SurfaceLine list
+        /// </summary>
+        private readonly IList<Scenario> scenarios = new List<Scenario>();
+
+        #endregion
+
+        #region Constructors
+
+        public EntityFactory()
+            : this(null, null, null, null, null, null)
+        {
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="surfaceLines">The surface lines look up table</param>
+        public EntityFactory(IEnumerable<SurfaceLine2> surfaceLines)
+            : this(null, null, null, surfaceLines, null, null)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="segments">The segment look up table</param>
+        /// <param name="surfaceLines">The surface lines look up table</param>
+        public EntityFactory(IEnumerable<Segment> segments, IEnumerable<SurfaceLine2> surfaceLines)
+            : this(null, null, segments, surfaceLines, null, null)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="soilProfiles">A soil profiles</param>
+        /// <param name="locations">The location look up table</param>
+        /// <param name="segments">The segment look up table</param>
+        public EntityFactory(IEnumerable<Location> locations, IEnumerable<SoilProfile1D> soilProfiles, IEnumerable<Segment> segments)
+            : this(locations, soilProfiles, segments, null, null, null)
+        {
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="soilProfiles">A soil profiles</param>
+        /// <param name="locations">The location look up table</param>
+        /// <param name="segments">The segment look up table</param>
+        /// <param name="surfaceLines">The surface lines look up table</param>
+        /// <param name="pl1Lines">The pl1Lines look up table</param>
+        /// <param name="gauges">The gauges look up table</param>
+        public EntityFactory(IEnumerable<Location> locations, IEnumerable<SoilProfile1D> soilProfiles, IEnumerable<Segment> segments, IEnumerable<SurfaceLine2> surfaceLines,
+            IEnumerable<PL1Line> pl1Lines, IEnumerable<Gauge> gauges)
+        {
+            if (soilProfiles != null)
+            {
+                this.soilProfiles = soilProfiles as IList<SoilProfile1D>;
+                if (this.soilProfiles == null)
+                {
+                    this.soilProfiles = new List<SoilProfile1D>();
+                    this.soilProfiles.AddRangeLeavingNullElementsOut(soilProfiles);
+                }
+                else
+                {
+                    this.soilProfiles.RemoveNullElements();
+                }
+            }
+
+            if (segments != null)
+            {
+                this.segments = segments as IList<Segment>;
+                if (this.segments == null)
+                {
+                    this.segments = new List<Segment>();
+                    this.segments.AddRangeLeavingNullElementsOut(segments);
+                }
+                else
+                {
+                    this.segments.RemoveNullElements();
+                }
+            }
+
+
+            if (locations != null)
+            {
+                this.locations = locations as IList<Location>;
+                if (this.locations == null)
+                {
+                    this.locations = new List<Location>();
+                    this.locations.AddRangeLeavingNullElementsOut(locations);
+                }
+                else
+                {
+                    this.locations.RemoveNullElements();
+                }
+            }
+
+            if (surfaceLines != null)
+            {
+                this.surfaceLines = surfaceLines as IList<SurfaceLine2>;
+                if (this.surfaceLines == null)
+                {
+                    this.surfaceLines = new List<SurfaceLine2>();
+                    this.surfaceLines.AddRangeLeavingNullElementsOut(surfaceLines);
+                }
+                else
+                {
+                    this.surfaceLines.RemoveNullElements();
+                }
+            }
+
+            if (pl1Lines != null)
+            {
+                this.pl1Lines = pl1Lines as IList<PL1Line>;
+                if (this.pl1Lines == null)
+                {
+                    this.pl1Lines = new List<PL1Line>();
+                    this.pl1Lines.AddRangeLeavingNullElementsOut(pl1Lines);
+                }
+                else
+                {
+                    this.pl1Lines.RemoveNullElements();
+                }
+            }
+
+            if (gauges != null)
+            {
+                this.gauges = gauges as IList<Gauge>;
+                if (this.gauges == null)
+                {
+                    this.gauges = new List<Gauge>();
+                    this.gauges.AddRangeLeavingNullElementsOut(gauges);
+                }
+                else
+                {
+                    this.gauges.RemoveNullElements();
+                }
+            }
+
+            if (scenarios != null)
+            {
+                this.scenarios = scenarios as IList<Scenario>;
+                if (this.scenarios == null)
+                {
+                    this.scenarios = new List<Scenario>();
+                    this.scenarios.AddRangeLeavingNullElementsOut(scenarios);
+                }
+                else
+                {
+                    this.scenarios.RemoveNullElements();
+                }
+            }            
+
+        }
+
+        #endregion
+
+        #region Public lookup tables (IEnumarable collections)
+
+        /// <summary>
+        /// Gets a reference to the locations list through the <see cref="IList{Location}"/> interface
+        /// </summary>
+        public IList<Location> Locations
+        {
+            get { return locations; }
+        }
+
+
+        /// <summary>
+        /// Gets a reference to the segments list through the <see cref="IList{Segment}"/> interface
+        /// </summary>
+        public IEnumerable<Segment> Segments
+        {
+            get { return segments; }
+        }
+
+        /// <summary>
+        /// Gets a reference to the soilProfiles list through the <see cref="IList{SoilProfile1D}"/> interface
+        /// </summary>
+        public IEnumerable<SoilProfile1D> SoilProfiles
+        {
+            get { return soilProfiles; }
+        }
+
+        /// <summary>
+        /// Gets a reference to the surfaceLines list through the <see cref="IList{SurfaceLine2}"/> interface
+        /// </summary>
+        public IEnumerable<SurfaceLine2> SurfaceLines
+        {
+            get { return surfaceLines; }
+        }
+
+
+        /// <summary>
+        /// Gets a reference to the scenarios list through the <see cref="IList{Scenario}"/> interface
+        /// </summary>
+        public IList<Scenario> Scenarios
+        {
+            get { return scenarios; }
+        }
+
+        #endregion
+
+        #region Factory / Creational Methods
+
+        public Dike CreateDike(string dikeId)
+        {
+            return new Dike { Name = dikeId };
+        }
+
+        public Dike CreateDummyDike(string dikeId)
+        {
+            var dike = new Dike();
+            dike.Name = dikeId;
+            dike.ShearStrengthModel = MStabShearStrength.CuGradient;
+            dike.SoilDatabaseName = SoilbaseDB.DefaultDatabaseName;
+            // PlLine
+            GeometryPoint plp1 = new GeometryPoint();
+            plp1.X = 1;
+            plp1.Y = 2;
+            plp1.Z = 3;
+            GeometryPoint plp2 = new GeometryPoint();
+            plp2.X = 4;
+            plp2.Y = 5;
+            plp2.Z = 6;
+            PL1Line pL1Line = new PL1Line();
+            pL1Line.Points.Add(plp1);
+            pL1Line.Points.Add(plp2);
+            dike.PL1Lines.Add(pL1Line);
+            // Locations
+            Location location1 = new Location();
+            location1.DampingFactorPL3 = 0.3;
+            location1.DampingFactorPL4 = 0.4;
+            location1.PL1Line = pL1Line;
+            location1.Name = "Location1";
+            location1.XRd = 45782;
+            location1.YRd = 143090;
+            location1.DikeEmbankmentMaterial = "clay";
+            location1.ShoulderEmbankmentMaterial = "sand";
+            location1.StabilityShoulderGrowSlope = 3.1;
+            location1.StabilityShoulderGrowDeltaX = 3.2;
+            location1.StabilitySlopeAdaptionDeltaX = 3.3;
+            location1.IntrusionVerticalWaterPressure = IntrusionVerticalWaterPressureType.FullHydroStatic;
+            location1.PenetrationLength = 3.6;
+            location1.TrafficLoad = 3.7;
+            location1.TL_DegreeOfConsolidation = 3.8;
+            location1.MinimalCircleDepth = 1.11;
+            location1.DistanceToEntryPoint = 1.16;
+            
+            dike.Locations.Add(location1);
+            Location location2 = new Location();
+            location2.Name = "Location2";
+            dike.Locations.Add(location2);
+            Location location3 = new Location();
+            location3.Name = "Location3";
+            dike.Locations.Add(location3);
+            Location location4 = new Location();
+            location4.Name = "Location4";
+            dike.Locations.Add(location4);
+            Location location5 = new Location();
+            location5.Name = "Location5";
+            dike.Locations.Add(location5);
+
+            // Segments
+            Segment segment1 = new Segment();
+            segment1.Name = "Segment1";
+            Segment segment2 = new Segment();
+            segment2.Name = "Segment2";
+
+            // Surface lines
+            var surfaceLine1 = new SurfaceLine2
+            {
+                Geometry = new LocalizedGeometryPointString(),
+                CharacteristicPoints = { GeometryMustContainPoint = true },
+                Name = "SurfaceLine1"
+            };
+            dike.SurfaceLines2.Add(surfaceLine1);
+            var surfaceLine2 = new SurfaceLine2
+            {
+                Geometry = new LocalizedGeometryPointString(),
+                CharacteristicPoints = { GeometryMustContainPoint = true },
+                Name = "SurfaceLine2"
+            };
+            dike.SurfaceLines2.Add(surfaceLine2);
+
+            //Soils
+            Soil soilClay1 = new Soil();
+            soilClay1.UseDefaultProbabilisticValues = false;
+            soilClay1.Name = "HW-OBO";
+            soilClay1.AbovePhreaticLevel = 15.00;
+            soilClay1.BelowPhreaticLevel = 16.00;
+            soilClay1.DiameterD70 = 0.000013;
+            soilClay1.WhitesConstant = 1.0;
+            soilClay1.BeddingAngle = 1.0;
+            soilClay1.PermeabKx = 1.0;
+            soilClay1.ExcessPorePressure = 21.0;
+            soilClay1.PorePressureFactor = 0.8;
+            soilClay1.Cohesion = 12.7;
+            soilClay1.FrictionAngle = 11.1;
+            //soilClay1.StressTableName = "strtab";
+            //soilClay1.StressTableNr = 3;
+            //soilClay1.BondStressTableName = "bondstrtab";
+            //soilClay1.BondStressTableNr = 2;
+            soilClay1.ShearStrengthModel = ShearStrengthModel.CPhi;
+            soilClay1.UseDefaultProbabilisticValues = false;
+            soilClay1.CorrelationCPhi = 0.5;
+            soilClay1.POP = 4.2;
+            soilClay1.SoilGroup = 11;
+            soilClay1.RRatio = 5.5;
+            dike.SoilList.Soils.Add(soilClay1);
+
+            Soil soilPeat1 = new Soil();
+            soilPeat1.UseDefaultProbabilisticValues = false;
+            soilPeat1.Name = "HW-DUN";
+            soilPeat1.AbovePhreaticLevel = 11.00;
+            soilPeat1.BelowPhreaticLevel = 13.00;
+            dike.SoilList.Soils.Add(soilPeat1);
+            Soil soilSand1 = new Soil();
+            soilSand1.UseDefaultProbabilisticValues = false;
+            soilSand1.Name = "Alg-zand (0-30)";
+            soilSand1.AbovePhreaticLevel = 18.50;
+            soilSand1.BelowPhreaticLevel = 21.75;
+            dike.SoilList.Soils.Add(soilSand1);
+
+            Soil soilClay2 = new Soil();
+            soilClay2.UseDefaultProbabilisticValues = false;
+            soilClay2.Name = "HW-OBO1";
+            soilClay2.AbovePhreaticLevel = 14.67;
+            soilClay2.BelowPhreaticLevel = 16.45;
+            dike.SoilList.Soils.Add(soilClay2);
+            Soil soilPeat2 = new Soil();
+            soilPeat2.UseDefaultProbabilisticValues = false;
+            soilPeat2.Name = "HW-DUN1";
+            soilPeat2.AbovePhreaticLevel = 11.13;
+            soilPeat2.BelowPhreaticLevel = 12.64;
+            dike.SoilList.Soils.Add(soilPeat2);
+            Soil soilSand2 = new Soil();
+            soilSand2.UseDefaultProbabilisticValues = false;
+            soilSand2.Name = "Alg-zand (0-30)1";
+            soilSand2.AbovePhreaticLevel = 17.92;
+            soilSand2.BelowPhreaticLevel = 22.08;
+            dike.SoilList.Soils.Add(soilSand2);
+            
+            // Soil profiles
+            SoilProfile1D soilProfile1 = new SoilProfile1D();
+            soilProfile1.Name = "SoilProfile1";
+            soilProfile1.X = 34534.34;
+            soilProfile1.Y = 49453.68;
+            soilProfile1.BottomLevel = -25.3;
+            soilProfile1.HasPhreaticLevel = true;
+            soilProfile1.PhreaticLevel = -3.54;
+            
+            SoilLayer1D layer = new SoilLayer1D();
+            layer.Id = "L1";
+            layer.Name = "Layer 1";
+            layer.TopLevel = -1.52;
+            layer.Soil = soilClay1;
+            layer.IsAquifer = true;
+            soilProfile1.Layers.Add(layer);
+            layer = new SoilLayer1D();
+            layer.Id = "L2";
+            layer.Name = "Layer 2";
+            layer.TopLevel = -3.18;
+            layer.Soil = soilPeat1;
+            soilProfile1.Layers.Add(layer);
+            layer = new SoilLayer1D();
+            layer.Id = "L3";
+            layer.Name = "Layer 3";
+            layer.TopLevel = -7.37;
+            layer.Soil = soilClay1;
+            layer.IsAquifer = true;
+            soilProfile1.Layers.Add(layer);
+            layer = new SoilLayer1D();
+            layer.Id = "L4";
+            layer.Name = "Layer 4";
+            layer.TopLevel = -12.28;
+            layer.Soil = soilPeat1;
+            soilProfile1.Layers.Add(layer);
+            layer = new SoilLayer1D();
+            layer.Id = "L5";
+            layer.Name = "Layer 5";
+            layer.TopLevel = -18.39;
+            layer.Soil = soilSand1;
+            soilProfile1.Layers.Add(layer);
+            dike.SoilProfiles.Add(soilProfile1);
+
+            SoilProfile1D soilProfile2 = new SoilProfile1D();
+            soilProfile2.Name = "SoilProfile2";
+            soilProfile2.X = 37212.54;
+            soilProfile2.Y = 48363.17;
+            soilProfile2.BottomLevel = -31.07;
+            soilProfile2.HasPhreaticLevel = true;
+            soilProfile2.PhreaticLevel = -5.92;
+
+            layer = new SoilLayer1D();
+            layer.Id = "L1";
+            layer.Name = "Layer 1";
+            layer.TopLevel = -3.17;
+            layer.Soil = soilPeat2;
+            soilProfile2.Layers.Add(layer);
+            layer = new SoilLayer1D();
+            layer.Id = "L2";
+            layer.Name = "Layer 2";
+            layer.TopLevel = -5.22;
+            layer.Soil = soilClay2;
+            soilProfile2.Layers.Add(layer);
+            layer = new SoilLayer1D();
+            layer.Id = "L3";
+            layer.Name = "Layer 3";
+            layer.TopLevel = -8.42;
+            layer.Soil = soilClay2;
+            soilProfile2.Layers.Add(layer);
+            layer = new SoilLayer1D();
+            layer.Id = "L4";
+            layer.Name = "Layer 4";
+            layer.TopLevel = -11.16;
+            layer.Soil = soilPeat2;
+            soilProfile2.Layers.Add(layer);
+            layer = new SoilLayer1D();
+            layer.Id = "L5";
+            layer.Name = "Layer 5";
+            layer.TopLevel = -17.23;
+            layer.Soil = soilClay2;
+            soilProfile2.Layers.Add(layer);
+            layer = new SoilLayer1D();
+            layer.Id = "L6";
+            layer.Name = "Layer 6";
+            layer.TopLevel = -25.78;
+            layer.Soil = soilSand2;
+            soilProfile2.Layers.Add(layer);
+            dike.SoilProfiles.Add(soilProfile2);
+
+            // Locations' Segment
+            location1.Segment = segment1;
+            location3.Segment = segment1;
+            location4.Segment = segment1;
+            location2.Segment = segment2;
+            location5.Segment = segment2;
+
+            // Locations' surface lines
+            location1.SurfaceLine2 = surfaceLine1;
+            location2.SurfaceLine2 = surfaceLine2;
+            location3.SurfaceLine2 = surfaceLine2;
+            location4.SurfaceLine2 = surfaceLine1;
+            location5.SurfaceLine2 = surfaceLine2;
+
+            // Segments' Soil profile probabilities
+            segment1.AddSoilProfileProbability(soilProfile1, 100.0, null);
+            segment2.AddSoilProfileProbability(soilProfile1, 32.4, null);
+            segment2.AddSoilProfileProbability(soilProfile2, 67.6, null);
+
+            // Surface lines' points
+            surfaceLine1.EnsurePointOfType(15.3, -3.52, CharacteristicPointType.SurfaceLevelOutside);
+            surfaceLine1.EnsurePointOfType(19.4, -1.46, CharacteristicPointType.DikeToeAtRiver);
+            surfaceLine1.EnsurePointOfType(27.4, 8.56, CharacteristicPointType.DikeTopAtRiver);
+            surfaceLine1.EnsurePointOfType(35.2, 8.62, CharacteristicPointType.DikeTopAtPolder);
+            surfaceLine1.EnsurePointOfType(41.5, -3.76, CharacteristicPointType.DikeToeAtPolder);
+            surfaceLine1.EnsurePointOfType(85.4, -3.61, CharacteristicPointType.SurfaceLevelInside);
+
+            surfaceLine2.EnsurePointOfType(0.0, -1.46, CharacteristicPointType.SurfaceLevelOutside);
+            surfaceLine2.EnsurePointOfType(19.4, -1.46, CharacteristicPointType.DikeToeAtRiver);
+            surfaceLine2.EnsurePointOfType(35.2, 8.62, CharacteristicPointType.DikeTopAtPolder);
+            surfaceLine2.EnsurePointOfType(41.5, -3.76, CharacteristicPointType.DikeToeAtPolder);
+            surfaceLine2.EnsurePoint(46.7, -3.82);
+            surfaceLine2.EnsurePoint(47.5, -4.78);
+            surfaceLine2.EnsurePoint(51.2, -4.82);
+            surfaceLine2.EnsurePoint(53.1, -3.78);
+            surfaceLine2.EnsurePointOfType(85.4, -3.61, CharacteristicPointType.SurfaceLevelInside);
+
+            // Gauges
+            Gauge gauge1 = new Gauge()
+            {
+                Name = "G1",
+                Location = location1,
+                LocalX = 1.5,
+            };
+            dike.Gauges.Add(gauge1);
+            Gauge gauge2 = new Gauge()
+            {
+                Name = "G2",
+                Location = location4,
+                LocalX = 3.1,
+            };
+            dike.Gauges.Add(gauge2);
+            Gauge gauge3 = new Gauge()
+            {
+                Name = "G1",
+                Location = location3,
+                LocalX = 2.5,
+            };
+            dike.Gauges.Add(gauge3);
+
+            // Gauge PL lines
+            GaugePLLine gaugePLLine1 = new GaugePLLine(PLLineType.PL2);
+            gaugePLLine1.Points.Add(new GaugePLLinePoint(0.5, 3.2, null, null));
+            gaugePLLine1.Points.Add(new GaugePLLinePoint(null, null, gauge1.Name, gauge1.Name));
+            gaugePLLine1.Points.Add(new GaugePLLinePoint(null, null, gauge3.Name, gauge2.Name));
+            dike.GaugePLLines.Add(gaugePLLine1);
+
+            GaugePLLine gaugePLLine2 = new GaugePLLine(PLLineType.PL4);
+            gaugePLLine2.Points.Add(new GaugePLLinePoint(0.7, 2.5, null, null));
+            gaugePLLine2.Points.Add(new GaugePLLinePoint(null, null, gauge1.Name, gauge1.Name));
+            gaugePLLine2.Points.Add(new GaugePLLinePoint(null, null, gauge3.Name, gauge2.Name));
+            dike.GaugePLLines.Add(gaugePLLine2);
+
+            DikeCoordinateSystemConverter dikeCoordinateSystemConverter = new DikeCoordinateSystemConverter();
+            dikeCoordinateSystemConverter.CreateLocalXZObjects(dike);
+            return dike;
+        }
+
+        /// <summary>
+        /// Creates an Segment object instance
+        /// </summary>
+        /// <param name="segmentId"></param>
+        /// <param name="soilProfileId">The soil profile for which the probability will be set</param>        
+        /// <param name="probability">The probability value</param>
+        /// <returns>Returns the constructed segment object</returns>
+        /// <exception cref="ArgumentNullException" />
+        /// <exception cref="RequiredEntityNotExistException" />
+        public Segment CreateSegment(string segmentId, string soilProfileId, double probability, FailureMechanismSystemType? segmentFailureMechanismType, string soilGeometry2DName)
+        {
+            ThrowHelper.ThrowIfStringArgumentNullOrEmpty(segmentId, StringResourceNames.SegmentIdArgumentNullOrEmpty);
+            ThrowWhenNoSoilGeometry(soilProfileId, soilGeometry2DName);
+            ThrowWhenDoubleSoilGeometry(soilProfileId, soilGeometry2DName);
+
+            // Lookup the segment to associate
+            var segment = segments.FirstOrDefault(s => s.Name == segmentId) ?? new Segment { Name = segmentId };
+            if (segments.Find(s => s.Name == segmentId) == null)
+            {
+                segments.Add(segment);
+            }
+            // Create 1d-soilprofile if defined
+            if (soilProfileId != null)
+            {
+                SoilProfile1D soilProfile;
+                soilProfile = soilProfiles.FirstOrDefault(s => s.Name == soilProfileId.ToString());
+                if (soilProfile == null)
+                {
+                    soilProfile = new SoilProfile1D() { Name = soilProfileId };
+                    soilProfiles.Add(soilProfile);
+                }
+                // Add the probability value to the table 
+                segment.AddSoilProfileProbability(soilProfile, probability, segmentFailureMechanismType);
+            }
+
+            // Create 2d-soilprofile if defined
+            if (soilGeometry2DName != null)
+            {
+                // Add the probability value to the table 
+                segment.AddSoilGeometry2DProbability(soilGeometry2DName, probability, segmentFailureMechanismType);
+            }
+
+
+            return segment;
+        }
+        
+        /// <summary>
+        /// Check if either a 1D-geometry or a 2D-geometry is specified
+        /// </summary>
+        /// <param name="soilProfileId"></param>
+        /// <param name="soilGeometry2DName"></param>
+        private void ThrowWhenNoSoilGeometry(string soilProfileId, string soilGeometry2DName)
+        {
+            ThrowHelper.ThrowWhenConditionIsTrue<EntityFactoryException>(
+                StringResourceNames.SoilProfileIdArgumentNullOrEmpty,
+                () => (String.IsNullOrEmpty(soilProfileId)) && (String.IsNullOrEmpty(soilGeometry2DName)));
+        }
+
+        /// <summary>
+        /// Check if both a 1D-geometry or a 2D-geometry is specified (which is not allowed)
+        /// </summary>
+        /// <param name="soilProfileId"></param>
+        /// <param name="soilGeometry2DName"></param>
+        private void ThrowWhenDoubleSoilGeometry(string soilProfileId, string soilGeometry2DName)
+        {
+            ThrowHelper.ThrowWhenConditionIsTrue<EntityFactoryException>(
+                StringResourceNames.SoilProfileIdArgumentNullOrEmpty,
+                () => (!String.IsNullOrEmpty(soilProfileId)) && (!String.IsNullOrEmpty(soilGeometry2DName)));
+        }
+
+        /// <summary>
+        /// Creates a new surface line point which will be added to the characteristics point collection
+        /// </summary>
+        /// <param name="surfaceLineId">The ID of the surface line containing the point collections</param>
+        /// <param name="characteristicPointType">The characteristic point type</param>
+        /// <param name="x">The x value</param>
+        /// <param name="z">The y value of the point</param>
+        /// <returns>The added surfaceline point</returns>
+        /// <remarks>The new point will only be added to the characteristic point collection when a match is found in the point collection of the surface line. An exception will be thrown if the point doesnt exist</remarks>
+        /// <exception cref="ArgumentNullException" />
+        /// <exception cref="RequiredEntityNotExistException" />
+        /// <exception cref="PointNotExistsException" />
+        public GeometryPoint CreateSurfaceLinePoint(string surfaceLineId, CharacteristicPointType characteristicPointType, double x, double z)
+        {
+            ThrowHelper.ThrowIfStringArgumentNullOrEmpty(surfaceLineId, StringResourceNames.SurfaceLineIdArgumentNullOrEmpty);
+
+            // it's required that the surface line with the given id exists if this is not the case an exception will be thrown
+            var surfaceLine = ThrowHelper.ThrowWhenRequiredEntityDoesntExistInLookup(
+                surfaceLines, surfaceLineId, s => s.Name == surfaceLineId);
+
+            var canAdd = (x != -1 || z != -1); // empty points will not be added 
+
+            GeometryPoint point = null;
+
+            if (canAdd)
+            {
+                // Is required because old data has been created by the klikprogramma of Erik Vastenburg
+                if (characteristicPointType == CharacteristicPointType.TrafficLoadOutside)
+                {
+                    const double cTolerance = 0.0051;
+                    point = surfaceLine.Geometry.Points.FirstOrDefault(p => p.X.AlmostEquals(x, cTolerance) && p.Z.AlmostEquals(z, cTolerance));
+                }
+                else
+                {
+                    point = surfaceLine.Geometry.Points.FirstOrDefault(p => p.X.AlmostEquals(x) && p.Z.AlmostEquals(z));
+                }
+
+                if (point != null)
+                {
+                    var index = FindUnannotatedGeometryPointForGivenLocation(surfaceLine, point);
+                    if (index == -1)
+                    {
+                        surfaceLine.AddCharacteristicPoint(point, characteristicPointType);
+                    }
+                    else
+                    {
+                        surfaceLine.CharacteristicPoints.Annotate(index, characteristicPointType);
+                    }
+                }
+                else
+                {
+                    throw new PointNotExistsException(
+                            surfaceLine.Name,
+                            characteristicPointType,
+                            point,
+                            ThrowHelper.GetResourceString(StringResourceNames.SurfaceLinePointNotExtists));
+                }
+            }
+
+            return point;
+        }
+
+        private static int FindUnannotatedGeometryPointForGivenLocation(SurfaceLine2 surfaceLine, GeometryPoint point)
+        {
+            int index = -1;
+            for (int i = 0; i < surfaceLine.CharacteristicPoints.Count; i++)
+            {
+                if (ReferenceEquals(surfaceLine.CharacteristicPoints[i].GeometryPoint, point) &&
+                    surfaceLine.CharacteristicPoints[i].CharacteristicPointType == CharacteristicPointType.None)
+                {
+                    index = i;
+                    break;
+                }
+            }
+            return index;
+        }
+
+        public Gauge CreateGauge(string gaugeId, string locationID, double localX)
+        {
+            ThrowHelper.ThrowIfStringArgumentNullOrEmpty(gaugeId, StringResourceNames.GaugeIdArgumentNullOrEmpty);
+            ThrowHelper.ThrowIfStringArgumentNullOrEmpty(locationID, StringResourceNames.LocationIdArgumentNullOrEmpty);
+
+            Location location = this.locations.FirstOrDefault(s => s.Name == locationID);
+            if (location == null)
+            {
+                throw new NonExistentLocationException(locationID, ThrowHelper.GetResourceString(StringResourceNames.NonExistentLocation));
+            }
+
+            Gauge gauge = this.gauges.FirstOrDefault(s => s.Name == gaugeId && s.Location == location) ?? new Gauge { Name = gaugeId };
+
+            gauge.Location = location;
+            gauge.LocalX = localX;
+
+            return gauge;
+        }
+
+        /// <summary>
+        /// Creates a scenario object
+        /// </summary>
+        /// <param name="locationId">The location id</param>
+        /// <param name="locationSegmentId">The location's scenario id</param>
+        /// <returns>A materialized object</returns>
+        /// <exception cref="ArgumentNullException" />
+        /// <exception cref="EntityAlreadyExistException"
+        public Scenario CreateScenario(string locationId, string locationScenarioId)
+        {
+            ThrowHelper.ThrowIfStringArgumentNullOrEmpty(locationId, StringResourceNames.SegmentIdArgumentNullOrEmpty);
+            ThrowHelper.ThrowIfStringArgumentNullOrEmpty(locationScenarioId, StringResourceNames.SegmentIdArgumentNullOrEmpty);
+
+            ThrowHelper.ThrowWhenConditionIsTrue(
+                scenarios.FirstOrDefault(s => s.Location.Name == locationId && s.LocationScenarioID == locationScenarioId),
+                StringResourceNames.EntityAlreadyExist,
+                c => c != null,
+                e => new EntityAlreadyExistException(ThrowHelper.GetResourceString(e))
+                );
+
+            // Lookup the location to associate
+            // if the item does not exist create one and add it to the lookup
+            Location location = this.locations.FirstOrDefault(s => s.Name == locationId);
+            if (location == null)
+            {
+                throw new NonExistentLocationException(locationId, ThrowHelper.GetResourceString(StringResourceNames.NonExistentLocation));
+            }
+
+
+            Scenario scenario = new Scenario()
+            {
+                Location = location,
+                LocationScenarioID = locationScenarioId
+            };
+
+            return scenario;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/Validator.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/Validator.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/Validator.cs	(revision 3305)
@@ -0,0 +1,35 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using Deltares.Dam.Data.Specifications;
+using Deltares.Standard.Specifications.Extensions;
+
+namespace Deltares.Standard.Specifications
+{
+    public static class Validator
+    {
+        public static IEnumerable<ValidationResult> Validate<T>(T target)
+        {
+            return target.Validate();
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationAttributeMapping.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationAttributeMapping.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationAttributeMapping.cs	(revision 3305)
@@ -0,0 +1,30 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Dam.Data.CsvImporters;
+using Deltares.Maps;
+
+namespace Deltares.Dam.Data.Importers
+{
+    public class LocationAttributeMapping : AttributeMapping<CsvImporterLocations.LocationRecord>
+    {
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/IDtoAssembler.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/IDtoAssembler.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/IDtoAssembler.cs	(revision 3305)
@@ -0,0 +1,138 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using System.Xml.Linq;
+
+namespace Deltares.Standard
+{
+    /// <summary>
+    /// Defines the contract of a data transfer object (dto) assembler
+    /// The interface should be used in scenario's where an domain object needs 
+    /// to be created from a dto and vice versa.
+    /// The dto in this case can be any class.
+    /// </summary>
+    /// <typeparam name="TDomainObject">The domain object type</typeparam>
+    /// <typeparam name="TDataTransferObject">The dto object type</typeparam>
+    public interface IDtoAssembler<TDomainObject, TDataTransferObject>
+    {
+        /// <summary>
+        /// Creates a domain object from dto 
+        /// </summary>
+        /// <param name="dtoObj">The dto to create a domain object from</param>
+        /// <returns>The domain object</returns>
+        TDomainObject CreateDomainObject(TDataTransferObject dtoObj);
+
+        /// <summary>
+        /// Creates a dto from a domain object
+        /// </summary>
+        /// <param name="domainObj">The domain object to create the dto from</param>
+        /// <returns>The dto object</returns>
+        TDataTransferObject CreateDataTransferObject(TDomainObject domainObj);
+    }
+
+    /// <summary>
+    /// Defines the contract of a data transfer object (dto) assembler
+    /// The interface should be used in scenario's where an domain object needs 
+    /// to be created from a dto and vice versa.
+    /// The dto in this case can be any class.
+    /// </summary>
+    /// <typeparam name="TDomainObject">The domain object type</typeparam>
+    /// <typeparam name="TDataTransferObject">The dto object type</typeparam>
+    public interface IDtoAssembler<TDomainInputObject, TDomainOutputObject, TDataTransferObject>
+    {
+        /// <summary>
+        /// Creates a domain object from output dto 
+        /// </summary>
+        /// <param name="dtoObj">The dto to create a domain object from</param>
+        /// <returns>The domain object</returns>
+        TDomainOutputObject CreateOutputObject(TDataTransferObject dto);
+
+        /// <summary>
+        /// Creates a domain object from output dto 
+        /// </summary>
+        /// <param name="dtoObj">The dto to create a domain object from</param>
+        /// <returns>The domain object</returns>
+        TDomainInputObject CreateInputObject(TDataTransferObject dto);
+
+        /// <summary>
+        /// Creates a dto from a domain input object
+        /// </summary>
+        /// <param name="domainObj">The domain object to create the dto from</param>
+        /// <returns>The dto object</returns>
+        TDataTransferObject CreateDataTransferObject(TDomainInputObject input);
+    }
+
+
+    /// <summary>
+    /// Defines the contract of a data transfer object (dto) assembler
+    /// The interface should be used in scenario's where an domain object needs 
+    /// to be created from a dto and vice versa.
+    /// The dto in this case is a <see cref="XElement"/> object.
+    /// </summary>
+    /// <typeparam name="TDomainObject">The domain object type</typeparam>
+    public interface IDtoAssembler<TDomainObject> : IDtoAssembler<TDomainObject, XElement>
+    {
+        string ElementName { get; }
+    }
+
+    /// <summary>
+    /// Defines the contract of a data transfer object (dto) collection assembler
+    /// The interface should be used in scenario's where an domain object collections needs 
+    /// to be created from a dto collection and vice versa.
+    /// The dto in this case is a <see cref="XElement"/> object.
+    /// </summary>
+    /// <typeparam name="TDomainObject">The domain object type in the collection</typeparam>
+    /// <typeparam name="TDataTransferObject">The data transfer object type in the collection</typeparam>
+    public interface IDtoCollectionAssembler<TDomainObject, TDataTransferObject>
+    {
+        /// <summary>
+        /// Gets the entity assembler
+        /// </summary>
+        IDtoAssembler<TDomainObject> EntityAssembler { get; }
+
+        /// <summary>
+        /// Create the domain object collection
+        /// </summary>
+        /// <param name="dtoCollObj">The dto collection object from which to create domain collection</param>
+        /// <returns>The (typed) domain object collection</returns>
+        IEnumerable<TDomainObject> CreateDomainObjectCollection(TDataTransferObject dtoCollObj);
+
+        /// <summary>
+        /// Created the data transfer collection object
+        /// </summary>
+        /// <param name="domainCollObj">The domain collection from which to create the dto collection</param>
+        /// <returns>The dto collection object</returns>
+        TDataTransferObject CreateDataTransferObject(IEnumerable<TDomainObject> domainCollObj);
+    }
+
+    /// <summary>
+    /// Defines the contract of a data transfer object (dto) collection assembler
+    /// The interface should be used in scenario's where an domain object collections needs 
+    /// to be created from a dto collection and vice versa.
+    /// The dto in this case is a <see cref="XElement"/> object.
+    /// </summary>
+    /// <typeparam name="TDomainObject">The domain object type in the collection</typeparam>
+    public interface IDtoCollectionAssembler<TDomainObject> : IDtoCollectionAssembler<TDomainObject, XElement>
+    {
+        string ElementName { get; }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/LessThanOrEqualToSpecification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/LessThanOrEqualToSpecification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/LessThanOrEqualToSpecification.cs	(revision 3305)
@@ -0,0 +1,39 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+
+namespace Deltares.Standard.Specifications
+{
+    public class LessThanOrEqualToSpecification<TCandidate, TValue> : ValueBoundSpecification<TCandidate, TValue> where TValue : IComparable
+    {
+        public LessThanOrEqualToSpecification(string attributeName, TValue attributeValue)
+            : base(attributeName, attributeValue)
+        {
+        }
+
+        public override bool IsSatisfiedBy(TCandidate candidate)
+        {
+            var actual = this.GetCandidateTValue(candidate) as IComparable;
+            return (actual.CompareTo(this.AttributeValue) <= 0);
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/GeometryRepositoryExtensions.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/GeometryRepositoryExtensions.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/GeometryRepositoryExtensions.cs	(revision 3305)
@@ -0,0 +1,79 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Deltares.Maps
+{
+    public static class GeometryRepositoryExtensions
+    {
+        /// <summary>
+        ///     Determines if lines in the source repository have an intersection with lines in the target repository,
+        ///     the result is grouped by the count of intersection points
+        /// </summary>
+        /// <param name="sourceRepository"></param>
+        /// <param name="targetRepository"></param>
+        /// <returns>
+        ///     A list of target and source geometries and the calculated intersection points grouped by the count of
+        ///     intersection points
+        /// </returns>
+        public static IEnumerable<IGrouping<int, IntersectionResult>> GetIntersectionPoints(
+            this IFeatureRepository sourceRepository, IFeatureRepository targetRepository)
+        {
+            /*
+            var results = from source in sourceRepository.Features
+                          from target in targetRepository.Query(source)
+                          let intersectionPoints = target.Geometry.Intersection(source.Geometry)
+                          select new IntersectionResult()
+                                     {
+                                         Source = source,
+                                         Target = target,
+                                         IntersectionPoints = intersectionPoints.Coordinates
+                                     };
+*/
+
+            var results = new List<IntersectionResult>();
+            foreach (IFeature source in sourceRepository.Features)
+            {
+                foreach (IFeature target in targetRepository.Query(source))
+                {
+                    results.Add(new IntersectionResult
+                    {
+                        Source = source,
+                        Target = target,
+                        IntersectionPoints = target.Geometry.Intersection(source.Geometry).Coordinates
+                    });
+                }
+            }
+
+            return from result in results
+                group result by result.IntersectionPoints.Count();
+        }
+
+        public static IEnumerable<IntersectionResult> GetResultsHavingCount(
+            this IEnumerable<IGrouping<int, IntersectionResult>> results, int count)
+        {
+            IGrouping<int, IntersectionResult> havingKey = results.FirstOrDefault(r => r.Key == count);
+            return havingKey == null ? new List<IntersectionResult>() : havingKey.Select(r => r);
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/ValidationException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/ValidationException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/ValidationException.cs	(revision 3305)
@@ -0,0 +1,48 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Deltares.Standard.Specifications
+{
+    [Serializable]
+    public class ValidationException : Exception
+    {
+        public ValidationException()
+        {
+        }
+
+        public ValidationException(string message) : base(message)
+        {
+        }
+
+        public ValidationException(string message, Exception inner) : base(message, inner)
+        {
+        }
+
+        protected ValidationException(
+            SerializationInfo info,
+            StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/FileIdentification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/FileIdentification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/FileIdentification.cs	(revision 3305)
@@ -0,0 +1,78 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Reflection;
+
+namespace Deltares.Standard
+{
+    /// <summary>
+    /// This class contains general properties which can be used in the header of an xml file or in
+    /// data transfer objects like <see cref="Deltares.CptInterpretation.CptDialogDocument"/> or <see cref="Deltares.GroundwaterFlow.WellCalcDoc"/>
+    /// </summary>
+    public class FileIdentification
+    {
+        public FileIdentification()
+            : this(Assembly.GetCallingAssembly())
+        {
+        }
+
+        public FileIdentification(Assembly assembly)
+        {
+            this.Application = assembly.GetName().Name;
+            this.Version = assembly.GetName().Version.ToString();
+            this.Company = "Deltares";
+            this.Created = DateTime.UtcNow;
+        }
+
+        /// <summary>
+        /// The name of the applcation where the xml data is coming from
+        /// </summary>
+        public string Application { get; set; }
+
+        /// <summary>
+        /// The version of the application or dll where this data is form
+        /// </summary>
+        public string Version { get; set; }
+
+        /// <summary>
+        /// The name of the company 
+        /// </summary>
+        public string Company { get; set; }
+
+        /// <summary>
+        /// The license of the application
+        /// </summary>
+        /// <remarks>This property is not required</remarks>
+        public string License { get; set; }
+
+        /// <summary>
+        /// A general description of the application where the data belongs to
+        /// </summary>
+        /// <remarks>This property is not required</remarks>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// Date time stamp of the creation of the data data items
+        /// </summary>
+        public DateTime Created { get; set; }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Properties/AssemblyInfo.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Properties/AssemblyInfo.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Properties/AssemblyInfo.cs	(revision 3305)
@@ -0,0 +1,60 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of the application DAM - UI.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+
+[assembly: AssemblyTitle("Deltares.Maps.Test")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("WL | Delft Hydraulics")]
+[assembly: AssemblyProduct("Deltares.Maps.Test")]
+[assembly: AssemblyCopyright("Copyright © WL | Delft Hydraulics 2011")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+
+[assembly: Guid("841a94ce-ee18-41a1-87b4-5d6c98edf935")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/NotNullSpecification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/NotNullSpecification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/NotNullSpecification.cs	(revision 3305)
@@ -0,0 +1,37 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Standard.Specifications
+{
+    public class NotNullSpecification : SpecificationBase<object>
+    {
+        public NotNullSpecification()
+        {
+            Name = "Not null specification";
+            Description = "The candidate should have a value other then null";
+        }
+
+        public override bool IsSatisfiedBy(object candidate)
+        {
+            return candidate != null;
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoPropertyAttributeMap.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoPropertyAttributeMap.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoPropertyAttributeMap.cs	(revision 3305)
@@ -0,0 +1,343 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Deltares.Standard.IO.DtoAssembler;
+
+namespace Deltares.Standard
+{
+    /// <summary>
+    /// The property bag defines a dynamic property collection (dictionary)
+    /// </summary>
+    public class DtoPropertyAttributeMap : IDictionary<string, DtoPropertyAttriubteMapping>
+    {
+        /// <summary>
+        /// Holds the property dictionary
+        /// </summary>
+        private readonly IDictionary<string, DtoPropertyAttriubteMapping> dict = new Dictionary<string, DtoPropertyAttriubteMapping>();
+
+        #region IDictionary<string,DtoPropertyAttriubteMapping> Members
+
+        /// <summary>
+        /// Adds a property attribute mapping to the dictionary
+        /// </summary>
+        /// <param name="propName">The name of the property</param>
+        /// <param name="value">The value</param>
+        public void Add(string propName, DtoPropertyAttriubteMapping item)
+        {
+            if (item == null)
+                throw new DtoPropertyMapException("Cannot add an empty or null item to the map");
+
+            if (!item.PropertyName.HasValidStringValue() || propName != item.PropertyName)
+                throw new DtoPropertyMapException("Property name is empty or doesn't match dictionary property name (key)");
+
+            this.dict.Add(propName, item);
+        }
+
+        /// <summary>
+        /// Determinses wheter the dictionary contains the specified key
+        /// </summary>
+        /// <param name="propName">The name of the property</param>
+        /// <returns></returns>
+        public bool ContainsKey(string propName)
+        {
+            return this.dict.ContainsKey(propName);
+        }
+
+        /// <summary>
+        /// Gets the containing keys
+        /// </summary>
+        public ICollection<string> Keys
+        {
+            get { return this.dict.Keys; }
+        }
+
+        /// <summary>
+        /// Removes a key from the dictionary
+        /// </summary>
+        /// <param name="propName">The key or property name </param>
+        /// <returns>Booleand value indicating when the item is successfuly removed</returns>
+        public bool Remove(string propName)
+        {
+            return this.dict.Remove(propName);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="propName"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public bool TryGetValue(string propName, out DtoPropertyAttriubteMapping value)
+        {
+            return this.dict.TryGetValue(propName, out value);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public ICollection<DtoPropertyAttriubteMapping> Values
+        {
+            get { return this.dict.Values; }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="propName"></param>
+        /// <returns></returns>
+        public DtoPropertyAttriubteMapping this[string propName]
+        {
+            get { return this.dict[propName]; }
+            set { this.dict[propName] = value; }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="item"></param>
+        public void Add(KeyValuePair<string, DtoPropertyAttriubteMapping> item)
+        {
+            this.dict.Add(item.Key, item.Value);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void Clear()
+        {
+            this.dict.Clear();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns></returns>
+        public bool Contains(KeyValuePair<string, DtoPropertyAttriubteMapping> item)
+        {
+            return ((IDictionary<string, DtoPropertyAttriubteMapping>) this.dict).Contains(item);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="array"></param>
+        /// <param name="arrayIndex"></param>
+        public void CopyTo(KeyValuePair<string, DtoPropertyAttriubteMapping>[] array, int arrayIndex)
+        {
+            ((IDictionary<string, DtoPropertyAttriubteMapping>) this.dict).CopyTo(array, arrayIndex);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Count
+        {
+            get { return this.dict.Count; }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public bool IsReadOnly
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns></returns>
+        public bool Remove(KeyValuePair<string, DtoPropertyAttriubteMapping> item)
+        {
+            return this.dict.Remove(item.Key);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerator<KeyValuePair<string, DtoPropertyAttriubteMapping>> GetEnumerator()
+        {
+            return this.dict.GetEnumerator();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return (IEnumerator) ((IDictionary<string, DtoPropertyAttriubteMapping>) this.dict).GetEnumerator();
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Adds a property attribute mapping to the dictionary
+        /// </summary>
+        /// <param name="item">The <see cref="DtoPropertyAttriubteMapping"/> item to add</param>
+        public void Add(DtoPropertyAttriubteMapping item)
+        {
+            if (item == null)
+                throw new ArgumentNullException("item");
+
+            this.Add(item.PropertyName, item);
+        }
+
+        /// <summary>
+        /// Adds a or updtes a property attribute mapping to the dictionary
+        /// </summary>
+        /// <param name="item">The <see cref="DtoPropertyAttriubteMapping"/> item to add</param>
+        public void AddOrUpdate(string propName, string attrName)
+        {
+            this.AddOrUpdate(propName, attrName, DtoPropertyImportance.Optional);
+        }
+
+        /// <summary>
+        /// Adds a or updtes a property attribute mapping to the dictionary
+        /// </summary>
+        /// <param name="item">The <see cref="DtoPropertyAttriubteMapping"/> item to add</param>
+        public void AddOrUpdate(string propName, string attrName, DtoPropertyImportance importance)
+        {
+            if (!attrName.HasValidStringValue())
+                throw new DtoPropertyMapException("attrName");
+
+            this.AddOrUpdate(propName,
+                             new DtoPropertyAttriubteMapping()
+                                 {
+                                     PropertyName = propName,
+                                     AttributeName = attrName,
+                                     Importance = importance
+                                 });
+        }
+
+
+        /// <summary>
+        /// Adds a or updtes a property attribute mapping to the dictionary
+        /// </summary>
+        /// <param name="item">The <see cref="DtoPropertyAttriubteMapping"/> item to add</param>
+        public void AddOrUpdate(DtoPropertyAttriubteMapping item)
+        {
+            if (item == null)
+                throw new ArgumentNullException("item");
+
+            this.AddOrUpdate(item.PropertyName, item);
+        }
+
+
+        /// <summary>
+        /// Adds or updates new items in the dictionary
+        /// </summary>
+        /// <param name="propName">The name of the property</param>
+        /// <param name="value">The value</param>
+        public void AddOrUpdate(string propName, DtoPropertyAttriubteMapping item)
+        {
+            if (item == null)
+                throw new ArgumentNullException("item");
+
+            if (!propName.HasValidStringValue())
+                throw new DtoPropertyMapException("Property name (or key) is empty");
+
+            if (!this.dict.ContainsKey(propName))
+            {
+                this.Add(item.PropertyName, item);
+            }
+            else
+            {
+                this.dict[propName] = item;
+            }
+        }
+
+        /// <summary>
+        /// Adds or updates new items in the dictionary
+        /// </summary>
+        /// <param name="coll">The key value pair collection to handle</param>
+        public void AddOrUpdateRange(IEnumerable<DtoPropertyAttriubteMapping> coll)
+        {
+            foreach (DtoPropertyAttriubteMapping item in coll)
+            {
+                this.AddOrUpdate(item);
+            }
+        }
+
+        /// <summary>
+        /// Gets an item by property name
+        /// </summary>
+        /// <param name="name">The name of the property to look for</param>
+        /// <returns>The item if found null otherwise</returns>
+        public DtoPropertyAttriubteMapping GetByPropertyName(string name)
+        {
+            return this.GetByPropertyName(name, StringComparison.InvariantCultureIgnoreCase);
+        }
+
+        /// <summary>
+        /// Gets an item by property name
+        /// </summary>
+        /// <param name="name">The name of the property to look for</param>        
+        /// <param name="comparisonType">The string <see cref="StringComparison"/> type</param>
+        /// <returns>The item if found null otherwise</returns>
+        public DtoPropertyAttriubteMapping GetByPropertyName(string name, StringComparison comparisonType)
+        {
+            IEnumerable<DtoPropertyAttriubteMapping> q = from x in this.dict.Values
+                                                         where x.PropertyName.Equals(name, comparisonType)
+                                                         select x;
+
+            if (q.Any())
+                return q.Single();
+
+            return null;
+        }
+
+        /// <summary>
+        /// Gets an item by attribute name
+        /// </summary>
+        /// <param name="name">The name of the property to look for</param>
+        /// <returns>The item if found null otherwise</returns>
+        public DtoPropertyAttriubteMapping GetByAttributeName(string name)
+        {
+            return this.GetByAttributeName(name, StringComparison.InvariantCultureIgnoreCase);
+        }
+
+        /// <summary>
+        /// Gets an item by attribute name
+        /// </summary>
+        /// <param name="name">The name of the property to look for</param>
+        /// <param name="comparisonType">The string <see cref="StringComparison"/> type</param>
+        /// <returns>The item if found null otherwise</returns>
+        public DtoPropertyAttriubteMapping GetByAttributeName(string name, StringComparison comparisonType)
+        {
+            IEnumerable<DtoPropertyAttriubteMapping> q = from x in this.dict.Values
+                                                         where x.AttributeName.Equals(name, comparisonType)
+                                                         select x;
+
+            if (q.Any())
+                return q.Single();
+
+            return null;
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LineAttributeImporter.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LineAttributeImporter.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LineAttributeImporter.cs	(revision 3305)
@@ -0,0 +1,297 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//#define INCLUDE_ALL_LINE_TYPES
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using Deltares.Dam.Data.CsvImporters;
+using Deltares.Maps;
+
+namespace Deltares.Dam.Data.Importers
+{
+    /// <summary>
+    /// Exception for the class LineAttributeImporter
+    /// </summary>
+    public class LineAttributeImporterException : Exception
+    {
+        public LineAttributeImporterException()
+        {
+        }
+
+        public LineAttributeImporterException(string message)
+            : base(message)
+        {
+        }
+
+        public LineAttributeImporterException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+    }
+
+    public class LineAttributeImporter<T> : IAttributeImporter<T> where T : CsvImporterLocations.LocationRecord
+    {
+        private readonly IList<Exception> errors;
+        private IDictionary<string, T> targetLookup;
+
+        public LineAttributeImporter()
+        {
+            this.errors = new List<Exception>();
+            this.targetLookup = new Dictionary<string, T>();
+        }
+
+        /// <summary>
+        /// Gets or sets the target objects
+        /// </summary>
+        public IEnumerable<T> Targets
+        {
+            private get { return this.targetLookup.Values; }
+            set
+            {
+                if (value != null)
+                {
+                    this.targetLookup = value.ToDictionary(k => k.LocationId.ToLowerInvariant(), v => v);
+
+                    if (CrossSectionRepository != null)
+                    {
+                        // Filter out all locations which are not subject for the intersection query..
+                        CrossSectionRepository.Remove(f => !targetLookup.ContainsKey(GetID(f)));                        
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// </summary>
+        public IFeatureRepository AttributeRepository { internal get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string LocationIDAttributeName { private get; set; }
+
+        private IFeatureRepository crossSectionRepository;
+
+        /// <summary>
+        /// Gets or sets the cross section repository
+        /// </summary>
+        public IFeatureRepository CrossSectionRepository
+        {
+            get { return this.crossSectionRepository; }
+            set
+            {
+                this.crossSectionRepository = value;
+                if (this.targetLookup != null && 
+                    this.targetLookup.Count > 0 && 
+                    value != null && 
+                    IsValidString(LocationIDAttributeName))
+                {
+                    // Filter out all locations which are not subject for the intersection query..
+                    CrossSectionRepository.Remove(f => !targetLookup.ContainsKey(GetID(f)));
+                }                
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public IEnumerable<Exception> Errors
+        {
+            get { return this.errors; }
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the file.
+        /// </summary>
+        /// <value>
+        /// The name of the file.
+        /// </value>
+        public string FileName { private get; set; }
+
+        public void AddError(Exception exception)
+        {
+            this.errors.Add(exception);
+        }
+
+        /// <summary>
+        /// Sets the attribute mappings
+        /// </summary>
+        public IEnumerable<AttributeMapping<T>> AttributeMappings { private get; set; }
+
+        private  string GetID(IFeature feature)
+        {
+            bool attributeExists = feature.Attributes.Exists(LocationIDAttributeName);
+            if (!attributeExists)
+            {
+                throw new LineAttributeImporterException(String.Format("Cannot find attribute '{0}'", LocationIDAttributeName));
+            }
+            return feature.Attributes[LocationIDAttributeName].ToString().ToLowerInvariant();
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <remarks>
+        /// Preconditions:
+        /// - A valid data folder needs to given
+        /// - A set of "targets" with their characteristic points table and initialized id's available from the waterboard
+        /// - The required files need to be in the data folder (one for the characteristics points, 
+        /// - A set of (characteristic) lines wich have to be retrieved from the files
+        ///   
+        /// Postconditions:
+        /// - Some targets (the result of a join from the Location shape file and the existing location list from the Waterboard) have new characteristic point values
+        /// 
+        /// </remarks>
+        /// <exception cref="FileNotFoundException" />
+        /// <exception cref="ArgumentNullException" />
+        /// <exception cref="ArgumentException" />
+        /// <exception cref="IOException" />
+        public void Import()
+        {
+            if (AttributeRepository == null)
+                throw new InvalidOperationException("No repository set");
+
+            if (!AttributeRepository.SupportedAttributes.Any())
+                throw new InvalidOperationException("The repository doesn't contain attributes");
+
+            if (!IsValidString(LocationIDAttributeName))
+                throw new InvalidOperationException("The location ID attribute name is not valid");
+
+            if (this.CrossSectionRepository == null)
+                throw new InvalidOperationException("No cross section repository set");
+
+            if (AttributeMappings == null)
+                throw new InvalidOperationException("No attribute mappings set");
+            
+            // Find the intersection points between the geometries
+
+            IEnumerable<IGrouping<int, IntersectionResult>> results = this.CrossSectionRepository.GetIntersectionPoints(AttributeRepository);
+
+            int count = 0; // <- using count to omit the Linq.Count() for perfomance reasons
+            IEnumerable<IntersectionResult> work = results.GetResultsHavingCount(1);
+            foreach (IntersectionResult intersectionResult in work)
+            {
+                foreach (AttributeMapping<T> mapping in AttributeMappings)
+                {
+                   
+                    IFeature crossSection, attributeLine;
+                    if (intersectionResult.Source.Attributes.Exists(mapping.Name))
+                    {
+                        crossSection = intersectionResult.Target;
+                        attributeLine = intersectionResult.Source;
+                    }
+                    else
+                    {
+                        if (intersectionResult.Target.Attributes.Exists(mapping.Name))
+                        {
+                            crossSection = intersectionResult.Source;
+                            attributeLine = intersectionResult.Target;
+                        }
+                        else
+                        {            
+                            AddError(new AttributeMissingException(mapping.Name));
+                            continue;
+                        }
+                    }
+
+                    // Get the surface line for the location having the location ID
+                    string locationId = GetID(crossSection);
+                    if (!targetLookup.ContainsKey(locationId))
+                    {
+                        this.errors.Add(new ImportException(string.Format("Location {0} not found", LocationIDAttributeName)));
+                        continue;
+                    }
+                    T target = targetLookup[locationId];
+                    object value = attributeLine.Attributes[mapping.Name];
+
+                    try
+                    {
+                        // set the value on target property
+                        mapping.Action(target, value);
+                        if (mapping.Name.ToUpper() == "DAMPINGPL3")
+                        {
+                            if (target.DampingFactorPl3 < 0 || target.DampingFactorPl3 > 1)
+                            {
+                                AddError(new AttributeWrongValueException(mapping.Name, target.DampingFactorPl3.Value, 0.0, 1.0));
+                                target.DampingFactorPl3 = 0;
+                            }
+                        }
+                        if (String.Compare(mapping.Name, "DampingPL4", true) == 0)
+                        {
+                            if (target.DampingFactorPl4 < 0 || target.DampingFactorPl4 > 1)
+                            {
+                                AddError(new AttributeWrongValueException(mapping.Name, target.DampingFactorPl4.Value, 0.0, 1.0));
+                                target.DampingFactorPl4 = 0;
+                            }
+                        }
+                        count++;
+                    }
+                    catch (Exception e)
+                    {   
+                        throw new AttributeParseException(
+                            string.Format("Error parsing the value '{0}' of '{1}' for target '{2}' ", value.ToString().Replace("\0", ""), 
+                            mapping.Name, target.LocationId), e);
+                    }
+                }
+            }
+            if (count == 0)
+            {
+                this.errors.Add(new NotSupportedException("There are none or multiple intersections found. There should be exactly one intersection for each location in the target repository"));
+            }
+        }
+
+        private static bool IsValidString(string value)
+        {
+            return !(string.IsNullOrEmpty(value) || value.Trim() == string.Empty);
+        }
+    }
+
+    [Serializable]
+    public class AttributeParseException : Exception
+    {
+        //
+        // For guidelines regarding the creation of new exception types, see
+        //    http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpgenref/html/cpconerrorraisinghandlingguidelines.asp
+        // and
+        //    http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dncscol/html/csharp07192001.asp
+        //
+
+        public AttributeParseException()
+        {
+        }
+
+        public AttributeParseException(string message) : base(message)
+        {
+        }
+
+        public AttributeParseException(string message, Exception inner) : base(message, inner)
+        {
+        }
+
+        protected AttributeParseException(
+            SerializationInfo info,
+            StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs	(revision 3305)
@@ -0,0 +1,2394 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.ComponentModel;
+using System.Diagnostics;
+using System.IO;
+using System.Xml.Serialization;
+using Deltares.Geographic;
+using Deltares.Geometry;
+using Deltares.Standard;
+using Deltares.Standard.EventPublisher;
+using Deltares.Standard.Units;
+using System;
+using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.SurfaceLines;
+using Deltares.Standard.Attributes;
+
+namespace Deltares.Dam.Data
+{
+    /// <summary>
+    /// Class for presenting Design results.
+    /// </summary>
+    /// <seealso cref="System.ICloneable" />
+    /// <seealso cref="Deltares.Standard.IVisibleEnabled" />
+    /// <seealso cref="Deltares.Geographic.IGeographicPoint" />
+    public class CsvExportData : IVisibleEnabled, IGeographicPoint
+    {
+        private string baseFileName;
+        private string scenarioName;
+        private string locationName;
+        private int locationScenarioCount;
+        private double xRd;
+        private double yRd;
+        private string profileName;
+
+        private string calculationSubDir;
+        private string dikeName;
+        private AnalysisType analysisType;
+        private DamFailureMechanismeCalculationSpecification damFailureMechanismeCalculationSpecification;
+        private Scenario scenario;
+        private SoilProfile1D soilProfile;
+        private string soilGeometry2DName;
+        private double? localPipingExitPointX;
+        private double? safetyFactorStability;
+        private double? zone1SafetyFactorStability;
+        private double? localZone1EntryPointX;
+        private double? localZone1ExitPointX;
+        private double? zone2SafetyFactorStability;
+        private double? localZone2EntryPointX;
+        private double? localZone2ExitPointX;
+        private double? upliftFactor;
+        private double? heaveFactor;
+        private double? blighPipingFactor;
+        private double? blighHCritical;
+        private double? sellmeijer2ForcesPipingFactor;
+        private double? sellmeijer2ForcesHCritical;
+        private double? sellmeijer4ForcesPipingFactor;
+        private double? sellmeijer4ForcesHCritical;
+        private double? sellmeijerPipingFactor;
+        private double? sellmeijerHCritical;
+        private double? wti2017BackwardErosionSafetyFactor;
+        private double? wti2017BackwardErosionHcritical;
+        private double? wti2017UpliftSafetyFactor;
+        private double? wti2017UpliftHcritical;
+        private double? wti2017BackwardErosionDeltaPhiC;
+        private double? wti2017BackwardErosionDeltaPhiReduced;
+        private double? wti2017UpliftDeltaPhiC;
+        private double? wti2017HeaveSafetyFactor;
+        private double? wti2017HeaveHcritical;
+        private double? wti2017Gradient;
+        private double? wti2017SafetyFactorOverall;
+        private double? wti2017HcriticalOverall;
+        private double? wti2017EffectiveStress;
+        private double? wti2017CCreep;
+
+        private bool? isUplift;
+        private double? pl3MinUplift;
+        private double? pl3HeadAdjusted;
+        private double? pl3LocalLocationXMinUplift;
+        private double? pl4MinUplift;
+        private double? pl4HeadAdjusted;
+        private double? pl4LocalLocationXMinUplift;
+        private CalculationResult calculationResult = CalculationResult.NoRun;
+        private string resultMessage = "";
+        private int numberOfIterations;
+        private MStabModelType? stabilityModel;
+
+        private ResultEvaluation resultEvaluation = ResultEvaluation.NotEvaluated;
+        private string notes = "";
+
+        private StabilityKernelType selectedStabilityKernelType = StabilityKernelType.DamClassicStability;
+        // redesigned LOCAL surfaceline (initialized with original local surfaceline)
+        private SurfaceLine2 redesignedSurfaceLine;
+        // redesigned Global surfaceline in use for this result (either piping or stability)
+        private SurfaceLine2 redesignedSurfaceLineGlobal;
+
+        public CsvExportData()
+        {
+            // this contructor is needed for the UI table eventhough is seems not to be referenced.
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CsvExportData"/> class.
+        /// </summary>
+        /// <param name="locationName">Name of the location.</param>
+        /// <param name="scenarioName">Name of the scenario.</param>
+        public CsvExportData(string locationName, string scenarioName)
+        {
+            this.locationName = locationName;
+            this.scenarioName = scenarioName;
+        }
+
+        /// <summary>
+        /// Determines the global point coordinates based on global surface line.
+        /// </summary>
+        /// <param name="localPoint">The local point.</param>
+        /// <param name="globalSurfaceLine">The global surface line.</param>
+        /// <returns></returns>
+        private GeometryPoint DetermineGlobalPointCoordinatesBasedOnGlobalSurfaceLine(GeometryPoint localPoint, SurfaceLine2 globalSurfaceLine)
+        {
+            CoordinateSystemConverter coordinateSystemConverter = new CoordinateSystemConverter();
+            coordinateSystemConverter.DefineGlobalXYZBasedOnLine(globalSurfaceLine.Geometry);
+
+            coordinateSystemConverter.ConvertLocalXZToGlobalXYZ(localPoint);
+            return localPoint;
+        }
+
+        [Browsable(false)]
+        public StabilityKernelType SelectedStabilityKernelType
+        {
+            get { return selectedStabilityKernelType; } 
+            set { selectedStabilityKernelType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the number of iterations (as used in the design calculation).
+        /// </summary>
+        /// <value>
+        /// The number of iterations.
+        /// </value>
+        [ReadOnly(true)]
+        public int NumberOfIterations
+        {
+            get
+            {
+                return numberOfIterations;
+            }
+            set { numberOfIterations = value; }
+        }
+
+        /// <summary>
+        /// Gets the result file.
+        /// </summary>
+        /// <value>
+        /// The result file.
+        /// </value>
+        [Browsable(false)]
+        public string ResultFile
+        {
+            get
+            {
+                if (!String.IsNullOrEmpty(BaseFileName))
+                {
+                    const string wmfExtension = ".wmf";
+                    string fullBaseFilename = DamProject.ProjectWorkingPath;
+                    if (CalculationSubDir !=  "")
+                    {
+                        fullBaseFilename = Path.Combine(fullBaseFilename, CalculationSubDir);
+                    }
+                    fullBaseFilename = fullBaseFilename + Path.DirectorySeparatorChar + BaseFileName;
+                    string fullFilename = fullBaseFilename + wmfExtension;
+                    if (!File.Exists(fullFilename))
+                    {
+                        fullFilename = fullBaseFilename + "z1" + wmfExtension;
+                    }
+                    if (!File.Exists(fullFilename))
+                    {
+                        fullFilename = fullBaseFilename + "z2" + wmfExtension;
+                    }
+                    return fullFilename;
+                }
+                return "";
+            }
+        }
+
+        /// <summary>
+        /// Gets the input file.
+        /// </summary>
+        /// <value>
+        /// The input file.
+        /// </value>
+        [Browsable(false)]
+        private string InputFile
+        {
+            get
+            {
+                if (!String.IsNullOrEmpty(BaseFileName))
+                {
+                    string fileExtension = ".sti";
+                    if (selectedStabilityKernelType != StabilityKernelType.DamClassicStability)
+                    {
+                        fileExtension = ".dsx";
+                    }
+                    string fullBaseFilename = DamProject.ProjectWorkingPath;
+                    if (CalculationSubDir != "")
+                    {
+                        fullBaseFilename = Path.Combine(fullBaseFilename, CalculationSubDir);
+                    }
+                    fullBaseFilename = fullBaseFilename + Path.DirectorySeparatorChar + BaseFileName;
+                    string fullFilename = fullBaseFilename + fileExtension;
+                    return fullFilename;
+                }
+                return "";
+            }
+        }
+
+        /// <summary>
+        /// Gets the piping result file.
+        /// </summary>
+        /// <value>
+        /// The piping result file.
+        /// </value>
+        [Browsable(false)]
+        private string PipingResultFile
+        {
+            // Path of piping is not based on the working dir but on assembly (Assembly.GetExecutingAssembly().Location)
+            get
+            {
+                if (!String.IsNullOrEmpty(BaseFileName))
+                {
+                    const string txtExtension = ".txt";
+                    string fullBaseFilename = DamProject.ProjectWorkingPath;
+                    if (CalculationSubDir != "")
+                    {
+                        fullBaseFilename = Path.Combine(fullBaseFilename, CalculationSubDir);
+                    }
+                    fullBaseFilename = fullBaseFilename + Path.DirectorySeparatorChar + BaseFileName;
+                    string fullFilename = fullBaseFilename + txtExtension;
+                    return fullFilename;
+                }
+                return "";
+            }
+        }
+
+        [PropertyOrder(1, 2)]
+        [ReadOnly(true)]
+        public AnalysisType AnalysisType // moet vanuit invoer komen
+        {
+            get { return analysisType; }
+            set { analysisType = value; }
+        }
+
+        [Browsable(false)]
+        public DamFailureMechanismeCalculationSpecification DamFailureMechanismeCalculation // moet vanuit invoer komen
+        {
+            get { return damFailureMechanismeCalculationSpecification; }
+            set
+            {
+                // Clone the specification to ensure a non-changeable version.
+                damFailureMechanismeCalculationSpecification = value.Clone();
+            }
+        }
+
+        [CsvExportColumn("DikeName", 2)]
+        [Browsable(false)]
+        public string DikeName
+        {
+            get
+            {
+                return dikeName;
+            }
+            set
+            {
+                dikeName = value;
+            }
+        }
+
+        [CsvExportColumn("Calculation", 3)]
+        [Browsable(false)]
+        public string Calculation
+        {
+            get { return damFailureMechanismeCalculationSpecification != null ? damFailureMechanismeCalculationSpecification.ToString() : ""; }
+        }
+
+        [CsvExportColumn("Scenario", 4)]
+        [Browsable(false)]
+        public string ScenarioName
+        {
+            get
+            {
+                return scenarioName; 
+            }
+            set
+            {
+                scenarioName = value;
+            }
+        }
+
+        [CsvExportColumn("LocationName", 5)]
+        [PropertyOrder(0, 1)]
+        [ReadOnly(true)]
+        public string LocationName
+        {
+            get
+            {
+                return locationName;
+            }
+            set
+            {
+                locationName = value;
+            }
+        }
+
+        [PropertyOrder(0, 2)]
+        [ReadOnly(true)]
+        public string ScenarioDefinitionName
+        {
+            get { return scenarioName + " of " + locationScenarioCount.ToString(); }
+        }
+
+        [PropertyOrder(0, 3)]
+        [ReadOnly(true)]
+        public CalculationResult CalculationResult
+        {
+            get
+            {
+                return calculationResult;
+            }
+            set
+            {
+                calculationResult = value;
+            }
+        }
+
+        [PropertyOrder(8,1)]
+        [ReadOnly(true)]
+        public string ResultMessage
+        {
+            get
+            {
+                RemoveCarriageReturnsFromMessage(ref resultMessage);
+                return resultMessage;
+            }
+            set { resultMessage = value; }
+        }
+
+        /// <summary>
+        /// Removes the carriage returns from message.
+        /// </summary>
+        /// <param name="message">The message.</param>
+        internal static void RemoveCarriageReturnsFromMessage(ref string message)
+        {
+            // remove carriage return at the end
+            message = message.TrimEnd('\r', '\n');
+            // replace other carriage returns by a space
+            message = message.Replace("\r\n", " ");
+        }
+
+
+        [CsvExportColumn("X", 6)]
+        [Format("F3")]
+        [PropertyOrder(1, 0)]
+        [Unit(UnitType.Length)]
+        [XmlIgnore]
+        [ReadOnly(true)]
+        public double X
+        {
+            get
+            {
+                return xRd;
+            }
+            set
+            {
+                xRd = value;
+            }
+        }
+
+        [CsvExportColumn("Y", 7)]
+        [Format("F3")]
+        [PropertyOrder(1, 1)]
+        [Unit(UnitType.Length)]
+        [XmlIgnore]
+        [ReadOnly(true)]
+        public double Y
+        {
+            get
+            {
+                return yRd;
+            }
+            set
+            {
+                yRd = value;                
+            }
+        }
+
+        [CsvExportColumn("LocationScenarioId", 8)]
+        [Browsable(false)]
+        public string LocationScenarioId
+        {
+            get { return scenarioName; }
+        }
+
+        [CsvExportColumn("RiverLevel", 9)]
+        [PropertyOrder(2, 12)]
+        [Format("F3")]
+        [ReadOnly(true)]
+        public double? RiverLevel
+        {
+            get { return scenario.RiverLevel; }
+        }
+
+        [CsvExportColumn("RiverLevelLow", 10)]
+        [PropertyOrder(2, 13)]
+        [Format("F3")]
+        [ReadOnly(true)]
+        public double? RiverLevelLow
+        {
+            get { return scenario.RiverLevelLow; }
+        }
+
+        [CsvExportColumn("DikeTableHeight", 11)]
+        [PropertyOrder(2, 14)]
+        [Format("F3")]
+        [ReadOnly(true)]
+        public double? DikeTableHeight
+        {
+            get { return scenario.DikeTableHeight; }
+        }
+
+        [CsvExportColumn("DikeTableHeight", 12)]
+        [PropertyOrder(2, 15)]
+        [Format("F3")]
+        [ReadOnly(true)]
+        public double? SlopeDampingPiezometricHeightPolderSide
+        {
+            get { return scenario.Location.SlopeDampingPiezometricHeightPolderSide; }
+        }
+
+        /// <summary>
+        /// Gets the height of the current original dike (so not of the redesigned surfaceline).
+        /// </summary>
+        /// <value>
+        /// The height of the current dike.
+        /// </value>
+        [CsvExportColumn("CurrentDikeHeight", 13)]
+        [Browsable(false)]
+        public double? CurrentDikeHeight
+        {
+            get { return scenario.Location.SurfaceLine2.GetDikeHeight(); }
+        }
+
+        /// <summary>
+        /// Gets the current original dike toe at polder x (so not of the redesigned surfaceline).
+        /// </summary>
+        /// <value>
+        /// The current global dike toe at polder x.
+        /// </value>
+        [CsvExportColumn("CurrentDikeToeAtPolderX", 14)]
+        [Browsable(false)]
+        public double? CurrentDikeToeAtPolderX
+        {
+            get
+            {
+                double? x = null;
+                GeometryPoint point = scenario.Location.SurfaceLine2.GetDikeToeInward();
+                if (point != null)
+                    x = point.X;
+                return x;
+            }
+        }
+
+        /// <summary>
+        /// Gets the current original dike toe at polder z (so not of the redesigned surfaceline).
+        /// </summary>
+        /// <value>
+        /// The current global dike toe at polder z.
+        /// </value>
+        [CsvExportColumn("CurrentDikeToeAtPolderZ", 15)]
+        [Browsable(false)]
+        public double? CurrentDikeToeAtPolderZ
+        {
+            get
+            {
+                double? z = null;
+                GeometryPoint point = scenario.Location.SurfaceLine2.GetDikeToeInward();
+                if (point != null)
+                    z = point.Z;
+                return z;
+            }
+        }
+
+        private double? GetSoilProfileProbability(FailureMechanismSystemType? failureMechanismType)
+        {
+            if (soilProfile != null)
+            {
+                return scenario.Location.GetSoilProfileProbability(soilProfile, failureMechanismType);
+            }
+            return scenario.Location.GetSoilGeometry2DProbability(soilGeometry2DName, failureMechanismType);
+        }
+
+        [CsvExportColumn("StabilityProfileName", 16)]
+        [Browsable(false)]
+        public string StabilityProfileName
+        {
+            get { return ProfileName; }
+        }
+
+        [CsvExportColumn("StabilityProfileProbability", 17)]
+        [Format("F3")]
+        [Unit(UnitType.Fractions)]
+        [Browsable(false)]
+        public double? StabilityProfileProbability
+        {
+            get { return GetSoilProfileProbability(FailureMechanismSystemType.StabilityInside); }
+        }
+
+        [CsvExportColumn("PipingProfileName", 18)]
+        [Browsable(false)]
+        public string PipingProfileName
+        {
+            get { return ProfileName; }
+        }
+
+        [CsvExportColumn("PipingProfileProbability", 19)]
+        [Format("F3")]
+        [Unit(UnitType.Fractions)]
+        [Browsable(false)]
+        public double? PipingProfileProbability
+        {
+            get { return GetSoilProfileProbability(FailureMechanismSystemType.Piping); }
+        }
+
+        /// <summary>
+        /// Gets the length of the current original dike (so not of the redesigned surfaceline).
+        /// </summary>
+        /// <value>
+        /// The length of the current dike.
+        /// </value>
+        [CsvExportColumn("CurrentDikeLength", 20)]
+        [Browsable(false)]
+        public double? CurrentDikeLength
+        {
+            get { return scenario.Location.SurfaceLine2.GetDikeLength(); }
+        }
+
+        [CsvExportColumn("StabilityToeAtPolderX", 21)]
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [Browsable(false)]
+        public double? StabilityToeAtPolderX
+        {
+            get
+            {
+                if (redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = redesignedSurfaceLineGlobal.GetDikeToeInward();
+                if (point != null)
+                    return point.X;
+                return null;
+            }
+        }
+
+        [CsvExportColumn("StabilityToeAtPolderZ", 22)]
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [Browsable(false)]
+        public double? StabilityToeAtPolderZ
+        {
+            get
+            {
+                if (redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = redesignedSurfaceLineGlobal.GetDikeToeInward();
+                if (point != null)
+                    return point.Z;
+                return null;
+            }
+        }
+
+        [CsvExportColumn("StabilityShoulderHeight", 23)]
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [Browsable(false)]
+        public double? StabilityShoulderHeight
+        {
+            get
+            {
+                if (redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside);
+                if (point != null)
+                    return point.Z;
+                return null;
+            }
+        }
+
+        [CsvExportColumn("StabilitySafetyFactor", 24)]
+        [Format("F3")]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [Browsable(false)]
+        public double? StabilitySafetyFactor
+        {
+            get { return safetyFactorStability; }
+            set { safetyFactorStability = value; }
+        }
+
+        [CsvExportColumn("RequiredSafetyFactorStabilityInnerSlope", 26)]
+        [Format("F3")]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [Browsable(false)]
+        public double? RequiredSafetyFactorStabilityInnerSlope
+        {
+            get { return scenario.RequiredSafetyFactorStabilityInnerSlope;}
+        }
+
+        [CsvExportColumn("RequiredSafetyFactorStabilityOuterSlope", 27)]
+        [Format("F3")]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [Browsable(false)]
+        public double? RequiredSafetyFactorStabilityOuterSlope
+        {
+            get { return scenario.RequiredSafetyFactorStabilityOuterSlope; }
+        }
+
+        [CsvExportColumn("RequiredSafetyFactorPiping", 28)]
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [Browsable(false)]
+        public double? RequiredSafetyFactorPiping
+        {
+            get { return scenario.RequiredSafetyFactorPiping; }
+        }
+
+        [CsvExportColumn("PipingToeAtPolderX", 29)]
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [Browsable(false)]
+        public double? PipingToeAtPolderX
+        {
+            get
+            {
+                if (redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = redesignedSurfaceLineGlobal.GetDikeToeInward();
+                if (point != null)
+                    return point.X;
+                return null;
+            }
+        }
+
+        [CsvExportColumn("PipingToeAtPolderZ", 30)]
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [Browsable(false)]
+        public double? PipingToeAtPolderZ
+        {
+            get
+            {
+                if (redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = redesignedSurfaceLineGlobal.GetDikeToeInward();
+                if (point != null)
+                    return point.Z;
+                return null;
+            }
+        }
+
+        [CsvExportColumn("PipingShoulderHeight", 31)]
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [Browsable(false)]
+        public double? PipingShoulderHeight
+        {
+            get
+            {
+                if (redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside);
+                if (point != null)
+                    return point.Z;
+                return null;
+            }
+        }
+
+        [CsvExportColumn("DikeLength", 33)]
+        [Format("F3")]
+        [PropertyOrder(4, 1)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        public double? DikeLength
+        {
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.GetDikeLength();
+                }
+                return null;
+            }
+        }
+
+        [CsvExportColumn("Zone1SafetyFactorStability", 34)]
+        [Format("F3")]
+        [PropertyOrder(3, 1)]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        public double? Zone1SafetyFactorStability
+        {
+            get { return zone1SafetyFactorStability; }
+            set { zone1SafetyFactorStability = value; }
+        }
+
+        [Format("F3")]
+        [PropertyOrder(3, 2)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        public double? LocalZone1EntryPointX
+        {
+            get { return localZone1EntryPointX; }
+            set { localZone1EntryPointX = value; }
+        }
+
+        [CsvExportColumn("Zone1EntryPointX", 36)]
+        [Format("F3")]
+        [PropertyOrder(3, 3)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [XmlIgnore]
+        public double? Zone1EntryPointX
+        {
+            get
+            {
+                if (localZone1EntryPointX == null || redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = DetermineGlobalPointCoordinatesBasedOnGlobalSurfaceLine(
+                    new GeometryPoint(localZone1EntryPointX.Value, 0.0, 0.0), redesignedSurfaceLineGlobal);
+
+                return point.X;                
+            }
+        }
+
+        [CsvExportColumn("Zone1EntryPointY", 37)]
+        [Format("F3")]
+        [PropertyOrder(3, 4)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [XmlIgnore]
+        public double? Zone1EntryPointY
+        {
+            get
+            {
+                if (localZone1EntryPointX == null || redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = DetermineGlobalPointCoordinatesBasedOnGlobalSurfaceLine(
+                    new GeometryPoint(localZone1EntryPointX.Value, 0.0, 0.0), redesignedSurfaceLineGlobal);
+
+                return point.Y;
+            }
+        }
+
+        [CsvExportColumn("Zone1EntryPointZ", 38)]
+        [Format("F3")]
+        [PropertyOrder(3, 5)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [XmlIgnore]
+        public double? Zone1EntryPointZ
+        {
+            get
+            {
+                if (localZone1EntryPointX == null)
+                    return null;
+                if (redesignedSurfaceLine == null)
+                    return null;
+                return redesignedSurfaceLine.Geometry.GetZAtX(localZone1EntryPointX.Value);
+            }
+        }
+
+        [CsvExportColumn("LocalZone1ExitPointX", 39)]
+        [Format("F3")]
+        [PropertyOrder(3, 6)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        public double? LocalZone1ExitPointX
+        {
+            get { return localZone1ExitPointX; }
+            set { localZone1ExitPointX = value; }
+        }
+
+        [CsvExportColumn("Zone1ExitPointX", 40)]
+        [Format("F3")]
+        [PropertyOrder(3, 7)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        public double? Zone1ExitPointX
+        {
+            get
+            {
+                if (localZone1ExitPointX == null || redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = DetermineGlobalPointCoordinatesBasedOnGlobalSurfaceLine(
+                    new GeometryPoint(localZone1ExitPointX.Value, 0.0, 0.0), redesignedSurfaceLineGlobal);
+
+                return point.X;
+            }
+        }
+
+        [CsvExportColumn("Zone1ExitPointY", 41)]
+        [Format("F3")]
+        [PropertyOrder(3, 8)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        public double? Zone1ExitPointY
+        {
+            get
+            {
+                if (localZone1ExitPointX == null || redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = DetermineGlobalPointCoordinatesBasedOnGlobalSurfaceLine(
+                    new GeometryPoint(localZone1ExitPointX.Value, 0.0, 0.0), redesignedSurfaceLineGlobal);
+
+                return point.Y;
+            }
+        }
+
+        [CsvExportColumn("Zone1ExitPointZ", 42)]
+        [Format("F3")]
+        [PropertyOrder(3, 9)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        public double? Zone1ExitPointZ
+        {
+            get
+            {
+                if (localZone1ExitPointX == null)
+                    return null;
+                if (redesignedSurfaceLine == null)
+                    return null;
+                return redesignedSurfaceLine.Geometry.GetZAtX(localZone1ExitPointX.Value);
+            }
+        }
+
+        [CsvExportColumn("Zone2SafetyFactorStability", 43)]
+        [Format("F3")]
+        [PropertyOrder(3, 10)]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        public double? Zone2SafetyFactorStability
+        {
+            get { return zone2SafetyFactorStability; }
+            set { zone2SafetyFactorStability = value; }
+        }
+
+        [CsvExportColumn("LocalZone2EntryPointX", 44)]
+        [Format("F3")]
+        [PropertyOrder(3, 11)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        public double? LocalZone2EntryPointX
+        {
+            get { return localZone2EntryPointX; }
+            set { localZone2EntryPointX = value; }
+        }
+
+        [CsvExportColumn("Zone2EntryPointX", 45)]
+        [Format("F3")]
+        [PropertyOrder(3, 12)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        public double? Zone2EntryPointX
+        {
+            get
+            {
+                if (localZone2EntryPointX == null || redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = DetermineGlobalPointCoordinatesBasedOnGlobalSurfaceLine(
+                    new GeometryPoint(localZone2EntryPointX.Value, 0.0, 0.0), redesignedSurfaceLineGlobal);
+
+                return point.X;
+                
+            }
+        }
+
+        [CsvExportColumn("Zone2EntryPointY", 46)]
+        [Format("F3")]
+        [PropertyOrder(3, 13)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        public double? Zone2EntryPointY
+        {
+            get
+            {
+                if (localZone2EntryPointX == null || redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = DetermineGlobalPointCoordinatesBasedOnGlobalSurfaceLine(
+                    new GeometryPoint(localZone2EntryPointX.Value, 0.0, 0.0), redesignedSurfaceLineGlobal);
+
+                return point.Y;
+
+            }
+        }
+
+        [CsvExportColumn("Zone2EntryPointZ", 47)]
+        [Format("F3")]
+        [PropertyOrder(3, 14)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        public double? Zone2EntryPointZ
+        {
+            get
+            {
+                if (localZone2EntryPointX == null)
+                    return null;
+                if (redesignedSurfaceLine == null)
+                    return null;
+                return redesignedSurfaceLine.Geometry.GetZAtX(localZone2EntryPointX.Value);
+            }
+        }
+
+        [CsvExportColumn("LocalZone2ExitPointX", 48)]
+        [Format("F3")]
+        [PropertyOrder(3, 15)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        public double? LocalZone2ExitPointX
+        {
+            get { return localZone2ExitPointX; }
+            set { localZone2ExitPointX = value; }
+        }
+
+        [CsvExportColumn("Zone2ExitPointX", 49)]
+        [Format("F3")]
+        [PropertyOrder(3, 16)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        public double? Zone2ExitPointX
+        {
+            get
+            {
+                if (localZone2ExitPointX == null || redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = DetermineGlobalPointCoordinatesBasedOnGlobalSurfaceLine(
+                    new GeometryPoint(localZone2ExitPointX.Value, 0.0, 0.0), redesignedSurfaceLineGlobal);
+
+                return point.X;
+            }
+        }
+
+        [CsvExportColumn("Zone2ExitPointY", 50)]
+        [Format("F3")]
+        [PropertyOrder(3, 17)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        public double? Zone2ExitPointY
+        {
+            get
+            {
+                if (localZone2ExitPointX == null || redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = DetermineGlobalPointCoordinatesBasedOnGlobalSurfaceLine(
+                    new GeometryPoint(localZone2ExitPointX.Value, 0.0, 0.0), redesignedSurfaceLineGlobal);
+
+                return point.Y;
+            }
+        }
+
+        [CsvExportColumn("Zone2ExitPointZ", 51)]
+        
+        [Format("F3")]
+        [PropertyOrder(3, 18)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        public double? Zone2ExitPointZ
+        {
+            get
+            {
+                if (localZone2ExitPointX == null || redesignedSurfaceLine == null)
+                    return null;
+                return redesignedSurfaceLine.Geometry.GetZAtX(localZone2ExitPointX.Value);
+            }
+        }
+
+        [CsvExportColumn("IsUplift", 52)]
+        [PropertyOrder(1, 4)]
+        [ReadOnly(true)]
+        public bool? IsUplift
+        {
+            get { return isUplift; }
+            set { isUplift = value; }
+        }
+
+        [CsvExportColumn("Pl3MinUplift", 53)]
+        [Format("F3")]
+        [PropertyOrder(5, 1)]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        public double? Pl3MinUplift
+        {
+            get { return pl3MinUplift; }
+            set { pl3MinUplift = value; }
+        }
+
+        [CsvExportColumn("Pl3HeadAdjusted", 54)]
+        [Format("F3")]
+        [PropertyOrder(5, 2)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        public double? Pl3HeadAdjusted
+        {
+            get { return pl3HeadAdjusted; }
+            set { pl3HeadAdjusted = value; }
+        }
+
+        [CsvExportColumn("pl3LocalLocationXMinUplift", 55)]
+        [Format("F3")]
+        [PropertyOrder(5, 3)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        public double? Pl3LocalLocationXMinUplift
+        {
+            get { return pl3LocalLocationXMinUplift; }
+            set { pl3LocalLocationXMinUplift = value; }
+        }
+
+        [CsvExportColumn("Pl3LocationXMinUplift", 56)]
+        [Format("F3")]
+        [PropertyOrder(5, 4)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [XmlIgnore]
+        public double? Pl3LocationXMinUplift
+        {
+            get
+            {
+                if (pl3LocalLocationXMinUplift == null || redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = DetermineGlobalPointCoordinatesBasedOnGlobalSurfaceLine(
+                    new GeometryPoint(pl3LocalLocationXMinUplift.Value, 0.0, 0.0), redesignedSurfaceLineGlobal);
+
+                return point.X;
+            }
+        }
+
+        [CsvExportColumn("Pl3LocationYMinUplift", 57)]
+        [Format("F3")]
+        [PropertyOrder(5, 5)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [XmlIgnore]
+        public double? Pl3LocationYMinUplift
+        {
+            get
+            {
+                if (pl3LocalLocationXMinUplift == null || redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = DetermineGlobalPointCoordinatesBasedOnGlobalSurfaceLine(
+                    new GeometryPoint(pl3LocalLocationXMinUplift.Value, 0.0, 0.0), redesignedSurfaceLineGlobal);
+
+                return point.Y;
+            }
+        }
+
+        [CsvExportColumn("Pl4MinUplift", 58)]
+        [Format("F3")]
+        [PropertyOrder(5, 6)]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        public double? Pl4MinUplift
+        {
+            get { return pl4MinUplift; }
+            set { pl4MinUplift = value; }
+        }
+
+        [CsvExportColumn("Pl4HeadAdjusted", 59)]
+        [Format("F3")]
+        [PropertyOrder(5, 7)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        public double? Pl4HeadAdjusted
+        {
+            get { return pl4HeadAdjusted; }
+            set { pl4HeadAdjusted = value; }
+        }
+
+        [CsvExportColumn("pl4LocalLocationXMinUplift", 60)]
+        [Format("F3")]
+        [PropertyOrder(5, 8)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        public double? Pl4LocalLocationXMinUplift
+        {
+            get { return pl4LocalLocationXMinUplift; }
+            set { pl4LocalLocationXMinUplift = value; }
+        }
+
+        [CsvExportColumn("Pl4LocationXMinUplift", 61)]
+        [Format("F3")]
+        [PropertyOrder(5, 9)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [XmlIgnore]
+        public double? Pl4LocationXMinUplift
+        {
+            get
+            {
+                if (pl4LocalLocationXMinUplift == null || redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = DetermineGlobalPointCoordinatesBasedOnGlobalSurfaceLine(
+                    new GeometryPoint(pl4LocalLocationXMinUplift.Value, 0.0, 0.0), redesignedSurfaceLineGlobal);
+
+                return point.X;
+            }
+        }
+
+        [CsvExportColumn("Pl4LocationYMinUplift", 62)]
+        [Format("F3")]
+        [PropertyOrder(5, 10)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [XmlIgnore]
+        public double? Pl4LocationYMinUplift
+        {
+            get
+            {
+                if (pl4LocalLocationXMinUplift == null || redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = DetermineGlobalPointCoordinatesBasedOnGlobalSurfaceLine(
+                    new GeometryPoint(pl4LocalLocationXMinUplift.Value, 0.0, 0.0), redesignedSurfaceLineGlobal);
+
+                return point.Y;
+            }
+        }
+
+        [Format("F3")]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [PropertyOrder(6, 11)]
+        public double? UpliftFactor
+        {
+            get { return upliftFactor; }
+            set { upliftFactor = value; }
+        }
+
+        [Format("F3")]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [PropertyOrder(6, 12)]
+        [Browsable(false)]
+        public double? HeaveFactor
+        {
+            get { return heaveFactor; }
+            set { heaveFactor = value; }
+        }
+
+        [CsvExportColumn("BlighPipingFactor", 63)]
+        [Format("F3")]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [Browsable(false)]
+        public double? BlighPipingFactor
+        {
+            get { return blighPipingFactor; }
+            set { blighPipingFactor = value; }
+        }
+
+        [CsvExportColumn("BlighHCritical", 64)]
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [Browsable(false)]
+        public double? BlighHCritical
+        {
+            get { return blighHCritical; }
+            set { blighHCritical = value; }
+        }
+
+        [CsvExportColumn("Sellmeijer2ForcesPipingFactor", 65)]
+        [Format("F3")]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [Browsable(false)]
+        public double? Sellmeijer2ForcesPipingFactor
+        {
+            get { return sellmeijer2ForcesPipingFactor; }
+            set { sellmeijer2ForcesPipingFactor = value; }
+        }
+
+        [CsvExportColumn("Sellmeijer2ForcesHCritical", 66)]
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [Browsable(false)]
+        public double? Sellmeijer2ForcesHCritical
+        {
+            get { return sellmeijer2ForcesHCritical; }
+            set { sellmeijer2ForcesHCritical = value; }
+        }
+
+        [CsvExportColumn("Sellmeijer4ForcesPipingFactor", 67)]
+        [Format("F3")]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [Browsable(false)]
+        public double? Sellmeijer4ForcesPipingFactor
+        {
+            get { return sellmeijer4ForcesPipingFactor; }
+            set { sellmeijer4ForcesPipingFactor = value; }
+        }
+
+        [CsvExportColumn("Sellmeijer4ForcesHCritical", 68)]
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [Browsable(false)]
+        public double? Sellmeijer4ForcesHCritical
+        {
+            get { return sellmeijer4ForcesHCritical; }
+            set { sellmeijer4ForcesHCritical = value; }
+        }
+
+        [CsvExportColumn("SellmeijerPipingFactor", 69)]
+        [Format("F3")]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [Browsable(false)]
+        public double? SellmeijerPipingFactor
+        {
+            get { return sellmeijerPipingFactor; }
+            set { sellmeijerPipingFactor = value; }
+        }
+
+        [CsvExportColumn("SellmeijerHCritical", 70)]
+        
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [Browsable(false)]
+        public double? SellmeijerHCritical
+        {
+            get { return sellmeijerHCritical; }
+            set { sellmeijerHCritical = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 safety factor for backward erosion.
+        /// </summary>
+        /// <value>
+        /// The wti2017 safety factor.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017BackwardErosionSafetyFactor", 71)]
+        [PropertyOrder(7, 1)]
+        public double? Wti2017BackwardErosionSafetyFactor
+        {
+            get { return wti2017BackwardErosionSafetyFactor; }
+            set { wti2017BackwardErosionSafetyFactor = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 safety factor for Uplift.
+        /// </summary>
+        /// <value>
+        /// The wti2017 safety factor for Uplift.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017UpliftSafetyFactor", 72)]
+        [PropertyOrder(7, 5)]
+        public double? Wti2017UpliftSafetyFactor
+        {
+            get
+            {
+                return wti2017UpliftSafetyFactor;
+            }
+            set
+            {
+                wti2017UpliftSafetyFactor = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 safety factor heave.
+        /// </summary>
+        /// <value>
+        /// The wti2017 safety factor heave.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017HeaveSafetyFactor", 73)]
+        [PropertyOrder(7, 8)]
+        public double? Wti2017HeaveSafetyFactor
+        {
+            get
+            {
+                return wti2017HeaveSafetyFactor;
+            }
+            set
+            {
+                wti2017HeaveSafetyFactor = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 safety factor overall (see MWDAM-1299).
+        /// </summary>
+        /// <value>
+        /// The wti2017 safety factor overall.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017SafetyFactorOverall", 74)]
+        [PropertyOrder(7, 11)]
+        public double? Wti2017SafetyFactorOverall
+        {
+            get
+            {
+                return wti2017SafetyFactorOverall;
+            }
+            set
+            {
+                wti2017SafetyFactorOverall = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 critical waterlevel for backward erosion.
+        /// </summary>
+        /// <value>
+        /// The wti2017 critical waterlevel backward erosion.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017BackwardErosionHcritical", 75)]
+        [PropertyOrder(7, 2)]
+        public double? Wti2017BackwardErosionHcritical
+        {
+            get { return wti2017BackwardErosionHcritical; }
+            set { wti2017BackwardErosionHcritical = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 critical waterlevel for Uplift.
+        /// </summary>
+        /// <value>
+        /// The wti2017 hcritical uplift.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017UpliftHcritical", 76)]
+        [PropertyOrder(7, 6)]
+        public double? Wti2017UpliftHcritical
+        {
+            get
+            {
+                return wti2017UpliftHcritical;
+            }
+            set
+            {
+                wti2017UpliftHcritical = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 critical waterlevel for Heave.
+        /// </summary>
+        /// <value>
+        /// The wti2017 hcritical heave.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017HeaveHcritical", 77)]
+        [PropertyOrder(7, 9)]
+        public double? Wti2017HeaveHcritical
+        {
+            get
+            {
+                return wti2017HeaveHcritical;
+            }
+            set
+            {
+                wti2017HeaveHcritical = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 critical waterlevel overall (see MWDAM-1299).
+        /// </summary>
+        /// <value>
+        /// The wti2017 hcritical overall.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017HcriticalOverall", 78)]
+        [PropertyOrder(7, 12)]
+        public double? Wti2017HcriticalOverall
+        {
+            get
+            {
+                return wti2017HcriticalOverall;
+            }
+            set
+            {
+                wti2017HcriticalOverall = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 delta phi c be (backward erosion, critical head difference).
+        /// </summary>
+        /// <value>
+        /// The wti2017 delta phi c be.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017BackwardErosionDeltaPhiC", 79)]
+        [PropertyOrder(7, 3)]
+        public double? Wti2017BackwardErosionDeltaPhiC
+        {
+            get
+            {
+                return wti2017BackwardErosionDeltaPhiC;
+            }
+            set
+            {
+                wti2017BackwardErosionDeltaPhiC = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 delta phi c be (backward erosion, reduced head difference).
+        /// </summary>
+        /// <value>
+        /// The wti2017 delta phi c be.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017BackwardErosionDeltaPhiReduced", 80)]
+        [PropertyOrder(7, 4)]
+        public double? Wti2017BackwardErosionDeltaPhiReduced
+        {
+            get
+            {
+                return wti2017BackwardErosionDeltaPhiReduced;
+            }
+            set
+            {
+                wti2017BackwardErosionDeltaPhiReduced = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 delta phi cu (Uplift, critical head difference).
+        /// </summary>
+        /// <value>
+        /// The wti2017 delta phi cu.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017UpliftDeltaPhiC", 81)]
+        [PropertyOrder(7, 7)]
+        public double? Wti2017UpliftDeltaPhiC
+        {
+            get
+            {
+                return wti2017UpliftDeltaPhiC;
+            }
+            set
+            {
+                wti2017UpliftDeltaPhiC = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 gradient (vertical outflow gradient for Heave).
+        /// </summary>
+        /// <value>
+        /// The wti2017 gradient.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017Gradient", 82)]
+        [PropertyOrder(7, 10)]
+        public double? Wti2017Gradient
+        {
+            get
+            {
+                return wti2017Gradient;
+            }
+            set
+            {
+                wti2017Gradient = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the effective stress (at exit point, as calculated with Wti EffectiveThicknessCalculator).
+        /// </summary>
+        /// <value>
+        /// The effective stress.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.Pressure)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017EffectiveStress", 83)]
+        [PropertyOrder(7, 13)]
+        public double? Wti2017EffectiveStress
+        {
+            get
+            {
+                return wti2017EffectiveStress;
+            }
+            set
+            {
+                wti2017EffectiveStress = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the wti2017 c creep (Creep coefficient).
+        /// </summary>
+        /// <value>
+        /// The wti2017 c creep.
+        /// </value>
+        [Format("F3")]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [CsvExportColumn("Wti2017CCreep", 84)]
+        [PropertyOrder(7, 14)]
+        public double? Wti2017CCreep
+        {
+            get { return wti2017CCreep; }
+            set { wti2017CCreep = value; }
+        }
+
+
+
+        [CsvExportColumn("DikeToeAtRiverXrd", 85)]
+        [Browsable(false)]
+        public double? DikeToeAtRiverXrd
+        {
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).X;
+                }
+                return null;
+            }
+        }
+
+        [CsvExportColumn("DikeToeAtRiverYrd", 86)]
+        [Browsable(false)]
+        public double? DikeToeAtRiverYrd
+        {
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).Y;
+                }
+                return null;
+            }
+        }
+
+        [CsvExportColumn("DikeToeAtRiverZrd", 87)]
+        [Browsable(false)]
+        public double? DikeToeAtRiverZrd
+        {
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver).Z;
+                }
+                return null;
+            }
+        }
+
+        [CsvExportColumn("DikeTopAtRiverXrd", 88)]
+        [Browsable(false)]
+        public double? DikeTopAtRiverXrd
+        {
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).X;
+                }
+                return null;
+            }
+        }
+
+        [CsvExportColumn("DikeTopAtRiverYrd", 89)]
+        [Browsable(false)]
+        public double? DikeTopAtRiverYrd
+        {
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).Y;
+                }
+                return null;
+            }
+        }
+
+        [CsvExportColumn("DikeTopAtRiverZrd", 90)]
+        [Browsable(false)]
+        public double? DikeTopAtRiverZrd
+        {
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).Z;
+                }
+                return null;
+            }
+        }
+
+        [CsvExportColumn("DikeTopAtPolderXrd", 91)]
+        [Browsable(false)]
+        public double? DikeTopAtPolderXrd
+        {
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).X;
+                }
+                return null;
+            }
+        }
+
+        [CsvExportColumn("DikeTopAtPolderYrd", 92)]
+        [Browsable(false)]
+        public double? DikeTopAtPolderYrd
+        {
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Y;
+                }
+                return null;
+            }
+        }
+
+        [CsvExportColumn("DikeTopAtPolderZrd", 93)]
+        [Browsable(false)]
+        public double? DikeTopAtPolderZrd
+        {
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z;
+                }
+                return null;
+            }
+        }
+
+        [CsvExportColumn("DikeToeAtPolderXrd", 94)]
+        [Browsable(false)]
+        public double? DikeToeAtPolderXrd
+        {
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).X;
+                }
+                return null;
+            }
+        }
+
+        [CsvExportColumn("DikeToeAtPolderYrd", 95)]
+        [Browsable(false)]
+        public double? DikeToeAtPolderYrd
+        {
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Y;
+                }
+                return null;
+            }
+        }
+
+        [CsvExportColumn("DikeToeAtPolderZrd", 96)]
+        [Browsable(false)]
+        public double? DikeToeAtPolderZrd
+        {
+            get
+            {
+                if (redesignedSurfaceLineGlobal != null)
+                {
+                    return redesignedSurfaceLineGlobal.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z;
+                }
+                return null;
+            }
+        }
+
+        [Browsable(false)]
+        public Scenario Scenario
+        {
+            get { return scenario; }
+            set
+            {
+                scenario = value;
+                if (scenario != null)
+                {
+                    scenarioName = scenario.LocationScenarioID;
+                    locationName = scenario.Location.Name;
+                    locationScenarioCount = scenario.Location.Scenarios.Count;
+                    xRd = scenario.Location.XRd;
+                    yRd = scenario.Location.YRd;
+                }
+            }
+        }
+
+        [Browsable(false)]
+        public SoilProfile1D SoilProfile
+        {
+            get { return soilProfile; }
+            set
+            {
+                soilProfile = value;
+            }
+        }
+
+        [Browsable(false)]
+        public string SoilGeometry2DName
+        {
+            get { return soilGeometry2DName; }
+            set { soilGeometry2DName = value; }
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="SurfaceLine2"/> instance based on <see cref="RedesignedSurfaceLine2"/>
+        /// with global coordinates instead of local coordinates.
+        /// </summary>
+        [Browsable(false)]
+        public SurfaceLine2 CreateRedesignedSurfaceLineGlobal()
+        {
+            SurfaceLine2 localRedesignedSurfaceLineGlobal = null;
+            if (redesignedSurfaceLine != null)
+            {
+                SurfaceLine2 originalSurfaceLine = scenario.Location.SurfaceLine2;
+                if (originalSurfaceLine != null)
+                {
+                    var coordinateSystemConverter = new CoordinateSystemConverter();
+                    coordinateSystemConverter.DefineGlobalXYZBasedOnLine(originalSurfaceLine.Geometry);
+                    localRedesignedSurfaceLineGlobal = redesignedSurfaceLine.FullDeepClone();
+                    coordinateSystemConverter.ConvertLocalXZToGlobalXYZ(localRedesignedSurfaceLineGlobal.Geometry);
+                }
+            }
+            return localRedesignedSurfaceLineGlobal;
+        }
+
+        /// <summary>
+        /// Gets or sets the redesigned surface line2.
+        /// </summary>
+        /// <value>
+        /// The redesigned surface line2.
+        /// </value>
+        [Browsable(false)]
+        public SurfaceLine2 RedesignedSurfaceLine2
+        {
+            get { return redesignedSurfaceLine; }
+            set
+            {
+                redesignedSurfaceLine = value;
+                // Also determine and set the correct global version in order to retrieve dependend properties
+                redesignedSurfaceLineGlobal = CreateRedesignedSurfaceLineGlobal();
+            }
+        }
+
+        [PropertyOrder(2, 1)]
+        [XmlIgnore]
+        [ReadOnly(true)]
+        public string ProfileName
+        {
+            get
+            {
+                if (scenario != null)
+                {
+                    profileName = GetSoilProfileName();
+                }
+                return profileName;
+            }
+            set
+            {
+                profileName = value;
+            }
+        }
+
+        private string GetSoilProfileName()
+        {
+            string soilprofilename = "";
+            if (soilProfile != null)
+            {
+                soilprofilename = soilProfile.Name;
+            }
+            else
+            {
+                if (!String.IsNullOrEmpty(soilGeometry2DName))
+                {
+                    soilprofilename = soilGeometry2DName;
+                }
+            }
+            return soilprofilename;
+        }
+
+        [Format("F3")]
+        [PropertyOrder(2, 2)]
+        [Unit(UnitType.Fractions)]
+        [ReadOnly(true)]
+        [XmlIgnore]
+        public double? ProfileProbability
+        {
+            get
+            {
+                double? res = null;
+                switch (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType)
+                {
+                    case FailureMechanismSystemType.HorizontalBalance:
+                    case FailureMechanismSystemType.StabilityOutside:
+                    case FailureMechanismSystemType.StabilityInside:
+                        res = StabilityProfileProbability;
+                        break;
+                    case FailureMechanismSystemType.Piping:
+                        res = PipingProfileProbability;
+                        break;
+                }
+                return res;
+            }
+        }
+
+        [Unit(UnitType.None)]
+        [PropertyOrder(2, 3)]
+        [ReadOnly(true)]
+        public MStabModelType? StabilityModel
+        {
+            get
+            {
+                return stabilityModel;
+            }
+            set { stabilityModel = value; }
+        }
+
+        [Unit(UnitType.None)]
+        [Format("F3")]
+        [PropertyOrder(2, 4)]
+        [ReadOnly(true)]
+        [XmlIgnore]
+        public double? SafetyFactor
+        {
+            get
+            {
+                double? res = null;
+                switch (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType)
+                {
+                    case FailureMechanismSystemType.HorizontalBalance:
+                    case FailureMechanismSystemType.StabilityOutside:
+                    case FailureMechanismSystemType.StabilityInside:
+                        res = StabilitySafetyFactor;
+                        break;
+                    case FailureMechanismSystemType.Piping:
+                        res = PipingFactor;
+                        break;                    
+                }
+                return res;
+            }
+        }
+
+        [Format("F3")]
+        [PropertyOrder(2, 10)]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [XmlIgnore]
+        public double? RequiredSafetyFactor
+        {
+            get
+            {
+                double? res = null;
+                switch (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType)
+                {
+                    case FailureMechanismSystemType.StabilityOutside:
+                        res = RequiredSafetyFactorStabilityOuterSlope;
+                        break;
+                    case FailureMechanismSystemType.StabilityInside:
+                        res = RequiredSafetyFactorStabilityInnerSlope;
+                        break;
+                    case FailureMechanismSystemType.Piping:
+                        res = RequiredSafetyFactorPiping;
+                        break;
+                }
+                return res;
+            }            
+        }
+
+        [Format("F3")]
+        [PropertyOrder(2, 5)]
+        [Unit(UnitType.Length)]
+        [XmlIgnore]
+        [ReadOnly(true)]
+        public double? ShoulderHeight
+        {
+            get
+            {
+                double? res = null;
+                switch (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType)
+                {
+                    case FailureMechanismSystemType.StabilityInside:
+                        res = StabilityShoulderHeight;
+                        break;
+                    case FailureMechanismSystemType.Piping:
+                        res = PipingShoulderHeight;
+                        break;
+                }
+                return res;
+            }
+        }
+
+        [Format("F3")]
+        [PropertyOrder(2, 7)]
+        [Unit(UnitType.Length)]
+        [XmlIgnore]
+        [ReadOnly(true)]
+        public double? ToeAtPolderX
+        {
+            get
+            {
+                double? res = null;
+                switch (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType)
+                {
+                    case FailureMechanismSystemType.StabilityInside:
+                        res = StabilityToeAtPolderX;
+                        break;
+                    case FailureMechanismSystemType.Piping:
+                        res = PipingToeAtPolderX;
+                        break;
+                }
+                return res;
+            }
+        }
+
+        [Format("F3")]
+        [PropertyOrder(2, 8)]
+        [Unit(UnitType.Length)]
+        [XmlIgnore]
+        [ReadOnly(true)]
+        public double? ToeAtPolderZ
+        {
+            get
+            {
+                double? res = null;
+                switch (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType)
+                {
+                    case FailureMechanismSystemType.StabilityInside:
+                        res = StabilityToeAtPolderZ;
+                        break;
+                    case FailureMechanismSystemType.Piping:
+                        res = PipingToeAtPolderZ;
+                        break;
+                }
+                return res;
+            }
+        }
+
+        [PropertyOrder(6, 1)]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [XmlIgnore]
+        public PipingModelType? PipingModel
+        {
+            get
+            {
+                if (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping)
+                {
+                    return damFailureMechanismeCalculationSpecification.PipingModelType;                    
+                }
+                return null;
+            }
+        }
+
+        [Format("F3")]
+        [PropertyOrder(6, 2)]
+        [Unit(UnitType.None)]
+        [ReadOnly(true)]
+        [XmlIgnore]
+        public double? PipingFactor
+        {
+            get
+            {
+                double? res = null;
+                if (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping)
+                {
+                    switch (damFailureMechanismeCalculationSpecification.PipingModelType)
+                    {
+                        case PipingModelType.Bligh:
+                            res = BlighPipingFactor;
+                            break;
+                        case PipingModelType.Sellmeijer:
+                            res = SellmeijerPipingFactor;
+                            break;
+                        case PipingModelType.Sellmeijer2Forces:
+                            res = Sellmeijer2ForcesPipingFactor;
+                            break;
+                        case PipingModelType.Sellmeijer4Forces:
+                            res = Sellmeijer4ForcesPipingFactor;
+                            break;
+                        case PipingModelType.Wti2017:
+                            res = Wti2017SafetyFactorOverall;
+                            break;
+                    }
+                }
+                return res;
+            }
+        }
+
+        [Format("F3")]
+        [PropertyOrder(6, 3)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [XmlIgnore]
+        public double? LocalPipingEntryPointX
+        {
+            get
+            {
+                GeometryPoint point = null;
+                if (redesignedSurfaceLine != null)
+                {
+                    point = redesignedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver);
+                }
+                if (point != null && scenario != null)
+                    return point.X - scenario.Location.DistanceToEntryPoint;
+                if (point != null)
+                    return point.X;
+                return null;
+            }
+        }
+
+        [Format("F3")]
+        [PropertyOrder(6, 4)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [XmlIgnore]
+        public double? PipingEntryPointX
+        {
+            get
+            {
+                if (LocalPipingEntryPointX == null || redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = DetermineGlobalPointCoordinatesBasedOnGlobalSurfaceLine(
+                    new GeometryPoint(LocalPipingEntryPointX.Value, 0.0, 0.0), redesignedSurfaceLineGlobal);
+
+                return point.X;
+            }
+        }
+
+        [Format("F3")]
+        [PropertyOrder(6, 5)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [XmlIgnore]
+        public double? PipingEntryPointY
+        {
+            get
+            {
+                if (LocalPipingEntryPointX == null || redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = DetermineGlobalPointCoordinatesBasedOnGlobalSurfaceLine(
+                    new GeometryPoint(LocalPipingEntryPointX.Value, 0.0, 0.0), redesignedSurfaceLineGlobal);
+
+                return point.Y;
+            }
+        }
+
+        [Format("F3")]
+        [PropertyOrder(6, 6)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        public double? LocalPipingExitPointX
+        {
+            get { return localPipingExitPointX; }
+            set { localPipingExitPointX = value; }
+        }
+
+        [Format("F3")]
+        [PropertyOrder(6, 7)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [XmlIgnore]
+        public double? PipingExitPointX
+        {
+            get
+            {
+                if (localPipingExitPointX == null || redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = DetermineGlobalPointCoordinatesBasedOnGlobalSurfaceLine(
+                    new GeometryPoint(localPipingExitPointX.Value, 0.0, 0.0), redesignedSurfaceLineGlobal);
+
+                return point.X;
+            }
+        }
+
+        [Format("F3")]
+        [PropertyOrder(6, 8)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [XmlIgnore]
+        public double? PipingExitPointY
+        {
+            get
+            {
+                if (localPipingExitPointX == null || redesignedSurfaceLineGlobal == null)
+                    return null;
+
+                GeometryPoint point = DetermineGlobalPointCoordinatesBasedOnGlobalSurfaceLine(
+                    new GeometryPoint(localPipingExitPointX.Value, 0.0, 0.0), redesignedSurfaceLineGlobal);
+
+                return point.Y;
+            }
+        }
+
+        [Format("F3")]
+        [PropertyOrder(6, 9)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        public double? SeepageLength
+        {
+            get
+            {
+                if (scenario != null)
+                {
+                    return localPipingExitPointX - LocalPipingEntryPointX;
+                }
+                return localPipingExitPointX - LocalPipingEntryPointX;
+            }
+        }
+
+        [Format("F3")]
+        [PropertyOrder(6, 10)]
+        [Unit(UnitType.Length)]
+        [ReadOnly(true)]
+        [XmlIgnore]
+        public double? HCritical
+        {
+            get
+            {
+                double? res = null;
+                if (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping)
+                {
+                    switch (damFailureMechanismeCalculationSpecification.PipingModelType)
+                    {
+                        case PipingModelType.Bligh:
+                            res = BlighHCritical;
+                            break;
+                        case PipingModelType.Sellmeijer:
+                            res = SellmeijerHCritical;
+                            break;
+                        case PipingModelType.Sellmeijer2Forces:
+                            res = Sellmeijer2ForcesHCritical;
+                            break;
+                        case PipingModelType.Sellmeijer4Forces:
+                            res = Sellmeijer4ForcesHCritical;
+                            break;
+                        case PipingModelType.Wti2017:
+                            res = Wti2017HcriticalOverall;
+                            break;
+                    }
+                }
+                return res;
+            }
+        }
+
+        [Browsable(false)]
+        public string BaseFileName
+        {
+            get { return baseFileName; }
+            set { baseFileName = value; }
+        }
+
+        [Browsable(false)]
+        public string CalculationSubDir
+        {
+            get { return calculationSubDir; }
+            set { calculationSubDir = value; }
+        }
+
+        
+        public ResultEvaluation ResultEvaluation
+        {
+            get { return resultEvaluation; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "ResultEvaluation");
+                resultEvaluation = value;
+                DataEventPublisher.AfterChange(this, "ResultEvaluation");
+            }
+        }
+
+        [Description("Use this area to explain the valuation and for any further remarks")]
+        public string Notes
+        {
+            get { return notes; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "Notes");
+                notes = value;
+                DataEventPublisher.AfterChange(this, "Notes");
+            }
+        }
+
+        /// <summary>
+        /// Copies the result file.
+        /// </summary>
+        /// <param name="extension">The extension.</param>
+        private void CopyResultFile(string extension)
+        {
+            string copyResFile = Path.GetDirectoryName(InputFile) + Path.DirectorySeparatorChar + Path.GetFileNameWithoutExtension(InputFile) + " (copy)" + extension;
+            var resFile = Path.ChangeExtension(InputFile, extension);
+            if (resFile != null)
+            {
+                File.Copy(resFile, copyResFile, true);
+            }
+        }
+
+        private string GetCurrentExeForOpenCalculationFile()
+        {
+            var exeName = DamHelperFunctions.MStabExePath;
+            if (SelectedStabilityKernelType != StabilityKernelType.DamClassicStability)
+            {
+                exeName = Path.GetDirectoryName(exeName) + "\\MStab.exe";
+            }
+            return exeName;
+        }
+
+        /// <summary>
+        /// Opens the calculation file.
+        /// </summary>
+        public void OpenCalculationFile()
+        {
+            if (File.Exists(InputFile))
+            {
+                string copyFile = Path.GetDirectoryName(InputFile) + Path.DirectorySeparatorChar + 
+                    Path.GetFileNameWithoutExtension(InputFile) + " (copy)" + Path.GetExtension(InputFile);
+                File.Copy(InputFile, copyFile, true);
+                var exeName = GetCurrentExeForOpenCalculationFile();
+                if (SelectedStabilityKernelType == StabilityKernelType.DamClassicStability)
+                {
+                    const string stdExtension = ".std";
+                    CopyResultFile(stdExtension);
+
+                    const string stoExtension = ".sto";
+                    CopyResultFile(stoExtension);
+                }
+                var process = new Process
+                {
+                    StartInfo =
+                    {
+                        RedirectStandardOutput = false,
+                        FileName = exeName
+                    }
+                };
+                if (SelectedStabilityKernelType == StabilityKernelType.DamClassicStability)
+                {
+                    process.StartInfo.Arguments = " \"" + copyFile + "\"";
+                }
+                process.StartInfo.UseShellExecute = false;
+                process.StartInfo.WindowStyle = ProcessWindowStyle.Normal;
+                process.Start();
+            }
+            else
+            {
+                if (File.Exists(PipingResultFile))
+                {
+                    string copyFile = Path.GetTempPath() + Path.DirectorySeparatorChar + Path.GetFileNameWithoutExtension(PipingResultFile) + " (copy)" +
+                        Path.GetExtension(PipingResultFile);
+
+                    File.Copy(PipingResultFile, copyFile, true);
+                    Process.Start(copyFile);
+                }
+            }
+        }
+
+        public bool IsEnabled(string property)
+        {
+            return true;
+        }
+
+        public bool IsVisible(string property)
+        {
+            if (damFailureMechanismeCalculationSpecification == null)
+                return false;
+            switch (property)
+            {
+                // #Bka note that using FailureMechanismSystemType here is only possible as long as multiple specifications are NOT allowed. Otherwise visibility would
+                // have top be set here per line instead for whole column.
+                case "Zone1SafetyFactorStability":
+                case "Zone1EntryPointX":
+                case "Zone1EntryPointZ":
+                case "Zone1ExitPointX":
+                case "Zone1ExitPointZ":
+                case "Zone2SafetyFactorStability":
+                case "Zone2EntryPointX":
+                case "Zone2EntryPointZ":
+                case "Zone2ExitPointX":
+                case "Zone2ExitPointZ":
+                    return damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside;// &&
+                        //(damFailureMechanismeCalculationSpecification.FailureMechanismeParamatersMStab.MStabParameters.ZonesType == MStabZonesType.ZoneAreas ||
+                        //damFailureMechanismeCalculationSpecification.FailureMechanismeParamatersMStab.MStabParameters.ZonesType == MStabZonesType.ForbiddenZone);
+                    //#Bka: zones are defined per location so can differ from result to result. Hence using Isvisible is not possible for this as zones should then be made
+                    // visible or invisible per line in the table.
+                case "StabilityModel":
+                    return damFailureMechanismeCalculationSpecification.FailureMechanismSystemType ==
+                           FailureMechanismSystemType.StabilityInside ||
+                           damFailureMechanismeCalculationSpecification.FailureMechanismSystemType ==
+                           FailureMechanismSystemType.StabilityOutside;
+                case "PipingModel":
+                    return damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping;
+                case "PipingFactor":
+                    return damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping;
+                case "HCritical":
+                    return damFailureMechanismeCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.Piping;
+                case "OpenCalculationFile":
+                    return damFailureMechanismeCalculationSpecification.FailureMechanismSystemType != FailureMechanismSystemType.Piping &&
+                           File.Exists(GetCurrentExeForOpenCalculationFile());
+                default:
+                    return true;
+            }
+
+        }        
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/packages.config
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/packages.config	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/packages.config	(revision 3305)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) Stichting Deltares 2018. All rights reserved.
+
+This file is part of the DAM - UI.
+
+The DAM - UI is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+<packages>
+  <package id="GeoAPI" version="1.7.1.1" targetFramework="net40" requireReinstallation="true" />
+  <package id="NetTopologySuite" version="1.13.1" targetFramework="net40" requireReinstallation="true" />
+  <package id="NetTopologySuite.IO" version="1.13.1" targetFramework="net40" requireReinstallation="true" />
+  <package id="NUnit" version="2.6.2" targetFramework="net40" />
+  <package id="RhinoMocks" version="3.6.1" targetFramework="net40" />
+</packages>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(revision 3305)
@@ -0,0 +1,752 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Deltares.Dam.Data.Properties;
+using Deltares.Dam.Data.Sensors;
+using Deltares.DamEngine.Io;
+using Deltares.DamEngine.Io.XmlInput;
+using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.SurfaceLines;
+using Soil = Deltares.Geotechnics.Soils.Soil;
+using SurfaceLine = Deltares.DamEngine.Io.XmlInput.SurfaceLine;
+
+namespace Deltares.Dam.Data.DamEngineIo
+{
+    /// <summary>
+    /// Create XML Input object from DAM UI project
+    /// </summary>
+    public class FillXmlInputFromDamUi
+    {
+        /// <summary>
+        /// Creates the input.
+        /// </summary>
+        /// <param name="damProjectData">The dam project data.</param>
+        /// <param name="projectMap">The project map.</param>
+        /// <returns></returns>
+        public static Input CreateInput(DamProjectData damProjectData)
+        {
+            ValidateDamProjectData(damProjectData);
+
+            Input input = new Input();
+            Dike dike = damProjectData.WaterBoard.Dikes[0];
+
+            input.ProjectPath = damProjectData.ProjectPath;
+            input.CalculationMap = damProjectData.CalculationMap;
+            input.MaxCalculationCoresSpecified = true;
+            input.MaxCalculationCores = damProjectData.MaxCalculationCores;
+
+            TransferAnalysisSpecification(damProjectData, input);
+            TransferStabilityParameters(damProjectData, input);
+
+            // Process locations
+            List<Location> localLocations = new List<Location>();
+            foreach (LocationJob locationJob in damProjectData.SelectedLocationJobs)
+            {
+                localLocations.Add(locationJob.Location);
+            }
+            input.Locations = new DamEngine.Io.XmlInput.Location[localLocations.Count];
+            TransferLocations(localLocations, input.Locations);
+
+            // Process surfacelines
+            List<SurfaceLine2> localSurfaceLines = new List<SurfaceLine2>();
+            for (int i = 0; i < localLocations.Count; i++)
+            {
+                var crtSurfaceLine = localLocations[i].LocalXZSurfaceLine2;
+                if (!localSurfaceLines.Any(sl => sl.Name.Equals(crtSurfaceLine.Name)))
+                {
+                    localSurfaceLines.Add(crtSurfaceLine);
+                }
+            }
+            input.SurfaceLines = new SurfaceLine[localSurfaceLines.Count];
+            TransferSurfaceLines(localSurfaceLines, input.SurfaceLines);
+
+            // Process soils
+            input.Soils = new DamEngine.Io.XmlInput.Soil[dike.SoilList.Soils.Count];
+            TransferSoils(dike.SoilList.Soils, input.Soils);
+            TransferAquiferSoils(dike.SoilList.AquiferDictionary, input);
+
+            // Process soilprofiles
+            if (damProjectData.DamProjectCalculationSpecification.SelectedStabilityKernelType == StabilityKernelType.DamClassicStability)
+            {
+                // Fill 1D profiles in case of DamClassicStability
+                if (dike.SoilProfiles != null)
+                {
+                    var profilesCount = dike.SoilProfiles.Count;
+                    input.SoilProfiles1D = new DamEngine.Io.XmlInput.SoilProfile1D[profilesCount];
+                    TransferSoilProfiles1D(dike.SoilProfiles, input.SoilProfiles1D);
+                    input.SoilProfiles2D = new DamEngine.Io.XmlInput.SoilProfile2D[dike.SoilProfiles.Count];
+                }
+            }
+
+            var localSegments = EnsureInputLocationsSegmentsAreInSegments(damProjectData.WaterBoard.Segments, localLocations);
+            if (damProjectData.DamProjectCalculationSpecification.SelectedStabilityKernelType == StabilityKernelType.WtiMacroStabilityKernel)
+            {
+                // fill 2D profiles in case of WtiMacroStabilityKernel
+                var i = 0;
+                foreach (var localSegment in localSegments)
+                {
+                    foreach (var localSegmentSoilProfileProbability in localSegment.SoilProfileProbabilities)
+                    {
+                        if (localSegmentSoilProfileProbability.SegmentFailureMechanismType ==
+                            FailureMechanismSystemType.StabilityInside)
+                        {
+                            var soilSurfaceProfile = new SoilSurfaceProfile();
+                            var soilProfile1D = new Deltares.Geotechnics.Soils.SoilProfile1D();
+                            soilProfile1D.Assign(localSegmentSoilProfileProbability.SoilProfile);
+                            soilSurfaceProfile.SoilProfile = soilProfile1D;
+                            soilSurfaceProfile.SurfaceLine2 = localLocations[i].LocalXZSurfaceLine2;
+                            var dikeSoil = localLocations[i].GetDikeEmbankmentSoil();
+                            soilSurfaceProfile.DikeEmbankmentMaterial = dikeSoil;
+                            foreach (SoilLayer2D layer in soilSurfaceProfile.Surfaces)
+                            {
+                                if (layer.Soil == null)
+                                {
+                                    layer.Soil = dikeSoil;
+                                }
+                            }
+                        }
+                    }
+                    i++;
+                }
+                TransferSoilProfiles2D(dike.SoilProfiles, input.SoilProfiles2D);
+            }
+
+            // Process segments
+            if (localSegments != null)
+            {
+                input.Segments = new DamEngine.Io.XmlInput.Segment[localSegments.Count];
+                TransferSegments(localSegments, input.Segments);
+            }
+
+            if (damProjectData.InputTimeSerieCollection != null)
+            {
+                input.OperationalInputTimeSeries = new DamEngine.Io.XmlInput.TimeSerie[damProjectData.InputTimeSerieCollection.Series.Count];
+                TransferInputTimeSeries(damProjectData.InputTimeSerieCollection, input.OperationalInputTimeSeries);
+            }
+
+            if (damProjectData.SensorData != null)
+            {
+                input.SensorData = new InputSensorData();
+                TransferSensorData(damProjectData.SensorData, input.SensorData);
+            }
+            return input;
+        }
+
+        private static void TransferSensorData(SensorData sensorData, InputSensorData inputSensorData)
+        {
+            // Transfer sensorgroups
+            int sensorGroupIndex = 0;
+            inputSensorData.SensorGroups = new DamEngine.Io.XmlInput.SensorGroup[sensorData.SensorGroups.Count];
+            foreach (var sensorGroup in sensorData.SensorGroups)
+            {
+                var inputSensorGroup = new DamEngine.Io.XmlInput.SensorGroup();
+                inputSensorGroup.SensorIds = new SensorGroupSensorIds[sensorGroup.SensorCount];
+                inputSensorGroup.Id = sensorGroup.ID;
+                int sensorIdIndex = 0;
+                foreach (var sensor in sensorGroup.SensorArray)
+                {
+                    inputSensorGroup.SensorIds[sensorIdIndex] = new SensorGroupSensorIds() { SensorId = sensor.ID };
+                    sensorIdIndex++;
+                }
+                inputSensorData.SensorGroups[sensorGroupIndex] = inputSensorGroup;
+                sensorGroupIndex++;
+            }
+
+            // Transfer sensorlocations
+            int senserLocationIndex = 0;
+            inputSensorData.SensorLocations = new DamEngine.Io.XmlInput.SensorLocation[sensorData.SensorLocations.Count];
+            foreach (var sensorLocation in sensorData.SensorLocations)
+            {
+                var inputSensorLocation = new DamEngine.Io.XmlInput.SensorLocation();
+                inputSensorLocation.GroupId = sensorLocation.GroupID;
+                inputSensorLocation.LocationId = sensorLocation.LocationName;
+                inputSensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = ConversionHelper.ConvertToInputDataSourceTypeSensors(sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder);
+                inputSensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = ConversionHelper.ConvertToInputDataSourceTypeSensors(sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder);
+                inputSensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = ConversionHelper.ConvertToInputDataSourceTypeSensors(sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver);
+                inputSensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = ConversionHelper.ConvertToInputDataSourceTypeSensors(sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside);
+                inputSensorLocation.SourceTypePl1WaterLevelAtRiver = ConversionHelper.ConvertToInputDataSourceTypeSensors(sensorLocation.SourceTypePl1WaterLevelAtRiver);
+                inputSensorLocation.SourceTypePl1WaterLevelAtPolder = ConversionHelper.ConvertToInputDataSourceTypeSensors(sensorLocation.SourceTypePl1WaterLevelAtPolder);
+                inputSensorLocation.SourceTypePl3 = ConversionHelper.ConvertToInputDataSourceTypeSensors(sensorLocation.SourceTypePl3);
+                inputSensorLocation.SourceTypePl4 = ConversionHelper.ConvertToInputDataSourceTypeSensors(sensorLocation.SourceTypePl4);
+                inputSensorData.SensorLocations[senserLocationIndex] = inputSensorLocation;
+                senserLocationIndex++;
+            }
+
+            // Transfer sensors
+            inputSensorData.Sensors = new DamEngine.Io.XmlInput.Sensor[sensorData.Sensors.Count];
+            int sensorIndex = 0;
+            foreach (var sensor in sensorData.Sensors)
+            {
+                var inputSensor = new DamEngine.Io.XmlInput.Sensor();
+                inputSensor.Id = sensor.ID;
+                inputSensor.Name = sensor.Name;
+                inputSensor.RelativeLocation = sensor.RelativeLocation;
+                inputSensor.SensorType = ConversionHelper.ConvertToInputSensorType(sensor.Type);
+                inputSensor.PlLineMapping = new SensorPlLineMapping[sensor.PLLineMappings.Length];
+                int mappingIndex = 0;
+                foreach (var plLineMapping in sensor.PLLineMappings)
+                {
+                    inputSensor.PlLineMapping[mappingIndex] = new SensorPlLineMapping() { PLineType = ConversionHelper.ConvertToInputPlLineType(plLineMapping) };
+                    mappingIndex++;
+                }
+                inputSensorData.Sensors[sensorIndex] = inputSensor;
+                sensorIndex++;
+            }
+        }
+
+        private static void TransferInputTimeSeries(TimeSerieCollection inputTimeSerieCollection, DamEngine.Io.XmlInput.TimeSerie[] operationalInputTimeSeries)
+        {
+            int timeSerieIndex = 0;
+            foreach (var timeSerie in inputTimeSerieCollection.Series)
+            {
+                var inputTimeSerie = new DamEngine.Io.XmlInput.TimeSerie();
+                inputTimeSerie.Entries = new TimeSerieEntries();
+                inputTimeSerie.Entries.TimeSerieEntry = new TimeSerieEntriesTimeSerieEntry[timeSerie.Entries.Count];
+                inputTimeSerie.TimeStep = new TimeSerieTimeStep();
+                inputTimeSerie.LocationId = timeSerie.LocationId;
+                inputTimeSerie.ParameterId = timeSerie.ParameterId;
+                inputTimeSerie.ForecastDateTime = timeSerie.ForecastDateTime;
+                inputTimeSerie.Type = timeSerie.Type;
+                inputTimeSerie.StartDateTime = timeSerie.StartDateTime;
+                inputTimeSerie.EndDateTime = timeSerie.EndDateTime;
+                inputTimeSerie.MissVal = timeSerie.MissVal;
+                inputTimeSerie.LongName = timeSerie.LongName;
+                inputTimeSerie.StationName = timeSerie.StationName;
+                inputTimeSerie.Units = timeSerie.Units;
+                inputTimeSerie.SourceOrganisation = timeSerie.SourceOrganisation;
+                inputTimeSerie.SourceSystem = timeSerie.SourceSystem;
+                inputTimeSerie.FileDescription = timeSerie.FileDescription;
+                inputTimeSerie.Region = timeSerie.Region;
+                inputTimeSerie.TimeStep.Multiplier = timeSerie.TimeStep.Multiplier;
+                inputTimeSerie.TimeStep.Divider = timeSerie.TimeStep.Divider;
+                inputTimeSerie.TimeStep.MultiplierSpecified1 = timeSerie.TimeStep.MultiplierSpecified;
+                inputTimeSerie.TimeStep.DividerSpecified1 = timeSerie.TimeStep.DividerSpecified;
+                inputTimeSerie.TimeStep.TimeStepUnit = ConversionHelper.ConvertToInputTimeStepUnit(timeSerie.TimeStep.Unit);
+                int timeSerieEntryIndex = 0;
+                foreach (var timestepEntry in timeSerie.Entries)
+                {
+                    TimeSerieEntriesTimeSerieEntryStochastValue stochastValue = null;
+                    if (timestepEntry.StochastValue != null)
+                    {
+                        stochastValue = new TimeSerieEntriesTimeSerieEntryStochastValue()
+                        {
+                            Distribution = timestepEntry.StochastValue.Distribution,
+                            Mean = timestepEntry.StochastValue.Mean,
+                            StandardDeviation = timestepEntry.StochastValue.StandardDeviation
+                        };
+                    }
+                    TimeSerieEntriesTimeSerieEntry timeStep = new TimeSerieEntriesTimeSerieEntry()
+                    {
+                        DateTime = timestepEntry.DateTime,
+                        Value = timestepEntry.Value,
+                        BasisFileNameWMF = timestepEntry.BasisFileName,
+                        Flagnietechtgebruikt = timestepEntry.Flag,
+                        RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName,
+                        StochastValue = stochastValue
+                    };
+                    inputTimeSerie.Entries.TimeSerieEntry[timeSerieEntryIndex] = timeStep;
+                    timeSerieEntryIndex++;
+
+                }
+                operationalInputTimeSeries[timeSerieIndex] = inputTimeSerie;
+                timeSerieIndex++;
+            }
+        }
+
+        private static void TransferAquiferSoils(Dictionary<Soil, bool> aquiferDictionary, Input input)
+        {
+            InputAquiferSoil[] aquiferSoils;
+            if (aquiferDictionary != null && aquiferDictionary.Count > 0)
+            {
+                aquiferSoils = new InputAquiferSoil[aquiferDictionary.Count];
+                int soilIndex = 0;
+                foreach (KeyValuePair<Soil, bool> keyValuePair in aquiferDictionary)
+                {
+                    aquiferSoils[soilIndex] = new InputAquiferSoil() { Soilname = keyValuePair.Key.Name, IsAquifer = keyValuePair.Value };
+                    soilIndex++;
+                }
+            }
+            else
+            {
+                aquiferSoils = null;
+            }
+            input.AquiferSoils = aquiferSoils;
+        }
+
+        private static IList<Segment> EnsureInputLocationsSegmentsAreInSegments(IList<Segment> segments, List<Location> localLocations)
+        {
+            var localSegments = new List<Segment>();
+            localSegments.AddRange(segments);
+            foreach (var localLocation in localLocations)
+            {
+                var seg = localSegments.FirstOrDefault(x => x.Name == localLocation.Segment.Name);
+                if (seg == null)
+                {
+                    localSegments.Add(localLocation.Segment);
+                }
+            }
+            return localSegments;
+        }
+
+        private static void TransferAnalysisSpecification(DamProjectData damProjectData, Input input)
+        {
+            input.DamProjectType = ConversionHelper.ConvertToInputDamProjectType(damProjectData.DamProjectType);
+            if (damProjectData.DamProjectCalculationSpecification.CurrentSpecification != null)
+            {
+                input.FailureMechanismSystemType = ConversionHelper.ConvertToInputFailureMechanismSystemType(damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType);
+
+                input.AnalysisTypeSpecified = (input.DamProjectType == InputDamProjectType.Design);
+                if (input.AnalysisTypeSpecified)
+                {
+                    input.AnalysisType = ConversionHelper.ConvertToInputAnalysisType(DamProjectCalculationSpecification.SelectedAnalysisType);
+                }
+
+                input.PipingModelTypeSpecified = input.FailureMechanismSystemType == ConversionHelper.InputFailureMechanismPiping;
+                if (input.PipingModelTypeSpecified)
+                {
+                    input.PipingModelType = ConversionHelper.ConvertToInputPipingModelType(damProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType);
+                }
+
+                input.StabilityModelTypeSpecified = input.FailureMechanismSystemType == ConversionHelper.InputFailureMechanismStabilityInside ||
+                                                    input.FailureMechanismSystemType == ConversionHelper.InputFailureMechanismStabilityOutside;
+                if (input.StabilityModelTypeSpecified)
+                {
+                    input.StabilityModelType = ConversionHelper.ConvertToInputStabilityModelType(damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType);
+                }
+            }
+        }
+
+        private static void TransferStabilityParameters(DamProjectData damProjectData, Input input)
+        {
+            if (damProjectData.DamProjectCalculationSpecification != null && damProjectData.DamProjectCalculationSpecification.CurrentSpecification != null)
+            {
+                var curSpec = damProjectData.DamProjectCalculationSpecification.CurrentSpecification;
+                if (curSpec.FailureMechanismeParamatersMStab != null && curSpec.FailureMechanismeParamatersMStab.MStabParameters != null)
+                {
+                    input.StabilityParameters = new StabilityParameters();
+                    input.StabilityParameters.SearchMethod = ConversionHelper.ConvertToInputSearchMethod(curSpec.FailureMechanismeParamatersMStab.MStabParameters.SearchMethod);
+                    var slipCircleDefinition = curSpec.FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition;
+                    if (slipCircleDefinition != null)
+                    {
+                        input.StabilityParameters.GridDetermination = ConversionHelper.ConvertToInputGridDetermination(slipCircleDefinition.GridSizeDetermination);
+                        input.StabilityParameters.BishopTangentLinesDefinitionSpecified = true;
+                        input.StabilityParameters.BishopTangentLinesDefinition = ConversionHelper.ConvertToInputTangentLinesDefinition(slipCircleDefinition.BishopTangentLinesDefinition);
+                        input.StabilityParameters.BishopTangentLinesDistanceSpecified = true;
+                        input.StabilityParameters.BishopTangentLinesDistance = slipCircleDefinition.BishopTangentLinesDistance;
+                        input.StabilityParameters.BishopGridVerticalPointsCountSpecified = true;
+                        input.StabilityParameters.BishopGridVerticalPointsCount = slipCircleDefinition.BishopGridVerticalPointCount;
+                        input.StabilityParameters.BishopGridVerticalPointsDistanceSpecified = true;
+                        input.StabilityParameters.BishopGridVerticalPointsDistance = slipCircleDefinition.BishopGridVerticalPointDistance;
+                        input.StabilityParameters.BishopGridHorizontalPointsCountSpecified = true;
+                        input.StabilityParameters.BishopGridHorizontalPointsCount = slipCircleDefinition.BishopGridHorizontalPointCount;
+                        input.StabilityParameters.BishopGridHorizontalPointsDistanceSpecified = true;
+                        input.StabilityParameters.BishopGridHorizontalPointsDistance = slipCircleDefinition.BishopGridHorizontalPointDistance;
+                        input.StabilityParameters.UpliftVanTangentLinesDefinitionSpecified = true;
+                        input.StabilityParameters.UpliftVanTangentLinesDefinition = ConversionHelper.ConvertToInputTangentLinesDefinition(slipCircleDefinition.UpliftVanTangentLinesDefinition);
+                        input.StabilityParameters.UpliftVanTangentLinesDistanceSpecified = true;
+                        input.StabilityParameters.UpliftVanTangentLinesDistance = slipCircleDefinition.UpliftVanTangentLinesDistance;
+                        input.StabilityParameters.UpliftVanGridLeftVerticalPointsCountSpecified = true;
+                        input.StabilityParameters.UpliftVanGridLeftVerticalPointsCount = slipCircleDefinition.UpliftVanLeftGridVerticalPointCount;
+                        input.StabilityParameters.UpliftVanGridLeftVerticalPointsDistanceSpecified = true;
+                        input.StabilityParameters.UpliftVanGridLeftVerticalPointsDistance = slipCircleDefinition.UpliftVanLeftGridVerticalPointDistance;
+                        input.StabilityParameters.UpliftVanGridLeftHorizontalPointsCountSpecified = true;
+                        input.StabilityParameters.UpliftVanGridLeftHorizontalPointsCount = slipCircleDefinition.UpliftVanLeftGridHorizontalPointCount;
+                        input.StabilityParameters.UpliftVanGridLeftHorizontalPointsDistanceSpecified = true;
+                        input.StabilityParameters.UpliftVanGridLeftHorizontalPointsDistance = slipCircleDefinition.UpliftVanLeftGridHorizontalPointDistance;
+                        input.StabilityParameters.UpliftVanGridRightVerticalPointsCountSpecified = true;
+                        input.StabilityParameters.UpliftVanGridRightVerticalPointsCount = slipCircleDefinition.UpliftVanRightGridVerticalPointCount;
+                        input.StabilityParameters.UpliftVanGridRightVerticalPointsDistanceSpecified = true;
+                        input.StabilityParameters.UpliftVanGridRightVerticalPointsDistance = slipCircleDefinition.UpliftVanRightGridVerticalPointDistance;
+                        input.StabilityParameters.UpliftVanGridRightHorizontalPointsCountSpecified = true;
+                        input.StabilityParameters.UpliftVanGridRightHorizontalPointsCount = slipCircleDefinition.UpliftVanRightGridHorizontalPointCount;
+                        input.StabilityParameters.UpliftVanGridRightHorizontalPointsDistanceSpecified = true;
+                        input.StabilityParameters.UpliftVanGridRightHorizontalPointsDistance = slipCircleDefinition.UpliftVanRightGridHorizontalPointDistance;
+                    }
+                }
+            }
+        }
+
+        private static void ValidateDamProjectData(DamProjectData damProjectData)
+        {
+            ThrowHelper.ThrowIfArgumentNull(damProjectData.WaterBoard, nameof(damProjectData.WaterBoard), StringResourceNames.NoDikeDefined);
+            if (damProjectData.WaterBoard.Dikes == null || damProjectData.WaterBoard.Dikes.Count != 1)
+            {
+                throw new ArgumentException(Resources.DikeShouldContainExactly1Dike);
+            }
+            var dike = damProjectData.WaterBoard.Dikes[0];
+            ThrowHelper.ThrowIfArgumentNull(dike.Locations, nameof(dike.Locations), StringResourceNames.NoLocationsDefined);
+            // Following situation should never occur in the UI. Tested because of the check on RiverLevelLow in the code below
+            var currentSpecification = damProjectData.DamProjectCalculationSpecification.CurrentSpecification;
+            ThrowHelper.ThrowIfArgumentNull(currentSpecification, nameof(currentSpecification), StringResourceNames.NoCalculationTypeSpecified);
+            foreach (Location location in dike.Locations)
+            {
+                ThrowHelper.ThrowIfArgumentNull(location.Scenarios, nameof(location.Scenarios), StringResourceNames.NoScenariosDefinedInLocation);
+                foreach (var scenario in location.Scenarios)
+                {
+                    string errorMessage = string.Format(Resources.NoRiverLevel, location.Name, scenario.LocationScenarioID);
+                    ThrowHelper.ThrowIfArgumentNull(scenario.RiverLevel, nameof(scenario.RiverLevel), errorMessage);
+                    // In code above is tested that CurrentSpecification exists
+                    if (currentSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside)
+                    {
+                        errorMessage = string.Format(Resources.NoRiverLevelLow, location.Name, scenario.LocationScenarioID);
+                        ThrowHelper.ThrowIfArgumentNull(scenario.RiverLevelLow, nameof(scenario.RiverLevelLow), errorMessage);
+                    }
+                }
+            }
+
+            ThrowHelper.ThrowIfArgumentNull(dike.SurfaceLines2, nameof(dike.SurfaceLines2), StringResourceNames.NoSurfaceLines);
+            foreach (var surfaceLine in dike.SurfaceLines2)
+            {
+                if ((surfaceLine.CharacteristicPoints == null) || (surfaceLine.CharacteristicPoints.Count < 1))
+                {
+                    throw new ArgumentException(string.Format(Resources.SurfaceLineHasNoCharacteristicPoints, surfaceLine.Name));
+                }
+                if ((surfaceLine.Geometry == null) || (surfaceLine.Geometry.Count < 2))
+                {
+                    throw new ArgumentException(string.Format(Resources.SurfaceLineHasNoPoints, surfaceLine.Name));
+                }
+            }
+            ThrowHelper.ThrowIfArgumentNull(dike.SoilList, nameof(dike.SoilList), StringResourceNames.NoSoilsDefinedInProject);
+            ThrowHelper.ThrowIfArgumentNull(dike.SoilList.Soils, nameof(dike.SoilList.Soils), StringResourceNames.NoSoilsDefinedInProject);
+            ThrowHelper.ThrowIfArgumentNull(dike.SoilProfiles, nameof(dike.SoilProfiles), StringResourceNames.NoSoilprofiles1DDefinedInProject);
+            // Check for invalid Id names
+            foreach (var location in dike.Locations)
+            {
+                if (!IdValidator.IsCorrectName(location.Name))
+                {
+                    throw new IdValidatorException(string.Format(Resources.LocationInvalidName, location.Name));
+                }
+            }
+            foreach (var segment in damProjectData.WaterBoard.Segments)
+            {
+                if (!IdValidator.IsCorrectName(segment.Name))
+                {
+                    throw new IdValidatorException(string.Format(Resources.SegmentInvalidName, segment.Name));
+                }
+            }
+            foreach (var surfaceLine2 in dike.SurfaceLines2)
+            {
+                if (!IdValidator.IsCorrectName(surfaceLine2.Name))
+                {
+                    throw new IdValidatorException(string.Format(Resources.SurfaceLineInvalidName, surfaceLine2.Name));
+                }
+            }
+            foreach (var soilProfile in dike.SoilProfiles)
+            {
+                if (!IdValidator.IsCorrectName(soilProfile.Name))
+                {
+                    throw new IdValidatorException(string.Format(Resources.SoilProfileInvalidName, soilProfile.Name));
+                }
+            }
+            foreach (var soil in dike.SoilList.Soils)
+            {
+                if (!IdValidator.IsCorrectName(soil.Name))
+                {
+                    throw new IdValidatorException(string.Format(Resources.SoilInvalidName, soil.Name));
+                }
+            }
+        }
+
+        private static void TransferSoils(List<Soil> soils, DamEngine.Io.XmlInput.Soil[] inputSoils)
+        {
+            for (int i = 0; i < soils.Count; i++)
+            {
+                var soil = soils[i];
+                var inputSoil = new DamEngine.Io.XmlInput.Soil();
+                inputSoil.Name = soil.Name;
+                inputSoil.AbovePhreaticLevelSpecified = !Double.IsNaN(soil.AbovePhreaticLevel);
+                inputSoil.AbovePhreaticLevel = soil.AbovePhreaticLevel;
+                inputSoil.BelowPhreaticLevelSpecified = !Double.IsNaN(soil.BelowPhreaticLevel);
+                inputSoil.BelowPhreaticLevel = soil.BelowPhreaticLevel;
+                inputSoil.DryUnitWeightSpecified = !Double.IsNaN(soil.DryUnitWeight);
+                inputSoil.DryUnitWeight = soil.DryUnitWeight;
+                inputSoil.BeddingAngleSpecified = !Double.IsNaN(soil.BeddingAngle);
+                inputSoil.BeddingAngle = soil.BeddingAngle;
+                inputSoil.DiameterD70Specified = !Double.IsNaN(soil.DiameterD70);
+                inputSoil.DiameterD70 = soil.DiameterD70;
+                inputSoil.DiameterD90Specified = !Double.IsNaN(soil.DiameterD90);
+                inputSoil.DiameterD90 = soil.DiameterD90;
+                inputSoil.PermeabKxSpecified = !Double.IsNaN(soil.PermeabKx);
+                inputSoil.PermeabKx = soil.PermeabKx;
+                inputSoil.WhitesConstantSpecified = !Double.IsNaN(soil.WhitesConstant);
+                inputSoil.WhitesConstant = soil.WhitesConstant;
+                inputSoil.ShearStrengthModelSpecified = true;
+                inputSoil.ShearStrengthModel = ConversionHelper.ConvertToSoilShearStrengthModel(soil.ShearStrengthModel);
+                inputSoil.UseDefaultShearStrengthModelSpecified = true;
+                inputSoil.UseDefaultShearStrengthModel = soil.UseDefaultShearStrengthModel;
+                inputSoil.CohesionSpecified = !Double.IsNaN(soil.Cohesion);
+                inputSoil.Cohesion = soil.Cohesion;
+                inputSoil.FrictionAngleSpecified = !Double.IsNaN(soil.FrictionAngle);
+                inputSoil.FrictionAngle = soil.FrictionAngle;
+                inputSoil.OcrSpecified = !Double.IsNaN(soil.OCR);
+                inputSoil.Ocr = soil.OCR;
+                inputSoil.SlopeRestProfileSpecified = !Double.IsNaN(soil.RestSlope);
+                inputSoil.SlopeRestProfile = soil.RestSlope;
+                inputSoil.DilatancyTypeSpecified = true;
+                inputSoil.DilatancyType = ConversionHelper.ConvertToSoilDilatancyType(soil.DilatancyType);
+                inputSoils[i] = inputSoil;
+            }
+        }
+
+        private static void TransferSurfaceLines(IList<SurfaceLine2> dikeSurfaceLines, SurfaceLine[] inputSurfaceLines)
+        {
+            for (int i = 0; i < dikeSurfaceLines.Count; i++)
+            {
+                var surfaceLine = dikeSurfaceLines[i];
+                var inputSurfaceLine = new SurfaceLine();
+                inputSurfaceLine.Name = surfaceLine.Name;
+                inputSurfaceLine.Points = new SurfaceLinePoint[surfaceLine.CharacteristicPoints.Count];
+                for (int j = 0; j < surfaceLine.CharacteristicPoints.Count; j++)
+                {
+                    var characteristicPoint = surfaceLine.CharacteristicPoints[j];
+                    var inputPoint = new SurfaceLinePoint()
+                    {
+                        PointType = ConversionHelper.ConvertToInputPointType(characteristicPoint.CharacteristicPointType),
+                        X = characteristicPoint.X,
+                        Z = characteristicPoint.Z
+                    };
+                    inputSurfaceLine.Points[j] = inputPoint;
+                }
+                inputSurfaceLines[i] = inputSurfaceLine;
+            }
+        }
+        private static void TransferLocations(IList<Location> dikeLocations, DamEngine.Io.XmlInput.Location[] inputLocations)
+        {
+            for (int i = 0; i < dikeLocations.Count; i++)
+            {
+                var location = dikeLocations[i];
+                var inputLocation = new DamEngine.Io.XmlInput.Location();
+                inputLocation.Name = location.Name;
+                inputLocation.DistanceToEntryPoint = location.DistanceToEntryPoint;
+                inputLocation.DistanceToEntryPointSpecified = true;
+                inputLocation.XSoilGeometry2DOriginSpecified = true;
+                inputLocation.XSoilGeometry2DOrigin = location.XSoilGeometry2DOrigin;
+
+                inputLocation.SurfaceLineName = location.LocalXZSurfaceLine2.Name;
+                inputLocation.SegmentName = location.Segment.Name;
+
+                var waternetOptions = new LocationWaternetOptions();
+                waternetOptions.PhreaticLineCreationMethod = ConversionHelper.ConvertToInputPhreaticLineCreationMethod(location.PLLineCreationMethod);
+                waternetOptions.IntrusionVerticalWaterPressure = ConversionHelper.ConvertToInputIntrusionVerticalWaterPressure(location.IntrusionVerticalWaterPressure ?? IntrusionVerticalWaterPressureType.Standard);
+                waternetOptions.DampingFactorPl3 = location.DampingFactorPL3;
+                waternetOptions.DampingFactorPl4 = location.DampingFactorPL4;
+                waternetOptions.PenetrationLength = location.PenetrationLength;
+                waternetOptions.SlopeDampingFactor = location.SlopeDampingPiezometricHeightPolderSide;
+                inputLocation.WaternetOptions = waternetOptions;
+
+                inputLocation.DesignScenarios = new LocationDesignScenario[location.Scenarios.Count];
+                for (int j = 0; j < location.Scenarios.Count; j++)
+                {
+                    var designScenario = location.Scenarios[j];
+                    var inputDesignScenario = new LocationDesignScenario();
+                    inputDesignScenario.RiverLevel = designScenario.RiverLevel.Value;
+
+                    inputDesignScenario.Id = designScenario.LocationScenarioID;
+                    inputDesignScenario.RiverLevelLowSpecified = designScenario.RiverLevelLow.HasValue;
+                    inputDesignScenario.RiverLevelLow = designScenario.RiverLevelLow ?? 0.0;
+                    inputDesignScenario.DikeTableHeightSpecified = designScenario.DikeTableHeight.HasValue;
+                    inputDesignScenario.DikeTableHeight = designScenario.DikeTableHeight ?? 0.0;
+                    inputDesignScenario.PlLineOffsetBelowDikeTopAtRiver = designScenario.PlLineOffsetBelowDikeTopAtRiver;
+                    inputDesignScenario.PlLineOffsetBelowDikeTopAtPolder = designScenario.PlLineOffsetBelowDikeTopAtPolder;
+                    inputDesignScenario.PlLineOffsetBelowShoulderBaseInside = designScenario.PlLineOffsetBelowShoulderBaseInside;
+                    inputDesignScenario.PlLineOffsetBelowDikeToeAtPolder = designScenario.PlLineOffsetBelowDikeToeAtPolder;
+                    inputDesignScenario.PlLineOffsetBelowDikeCrestMiddleSpecified = designScenario.UsePlLineOffsetBelowDikeCrestMiddle ?? false;
+                    inputDesignScenario.PlLineOffsetBelowDikeCrestMiddle = designScenario.PlLineOffsetBelowDikeCrestMiddle ?? 0.0;
+                    inputDesignScenario.PlLineOffsetFactorBelowShoulderCrestSpecified = designScenario.UsePlLineOffsetFactorBelowShoulderCrest ?? false;
+                    inputDesignScenario.PlLineOffsetFactorBelowShoulderCrest = designScenario.PlLineOffsetFactorBelowShoulderCrest ?? 0.0;
+                    inputDesignScenario.HeadPl3Specified = designScenario.HeadPl3.HasValue;
+                    inputDesignScenario.HeadPl3 = designScenario.HeadPl3 ?? 0.0;
+                    inputDesignScenario.HeadPl4Specified = designScenario.HeadPl4.HasValue;
+                    inputDesignScenario.HeadPl4 = designScenario.HeadPl4 ?? 0.0;
+                    inputDesignScenario.UpliftCriterionStability = designScenario.UpliftCriterionStability;
+                    inputDesignScenario.UpliftCriterionPiping = designScenario.UpliftCriterionPiping;
+                    inputDesignScenario.RequiredSafetyFactorStabilityInnerSlope = designScenario.RequiredSafetyFactorStabilityInnerSlope;
+                    inputDesignScenario.RequiredSafetyFactorStabilityOuterSlope = designScenario.RequiredSafetyFactorStabilityOuterSlope;
+                    inputDesignScenario.RequiredSafetyFactorPiping = designScenario.RequiredSafetyFactorPiping;
+                    inputDesignScenario.PolderLevel = designScenario.PolderLevel;
+                    inputDesignScenario.HeadPl2Specified = designScenario.HeadPl2.HasValue;
+                    inputDesignScenario.HeadPl2 = designScenario.HeadPl2 ?? 0.0;
+
+                    inputLocation.DesignScenarios[j] = inputDesignScenario;
+                }
+                inputLocation.DikeEmbankmentMaterial = location.DikeEmbankmentMaterial;
+                inputLocation.StabilityOptions = new LocationStabilityOptions
+                {
+                    MapForSoilgeometries2D = location.MapForSoilGeometries2D,
+                    SoilDatabaseName = location.SoildatabaseName,
+                    ZoneType = ConversionHelper.ConvertToInputZoneType(location.StabilityZoneType),
+                    ForbiddenZoneFactorSpecified = true,
+                    ForbiddenZoneFactor = location.ForbiddenZoneFactor,
+                    ZoneAreaRestSlopeCrestWidthSpecified = true,
+                    ZoneAreaRestSlopeCrestWidth = location.ZoneAreaRestSlopeCrestWidth,
+                    TrafficLoadSpecified = true,
+                    TrafficLoad = location.TrafficLoad,
+                    TrafficLoadDegreeOfConsolidationSpecified = location.TL_DegreeOfConsolidation.HasValue,
+                    TrafficLoadDegreeOfConsolidation = location.TL_DegreeOfConsolidation ?? 0.0,
+                    MinimumCircleDepthSpecified = true,
+                    MinimumCircleDepth = location.MinimalCircleDepth
+                };
+
+                // Design options
+                var designOptions = new LocationDesignOptions();
+                designOptions.RedesignDikeHeight = location.RedesignDikeHeight;
+                designOptions.RedesignDikeShoulder = location.RedesignDikeShoulder;
+                designOptions.ShoulderEmbankmentMaterial = location.ShoulderEmbankmentMaterial;
+                designOptions.StabilityShoulderGrowSlope = location.StabilityShoulderGrowSlope;
+                designOptions.StabilityShoulderGrowDeltaX = location.StabilityShoulderGrowDeltaX;
+                designOptions.StabilitySlopeAdaptionDeltaX = location.StabilitySlopeAdaptionDeltaX;
+                designOptions.SlopeAdaptionStartCotangent = location.SlopeAdaptionStartCotangent;
+                designOptions.SlopeAdaptionEndCotangent = location.SlopeAdaptionEndCotangent;
+                designOptions.SlopeAdaptionStepCotangent = location.SlopeAdaptionStepCotangent;
+                designOptions.NewDikeTopWidthSpecified = location.UseNewDikeTopWidth;
+                designOptions.NewDikeTopWidth = location.NewDikeTopWidth;
+                designOptions.NewDikeSlopeInsideSpecified = location.UseNewDikeSlopeInside;
+                designOptions.NewDikeSlopeInside = location.NewDikeSlopeInside;
+                designOptions.NewDikeSlopeOutsideSpecified = location.UseNewDikeSlopeOutside;
+                designOptions.NewDikeSlopeOutside = location.NewDikeSlopeOutside;
+                designOptions.NewShoulderTopSlopeSpecified = location.UseNewShoulderTopSlope;
+                designOptions.NewShoulderTopSlope = location.NewShoulderTopSlope;
+                designOptions.NewShoulderBaseSlopeSpecified = location.UseNewShoulderBaseSlope;
+                designOptions.NewShoulderBaseSlope = location.NewShoulderBaseSlope;
+                designOptions.NewMaxHeightShoulderAsFractionSpecified = location.UseNewMaxHeightShoulderAsFraction;
+                designOptions.NewMaxHeightShoulderAsFraction = location.NewMaxHeightShoulderAsFraction;
+                designOptions.NewMinDistanceDikeToeStartDitchSpecified = location.UseNewMinDistanceDikeToeStartDitch;
+                designOptions.NewMinDistanceDikeToeStartDitch = location.NewMinDistanceDikeToeStartDitch;
+                designOptions.UseNewDitchDefinition = location.UseNewDitchDefinition;
+                designOptions.NewWidthDitchBottomSpecified = location.UseNewDitchDefinition;
+                designOptions.NewWidthDitchBottom = location.NewWidthDitchBottom;
+                designOptions.NewSlopeAngleDitchSpecified = location.UseNewDitchDefinition;
+                designOptions.NewSlopeAngleDitch = location.NewSlopeAngleDitch;
+                designOptions.NewDepthDitchSpecified = location.UseNewDitchDefinition;
+                designOptions.NewDepthDitch = location.NewDepthDitch;
+                designOptions.StabilityDesignMethod = ConversionHelper.ConvertToInputStabilityDesignMethod(location.StabilityDesignMethod);
+                inputLocation.DesignOptions = designOptions;
+                inputLocations[i] = inputLocation;
+            }
+        }
+
+        private static void TransferSoilProfiles1D(IList<Deltares.Geotechnics.Soils.SoilProfile1D> dikeSoilProfiles, DamEngine.Io.XmlInput.SoilProfile1D[] inputSoilProfiles1D)
+        {
+            var profilesCount = dikeSoilProfiles.Count;
+            for (int i = 0; i < profilesCount; i++)
+            {
+                var soilProfile1D = dikeSoilProfiles[i];
+                var inputSoilProfile1D = new DamEngine.Io.XmlInput.SoilProfile1D
+                {
+                    Name = soilProfile1D.Name,
+                    BottomLevel = soilProfile1D.BottomLevel,
+                    Layers1D = new SoilProfile1DLayer1D[soilProfile1D.LayerCount]
+                };
+                AddLayers1D(soilProfile1D, inputSoilProfile1D);
+                inputSoilProfiles1D[i] = inputSoilProfile1D;
+            }
+        }
+
+        private static void TransferSoilProfiles2D(IList<Deltares.Geotechnics.Soils.SoilProfile1D> dikeSoilProfiles, DamEngine.Io.XmlInput.SoilProfile2D[] inputSoilProfiles2D)
+        {
+            var profilesCount = dikeSoilProfiles.Count;
+            for (int i = 0; i < profilesCount; i++)
+            {
+                var soilProfile2D = dikeSoilProfiles[i];
+                var inputSoilProfile2D = new DamEngine.Io.XmlInput.SoilProfile2D
+                {
+                    Name = soilProfile2D.Name,
+
+                    Layers2D = new SoilProfile2DLayer2D[soilProfile2D.LayerCount]
+                };
+                // AddLayers2D(soilProfile2D, inputSoilProfile2D);
+                inputSoilProfiles2D[i] = inputSoilProfile2D;
+            }
+        }
+
+        private static void AddLayers1D(Deltares.Geotechnics.Soils.SoilProfile1D soilProfile1D, DamEngine.Io.XmlInput.SoilProfile1D inputSoilProfile1D)
+        {
+            for (int i = 0; i < soilProfile1D.LayerCount; i++)
+            {
+                var layer = soilProfile1D.Layers[i];
+                var inputLayer = new SoilProfile1DLayer1D
+                {
+                    Name = layer.Id,
+                    SoilName = layer.Soil.Name,
+                    TopLevel = layer.TopLevel,
+                    IsAquifer = layer.IsAquifer,
+                    WaterpressureInterpolationModel = ConversionHelper.ConvertToInputWaterpressureInterpolationModel(
+                        layer.WaterpressureInterpolationModel)
+                };
+                inputSoilProfile1D.Layers1D[i] = inputLayer;
+            }
+        }
+        private static void TransferSegments(IList<Segment> segments, DamEngine.Io.XmlInput.Segment[] inputSegments)
+        {
+            for (int i = 0; i < segments.Count; i++)
+            {
+                var segment = segments[i];
+                var inputSegment = new DamEngine.Io.XmlInput.Segment
+                {
+                    Name = segment.Name
+                };
+                AddSoilProfileProbabilities(segment, inputSegment);
+                inputSegments[i] = inputSegment;
+            }
+        }
+
+        private static void AddSoilProfileProbabilities(Segment segment, DamEngine.Io.XmlInput.Segment inputSegment)
+        {
+            if (segment.SoilProfileProbabilities != null)
+            {
+                var probabilityCount = segment.SoilProfileProbabilities.Count;
+                inputSegment.SoilGeometryProbability = new SegmentSoilGeometryProbability[probabilityCount];
+                for (int i = 0; i < probabilityCount; i++)
+                {
+                    var soilGeometryProbability = segment.SoilProfileProbabilities[i];
+                    var inputSoilGeometryProbability = new SegmentSoilGeometryProbability();
+                    inputSoilGeometryProbability.Probability = soilGeometryProbability.Probability;
+                    if (soilGeometryProbability.SegmentFailureMechanismType.HasValue)
+                    {
+                        inputSoilGeometryProbability.SegmentFailureMechanismType = ConversionHelper.ConvertToInputSegmentFailureMechanismType(soilGeometryProbability.SegmentFailureMechanismType.Value);
+                        inputSoilGeometryProbability.SegmentFailureMechanismTypeSpecified = true;
+                    }
+                    else
+                    {
+                        inputSoilGeometryProbability.SegmentFailureMechanismTypeSpecified = false;
+                    }
+
+                    switch (soilGeometryProbability.SoilProfileType)
+                    {
+                        case SoilProfileType.SoilProfile1D:
+                        case SoilProfileType.SoilProfile2D:
+                            inputSoilGeometryProbability.SoilProfileName = soilGeometryProbability.SoilGeometryName;
+                            break;
+                        default:
+                            inputSoilGeometryProbability.SoilProfileName = soilGeometryProbability.SoilGeometry2DName;
+                            break;
+
+                    }
+                    inputSoilGeometryProbability.SoilProfileType = ConversionHelper.ConvertToInputSoilProfileType(soilGeometryProbability.SoilProfileType);
+                    inputSegment.SoilGeometryProbability[i] = inputSoilGeometryProbability;
+                }
+            }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoPropertyMapException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoPropertyMapException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoPropertyMapException.cs	(revision 3305)
@@ -0,0 +1,49 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Deltares.Standard
+{
+    [Serializable]
+    public class DtoPropertyMapException : Exception
+    {
+        public DtoPropertyMapException()
+        {
+        }
+
+        public DtoPropertyMapException(string message) : base(message)
+        {
+        }
+
+        public DtoPropertyMapException(string message, Exception inner) : base(message, inner)
+        {
+        }
+
+        protected DtoPropertyMapException(
+            SerializationInfo info,
+            StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs	(revision 3305)
@@ -0,0 +1,1317 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using Deltares.Dam.Data.CsvImporters;
+using Deltares.Dam.Data.IO;
+using Deltares.Geometry;
+using Deltares.Geotechnics.IO;
+using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.SurfaceLines;
+using Deltares.Maps;
+using Deltares.Standard;
+using Deltares.Standard.Logging;
+using GeoAPI.Geometries;
+
+namespace Deltares.Dam.Data.DataPlugins
+{
+    using Data;
+    using Importers;
+    using Configuration;
+    using Location = Location;
+
+    // TODO: Import PL1-lines 
+
+    /// <summary>
+    /// ImportMode
+    /// </summary>
+    internal enum ImportMode
+    {
+        DikeRingAndLocationData,
+        All
+    }
+
+    /// <summary>
+    /// Exception for DataPluginImporter 
+    /// </summary>
+    public class DataPluginImporterException : ApplicationException
+    {
+        public DataPluginImporterException()
+        {
+        }
+
+        public DataPluginImporterException(string message)
+            : base(message)
+        {
+        }
+
+        public DataPluginImporterException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+    }
+
+    /// <summary>
+    /// DataPlugin implementation to import from files
+    /// </summary>
+    public class DataPluginImporter : IDataPlugin
+    {
+        private bool isAllDataImported = false;
+        private bool isDikeRingAndLocationDataImported = false;
+        private WaterBoard waterBoard;
+        private readonly IFeatureRepository repository = new FeatureRepository();
+        private readonly List<LogMessage> importLogMessages = new List<LogMessage>();
+        private List<DataAttribute> attributes;
+        private DamProjectType damProjectType;
+        private bool csvDataAdded = false;
+
+        private string damProjectFolder;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataPluginImporter"/> class.
+        /// </summary>
+        public DataPluginImporter()
+        {
+            InitializeWaterBoard();
+            attributes = new List<DataAttribute>();
+        }
+
+        private void InitializeWaterBoard()
+        {
+            if (waterBoard != null)
+            {
+                waterBoard.Dispose();
+            }
+            waterBoard = new WaterBoard();
+        }
+
+        /// <summary>
+        /// Sets the type of the dam project.
+        /// </summary>
+        /// <value>
+        /// The type of the dam project.
+        /// </value>
+        public DamProjectType DamProjectType
+        {
+            set
+            {
+                damProjectType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the import log messages.
+        /// </summary>
+        /// <value>
+        /// The import log messages.
+        /// </value>
+        public List<LogMessage> ImportLogMessages
+        {
+            get { return importLogMessages; }
+        }
+
+        /// <summary>
+        /// Gets or sets the dam project folder.
+        /// </summary>
+        /// <value>
+        /// The dam project folder.
+        /// </value>
+        public string DamProjectFolder
+        {
+            get { return damProjectFolder; }
+            set
+            {
+                if (damProjectFolder != value)
+                {
+                    damProjectFolder = value;
+                    Clear();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the data folder.
+        /// </summary>
+        /// <value>
+        /// The data folder.
+        /// </value>
+        public string DataFolder { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the attributes.
+        /// </summary>
+        /// <value>
+        /// The attributes.
+        /// </value>
+        /// <exception cref="System.ArgumentNullException">value</exception>
+        public IEnumerable<DataAttribute> Attributes
+        {
+            get { return attributes; }
+            set
+            {
+                if (value == null)
+                    throw new ArgumentNullException("value");
+
+                isAllDataImported = false;
+                attributes = value as List<DataAttribute> ?? value.ToList();
+            }
+        }
+
+        /// <summary>
+        /// Define data sources
+        /// </summary>
+        /// <param name="dataFolder"> </param>
+        /// <param name="dataSources"></param>
+        public void SetDataSources(string dataFolder, IEnumerable<DataSource> dataSources)
+        {
+            isAllDataImported = false;
+            DataFolder = dataFolder;
+            DataSources = dataSources;
+        }
+
+        /// <summary>
+        /// Get data source definitions
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<DataSource> DataSources { get; private set; }
+
+        /// <summary>
+        /// Get info for WaterBoard
+        /// </summary>
+        /// <returns></returns>
+        public Info WaterBoardInfo
+        {
+            get
+            {
+                ThrowIfDataNotRead();
+                return new Info
+                {
+                    Name = waterBoard.Name,
+                    Description = waterBoard.Description,
+                    Source = DataSourceManager.GetSource(waterBoard, "Name")
+                };
+            }
+        }
+
+        /// <summary>
+        /// Gets the map geometry identifier list.
+        /// </summary>
+        /// <value>
+        /// The map geometry identifier list.
+        /// </value>
+        public IEnumerable<string> MapGeometryIdList
+        {
+            get
+            {
+                ThrowIfDataNotRead();
+                return repository.FeatureIds.Select(id => id.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Clears this instance.
+        /// </summary>
+        private void Clear()
+        {
+            InitializeWaterBoard();
+
+            isAllDataImported = false;
+            isDikeRingAndLocationDataImported = false;
+        }
+
+        /// <summary>
+        /// Gets the dike.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <returns></returns>
+        private Dike GetDike(string dikeRingId)
+        {
+            ThrowIfDataNotRead();
+            return waterBoard.Dikes.First(d => d.Name.Equals(dikeRingId));
+        }
+
+        /// <summary>
+        /// Gets the or create dike.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <returns></returns>
+        private Dike GetOrCreateDike(string dikeRingId)
+        {
+            // first check to see if this dike is already known, if not create it
+            Dike dike = null;
+
+            // try to get it
+            if (waterBoard.Dikes.Any())
+            {
+                var id = dikeRingId;
+                dike = waterBoard.Dikes.FirstOrDefault(x => x.Name.Equals(id));
+            }
+
+            // not found, create it
+            if (dike == null)
+            {
+                dike = new Dike { Name = dikeRingId };
+                waterBoard.Dikes.Add(dike);
+            }
+
+            return dike;
+        }
+
+        /// <summary>
+        /// Gets the segment.
+        /// </summary>
+        /// <param name="segmentID">The segment identifier.</param>
+        /// <returns></returns>
+        private Segment GetSegment(string segmentID)
+        {
+            ThrowIfDataNotRead();
+            return waterBoard.Segments.First(s => s.Name.Equals(segmentID));
+        }
+
+        /// <summary>
+        /// Gets the location.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="locationId">The location identifier.</param>
+        /// <returns></returns>
+        private Location GetLocation(string dikeRingId, string locationId)
+        {
+            var dike = GetDike(dikeRingId);
+            return dike.Locations.First(l => l.Name.Equals(locationId));
+        }
+
+        /// <summary>
+        /// Gets a soil.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="soilId">The soil identifier.</param>
+        /// <returns></returns>
+        private Soil GetSoil(string dikeRingId, string soilId)
+        {
+            var dike = GetDike(dikeRingId);
+            Soil soil = dike.SoilList.GetSoilByName(soilId);
+            return soil;
+        }
+
+        /// <summary>
+        /// Gets a soil profile.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="soilProfile1DId">The soil profile1 d identifier.</param>
+        /// <returns></returns>
+        private SoilProfile1D GetSoilProfile(string dikeRingId, string soilProfile1DId)
+        {
+            var dike = GetDike(dikeRingId);
+            return dike.SoilProfiles.First(p => p.Name.Equals(soilProfile1DId));
+        }
+
+        /// <summary>
+        /// Gets a scenario.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="locationId">The location identifier.</param>
+        /// <param name="scenarioId">The scenario identifier.</param>
+        /// <returns></returns>
+        private Scenario GetScenario(string dikeRingId, string locationId, string scenarioId)
+        {
+            var dike = GetDike(dikeRingId);
+            var location = dike.Locations.FirstOrDefault(l => l.Name.Equals(locationId));
+            return (location == null ? null : location.Scenarios.FirstOrDefault(s => s.LocationScenarioID.Equals(scenarioId)));
+        }
+
+        /// <summary>
+        /// Gets a surface line.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="surfaceLineId">The surface line identifier.</param>
+        /// <returns></returns>
+        private SurfaceLine2 GetSurfaceLine(string dikeRingId, string surfaceLineId)
+        {
+            var dike = GetDike(dikeRingId);
+            return dike.SurfaceLines2.First(x => x.Name.Equals(surfaceLineId));
+        }
+
+        /// <summary>
+        /// Gets the surface line identifier list.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <returns></returns>
+        public IEnumerable<string> GetSurfaceLineIdList(string dikeRingId)
+        {
+            var dike = GetDike(dikeRingId);
+            return dike.SurfaceLines2.Select(surfaceLine => surfaceLine.Name);
+        }
+
+        /// <summary>
+        /// Gets the parameters from dictionary.
+        /// </summary>
+        /// <param name="dictionary">The dictionary.</param>
+        /// <param name="source">The source.</param>
+        /// <returns></returns>
+        private IEnumerable<NameValueParameter> GetParametersFromDictionary(
+            Dictionary<string, string> dictionary, object source)
+        {
+            var pairs = dictionary.Select(nameValuePair => new NameValueParameter
+            {
+                ParameterName = nameValuePair.Key,
+                ParameterValue = nameValuePair.Value,
+                Source = DataSourceManager.GetSource(source, nameValuePair.Key)
+            });
+
+            return new List<NameValueParameter>(pairs);
+        }
+
+        /// <summary>
+        /// Gets the dike ring identifier list.
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<string> GetDikeRingIdList()
+        {
+            ImportDikeRingAndLocationData();
+            return waterBoard.Dikes.Select(dike => dike.Name);
+        }
+
+        /// <summary>
+        /// Imports the data for dike rings.
+        /// </summary>
+        /// <param name="dikeRingIds">The dike ring ids.</param>
+        /// <param name="progress">The progress.</param>
+        public void ImportDataForDikeRings(IEnumerable<string> dikeRingIds,
+            DamEngine.Data.Standard.Calculation.ProgressDelegate progress)
+        {
+            isAllDataImported = false;
+            isDikeRingAndLocationDataImported = false;
+            ImportAllData(dikeRingIds, progress);
+        }
+
+        /// <summary>
+        /// Gets the scenario list.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="locationId">The location identifier.</param>
+        /// <returns></returns>
+        public IEnumerable<string> GetScenarioList(string dikeRingId, string locationId)
+        {
+            var location = GetLocation(dikeRingId, locationId);
+            return location.Scenarios.Select(scenario => scenario.LocationScenarioID);
+        }
+
+        /// <summary>
+        /// Gets the dike ring information.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <returns></returns>
+        public Info GetDikeRingInfo(string dikeRingId)
+        {
+            var dike = GetDike(dikeRingId);
+            return new Info
+            {
+                Name = dike.Name,
+                Description = dike.Description,
+                Source = DataSourceManager.GetSource(dike, "Name")
+            };
+        }
+
+        /// <summary>
+        /// Gets the dike parameters.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <returns></returns>
+        public IEnumerable<NameValueParameter> GetDikeParameters(string dikeRingId)
+        {
+            var dike = GetDike(dikeRingId);
+            var nameValuePairs = dike.GetParametersAsNameValuePairs();
+
+            return GetParametersFromDictionary(nameValuePairs, dike);
+        }
+
+        /// <summary>
+        /// Gets the location identifier list.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <returns></returns>
+        public IEnumerable<string> GetLocationIdList(string dikeRingId)
+        {
+            ImportDikeRingAndLocationData();
+            var dike = GetDike(dikeRingId);
+            return dike.Locations.Select(location => location.Name);
+        }
+
+        /// <summary>
+        /// Gets the location information.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="locationId">The location identifier.</param>
+        /// <returns></returns>
+        public Info GetLocationInfo(string dikeRingId, string locationId)
+        {
+            var location = GetLocation(dikeRingId, locationId);
+            return new Info
+            {
+                Name = location.Name,
+                Description = "",
+                Source = DataSourceManager.GetSource(location, "Name")
+            };
+        }
+
+        /// <summary>
+        /// Gets the location details.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="locationId">The location identifier.</param>
+        /// <returns></returns>
+        public IEnumerable<NameValueParameter> GetLocationDetails(string dikeRingId, string locationId)
+        {
+            var location = GetLocation(dikeRingId, locationId);
+
+            var nameValuePairs = location.GetParametersAsNameValuePairs();
+            return GetParametersFromDictionary(nameValuePairs, location);
+        }
+
+        /// <summary>
+        /// Gets the scenario details.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="locationId">The location identifier.</param>
+        /// <param name="scenarioId">The scenario identifier.</param>
+        /// <returns></returns>
+        public IEnumerable<NameValueParameter> GetScenarioDetails(string dikeRingId, string locationId, string scenarioId)
+        {
+            var location = GetLocation(dikeRingId, locationId);
+            var scenario = GetScenario(dikeRingId, locationId, scenarioId);
+
+            if (scenario == null) yield break;
+
+            var nameValuePairs = scenario.GetParametersAsNameValuePairs();
+            foreach (var nameValuePair in nameValuePairs)
+            {
+                yield return new NameValueParameter
+                {
+                    ParameterName = nameValuePair.Key,
+                    ParameterValue = nameValuePair.Value,
+                    Source = DataSourceManager.GetSource(location, nameValuePair.Key)
+                };
+            }
+        }
+
+        public void DisposeImportedItem(string dikeRingId)
+        {
+            GetDike(dikeRingId).Dispose();
+        }
+
+        /// <summary>
+        /// Gets the surface line points.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="surfaceLineId">The surface line identifier.</param>
+        /// <returns></returns>
+        public IList<GeometryPoint> GetSurfaceLinePoints(string dikeRingId, string surfaceLineId)
+        {
+            var surfaceLine = GetSurfaceLine(dikeRingId, surfaceLineId);
+
+            var surfaceLinePoints = new List<GeometryPoint>();
+            for (int pointIndex = 0; pointIndex < surfaceLine.Geometry.Points.Count(); pointIndex++)
+            {
+                surfaceLinePoints.Add(surfaceLine.Geometry.Points[pointIndex]);
+            }
+            return surfaceLinePoints;
+        }
+
+        /// <summary>
+        /// Gets the surface line characteristic points.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="surfaceLineId">The surface line identifier.</param>
+        /// <returns></returns>
+        public IEnumerable<DpCharacteristicPoint> GetSurfaceLineCharacteristicPoints(string dikeRingId,
+                                                                                     string surfaceLineId)
+        {
+            var surfaceLine = GetSurfaceLine(dikeRingId, surfaceLineId);
+
+            foreach (CharacteristicPointType type in Enum.GetValues(typeof(CharacteristicPointType)))
+            {
+                // get & check point
+                var point = surfaceLine.CharacteristicPoints.GetGeometryPoint(type);
+                if (point == null) continue;
+                if ((point.X == -1.0) && (point.Y == -1.0) && (point.Z == -1.0)) continue;
+
+                // create point
+                yield return new DpCharacteristicPoint { Id = type.ToString(), X = point.X, Y = point.Y, Z = point.Z };
+            }
+        }
+
+        /// <summary>
+        /// Gets the segment identifier list.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <returns></returns>
+        public IEnumerable<string> GetSegmentIdList(string dikeRingId)
+        {
+            ThrowIfDataNotRead();
+            return waterBoard.Segments.Select(segment => segment.Name);
+        }
+
+        /// <summary>
+        /// Gets the profile1 d identifier list for segment.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="segmentId">The segment identifier.</param>
+        /// <param name="segmentFailureMechanismType">Type of the segment failure mechanism.</param>
+        /// <returns></returns>
+        public IEnumerable<string> GetProfile1DIdListForSegment(string dikeRingId, string segmentId, FailureMechanismSystemType segmentFailureMechanismType)
+        {
+            ThrowIfDataNotRead();
+            var segment = GetSegment(segmentId);
+            foreach (SoilGeometryProbability soilGeometryProbability in segment.SoilProfileProbabilities)
+            {
+                if (soilGeometryProbability.SoilProfile != null)
+                {
+                    if ((soilGeometryProbability.SegmentFailureMechanismType == null) || (soilGeometryProbability.SegmentFailureMechanismType.Value == segmentFailureMechanismType))
+                        yield return soilGeometryProbability.SoilGeometryName;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the profile2 d identifier list for segment.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="segmentId">The segment identifier.</param>
+        /// <param name="segmentFailureMechanismType">Type of the segment failure mechanism.</param>
+        /// <returns></returns>
+        public IEnumerable<string> GetProfile2DIdListForSegment(string dikeRingId, string segmentId, FailureMechanismSystemType segmentFailureMechanismType)
+        {
+            ThrowIfDataNotRead();
+            var segment = GetSegment(segmentId);
+            foreach (SoilGeometryProbability soilGeometryProbability in segment.SoilProfileProbabilities)
+            {
+                if (soilGeometryProbability.SoilProfile == null)
+                {
+                    if ((soilGeometryProbability.SegmentFailureMechanismType == null) || (soilGeometryProbability.SegmentFailureMechanismType.Value == segmentFailureMechanismType))
+                        yield return soilGeometryProbability.SoilGeometryName;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the segment profile1 d details.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="segmentId">The segment identifier.</param>
+        /// <param name="profile1DId">The profile1 d identifier.</param>
+        /// <returns></returns>
+        public IEnumerable<NameValueParameter> GetSegmentProfile1DDetails(string dikeRingId, string segmentId,
+                                                                          string profile1DId, FailureMechanismSystemType segmentFailureMechanismType)
+        {
+            var segment = GetSegment(segmentId);
+            var nameValuePairs = segment.GetParametersForSoilProfile1DAsNameValuePairs(profile1DId, segmentFailureMechanismType);
+
+            return GetParametersFromDictionary(nameValuePairs, segment);
+        }
+
+        /// <summary>
+        /// Gets the segment profile2 d details.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="segmentId">The segment identifier.</param>
+        /// <param name="profile2DId">The profile2 d identifier.</param>
+        /// <returns></returns>
+        public IEnumerable<NameValueParameter> GetSegmentProfile2DDetails(string dikeRingId, string segmentId,
+                                                                          string profile2DId, FailureMechanismSystemType failureMechanismSystemType)
+        {
+            var segment = GetSegment(segmentId);
+            var nameValuePairs = segment.GetParametersForSoilProfile2DAsNameValuePairs(profile2DId, failureMechanismSystemType);
+
+            return GetParametersFromDictionary(nameValuePairs, segment);
+        }
+
+        /// <summary>
+        /// Gets the soil profile1 d identifier list.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <returns></returns>
+        public IEnumerable<string> GetSoilProfile1DIdList(string dikeRingId)
+        {
+            var dike = GetDike(dikeRingId);
+            return dike.SoilProfiles.Select(soilProfile => soilProfile.Name);
+        }
+
+        /// <summary>
+        /// Gets the soil profile1 d details.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="soilProfile1DId">The soil profile1 d identifier.</param>
+        /// <returns></returns>
+        public DpSoilProfile GetSoilProfile1DDetails(string dikeRingId, string soilProfile1DId)
+        {
+            var soilProfile = GetSoilProfile(dikeRingId, soilProfile1DId);
+            var dpSoilProfile = new DpSoilProfile { Layers = new List<DpLayer>() };
+            for (int layerIndex = 0; layerIndex < soilProfile.Layers.Count; layerIndex++)
+            {
+                var dpLayer = new DpLayer
+                    {
+                        TopLevel = soilProfile.Layers[layerIndex].TopLevel,
+                        SoilName = soilProfile.Layers[layerIndex].Soil.Name
+                    };
+                dpSoilProfile.Layers.Add(dpLayer);
+            }
+            var bottomLevelLayer = new DpLayer
+            {
+                TopLevel = soilProfile.BottomLevel,
+                SoilName = SoilProfile1D.SoilProfileBottomLevelId
+            };
+            dpSoilProfile.Layers.Add(bottomLevelLayer);
+            return dpSoilProfile;
+        }
+
+        /// <summary>
+        /// Gets the soil profile2 d identifier list.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <returns></returns>
+        /// <exception cref="System.NotImplementedException"></exception>
+        public IEnumerable<string> GetSoilProfile2DIdList(string dikeRingId)
+        {
+            ThrowIfDataNotRead();
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Gets the soil profile2 d details.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="soilProfile2DId">The soil profile2 d identifier.</param>
+        /// <returns></returns>
+        /// <exception cref="System.NotImplementedException"></exception>
+        public string GetSoilProfile2DDetails(string dikeRingId, string soilProfile2DId)
+        {
+            ThrowIfDataNotRead();
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Gets the soil identifier list.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <returns></returns>
+        public IEnumerable<string> GetSoilIdList(string dikeRingId)
+        {
+            var dike = GetDike(dikeRingId);
+            IEnumerable<string> soilNames = dike.SoilList.Soils.Select(soil => soil.Name).ToList();
+            return soilNames;
+        }
+
+        /// <summary>
+        /// Gets the soil aquifer values.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <returns></returns>
+        public IEnumerable<NameValueParameter> GetSoilAquiferValues(string dikeRingId)
+        {
+            var dike = GetDike(dikeRingId);
+            var res = new List<NameValueParameter>();
+            foreach (var soil in dike.SoilList.Soils)
+            {
+                if (dike.SoilList.AquiferDictionary.ContainsKey(soil))
+                {
+                    var nvp = new NameValueParameter();
+                    nvp.ParameterName = soil.Name;
+                    nvp.ParameterValue = dike.SoilList.AquiferDictionary[soil].ToString();
+                    nvp.Source = DataSourceSystemType.MSoilBase;
+                    res.Add(nvp);
+                }
+            }
+            return res;
+        }
+
+        /// <summary>
+        /// Gets the soil details.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="soilId">The soil identifier.</param>
+        /// <returns></returns>
+        public IEnumerable<NameValueParameter> GetSoilDetails(string dikeRingId, string soilId)
+        {
+            var soil = GetSoil(dikeRingId, soilId);
+            var nameValuePairs = SoilUtils.GetParametersAsNameValuePairs(soil);
+
+            return GetParametersFromDictionary(nameValuePairs, soil);
+        }
+
+        /// <summary>
+        /// Gets the map geometry.
+        /// </summary>
+        /// <param name="mapGeometryId">The map geometry identifier.</param>
+        /// <returns></returns>
+        public string GetMapGeometry(string mapGeometryId)
+        {
+            ThrowIfDataNotRead();
+            var geom = GetGeometryById(mapGeometryId);
+            return geom.AsText();
+        }
+
+        /// <summary>
+        /// Gets the map geometry attributes.
+        /// </summary>
+        /// <param name="mapGeometryId">The map geometry identifier.</param>
+        /// <returns></returns>
+        public IEnumerable<NameValueParameter> GetMapGeometryAttributes(string mapGeometryId)
+        {
+            ThrowIfDataNotRead();
+            var geom = GetGeometryById(mapGeometryId);
+
+            var geomAttributes = repository.GetAttributes(geom);
+
+            return geomAttributes
+                .Select(kvp =>
+                        new NameValueParameter
+                            {
+                                ParameterName = kvp.Key,
+                                ParameterValue = kvp.Value.ToString()
+                            }).ToList();
+        }
+
+        /// <summary>
+        /// Import all csv files
+        /// </summary>
+        /// <param name="importFolder">The import folder.</param>
+        /// <param name="importMode">The import mode.</param>
+        /// <param name="progress">The progress.</param>
+        /// <param name="csvImporter">The CSV importer.</param>
+        /// <returns></returns>
+        private bool ImportCsvFiles(string importFolder, 
+            ImportMode importMode, DamEngine.Data.Standard.Calculation.ProgressDelegate progress, ref CsvImporter csvImporter)
+        {
+            DataSourceManager.CurrentSource = DataSourceSystemType.Csv;
+            bool isImportOnlyLocations = (importMode == ImportMode.DikeRingAndLocationData);
+            csvImporter.ImportCsvDataFromDirectory(importFolder, isImportOnlyLocations, progress, damProjectType);
+
+            // add messages
+            var messages = csvImporter.ErrorMessages;
+            ImportLogMessages.AddRange(messages);
+
+            DataSourceManager.CurrentSource = DataSourceSystemType.User;
+
+            // check for fatal messages
+            bool importOk = messages.All(m => m.MessageType != LogMessageType.FatalError);
+
+            return importOk;
+        }
+
+        /// <summary>
+        /// Import name of the specified soilbase to all dikerings with id as specified in dikeRingIds.
+        /// Note that it does NOT import the soils in the database themselves.
+        /// If dikeringId not found then a new dike is created for that dikeRingId.
+        /// </summary>
+        /// <param name="importFolder">path where the data can be found</param>
+        /// <param name="dikeRingIds"></param>
+        private void ImportMSoilBaseName(string importFolder, IEnumerable<string> dikeRingIds)
+        {
+            if (dikeRingIds == null) return;
+
+            DataSourceManager.CurrentSource = DataSourceSystemType.MSoilBase;
+
+            foreach (string dikeRingId in dikeRingIds)
+            {
+                var dike = GetOrCreateDike(dikeRingId);
+
+                dike.SoilDatabaseName = importFolder;
+            }
+
+            DataSourceManager.CurrentSource = DataSourceSystemType.User;
+        }
+
+        /// <summary>
+        /// Import the specified MGeobase to all dikerings with id as specified in dikeRingIds
+        /// Note that this does import the 1D soil profiles together with the soils and their parameters.
+        /// If dikeringId not found then a new dike is created for that dikeRingId
+        /// </summary>
+        /// <param name="importFolder">path where the data can be found</param>
+        /// <param name="dikeRingIds"></param>
+        private void ImportMGeobase(string importFolder, IEnumerable<string> dikeRingIds)
+        {
+            if (dikeRingIds == null) return;
+
+            DataSourceManager.CurrentSource = DataSourceSystemType.MGeobase;
+
+            foreach (string dikeRingId in dikeRingIds)
+            {
+                // first check to see if this dike is already known, if not create it
+                var dike = GetOrCreateDike(dikeRingId);
+
+                dike.SoilDatabaseName = importFolder;
+                dike.AddSoilProfilesFromDB();
+            }
+
+            DataSourceManager.CurrentSource = DataSourceSystemType.User;
+        }
+
+        /// <summary>
+        /// Import data from Iris shapefiles
+        /// </summary>
+        /// <param name="importFolder">path where the data can be found</param>
+        private void ImportIrisFiles(string importFolder)
+        {
+            DataSourceManager.CurrentSource = DataSourceSystemType.Iris;
+
+            // get locations (locationid and beginpoint and endpoint in RD) from "locations.shp" (LocationsNew)
+            // get line of buitenkruinlijn
+            // voeg aan elke locatie snijpunt met buitenkruinlijn toe (geen snijpunt is exception)
+            // nu heeft locatie een begin-, eind- en buitenrkuinpunt
+            // get line of binnenkruinlijn
+            // voeg aan elke locatie snijpunt met binnenkruinlijn toe (geen snijpunt is exception)
+            // nu heeft locatie een begin-, eind-, binnen- en buitenrkuinpunt
+
+            // er is al een lijst met locaties in Waterboard WaterBoard.Dike[0].Locations (LocationsOrg)
+            // LocationOrg.GeometryPoint[DikeTopAtRiver] = LocationNew.buitenkuinpunt
+            // LocationOrg.GeometryPoint[DikeTopAtPolder] = LocationNew.binnnenkuinpunt
+            //  Als LocationNew.id niet gevonden kan worden in LocationsOrg dan exception
+
+            // Get all locations from waterboard            
+            var locations = GetAllLocations();
+
+            var importer = new LocationCharacteristicPointImporter(importFolder, locations);
+            importer.Import();
+
+            DataSourceManager.CurrentSource = DataSourceSystemType.User;
+        }
+
+        /// <summary>
+        /// Get background shapefile for this waterboard
+        /// </summary>
+        /// <param name="importFolder">path where the data can be found</param>
+        private void ImportBackgroundShapeFiles(string importFolder)
+        {
+            DataSourceManager.CurrentSource = DataSourceSystemType.Gis;
+
+            var reader = new ShapeFileReader(importFolder)
+                             {
+                                 IgnoreAttributeData = true
+                             };
+            var importer = new FeatureImporter(repository, reader);
+            importer.Import();
+
+            DataSourceManager.CurrentSource = DataSourceSystemType.User;
+        }
+
+        /// <summary>
+        /// Get all locations for all dikes
+        /// </summary>
+        /// <returns></returns>
+        private IEnumerable<Location> GetAllLocations()
+        {
+            return waterBoard.Dikes.SelectMany(dike => dike.Locations);
+        }
+
+        /// <summary>
+        /// Pre conditions:
+        /// - A list of waterboard locations with initialized x,y values
+        /// - shape file ccontaining the attributes and data
+        /// 
+        /// Post condition:
+        /// - Location properties (in relation to the attributes) are set
+        /// </summary>
+        /// <param name="importFolder"></param>
+        /// <param name="dataAttributes"></param>
+        /// <param name="importMode"></param>
+        /// <param name="dikeRingIds"></param>
+        /// <param name="progress"></param>
+        private void ImportDataShapeFiles(string importFolder, IEnumerable<DataAttribute> dataAttributes, 
+            ImportMode importMode, IEnumerable<string> dikeRingIds,
+            DamEngine.Data.Standard.Calculation.ProgressDelegate progress,
+            ref List<CsvImporterLocations.LocationRecord> locationRecords)
+        {
+            DataSourceManager.CurrentSource = DataSourceSystemType.Gis;
+
+            if (importFolder == null)
+                throw new ArgumentNullException("importFolder");
+
+            string importErrorLogFile = @"shapefiletrace.log";
+            if (!string.IsNullOrEmpty(DamProjectFolder))
+            {
+                importErrorLogFile = Path.Combine(DamProjectFolder, importErrorLogFile);
+            }
+            var dataAttributesList = dataAttributes as List<DataAttribute> ?? dataAttributes.ToList();
+            var exceptions = new List<Exception>();
+
+            var locationImporter = LocationShapeFileImporter.Create(
+                locationRecords, dataAttributesList, importFolder);
+            if (locationImporter != null)
+            {
+                locationImporter.Import();
+                locationRecords = locationImporter.ImportedItems.ToList();
+            }
+
+            // Skip reading properties when only dikering and locationdata is required
+            if (importMode == ImportMode.All)
+            {
+                //
+                // Location Property Importer
+                // This is where all the attribute values are read form the shapefiles
+                //
+                var importer = new LocationPropertyImporter(importFolder, dataAttributesList)
+                {
+                    Targets = locationRecords
+                };
+
+                importer.Import(progress);
+                exceptions.AddRange(importer.ImportErrors);
+                foreach (var importerMessage in importer.ImproperAttributeMessages)
+                {
+                    var lm = new LogMessage(LogMessageType.Error, this, importerMessage);
+                    importLogMessages.Add(lm);
+                }
+            }
+
+            using (var sw = new StreamWriter(importErrorLogFile, false))
+            {
+                if (!exceptions.Any()) return;
+                foreach (var error in exceptions)
+                {
+                    //defaultWriter.Write(error.Message);
+                    sw.WriteLine("Date: {0}, Error type: {1},  Message: {2}",
+                                               DateTime.Now.ToShortDateString(), error.GetType().Name, error.Message);
+                    var lm = new LogMessage(LogMessageType.Error, this, error.Message);
+                    importLogMessages.Add(lm);
+                }                
+            }
+        }
+
+        /// <summary>
+        /// Gets the geometry by identifier.
+        /// </summary>
+        /// <param name="mapGeometryId">The map geometry identifier.</param>
+        /// <returns></returns>
+        /// <exception cref="System.ArgumentNullException">mapGeometryId</exception>
+        /// <exception cref="System.ArgumentException">Can't find a geometry with this id</exception>
+        private IGeometry GetGeometryById(string mapGeometryId)
+        {
+            if (mapGeometryId == null)
+                throw new ArgumentNullException("mapGeometryId");
+
+            var id = new Guid(mapGeometryId);
+
+            var geom = repository.GetGeometryById(id);
+            if (geom == null)
+                throw new ArgumentException("Can't find a geometry with this id");
+
+            return geom;
+        }
+
+        /// <summary>
+        /// Import only Dikering and location id's
+        /// </summary>
+        private void ImportDikeRingAndLocationData()
+        {
+            if (isDikeRingAndLocationDataImported || isAllDataImported) return;
+
+            CsvImporter csvImporter = new CsvImporter();
+            foreach (var dataSource in DataSources)
+            {
+                ImportDikeRingAndLocationData(dataSource, ref csvImporter);
+            }
+            var combineImportedData = new CombineImportedData
+            {
+                WaterBoard = waterBoard,
+                LocationRecords = csvImporter.LocationRecords,
+            };
+            combineImportedData.AddCsvDataToDikes();
+            isDikeRingAndLocationDataImported = true;
+        }
+
+        /// <summary>
+        /// Gets the data location.
+        /// </summary>
+        /// <param name="dataSource">The data source.</param>
+        /// <returns></returns>
+        private string GetDataLocation(DataSource dataSource)
+        {
+            var dataLocation = dataSource.DataLocation;
+            if (!string.IsNullOrEmpty(DataFolder)
+                && (!Directory.Exists(dataLocation) || !File.Exists(dataLocation)))
+            {
+                dataLocation = Path.Combine(DataFolder, dataLocation);
+            }
+
+            return dataLocation;
+        }
+
+        /// <summary>
+        /// Imports the dike ring and location data.
+        /// </summary>
+        /// <param name="dataSource">The data source.</param>
+        /// <param name="csvImporter"></param>
+        /// <exception cref="System.ArgumentOutOfRangeException"></exception>
+        private void ImportDikeRingAndLocationData(DataSource dataSource, ref CsvImporter csvImporter)
+        {
+            var dataLocation = GetDataLocation(dataSource);
+
+            switch (dataSource.DataSourceType)
+            {
+                case DataSourceType.CsvFiles:
+                    // New importer
+                    ImportCsvFiles(dataLocation, ImportMode.DikeRingAndLocationData, null, ref csvImporter);
+                    break;
+                case DataSourceType.DataShapeFiles:
+                    List<CsvImporterLocations.LocationRecord> locationRecords = csvImporter.LocationRecords;
+                    ImportShapeFile(dataLocation, ref locationRecords);
+                    csvImporter.LocationRecords = locationRecords;
+                    break;
+                case DataSourceType.Iris:
+                case DataSourceType.BackgroundShapeFiles:
+                case DataSourceType.MSoilBase:
+                case DataSourceType.MGeobase:
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+
+        /// <summary>
+        /// Imports the data.
+        /// </summary>
+        /// <param name="dataSource">The data source.</param>
+        /// <param name="dikeRingIdList">The dike ring identifier list.</param>
+        /// <param name="importMode">The import mode.</param>
+        /// <param name="progress">The progress.</param>
+        /// <param name="csvImporter">The CSV importer.</param>
+        /// <exception cref="System.ArgumentOutOfRangeException"></exception>
+        private void ImportData2(DataSource dataSource,
+                                 IEnumerable<string> dikeRingIdList, ImportMode importMode,
+                                 DamEngine.Data.Standard.Calculation.ProgressDelegate progress, ref CsvImporter csvImporter)
+        {
+            var dataLocation = GetDataLocation(dataSource);
+            switch (dataSource.DataSourceType)
+            {
+                case DataSourceType.CsvFiles:
+                    // New importer
+                    ImportCsvFiles(dataLocation, importMode, progress, ref csvImporter);
+                    break;
+                case DataSourceType.Iris:
+                    ImportIrisFiles(dataLocation);
+                    break;
+                case DataSourceType.DataShapeFiles:
+                    List<CsvImporterLocations.LocationRecord> locationRecords = csvImporter.LocationRecords;
+                    ImportDataShapeFiles(dataLocation, attributes, importMode, dikeRingIdList, progress, ref locationRecords);
+                    csvImporter.LocationRecords = locationRecords;
+                    break;
+                case DataSourceType.BackgroundShapeFiles:
+                    if (importMode == ImportMode.All)
+                    {
+                        ImportBackgroundShapeFiles(dataLocation);
+                    }
+                    break;
+                case DataSourceType.MSoilBase:
+                    ImportMSoilBaseName(dataLocation, dikeRingIdList);
+                    break;
+                case DataSourceType.MGeobase:
+                    ImportMGeobase(dataLocation, dikeRingIdList);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+
+        /// <summary>
+        /// Imports the shape file.
+        /// </summary>
+        /// <param name="dataLocation">The data location.</param>
+        /// <param name="locationRecords">The location records.</param>
+        private void ImportShapeFile(string dataLocation, ref List<CsvImporterLocations.LocationRecord> locationRecords)
+        {
+            // get locations
+            var configuredAttribute =
+                attributes.SingleOrDefault(a => a.AttributeId.Equals(
+                    LocationShapeFileAttributeMap.LocationAttributeId,
+                    StringComparison.InvariantCultureIgnoreCase));
+            if (configuredAttribute == null)
+            {
+                return;
+            }
+            var locationImporter = LocationShapeFileImporter.Create(
+                locationRecords, attributes, dataLocation);
+            if (locationImporter != null)
+            {
+                locationImporter.Import();
+                locationRecords = locationImporter.ImportedItems.ToList();
+            }
+        }
+
+        /// <summary>
+        /// Imports all data.
+        /// </summary>
+        /// <param name="dikeRingIds">The dike ring ids.</param>
+        /// <param name="progress">The progress.</param>
+        private void ImportAllData(IEnumerable<string> dikeRingIds, DamEngine.Data.Standard.Calculation.ProgressDelegate progress)
+        {
+            // do nothing if all data is already imported
+            if (isAllDataImported) return;
+
+            ImportData(ImportMode.All, dikeRingIds, progress);
+
+            isAllDataImported = true;
+        }
+
+        /// <summary>
+        /// Import all data
+        /// </summary>
+        private void ImportData(ImportMode importMode, IEnumerable<string> dikeRingIds, DamEngine.Data.Standard.Calculation.ProgressDelegate progress)
+        {
+            ThrowIfNoDataDefinitions();
+            if (!isDikeRingAndLocationDataImported)
+            {
+                // If locations and dikeringIds were not read yet then we start with a new waterboard
+                // Else continue with waterboard that was created when importing the locations
+                InitializeWaterBoard();
+            }
+
+            waterBoard.Description = "Waterschap";
+            CsvImporter csvImporter = new CsvImporter();
+
+            var dikeRingIdList = dikeRingIds == null ? null : dikeRingIds as List<string> ?? dikeRingIds.ToList();
+
+            foreach (var dataSource in DataSources)
+            {
+                // Skip Iris because it needs the locations
+                // Data from shapefiles is added to locationrecords from csvImporter
+                if (dataSource.DataSourceType != DataSourceType.Iris)
+                {
+                    ImportData2(dataSource, dikeRingIdList, importMode, progress, ref csvImporter);
+                }
+            }
+            // create and fill the locations, scenarios etc. with the data from csv and shapefiles
+            AddCsvDataToDikes(csvImporter);
+            // Now that the locations are defined, read Iris data
+            foreach (var dataSource in DataSources)
+            {
+                if (dataSource.DataSourceType == DataSourceType.Iris)
+                {
+                    ImportData2(dataSource, dikeRingIdList, importMode, progress, ref csvImporter);
+                }
+            }
+            AddScenarioDataToDikes(csvImporter);
+            if (importMode == ImportMode.All)
+            {
+                CorrectSegmentAssignments();                
+            }
+        }
+
+        /// <summary>
+        /// Adds the scenario data to dikes.
+        /// </summary>
+        /// <param name="csvImporter">The CSV importer.</param>
+        private void AddScenarioDataToDikes(CsvImporter csvImporter)
+        {
+            if (csvImporter != null)
+            {
+                DataSourceManager.CurrentSource = DataSourceSystemType.Csv;
+                var combineImportedData = new CombineImportedData
+                {
+                    WaterBoard = waterBoard,
+                    LocationRecords = csvImporter.LocationRecords,
+                    ScenarioRecords = csvImporter.ScenariosRecords,
+                };
+                combineImportedData.AddScenarioDataToDikes();
+                importLogMessages.AddRange(combineImportedData.ErrorMessages);
+                Debug.Assert(ReferenceEquals(waterBoard, combineImportedData.WaterBoard));
+                waterBoard = combineImportedData.WaterBoard;
+            }
+        }
+
+        /// <summary>
+        /// Adds the CSV data to dikes.
+        /// </summary>
+        /// <param name="csvImporter">The CSV importer.</param>
+        private void AddCsvDataToDikes(CsvImporter csvImporter)
+        {
+            if (csvImporter != null)
+            {
+                DataSourceManager.CurrentSource = DataSourceSystemType.Csv;
+                var combineImportedData = new CombineImportedData
+                {
+                    WaterBoard = waterBoard,
+                    LocationRecords = csvImporter.LocationRecords,
+                    CharacteristicPointsRecords = csvImporter.CharacteristicPointsRecords,
+                    ScenarioRecords = csvImporter.ScenariosRecords,
+                    SegmentRecords = csvImporter.SegmentRecords,
+                    SoilProfilerecords = csvImporter.SoilProfilesRecords,
+                    SurfaceLineRecords = csvImporter.SurfaceLinesRecords
+                };
+                combineImportedData.AddCsvDataToDikes();
+                importLogMessages.AddRange(combineImportedData.ErrorMessages);
+                Debug.Assert(ReferenceEquals(waterBoard, combineImportedData.WaterBoard));
+                waterBoard = combineImportedData.WaterBoard;
+                csvDataAdded = true;
+            }
+        }
+
+        /// <summary>
+        /// When segment shapefile has assigned new segmentIds the segment object has to be re-assigned
+        /// </summary>
+        private void CorrectSegmentAssignments()
+        {
+            foreach (var dike in waterBoard.Dikes)
+            {
+                foreach (var location in dike.Locations)
+                {
+                    location.Segment = waterBoard.Segments.FirstOrDefault(s => s.Name.Equals(location.SegmentId));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Check if data definitions already specified
+        /// </summary>
+        private void ThrowIfNoDataDefinitions()
+        {
+            if (DataSources == null || !DataSources.Any())
+            {
+                throw new DataPluginImporterException("No data sources defined");
+            }
+        }
+
+        /// <summary>
+        /// Check if data has been read
+        /// </summary>
+        private void ThrowIfDataNotRead()
+        {
+            if (!isAllDataImported)
+            {
+                throw new DataPluginImporterException("Data has not been imported yet");
+            }
+        }
+
+        /// <summary>
+        /// Returns a <see cref="System.String" /> that represents this instance.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String" /> that represents this instance.
+        /// </returns>
+        public override string ToString()
+        {
+            return "DataPluginImporter";
+        }
+    }    
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Sensor.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Sensor.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Sensor.cs	(revision 3305)
@@ -0,0 +1,388 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Xml.Serialization;
+using Deltares.Standard;
+using Deltares.Standard.Attributes;
+using Deltares.Standard.EventPublisher;
+using Deltares.Standard.IO.Xml;
+using Deltares.Standard.Specifications;
+using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
+using Validator = Deltares.Standard.Specifications.Validator;
+using XmlSerializer = Deltares.Standard.IO.Xml.XmlSerializer;
+
+namespace Deltares.Dam.Data.Sensors
+{
+    /// <summary>
+    /// This class represents a sensor or monitoring point used in dikes. 
+    /// This entity is created for Dam Live
+    /// </summary>
+    [Serializable]
+    public class Sensor : IName, IVisibleEnabled
+    {
+        #region Business Rules
+
+        /// <summary>
+        /// Specication to test if the value of the candidate is valid
+        /// </summary>
+        internal class ContiansAtLeastOneItem : PredicateSpecification<IEnumerable<PLLineType>>
+        {
+            public ContiansAtLeastOneItem()
+                : base(x => x.Any())
+            {
+                Description = "The sensor should contain at least one PL Line mapping.";
+            }
+        }
+
+        #endregion
+
+        private readonly IGeometry geometry;
+        private double relativeLocation;
+        private readonly HashSet<PLLineType> plLineTypes;
+        private int id;
+
+        public Sensor()
+        {
+            plLineTypes = new HashSet<PLLineType>();
+            ID = -1;
+            geometry = new Point(0,0,0);            
+        }
+
+        public Sensor(Point point) : this()
+        {
+            if (point == null) throw new ArgumentNullException("point");
+            this.geometry = point;
+
+        }
+
+        public Sensor(double x, double y, double z) : this(new Point(x, y, z))
+        {           
+        }
+
+        /// <summary>
+        /// Gets or sets the ID.
+        /// </summary>
+        /// <value>
+        /// The ID should be unique.
+        /// </value>
+        [PropertyOrder(1,1)]
+        public int ID 
+        { 
+            get { return id; }
+            set
+            {
+                id = value;
+                DataEventPublisher.AfterChange(this, s => s.ID);
+            } 
+        }
+
+        /// <summary>
+        /// Gets or sets the name of this sensor.
+        /// </summary>
+        /// <value>
+        /// The name string value should not be empty and unique.  
+        /// </value>
+        [Specification(typeof(NotEmptySpecification))]
+        [PropertyOrder(1, 2)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the depth.
+        /// </summary>
+        /// <value>
+        /// The depth.
+        /// </value>
+        [PropertyOrder(1, 5)]
+        [Format("F3")]
+        public double Depth
+        {
+            get { return ZRd; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, s => s.Depth);
+                ZRd = value;
+                DataEventPublisher.AfterChange(this, s => s.Depth);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the relative location along the profile.
+        /// </summary>
+        /// <value>
+        /// The relative location in meter.
+        /// </value>
+        [PropertyOrder(1, 4)]
+        [Format("F3")]
+        public double RelativeLocation
+        {
+            get { return relativeLocation; }
+            set 
+            {
+                DataEventPublisher.BeforeChange(this, s => s.RelativeLocation);
+                relativeLocation = value;
+                RelativeLocationSpecified = true;
+                DataEventPublisher.AfterChange(this, s => s.RelativeLocation);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the X rd.
+        /// </summary>
+        /// <value>
+        /// The X rd.
+        /// </value>
+        [Browsable(false)]
+        public double XRd
+        {
+            get { return geometry.Coordinate.X; }
+            set { geometry.Coordinate.X = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the Y rd.
+        /// </summary>
+        /// <value>
+        /// The Y rd.
+        /// </value>
+        [Browsable(false)]
+        public double YRd
+        {
+            get { return geometry.Coordinate.Y; }
+            set { geometry.Coordinate.Y = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the Z rd. Same as Depth??
+        /// </summary>
+        /// <value>
+        /// The Z rd.
+        /// </value>
+        [Browsable(false)]
+        public double ZRd
+        {
+            get { return geometry.Coordinate.Z; }
+            set { geometry.Coordinate.Z = value; }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the relative location is specified.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if the relative location is specified; otherwise, <c>false</c>.
+        /// </value>
+        [Browsable(false)]
+        public bool RelativeLocationSpecified { get; private set; } 
+
+        private SensorType type;
+
+        /// <summary>
+        /// Gets or sets the type of this sensor.
+        /// </summary>
+        /// <value>
+        /// The type. Default value is PiezoMetricHead.
+        /// </value>
+        [PropertyOrder(1, 7)]
+        public SensorType Type
+        {
+            get { return type; }
+            set { type = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the PL line array. Used for serialization only.      
+        /// </summary>
+        /// <value>
+        /// The PL line array.
+        /// </value>
+        [XmlElement("PLLineMappings")]
+        [Specification(typeof(NotNullSpecification))]
+        [Specification(typeof(ContiansAtLeastOneItem))]
+        [Browsable(false)]
+        public PLLineType[] PLLineMappings 
+        {
+            get { return plLineTypes.ToArray(); }
+            set 
+            { 
+                ClearPLLines();
+                foreach (var lineType in value)
+                {
+                    Add(lineType);    
+                }                
+            }
+        }
+
+        [XmlIgnore]
+        [PropertyOrder(1, 6)]
+        public string PLLineMappingsAsString
+        {
+            get
+            {
+                string res = "";
+                foreach (var plLineType in plLineTypes)
+                {
+                    switch (plLineType)
+                    {
+                        case PLLineType.PL1: res = res + "1; "; break;
+                        case PLLineType.PL2: res = res + "2; "; break;
+                        case PLLineType.PL3: res = res + "3; "; break;
+                        case PLLineType.PL4: res = res + "4; "; break;                       
+                    }                    
+                }
+                return res;
+            }
+            set
+            {
+                ClearPLLines();
+                var locPlLineTypes = ParseStringToPlLineTypes(value);
+                foreach (var plLineType in locPlLineTypes)
+                {
+                    switch (plLineType)
+                    {
+                        case 1: plLineTypes.Add(PLLineType.PL1); break;
+                        case 2: plLineTypes.Add(PLLineType.PL2); break;
+                        case 3: plLineTypes.Add(PLLineType.PL3); break;
+                        case 4: plLineTypes.Add(PLLineType.PL4); break;
+                    }                    
+                }
+            }
+        }
+
+        private List<int> ParseStringToPlLineTypes(string value)
+        {
+            value = value.Trim();
+            var ids = new List<int>();
+            var idsarr = value.Split(new Char[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
+            foreach (var s in idsarr)
+            {
+                try
+                {
+                    var val = Int32.Parse(s);
+                    ids.Add(val);
+                }
+                catch (Exception)
+                {
+                    // surpress errors, just do not use value
+                }
+            }
+            return ids;
+        }
+
+        /// <summary>
+        /// Adds the specified PL line.
+        /// </summary>
+        /// <param name="plLine">The PL line.</param>
+        public void Add(PLLineType plLine)
+        {
+            plLineTypes.Add(plLine);
+        }
+
+        /// <summary>
+        /// Removes the specified PL line.
+        /// </summary>
+        /// <param name="plLine">The PL line.</param>
+        public void Remove(PLLineType plLine)
+        {
+            plLineTypes.Remove(plLine);
+        }
+
+        /// <summary>
+        /// Clears the PL lines list.
+        /// </summary>
+        public void ClearPLLines()
+        {
+            plLineTypes.Clear();
+        }
+
+
+        /// <summary>
+        /// Serializes this instance to a xml string.
+        /// </summary>
+        /// <returns>A xml string</returns>
+        internal string Serialize()
+        {
+            var xmlSerializer = new XmlSerializer();
+            return xmlSerializer.SerializeToString(this);
+        }
+
+
+        /// <summary>
+        /// Deserializes the specified XML.
+        /// </summary>
+        /// <param name="xml">The XML to deserialize.</param>
+        /// <returns>A sensor instance</returns>
+        internal static Sensor Deserialize(string xml)
+        {
+            var xmlDeserializer = new XmlDeserializer();
+            return (Sensor)xmlDeserializer.XmlDeserializeFromString(xml, typeof(Sensor));
+        }
+
+        /// <summary>
+        /// Determines whether this instance is valid.
+        /// </summary>
+        /// <returns>
+        ///   <c>true</c> if this instance is valid; otherwise, <c>false</c>.
+        /// </returns>
+        public bool IsValid()
+        {
+            return !Validator.Validate(this).Any();
+        }
+
+        /// <summary>
+        /// Determines whether this instance is transient (associated with a correct ID in the context of the repository).
+        /// </summary>
+        /// <returns>
+        ///   <c>true</c> if this instance is transient; otherwise, <c>false</c>.
+        /// </returns>
+        public bool IsTransient()
+        {
+            return ID < 0;
+        }
+
+        public override string ToString()
+        {
+            var name = string.IsNullOrWhiteSpace(Name) ? "name_not_set" : Name;
+
+            return string.Format("[ID: {0}, Name: {1}, Depth: {2}, Type: {3}, RelativeLocation: {4}]", 
+                ID, name, Depth, Type, RelativeLocation);
+        }
+
+        public bool IsVisible(string property)
+        {
+            switch (property)
+            {
+                case "XRd": return false;
+                case "YRd": return false;
+                case "ZRd": return false;
+                default: return true;
+            }            
+        }
+
+        public bool IsEnabled(string property)
+        {
+            return true;
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Geometry2DBoundaryLine.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Geometry2DBoundaryLine.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Geometry2DBoundaryLine.cs	(revision 3305)
@@ -0,0 +1,50 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Geometry;
+using Deltares.Standard;
+
+namespace Deltares.Dam.Data
+{
+
+    public class Geometry2DPoint : GeometryPoint
+    {
+        public Geometry2DPoint() : this (0, 0) { }
+
+        public Geometry2DPoint(double aX, double aZ) : base(aX, 0, aZ) 
+        {
+        }
+    }
+
+    public class Geometry2DBoundaryLine : PolyLine<Geometry2DPoint>, ICloneable<Geometry2DBoundaryLine>
+    {
+        public Geometry2DBoundaryLine Clone()
+        {
+            Geometry2DBoundaryLine boundaryLine = new Geometry2DBoundaryLine();
+            foreach (Geometry2DPoint point in this.Points)
+            {
+                Geometry2DPoint newPoint = new Geometry2DPoint() { X = point.X, Y = point.Y, Z = point.Z };
+                boundaryLine.Points.Add(newPoint);
+            }
+            return boundaryLine;
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/SoilGeometry.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/SoilGeometry.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/SoilGeometry.cs	(revision 3305)
@@ -0,0 +1,96 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Deltares.Geotechnics.Soils;
+using Deltares.Standard.Attributes;
+
+namespace Deltares.Dam.Data
+{
+
+    /// <summary>
+    /// Exception class for SoilGeometry
+    /// </summary>
+    public class SoilGeometryException : ApplicationException
+    {
+        public SoilGeometryException(string message) : base(message)
+        {
+        }
+    }
+
+    public class SoilGeometryBase
+    {
+        [XmlOldName("SoilGeometryType")]
+        public virtual SoilProfileType SoilProfileType { get; set; }
+        public virtual string SoilGeometryName { get; set; }
+    }
+
+    /// <summary>
+    /// Super class to contain 1D and 2D soil geometry
+    /// </summary>
+    public class SoilGeometry : SoilGeometryBase
+    {
+        private SoilProfile1D soilProfile;
+        private string soilGeometry2DName;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public SoilGeometry(SoilProfile1D soilProfile, string soilGeometry2DName)
+        {
+            this.SoilProfile = soilProfile;
+            this.SoilGeometry2DName = soilGeometry2DName;
+        }
+
+        #region PublicPropteries
+
+        [XmlOldName("SoilGeometryType")]
+        public override SoilProfileType SoilProfileType
+        {
+            get
+            {
+                SoilProfileType soilProfileType = SoilProfileType.SoilGeometryStiFile;
+                if (soilProfile != null)
+                {
+                    soilProfileType = SoilProfileType.SoilProfile1D;
+                }
+                if ((SoilProfile == null) && ((SoilGeometry2DName == null) || SoilGeometry2DName == ""))
+                {
+                    throw new SoilGeometryException("No geometry assigned");
+                }
+                return soilProfileType;
+            }
+        }
+
+        public SoilProfile1D SoilProfile
+        {
+            get { return soilProfile; }
+            set { soilProfile = value; }
+        }
+
+        public string SoilGeometry2DName
+        {
+            get { return soilGeometry2DName; }
+            set { soilGeometry2DName = value; }
+        }
+        #endregion PublicPropteries
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/BackgroundRepositoryFeature.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/BackgroundRepositoryFeature.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/BackgroundRepositoryFeature.cs	(revision 3305)
@@ -0,0 +1,35 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Geographic;
+
+namespace Deltares.Dam.Data
+{
+    public class BackgroundRepositoryFeature : IWKT
+    {
+        public virtual string Feature { get; set; }
+
+        public string WKT
+        {
+            get { return this.Feature; }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/GaugePLLine.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/GaugePLLine.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/GaugePLLine.cs	(revision 3305)
@@ -0,0 +1,74 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Geometry;
+
+namespace Deltares.Dam.Data
+{
+    using System;
+    public class GaugePLLinePoint : GeometryPoint
+    {
+        public GaugePLLinePoint() : this(null, null, null, null) { }
+
+        public GaugePLLinePoint(double? localX, double? localZ, string gaugeX, string gaugeZ)
+        {
+            this.X = localX;
+            this.Z = localZ;
+            this.GaugeIDX = gaugeX;
+            this.GaugeIDZ = gaugeZ;
+        }
+
+        public new double? X { get; set; }
+        public new double? Z { get; set; }
+        public string GaugeIDX { get; set; }
+        public string GaugeIDZ { get; set; }
+
+        public override string ToString()
+        {
+            return String.Format("({0}, {1}, '{2}', '{3}')", this.X.HasValue ? this.X.ToString() : "?", this.Z.HasValue ? this.Z.ToString() : "?", this.GaugeIDX, this.GaugeIDZ);
+        }
+    }
+
+    public class GaugePLLine : PolyLine<GaugePLLinePoint>
+    {
+        private GaugePLLine()
+            : base()
+        {
+        }
+
+        public GaugePLLine(PLLineType plLineType)
+            : this()
+        {
+            this.PLLineType = plLineType;
+        }
+
+        public PLLineType PLLineType { get; set; }
+
+        public override string ToString()
+        {
+            string result = String.Format("{0} | ", this.PLLineType.ToString());
+            foreach (GaugePLLinePoint point in this.Points)
+                result += point.ToString() + ", ";
+
+            return result;
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/MissingRequiredFieldValueException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/MissingRequiredFieldValueException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/MissingRequiredFieldValueException.cs	(revision 3305)
@@ -0,0 +1,52 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Deltares.Standard
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Serializable]
+    public class MissingRequiredValueException : Exception
+    {
+        public MissingRequiredValueException()
+        {
+        }
+
+        public MissingRequiredValueException(string message) : base(message)
+        {
+        }
+
+        public MissingRequiredValueException(string message, Exception inner) : base(message, inner)
+        {
+        }
+
+        protected MissingRequiredValueException(
+            SerializationInfo info,
+            StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorRepository.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorRepository.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorRepository.cs	(revision 3305)
@@ -0,0 +1,151 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using Deltares.Standard.Extensions;
+
+namespace Deltares.Dam.Data.Sensors
+{
+    public class SensorRepository
+    {
+        private SensorLocation sensorLocation;
+        private readonly HashSet<string> names;
+        private readonly HashSet<int> ids;
+
+        private SensorRepository()
+        {
+            names = new HashSet<string>();
+            ids = new HashSet<int>();
+        }
+
+        public SensorRepository(Location location) : this()
+        {            
+            if (location.SensorLocation == null)
+            {
+                location.AddNewSensorData();
+            }
+
+            sensorLocation = location.SensorLocation;
+
+            if (sensorLocation.Group == null)
+                sensorLocation.Group = new Group();
+        }
+
+        internal Group Group
+        {
+            get { return sensorLocation.Group; }
+        }
+
+        public IEnumerable<Sensor> Sensors
+        {
+            get { return Group.Selection; }
+        }
+
+        internal int GetUniqueSensorID()
+        {
+            return Group.Selection.GetUniqueID(x => x.ID);
+        }
+
+        /// <summary>
+        /// Adds a new sensor to the location sensor group.
+        /// </summary>
+        /// <returns>The created Sensor</returns>
+        public Sensor AddNew()
+        {
+            var factory = new SensorFactory();
+            Sensor sensor = factory.CreateUniqueSensor(Group.Selection);
+            AddSensor(sensor);
+            return sensor;
+        }
+
+        /// <summary>
+        /// Adds the collection of sensors to the group.
+        /// </summary>
+        /// <remarks>The sensor needs to meet the business rules before it can be added</remarks>
+        /// <param name="sensors">The sensor collection to add to the group of this location.</param>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <exception cref="ArgumentException"></exception>
+        public void Add(IEnumerable<Sensor> sensors)
+        {
+            if (sensors == null) throw new ArgumentNullException("sensors");
+            foreach (var sensor in sensors)
+                Add(sensor);
+        }
+
+        /// <summary>
+        /// Adds the specified sensor.
+        /// </summary>
+        /// <remarks>The sensor needs to meet the business rules before it can be added</remarks>
+        /// <param name="sensor">The sensor to add.</param>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <exception cref="ArgumentException"></exception>
+        public void Add(Sensor sensor)
+        {
+            if (sensor == null) 
+                throw new ArgumentNullException("sensor");
+           
+            if (string.IsNullOrWhiteSpace(sensor.Name))
+                throw new ArgumentException("Cant add this sensor because its name is empty");
+
+            if (sensor.IsTransient())
+                throw new ArgumentException("Cant add this sensor because its ID is not valid. The ID must be greater then -1");
+
+            if (ids.Contains(sensor.ID))
+                throw new ArgumentException("Cant add this sensor becuase its ID is already added");
+
+            if (names.Contains(sensor.Name))
+                throw new ArgumentException("Cant add this sensor because its name is already used");
+
+            AddSensor(sensor);
+        }
+
+        /// <summary>
+        /// Adds the sensor unconditionally
+        /// </summary>
+        /// <param name="sensor">The sensor.</param>
+        private void AddSensor(Sensor sensor)
+        {
+            ids.Add(sensor.ID);
+            names.Add(sensor.Name);
+            sensorLocation.Group.Add(sensor);
+        }
+
+        /// <summary>
+        /// Serializes the state of this repository to a XML string.
+        /// </summary>
+        /// <returns></returns>
+        internal string Serialize()
+        {
+            return sensorLocation.Serialize();
+        }
+
+        /// <summary>
+        /// Deserializes the specified XML to restore the state of this repository
+        /// </summary>
+        /// <param name="xml">The XML.</param>
+        internal static SensorRepository Deserialize(string xml)
+        {
+            if (string.IsNullOrWhiteSpace(xml)) throw new ArgumentException("xml");
+            return new SensorRepository() { sensorLocation = SensorLocation.Deserialize(xml) };
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/FeatureRepository.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/FeatureRepository.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/FeatureRepository.cs	(revision 3305)
@@ -0,0 +1,284 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using GeoAPI.Geometries;
+
+using NetTopologySuite.Features;
+using NetTopologySuite.Index.Quadtree;
+
+namespace Deltares.Maps
+{
+    /// <summary>
+    ///     Spatial Indexed Feature Repository
+    /// </summary>
+    public class FeatureRepository : IFeatureRepository
+    {
+        private readonly IList<IFeature> emptyGeometryFeatures;
+        private readonly IList<IFeature> features;
+        private Quadtree<IFeature> spatialIndex;
+
+        public FeatureRepository()
+        {
+            features = new List<IFeature>();
+            emptyGeometryFeatures = new List<IFeature>();
+            spatialIndex = new Quadtree<IFeature>();
+        }
+
+        public static IFeatureRepository CreateFromShapeFile(string fileName)
+        {
+            if (fileName == null)
+            {
+                throw new ArgumentNullException("fileName");
+            }
+
+            return CreateFromShapeFile(new ShapeFileLocation(fileName));
+        }
+
+        public IEnumerable<IFeature> Query(IFeature feature)
+        {
+            return Query(feature.Geometry);
+        }
+
+        public IEnumerable<IFeature> Query(IGeometry geometry)
+        {
+            return geometry.IsEmpty ? emptyGeometryFeatures : Query(geometry.EnvelopeInternal);
+        }
+
+        /// <summary>
+        ///     Gets features based on the envelope.
+        /// </summary>
+        /// <remarks>
+        ///     Note that this call won't handle empty geometries. To return empty geometries as well use Query(IFeature) or
+        ///     Query(IGeometry)
+        ///     instead of this call
+        /// </remarks>
+        /// <param name="envelope"></param>
+        /// <returns></returns>
+        public IEnumerable<IFeature> Query(Envelope envelope)
+        {
+            //return this.featureLookup.Values.Where(f => envelope.Intersects(f.Geometry.EnvelopeInternal));
+            return spatialIndex.Query((Envelope)envelope);
+        }
+
+        public static IFeatureRepository CreateFromShapeFile(ShapeFileLocation shapeFileLocation)
+        {
+            if (shapeFileLocation == null)
+            {
+                throw new ArgumentNullException("shapeFileLocation");
+            }
+            var repository = new FeatureRepository();
+            try
+            {
+                FeatureImporter.ImportFromShapeFile(shapeFileLocation, repository);
+            }
+            catch (Exception e)
+            {
+                throw e;
+            }
+            return repository;
+        }
+
+        public IEnumerable<Guid> FeatureIds
+        {
+            get { return Features.Select(geom => geom.Id); }
+        }
+
+        public IGeometry GetGeometryById(Guid id)
+        {
+            //var feature = this.featureLookup.Values.FirstOrDefault(item => item.Id == id);
+            IFeature feature = Features.FirstOrDefault(item => item.Id == id);
+            if (feature != null)
+            {
+                return feature.Geometry;
+            }
+
+            throw new ArgumentException(string.Format("Unknown id '{0}', geometry not found", id));
+        }
+
+        public IEnumerable<KeyValuePair<string, object>> GetAttributes(IGeometry geom)
+        {
+            if (geom == null)
+            {
+                throw new ArgumentNullException("geom");
+            }
+
+            IFeature feature =
+                Features.SingleOrDefault(
+                    f => f.Geometry == geom || f.Geometry.AsText().GetHashCode() == geom.AsText().GetHashCode());
+
+            if (feature != null)
+            {
+                IAttributesTable attributes = feature.Attributes;
+                return attributes.GetNames().Select(attr => new KeyValuePair<string, object>(attr, attributes[attr]));
+                ;
+            }
+
+            throw new ArgumentException("Couldn't find the geometry in the repository");
+        }
+
+        public IEnumerable<IFeature> Features
+        {
+            get { return features.Concat(emptyGeometryFeatures); }
+        }
+
+        /// <summary>
+        ///     TODO: Is it allowed to have different attributes per geometry? If this is the case the we have to create a fast and
+        ///     robust attribute collector.
+        /// </summary>
+        public IEnumerable<string> SupportedAttributes
+        {
+            get
+            {
+                if (Features == null || !Features.Any())
+                {
+                    return new List<string>();
+                }
+
+                return Features.SelectMany(geometry => geometry.Attributes.GetNames()).Distinct();
+            }
+        }
+
+        public void Add(IFeature feature)
+        {
+            if (feature == null)
+            {
+                throw new ArgumentNullException("feature");
+            }
+
+            if (feature.Geometry.IsEmpty)
+            {
+                emptyGeometryFeatures.Add(feature);
+            }
+            else
+            {
+                features.Add(feature);
+                AddToSpatialIndex(feature);
+            }
+        }
+
+        private void AddToSpatialIndex(IFeature feature)
+        {
+            try
+            {
+                spatialIndex.Insert(feature.Geometry.EnvelopeInternal, feature);
+            }
+            catch (Exception e)
+            {
+                throw e;
+            }
+        }
+
+        private void RemoveFromSpatialIndex(IFeature feature)
+        {
+            spatialIndex.Insert(feature.Geometry.EnvelopeInternal, feature);
+        }
+
+        public void Add(IEnumerable<IFeature> featureCollection)
+        {
+            if (featureCollection == null)
+            {
+                throw new ArgumentNullException("featureCollection");
+            }
+
+            foreach (IFeature feature in featureCollection)
+            {
+                Add(feature);
+            }
+        }
+
+        public void Remove(IFeature feature)
+        {
+            if (feature == null)
+            {
+                throw new ArgumentNullException("feature");
+            }
+
+            if (feature.Geometry.IsEmpty)
+            {
+                emptyGeometryFeatures.Remove(feature);
+            }
+            else
+            {
+                features.Remove(feature);
+                RemoveFromSpatialIndex(feature);
+            }
+        }
+
+        public void Remove(Func<IFeature, bool> predicate)
+        {
+            if (predicate == null)
+            {
+                throw new ArgumentNullException("predicate");
+            }
+
+            var work = new Queue<IFeature>(Count);
+            foreach (IFeature feature in Features.Where(predicate))
+            {
+                work.Enqueue(feature);
+            }
+
+            while (work.Count > 0)
+            {
+                Remove(work.Dequeue());
+            }
+        }
+
+        public void Add(Feature feature, Func<IFeature, bool> predicate)
+        {
+            if (feature == null)
+            {
+                throw new ArgumentNullException("feature");
+            }
+
+            if (predicate == null)
+            {
+                throw new ArgumentNullException("predicate");
+            }
+
+            if (predicate(feature))
+            {
+                Add(feature);
+            }
+        }
+
+        /// <summary>
+        ///     Clears the list of features in the repository
+        /// </summary>
+        public void Clear()
+        {
+            features.Clear();
+            emptyGeometryFeatures.Clear();
+            spatialIndex = new Quadtree<IFeature>();
+        }
+
+        /// <summary>
+        ///     Gets the feature count in the repository
+        /// </summary>
+        public int Count
+        {
+            get { return features.Count + emptyGeometryFeatures.Count; }
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/TestData/Gemeenten.shp
===================================================================
diff -u
Binary files differ
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterSurfaceLines.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterSurfaceLines.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterSurfaceLines.cs	(revision 3305)
@@ -0,0 +1,196 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using Deltares.Standard.IO;
+using Deltares.Standard.Language;
+using LumenWorks.Framework.IO.Csv;
+
+namespace Deltares.Dam.Data.CsvImporters
+{
+    public class CsvImporterSurfaceLinesException : Exception
+    {
+        public CsvImporterSurfaceLinesException(string message) : base(message)
+        {
+        }
+    }
+
+    public class CsvImporterSurfaceLines
+    {
+        private readonly List<SurfaceLineRecord> surfaceLineRecords = new List<SurfaceLineRecord>();
+        private List<string> errorMessages = new List<string>();
+
+        public class SurfaceLineRecord
+        {
+            private IList<double> xcoors = new List<double>();
+            private IList<double> ycoors = new List<double>();
+            private IList<double> zcoors = new List<double>();
+
+            public string SurfaceLineId { get; set; }
+            public int SurfaceLineRecordId { get; set; }
+
+            public IList<double> Xcoors
+            {
+                get { return xcoors; }
+                set { xcoors = value; }
+            }
+
+            public IList<double> Ycoors
+            {
+                get { return ycoors; }
+                set { ycoors = value; }
+            }
+
+            public IList<double> Zcoors
+            {
+                get { return zcoors; }
+                set { zcoors = value; }
+            }
+        }
+
+        private void CheckColumn(int index, string fileName, string fieldName)
+        {
+            if (index < 0)
+            {
+                var csvHeaderFieldError = LocalizationManager.GetTranslatedText(GetType(), "csvHeaderFieldError");
+                throw new CsvImporterSurfaceLinesException(String.Format("{0} : {1} {2}", fileName, csvHeaderFieldError, fieldName));
+            }
+        }
+
+        /// <summary>
+        /// Copies to temporary file.
+        /// </summary>
+        /// <param name="fileName">Name of the file.</param>
+        /// <returns>the name of the temporary file</returns>
+        private string CopyToTemporaryFile(string fileName)
+        {
+            string newFilename = Path.GetTempFileName();
+            File.Delete(newFilename);
+            File.Copy(fileName, newFilename);
+            return newFilename;
+        }
+
+        public CsvImporterSurfaceLines(string filename)
+        {
+            errorMessages.Clear();
+            ThrowHelper.ThrowIfStringArgumentNullOrEmpty(filename, StringResourceNames.CsvFileNotValid);
+            ThrowHelper.ThrowIfFileNotExist(filename, StringResourceNames.CsvFileNotFound);
+
+            // This is a 'dynamic' csv file, i.e. the number of columns is not known and can vary per row. So make sure of a 
+            // proper header (i.e. a header with the maximum number of fields
+            // because the file will be changed we copy it to a temporary file and perform the action on the temporary file
+            string tempFilename = CopyToTemporaryFile(filename);
+            CsvReaderUtilities.EnsureProperHeaderForDynamicRecordLengthInCsvFile(tempFilename);
+            var oldcur = Thread.CurrentThread.CurrentCulture;
+            try
+            {
+                Thread.CurrentThread.CurrentCulture = CsvReaderUtilities.DetermineCultureForFile(tempFilename);
+                using (CsvReader csv = new CsvReader(new StreamReader(tempFilename), true, ';'){ MissingFieldAction = MissingFieldAction.ReplaceByNull })
+                {
+                    string[] headers = CsvImporterHelper.GetFieldHeaders(this, csv);
+                    int colIndexSurfaceLineId = CsvReaderUtilities.GetHeaderIndexByString(headers, SurfaceLineCsvColumnNames.LocationColumnName);
+                    if (colIndexSurfaceLineId < 0)
+                    {
+                        // colIndexSurfaceLineId can be defined with 2 identifiers (ProfileNameColumnName is deprecated, LocationColumnName is the new one)
+                        colIndexSurfaceLineId = CsvReaderUtilities.GetHeaderIndexByString(headers, SurfaceLineCsvColumnNames.LocationColumnName);
+                        if (colIndexSurfaceLineId < 0)
+                        {
+                            colIndexSurfaceLineId = CsvReaderUtilities.GetHeaderIndexByString(headers, SurfaceLineCsvColumnNames.ProfileNameColumnName);
+                        }
+                    }
+                    CheckColumn(colIndexSurfaceLineId, tempFilename, SurfaceLineCsvColumnNames.LocationColumnName);
+                    int colIndexFirstX = CsvReaderUtilities.GetHeaderIndexByString(headers, SurfaceLineCsvColumnNames.FirstXColumnName);
+                    CheckColumn(colIndexFirstX, tempFilename, SurfaceLineCsvColumnNames.FirstXColumnName);
+                    int maxColumns = headers.Count();
+                    var end = Math.Floor((maxColumns - colIndexFirstX + 1) / 3.0);
+                    var surflineIndex = 1;
+                    while (csv.ReadNextRecord())
+                    {
+                        var recordReadError = false;
+                        SurfaceLineRecord surfaceLine = new SurfaceLineRecord
+                        {
+                            SurfaceLineRecordId = surflineIndex
+                        };
+                        surflineIndex++;
+                        surfaceLine.SurfaceLineId = csv[colIndexSurfaceLineId];
+                        var colIndex = colIndexFirstX;
+                        for (int i = 0; i < end; i++)
+                        {
+                            // if the first value = null the end of this surfaceline is reached, so break and it. Checking on null can only be done this way,
+                            // a csv[index] == null does not work as that throws an exception itself.
+                            try
+                            {
+                                var dum = csv[colIndex];
+                                if (String.IsNullOrEmpty(dum))
+                                    break;
+                            }
+                            catch (Exception)
+                            {
+                                break;
+                            }
+                            // other "errors" are real errors so trap them.
+                            try
+                            {                                
+                                surfaceLine.Xcoors.Add(Convert.ToDouble(csv[colIndex]));
+                                colIndex++;
+                                surfaceLine.Ycoors.Add(Convert.ToDouble(csv[colIndex]));
+                                colIndex++;
+                                surfaceLine.Zcoors.Add(Convert.ToDouble(csv[colIndex]));
+                                colIndex++;
+                            }
+                            catch (Exception e)
+                            {
+                                var csvSurfaceLineError = String.Format(LocalizationManager.GetTranslatedText(GetType(), "csvSurfaceLineError"), surfaceLine.SurfaceLineRecordId, colIndex + 1);
+                                errorMessages.Add(csvSurfaceLineError + e.Message);
+                                recordReadError = true;
+                                break;
+                            }                                                        
+                        }
+                        if (!recordReadError)
+                        {
+                            surfaceLineRecords.Add(surfaceLine);
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                File.Delete(tempFilename);
+                Thread.CurrentThread.CurrentCulture = oldcur;
+            }
+        }
+
+        public List<SurfaceLineRecord> ImportedItems
+        {
+            get { return surfaceLineRecords; }
+        }
+
+        public List<string> ErrorMessages
+        {
+            get { return errorMessages; }
+            set { errorMessages = value; }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/AbstractExporter.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/AbstractExporter.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/AbstractExporter.cs	(revision 3305)
@@ -0,0 +1,112 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using SPath = System.IO.Path;
+
+namespace Deltares.Dam.Data.IO
+{
+    public abstract class AbstractExporter<T> : IExport
+    {
+        private string name;
+        private string path;
+
+        protected AbstractExporter(string name) 
+            : this(name, ".")
+        {
+        }
+
+        protected AbstractExporter(string name, string outputPath) 
+            : this(name, outputPath, default(T))
+        {
+        }
+
+        protected AbstractExporter(string name, string outputPath, T data)
+        {
+            this.name = name;
+            this.path = outputPath;
+            this.Data = data;
+        }
+
+        #region Implementation of IExport
+
+        /// <summary>
+        /// Sets the name of the file without extension
+        /// </summary>
+        public string Name
+        {
+            protected get { return this.name; }
+            set { this.name = value; }
+        }
+
+        /// <summary>
+        /// Sets the path of the output folder
+        /// </summary>
+        public string Path
+        {
+            set { this.path = value; }
+            protected get { return this.path; }
+        }
+
+        /// <summary>
+        /// Sets the data to export
+        /// </summary>
+        object IExport.Data { set { this.Data = (T)value; } }
+
+        /// <summary>
+        /// Sets the data to export
+        /// </summary>
+        public T Data { set; protected get; }
+
+        /// <summary>
+        /// Gets or sets the name of the file which will be set/combined by Path + Name + Extension in the export method
+        /// </summary>
+        public string FileName { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the file extension 
+        /// </summary>
+        protected string FileExtension { private get; set; }
+
+        /// <summary>
+        /// Exports the data to files in the current folder
+        /// </summary>
+        public void Export()
+        {
+            if (string.IsNullOrEmpty(this.path))
+                throw new InvalidOperationException("path");
+
+            if (string.IsNullOrEmpty(this.name) || this.name.Trim() == "")
+                throw new InvalidOperationException("No name given for the file to export to");
+
+            this.FileName = SPath.Combine(path, name + this.FileExtension);
+
+            Export(this.FileName, this.Data);
+        }
+
+        #endregion
+
+        protected virtual void Export(string fileName, T data)
+        {
+        }
+
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/ImportException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/ImportException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/ImportException.cs	(revision 3305)
@@ -0,0 +1,48 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Deltares.Dam.Data.Importers
+{
+    [Serializable]
+    public class ImportException : Exception
+    {
+        public ImportException()
+        {
+        }
+
+        public ImportException(string message) : base(message)
+        {
+        }
+
+        public ImportException(string message, Exception inner) : base(message, inner)
+        {
+        }
+
+        protected ImportException(
+            SerializationInfo info,
+            StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Specifications/PiezometricHeadSensorSpecification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Specifications/PiezometricHeadSensorSpecification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Specifications/PiezometricHeadSensorSpecification.cs	(revision 3305)
@@ -0,0 +1,33 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Standard.Specifications;
+
+namespace Deltares.Dam.Data.Sensors.Specifications
+{
+    internal class  PiezometricHeadSensorSpecification : PredicateSpecification<Sensor>
+    {
+        public PiezometricHeadSensorSpecification() :
+            base(s => s.Type == SensorType.PiezometricHead)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs	(revision 3305)
@@ -0,0 +1,318 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using System.Linq;
+using Deltares.DamEngine.Io.XmlOutput;
+using Deltares.Geometry;
+using Deltares.Geotechnics.GeotechnicalGeometry;
+using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.SurfaceLines;
+using Deltares.Standard.EventPublisher;
+using Deltares.Standard.Extensions;
+using SurfaceLine = Deltares.DamEngine.Io.XmlOutput.SurfaceLine;
+
+namespace Deltares.Dam.Data.DamEngineIo
+{
+    /// <summary>
+    /// Class to support the conversion of XmlOutput (as provided by the Engine) to DamUI objects.
+    /// </summary>
+    public class FillDamUiFromXmlOutput
+    {
+        /// <summary>
+        /// Adds the output to dam project data.
+        /// Precondition is that dam project data is filled and contains all relevant data that is referred to in the Output.
+        /// </summary>
+        /// <param name="damProjectData">The dam project data.</param>
+        /// <param name="output">The output.</param>
+        /// <returns></returns>
+        public static DamProjectData AddOutputToDamProjectData(DamProjectData damProjectData, Output output)
+        {
+            if (output != null && output.Results != null && output.Results.CalculationResults != null)
+            {
+                if (output.Results.CalculationResults != null)
+                {
+                    DataEventPublisher.InvokeWithoutPublishingEvents(() =>
+                        {
+                            CreateDesignResultsFromOutput(output, damProjectData);
+                        }
+                    );
+                }                
+            }
+
+            // Transfer calculation messages
+            if (output != null && output.Results != null && output.Results.CalculationMessages != null)
+            {
+                damProjectData.CalculationMessages = new List<Standard.Logging.LogMessage>();
+                for (int i = 0; i < output.Results.CalculationMessages.Length; i++)
+                {
+                    var validationResult = output.Results.CalculationMessages[i];
+                    var logMessage = new Deltares.Standard.Logging.LogMessage();
+                    logMessage.MessageType = ConversionHelper.ConvertToMessageType(validationResult.MessageType);
+                    logMessage.Subject = null;
+                    logMessage.Message = validationResult.Message1;
+                    damProjectData.CalculationMessages.Add(logMessage);
+                }
+            }
+
+            // Transfer output time series
+            if (output.Results.OperationalOutputTimeSeries != null)
+            {
+                damProjectData.OutputTimeSerieCollection = new TimeSerieCollection();
+                TransferOutputTimeSeries(output.Results.OperationalOutputTimeSeries, damProjectData.OutputTimeSerieCollection);
+            }
+            return damProjectData;
+        }
+
+        private static void TransferOutputTimeSeries(DamEngine.Io.XmlOutput.TimeSerie[] outputTimeSeries, TimeSerieCollection outputTimeSerieCollection)
+        {
+            foreach (var outputTimeSerie in outputTimeSeries)
+            {
+                var timeSerie = outputTimeSerieCollection.AddNewSeries(outputTimeSerie.LocationId);
+                timeSerie.ParameterId = outputTimeSerie.ParameterId;
+                timeSerie.ForecastDateTime = outputTimeSerie.ForecastDateTime;
+                timeSerie.Type = outputTimeSerie.Type;
+                timeSerie.StartDateTime = outputTimeSerie.StartDateTime;
+                timeSerie.EndDateTime = outputTimeSerie.EndDateTime;
+                timeSerie.MissVal = outputTimeSerie.MissVal;
+                timeSerie.LongName = outputTimeSerie.LongName;
+                timeSerie.StationName = outputTimeSerie.StationName;
+                timeSerie.Units = outputTimeSerie.Units;
+                timeSerie.SourceOrganisation = outputTimeSerie.SourceOrganisation;
+                timeSerie.SourceSystem = outputTimeSerie.SourceSystem;
+                timeSerie.FileDescription = outputTimeSerie.FileDescription;
+                timeSerie.Region = outputTimeSerie.Region;
+                timeSerie.TimeStep.Multiplier = outputTimeSerie.TimeStep.Multiplier;
+                timeSerie.TimeStep.Divider = outputTimeSerie.TimeStep.Divider;
+                timeSerie.TimeStep.MultiplierSpecified = outputTimeSerie.TimeStep.MultiplierSpecified1;
+                timeSerie.TimeStep.DividerSpecified = outputTimeSerie.TimeStep.DividerSpecified1;
+                timeSerie.TimeStep.Unit = ConversionHelper.ConvertToTimeStepUnit(outputTimeSerie.TimeStep.TimeStepUnit);
+                for (int i = 0; i < outputTimeSerie.Entries.TimeSerieEntry.Length; i++)
+                {
+                    var entry = outputTimeSerie.Entries.TimeSerieEntry[i];
+                    Stochast stochastValue = null;
+                    if (entry.StochastValue != null)
+                    {
+                        stochastValue = new Stochast()
+                        {
+                            Distribution = entry.StochastValue.Distribution,
+                            Mean = entry.StochastValue.Mean,
+                            StandardDeviation = entry.StochastValue.StandardDeviation
+                        };
+                    }
+                    TimeSerieEntry timeSerieEntry = new TimeSerieEntry()
+                    {
+                        DateTime = entry.DateTime,
+                        Value = entry.Value,
+                        BasisFileName = entry.BasisFileNameWMF,
+                        Flag = entry.Flagnietechtgebruikt,
+                        RelativeCalculationPathName = entry.RelativeCalculationPathName,
+                        StochastValue = stochastValue
+                    };
+                    timeSerie.Entries.Add(timeSerieEntry);
+                }
+            }
+        }
+
+        private static void CreateDesignResultsFromOutput(Output output, DamProjectData damProjectData)
+        {
+            if (damProjectData.WaterBoard.Dikes[0] != null)
+            {
+                // Design results
+                damProjectData.DesignCalculations = new List<CsvExportData>();
+                for (int i = 0; i < output.Results.CalculationResults.Length; i++)
+                {
+                    var designResult = output.Results.CalculationResults[i];
+                    var desResult = new CsvExportData(designResult.LocationName, designResult.ScenarioName)
+                    {
+                        DamFailureMechanismeCalculation = damProjectData.DamProjectCalculationSpecification.CurrentSpecification, // vanuit invoer
+                        SelectedStabilityKernelType = damProjectData.DamProjectCalculationSpecification.SelectedStabilityKernelType,
+                        AnalysisType = DamProjectCalculationSpecification.SelectedAnalysisType, //is vanuit invoer
+                        DikeName = damProjectData.WaterBoard.Dikes[0].Name, // is de enige voor nu
+                        CalculationResult = ConversionHelper.ConvertToCalculationResult(designResult.CalculationResult),
+                        BaseFileName = designResult.BaseFileName,
+                        CalculationSubDir = designResult.CalculationSubDir,
+                        ProfileName = designResult.ProfileName
+                    };
+                    desResult.CalculationResult = ConversionHelper.ConvertToCalculationResult(designResult.CalculationResult);
+                    desResult.Scenario = GetScenarioByName(damProjectData, designResult.LocationName, designResult.ScenarioName);
+                    desResult.SoilProfile = GetSoilProfileByName(damProjectData, designResult.ProfileName);
+                    if (desResult.SoilProfile == null)
+                    {
+                        desResult.SoilGeometry2DName = designResult.ProfileName;
+                    }
+                    if (designResult.PipingDesignResults != null)
+                    {
+                        CreateDesignResultsPipingOutput(designResult, desResult);
+                    }
+                    if (designResult.StabilityDesignResults != null)
+                    {
+                        CreateDesignResultsStabilityOutput(designResult, desResult);
+                    }
+                    if (desResult.Scenario != null)
+                    {
+                        desResult.Scenario.CalculationResult = desResult.CalculationResult;
+                        desResult.Scenario.CalculationResults.Add(desResult);
+                    }
+                    damProjectData.DesignCalculations.Add(desResult);
+                }
+            }
+        }
+
+        private static void CreateDesignResultsPipingOutput(DesignResult designResult, CsvExportData desResult)
+        {
+            desResult.ResultMessage = designResult.PipingDesignResults.ResultMessage;
+            if (designResult.PipingDesignResults.RedesignedSurfaceLine != null)
+            {
+                desResult.RedesignedSurfaceLine2 = new SurfaceLine2();
+                var surfaceLine = ConvertXmlSurfaceLineToSurfaceLine2(designResult.PipingDesignResults.RedesignedSurfaceLine);
+                desResult.RedesignedSurfaceLine2 = surfaceLine;
+            }
+            if (designResult.PipingDesignResults.UpliftFactorSpecified) desResult.UpliftFactor = designResult.PipingDesignResults.UpliftFactor;
+            if (designResult.PipingDesignResults.HeaveFactorSpecified) desResult.HeaveFactor = designResult.PipingDesignResults.HeaveFactor;
+            if (designResult.PipingDesignResults.BlighFactorSpecified) desResult.BlighPipingFactor = designResult.PipingDesignResults.BlighFactor;
+            if (designResult.PipingDesignResults.BlighHcriticalSpecified) desResult.BlighHCritical = designResult.PipingDesignResults.BlighHcritical;
+            if (designResult.PipingDesignResults.Sellmeijer4ForcesFactorSpecified) desResult.Sellmeijer4ForcesPipingFactor = designResult.PipingDesignResults.Sellmeijer4ForcesFactor;
+            if (designResult.PipingDesignResults.Sellmeijer4ForcesHcriticalSpecified) desResult.Sellmeijer4ForcesHCritical = designResult.PipingDesignResults.Sellmeijer4ForcesHcritical;
+            if (designResult.PipingDesignResults.SellmeijerVnkFactorSpecified) desResult.SellmeijerPipingFactor = designResult.PipingDesignResults.SellmeijerVnkFactor;
+            if (designResult.PipingDesignResults.SellmeijerVnkHcriticalSpecified) desResult.SellmeijerHCritical = designResult.PipingDesignResults.SellmeijerVnkHcritical;
+            if (designResult.PipingDesignResults.Wti2017BackwardErosionFactorSpecified) desResult.Wti2017BackwardErosionSafetyFactor = designResult.PipingDesignResults.Wti2017BackwardErosionFactor;
+            if (designResult.PipingDesignResults.Wti2017BackwardErosionHcriticalSpecified) desResult.Wti2017BackwardErosionHcritical = designResult.PipingDesignResults.Wti2017BackwardErosionHcritical;
+            if (designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiCSpecified) desResult.Wti2017BackwardErosionDeltaPhiC = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC;
+            if (designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReducedSpecified) desResult.Wti2017BackwardErosionDeltaPhiReduced = designResult.PipingDesignResults.Wti2017BackwardErosionDeltaPhiReduced;
+            if (designResult.PipingDesignResults.Wti2017UpliftFactorSpecified) desResult.Wti2017UpliftSafetyFactor = designResult.PipingDesignResults.Wti2017UpliftFactor;
+            if (designResult.PipingDesignResults.Wti2017UpliftHcriticalSpecified) desResult.Wti2017UpliftHcritical = designResult.PipingDesignResults.Wti2017UpliftHcritical;
+            if (designResult.PipingDesignResults.Wti2017DeltaPhiCuSpecified) desResult.Wti2017UpliftDeltaPhiC = designResult.PipingDesignResults.Wti2017DeltaPhiCu;
+            if (designResult.PipingDesignResults.Wti2017HeaveFactorSpecified) desResult.Wti2017HeaveSafetyFactor = designResult.PipingDesignResults.Wti2017HeaveFactor;
+            if (designResult.PipingDesignResults.Wti2017HeaveHcriticalSpecified) desResult.Wti2017HeaveHcritical = designResult.PipingDesignResults.Wti2017HeaveHcritical;
+            if (designResult.PipingDesignResults.Wti2017GradientSpecified) desResult.Wti2017Gradient = designResult.PipingDesignResults.Wti2017Gradient;
+            if (designResult.PipingDesignResults.Wti2017FactorOverallSpecified) desResult.Wti2017SafetyFactorOverall = designResult.PipingDesignResults.Wti2017FactorOverall;
+            if (designResult.PipingDesignResults.Wti2017HcriticalOverallSpecified) desResult.Wti2017HcriticalOverall = designResult.PipingDesignResults.Wti2017HcriticalOverall;
+            if (designResult.PipingDesignResults.Wti2017EffectiveStressSpecified) desResult.Wti2017EffectiveStress = designResult.PipingDesignResults.Wti2017EffectiveStress;
+            if (designResult.PipingDesignResults.Wti2017CCreepSpecified) desResult.Wti2017CCreep = designResult.PipingDesignResults.Wti2017CCreep;
+
+            if (designResult.PipingDesignResults.ExitPointXSpecified) desResult.LocalPipingExitPointX = designResult.PipingDesignResults.ExitPointX;
+
+            if (designResult.PipingDesignResults.UpliftSituation != null)
+            {
+                var uplift = designResult.PipingDesignResults.UpliftSituation;
+                desResult.IsUplift = uplift.IsUplift;
+                desResult.Pl3MinUplift = uplift.Pl3MinUplift;
+                desResult.Pl3HeadAdjusted = uplift.Pl3HeadAdjusted;
+                desResult.Pl3LocalLocationXMinUplift = uplift.Pl3LocationXMinUplift;
+                desResult.Pl4MinUplift = uplift.Pl4MinUplift;
+                desResult.Pl4HeadAdjusted = uplift.Pl4HeadAdjusted;
+                desResult.Pl4LocalLocationXMinUplift = uplift.Pl4LocationXMinUplift;
+            }
+        }
+
+        private static Scenario GetScenarioByName(DamProjectData damProjectData, string locationName, string scenarioName)
+        {
+            var locations = damProjectData.Locations;
+            foreach (var location in locations)
+            {
+                if (location.Name == locationName)
+                {
+                    foreach (var scenario in location.Scenarios)
+                    {
+                        if (scenario.LocationScenarioID == scenarioName)
+                        {
+                            return scenario;
+                        }
+                    }
+                }
+            }
+            return null;
+        }
+
+        private static SoilProfile1D GetSoilProfileByName(DamProjectData damProjectData, string profileName)
+        {
+            var soilProfiles1D = damProjectData.WaterBoard.Dikes[0].SoilProfiles;
+            foreach (var soilProfile1D in soilProfiles1D)
+            {
+                if (soilProfile1D.Name == profileName)
+                {
+                    return soilProfile1D;
+                }
+            }
+            return null;
+        }
+
+        private static SurfaceLine2 ConvertXmlSurfaceLineToSurfaceLine2(SurfaceLine inputSurfaceLine)
+        {
+            var surfaceLine = new SurfaceLine2
+            {
+                Name = inputSurfaceLine.Name
+            };
+            surfaceLine.CharacteristicPoints.Geometry = surfaceLine.Geometry;
+            AddPointsToSurfaceLine(inputSurfaceLine, surfaceLine);
+            return surfaceLine;
+        }
+
+        private static void AddPointsToSurfaceLine(SurfaceLine inputSurfaceLine, SurfaceLine2 surfaceLine)
+        {
+            surfaceLine.Geometry = new LocalizedGeometryPointString();
+            for (int j = 0; j < inputSurfaceLine.Points.Length; j++)
+            {
+                var inputPoint = inputSurfaceLine.Points[j];
+                var geometryPoint = new GeometryPoint()
+                {
+                    X = inputPoint.X,
+                    Y = 0.0,
+                    Z = inputPoint.Z
+                };
+                surfaceLine.AddCharacteristicPoint(geometryPoint, ConversionHelper.ConvertToDamPointType(inputPoint.PointType));
+            }
+        }
+
+
+        private static void CreateDesignResultsStabilityOutput(DesignResult designResult, CsvExportData desResult)
+        {
+            desResult.ResultMessage = designResult.StabilityDesignResults.ResultMessage;
+            if (designResult.StabilityDesignResults.RedesignedSurfaceLine != null)
+            {
+                var surfaceLine = ConvertXmlSurfaceLineToSurfaceLine2(designResult.StabilityDesignResults.RedesignedSurfaceLine);
+                desResult.RedesignedSurfaceLine2 = surfaceLine;
+            }
+            if (designResult.StabilityDesignResults.SafetyFactorSpecified) desResult.StabilitySafetyFactor = designResult.StabilityDesignResults.SafetyFactor;
+            if (designResult.StabilityDesignResults.Zone1SafetyFactorSpecified) desResult.Zone1SafetyFactorStability = designResult.StabilityDesignResults.Zone1SafetyFactor;
+            if (designResult.StabilityDesignResults.Zone1EntryPointXSpecified) desResult.LocalZone1EntryPointX = designResult.StabilityDesignResults.Zone1EntryPointX;
+            if (designResult.StabilityDesignResults.Zone1ExitPointXSpecified) desResult.LocalZone1ExitPointX = designResult.StabilityDesignResults.Zone1ExitPointX;
+            if (designResult.StabilityDesignResults.Zone2SafetyFactorSpecified) desResult.Zone2SafetyFactorStability = designResult.StabilityDesignResults.Zone2SafetyFactor;
+            if (designResult.StabilityDesignResults.Zone2EntryPointXSpecified) desResult.LocalZone2EntryPointX = designResult.StabilityDesignResults.Zone2EntryPointX;
+            if (designResult.StabilityDesignResults.Zone2ExitPointXSpecified) desResult.LocalZone2ExitPointX = designResult.StabilityDesignResults.Zone2ExitPointX;
+            if (designResult.StabilityDesignResults.NumberOfIterationsSpecified) desResult.NumberOfIterations = designResult.StabilityDesignResults.NumberOfIterations;
+            if (designResult.StabilityDesignResults.SafetyFactorSpecified) desResult.StabilityModel = ConversionHelper.ConvertToStabilityModelType(designResult.StabilityDesignResults.StabilityModelType);
+
+            if (designResult.StabilityDesignResults.UpliftSituation != null)
+            {
+                var uplift = designResult.StabilityDesignResults.UpliftSituation;
+                desResult.IsUplift = uplift.IsUplift;
+                desResult.Pl3MinUplift = uplift.Pl3MinUplift;
+                desResult.Pl3HeadAdjusted = uplift.Pl3HeadAdjusted;
+                desResult.Pl3LocalLocationXMinUplift = uplift.Pl3LocationXMinUplift;
+                desResult.Pl4MinUplift = uplift.Pl4MinUplift;
+                desResult.Pl4HeadAdjusted = uplift.Pl4HeadAdjusted;
+                desResult.Pl4LocalLocationXMinUplift = uplift.Pl4LocationXMinUplift;
+            }
+        }        
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/TimeStep.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/TimeStep.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/TimeStep.cs	(revision 3305)
@@ -0,0 +1,58 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Dam.Data
+{
+    public class TimeStep
+    {
+        public TimeStep()
+        {
+            DividerSpecified = false;
+        }
+
+        public TimeStepUnit Unit { get; set; }
+        
+        private uint divider;
+        public uint Divider
+        {
+            get { return divider; }
+            set
+            {
+                divider = value;
+                DividerSpecified = true;
+            }
+        }
+
+        public bool DividerSpecified { get; set; }
+        public bool MultiplierSpecified { get; set; }
+
+        private uint multiplier;
+        public uint Multiplier
+        {
+            get { return multiplier; }
+            set
+            {
+                multiplier = value;
+                MultiplierSpecified = true;
+            }
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/DamMStabInputDefinition.xsd
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/DamMStabInputDefinition.xsd	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/DamMStabInputDefinition.xsd	(revision 3305)
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) Stichting Deltares 2019. All rights reserved.
+
+This file is part of the DAM - Clients Library.
+
+The DAM - UI is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+
+<!-- Created with Liquid XML Studio 1.0.8.0 (http://www.liquid-technologies.com) -->
+<xs:schema xmlns:ns4="http://deltares.nl/2008/CPTipSoilDefinition" xmlns:ns0="http://deltares.nl/2008/CPTDefinition" xmlns:ns5="http://deltares.nl/2008/ImageDefinition" xmlns:ns1="http://deltares.nl/2008/ProfileDefinition" xmlns:ns2="http://deltares.nl/2008/FileIdentificationDefinition" xmlns:ns3="http://deltares.nl/2008/CPTipInterpretationParametersDefinition" elementFormDefault="qualified" targetNamespace="http://deltares.nl/2008/DamMStabInputDefinition" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:complexType name="DamMStabInput">
+    <xs:sequence>
+      <xs:element minOccurs="1" maxOccurs="1" name="SurfaceLine">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="SurfacePoint">
+              <xs:complexType>
+                <xs:attribute name="XCoord" type="xs:double" use="required" />
+                <xs:attribute name="YCoord" type="xs:double" use="required" />
+              </xs:complexType>
+            </xs:element>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="CharacteristicPoints">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="CharacteristicPoint">
+              <xs:complexType>
+                <xs:attribute name="XCoord" type="xs:double" use="required" />
+                <xs:attribute name="YCoord" type="xs:double" use="required" />
+                <xs:attribute name="CharacteristicPointType" type="xs:string" />
+              </xs:complexType>
+            </xs:element>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element minOccurs="1" maxOccurs="1" name="ExternalPLLines">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="PLLine">
+              <xs:complexType>
+                <xs:sequence>
+                  <xs:element minOccurs="0" maxOccurs="unbounded" name="PLPoint">
+                    <xs:complexType>
+                      <xs:attribute name="XCoord" type="xs:double" use="required" />
+                      <xs:attribute name="YCoord" type="xs:double" use="required" />
+                    </xs:complexType>
+                  </xs:element>
+                </xs:sequence>
+                <xs:attribute name="IsPhreatic" type="xs:boolean" use="required" />
+                <xs:attribute name="BoundaryLayer" type="xs:integer" use="required" />
+              </xs:complexType>
+            </xs:element>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element minOccurs="1" maxOccurs="1" name="Model">
+        <xs:complexType>
+          <xs:attribute name="CalculationModel">
+            <xs:simpleType>
+              <xs:restriction base="xs:string">
+                <xs:enumeration value="Bishop" />
+                <xs:enumeration value="Spencer" />
+                <xs:enumeration value="Fellenius" />
+                <xs:enumeration value="UpliftVan" />
+                <xs:enumeration value="UpliftSpencer" />
+                <xs:enumeration value="BishopRandomField" />
+                <xs:enumeration value="HorizontalBalance" />
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attribute name="ShearStrength" use="required">
+            <xs:simpleType>
+              <xs:restriction base="xs:string">
+                <xs:enumeration value="CPhi" />
+                <xs:enumeration value="StressTables" />
+                <xs:enumeration value="CuCalculated" />
+                <xs:enumeration value="CuMeasured" />
+                <xs:enumeration value="CUGradient" />
+                <xs:enumeration value="PseudoValues" />
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attribute name="Probabilistic" type="xs:boolean" />
+          <xs:attribute name="SearchMethod">
+            <xs:simpleType>
+              <xs:restriction base="xs:string">
+                <xs:enumeration value="Grid" />
+                <xs:enumeration value="GeneticAlgorithm" />
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attribute name="GridPosition">
+            <xs:simpleType>
+              <xs:restriction base="xs:string">
+                <xs:enumeration value="left" />
+                <xs:enumeration value="right" />
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+        </xs:complexType>
+      </xs:element>
+      <xs:element minOccurs="0" maxOccurs="1" name="ZoneAreas">
+        <xs:complexType>
+          <xs:attribute name="DikeTableHeight" type="xs:double" />
+          <xs:attribute name="DikeTableWidth" type="xs:double" />
+          <xs:attribute name="XCoordinateDikeTopAtRiver" type="xs:double" />
+          <xs:attribute name="XCoordinateDikeTopAtPolder" type="xs:double" />
+          <xs:attribute name="XCoordinateStartRestProfile" type="xs:double" />
+          <xs:attribute name="SafetyFactorZone1A" type="xs:double" />
+          <xs:attribute name="SafetyFactorZone1B" type="xs:double" />
+        </xs:complexType>
+      </xs:element>
+      <xs:element minOccurs="0" name="TrafficLoad">
+        <xs:complexType>
+          <xs:attribute name="XCoordinateAtRiver" type="xs:double" />
+          <xs:attribute name="XCoordinateAtPolder" type="xs:double" />
+          <xs:attribute name="Load" type="xs:double" />
+        </xs:complexType>
+      </xs:element>
+      <xs:element minOccurs="0" maxOccurs="1" name="CalculationOptions">
+        <xs:complexType>
+          <xs:attribute name="MinimalCircleDepth" type="xs:double" />
+          <xs:attribute name="ZonesType">
+            <xs:simpleType>
+              <xs:restriction base="xs:string">
+                <xs:enumeration value="NoZones" />
+                <xs:enumeration value="ZoneAreas" />
+                <xs:enumeration value="ForbiddenZone" />
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+        </xs:complexType>
+      </xs:element>
+      <xs:element minOccurs="0" maxOccurs="1" name="GeometryCreationOptions">
+        <xs:complexType>
+          <xs:attribute name="SoilProfileType" use="optional">
+            <xs:simpleType>
+              <xs:restriction base="xs:string">
+                <xs:enumeration value="SoilProfile1D" />
+                <xs:enumeration value="SoilGeometryStiFile" />
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attribute name="SoilGeometry2DFilename" type="xs:string" use="optional" />
+          <xs:attribute name="XOffsetSoilGeometry2DOrigin" type="xs:double" use="optional" />
+          <xs:attribute name="MaterialForDike" type="xs:string" use="optional" />
+          <xs:attribute name="MaterialForShoulder" type="xs:string" use="optional" />
+          <xs:attribute name="IsUseOriginalPLLineAssignments" type="xs:boolean" use="optional" />
+          <xs:attribute name="IsUseOriginalCalculationOptions" type="xs:boolean" use="optional" />
+          <xs:attribute default="false" name="IsDrySituation" type="xs:boolean" use="optional" />
+          <xs:attribute name="PLLineAssignment">
+            <xs:simpleType>
+              <xs:restriction base="xs:string">
+                <xs:enumeration value="ExpertKnowledge" />
+                <xs:enumeration value="NoPLLines" />
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attribute name="IntrusionVerticalWaterPressure">
+            <xs:simpleType>
+              <xs:restriction base="xs:string">
+                <xs:enumeration value="Standard" />
+                <xs:enumeration value="Linear" />
+                <xs:enumeration value="FullHydroStatic" />
+                <xs:enumeration value="HydroStatic" />
+                <xs:enumeration value="SemiTimeDependent" />
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attribute name="IsDesign" type="xs:boolean" />
+          <xs:attribute name="PenetrationLength" type="xs:double" />
+        </xs:complexType>
+      </xs:element>
+      <xs:element minOccurs="0" maxOccurs="1" name="SheetPiling">
+        <xs:complexType>
+          <xs:attribute name="XCoordinate" type="xs:double" use="required" />
+          <xs:attribute name="YCoordinate" type="xs:double" use="required" />
+          <xs:attribute name="ZCoordinate" type="xs:double" />
+          <xs:attribute name="Length" type="xs:double" use="required" />
+        </xs:complexType>
+      </xs:element>
+      <xs:element minOccurs="0" maxOccurs="1" name="ForbiddenZone">
+        <xs:complexType>
+          <xs:attribute name="IsXMinEntryUsed" type="xs:boolean" />
+          <xs:attribute name="XEntryMin" type="xs:double" />
+          <xs:attribute name="IsXMaxEntryUsed" type="xs:boolean" />
+          <xs:attribute name="XEntryMax" type="xs:double" />
+        </xs:complexType>
+      </xs:element>
+      <xs:element minOccurs="0" maxOccurs="1" name="HorizontalBalanceArea">
+        <xs:complexType>
+          <xs:attribute name="XLeft" type="xs:double" />
+          <xs:attribute name="XRight" type="xs:double" />
+          <xs:attribute name="YTop" type="xs:double" />
+          <xs:attribute name="YBottom" type="xs:double" />
+          <xs:attribute name="PlaneCount" type="xs:integer" />
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="SlipCircleDefinition">
+        <xs:complexType>
+          <xs:attribute name="XCoordinateLastUpliftPoint" type="xs:double" />
+          <xs:attribute name="UpliftVanTangentLinesDefinition">
+            <xs:simpleType>
+              <xs:restriction base="xs:string">
+                <xs:enumeration value="OnBoundaryLines" />
+                <xs:enumeration value="Specified" />
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attribute name="BishopTangentLinesDefinition">
+            <xs:simpleType>
+              <xs:restriction base="xs:string">
+                <xs:enumeration value="OnBoundaryLines" />
+                <xs:enumeration value="Specified" />
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attribute name="GridSizeDetermination">
+            <xs:simpleType>
+              <xs:restriction base="xs:string">
+                <xs:enumeration value="Automatic" />
+                <xs:enumeration value="Specified" />
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attribute name="UpliftVanTangentLinesDistance" type="xs:double" />
+          <xs:attribute name="BishopTangentLinesDistance" type="xs:double" />
+          <xs:attribute name="UpliftVanLeftGridVerticalPointCount" type="xs:integer" />
+          <xs:attribute name="UpliftVanLeftGridVerticalPointDistance" type="xs:double" />
+          <xs:attribute name="UpliftVanLeftGridHorizontalPointCount" type="xs:integer" />
+          <xs:attribute name="UpliftVanLeftGridHorizontalPointDistance" type="xs:double" />
+          <xs:attribute name="UpliftVanRightGridVerticalPointCount" type="xs:integer" />
+          <xs:attribute name="UpliftVanRightGridVerticalPointDistance" type="xs:double" />
+          <xs:attribute name="UpliftVanRightGridHorizontalPointCount" type="xs:integer" />
+          <xs:attribute name="UpliftVanRightGridHorizontalPointDistance" type="xs:double" />
+          <xs:attribute name="BishopGridVerticalPointCount" type="xs:integer" />
+          <xs:attribute name="BishopGridVerticalPointDistance" type="xs:double" />
+          <xs:attribute name="BishopGridHorizontalPointCount" type="xs:integer" />
+          <xs:attribute name="BishopGridHorizontalPointDistance" type="xs:double" />
+        </xs:complexType>
+      </xs:element>
+      <xs:element minOccurs="0" maxOccurs="1" name="Design">
+        <xs:complexType>
+          <xs:attribute name="EmbankmentMaterialName" type="xs:string" />
+          <xs:attribute name="PreviousGeometry2DFilename" type="xs:string" />
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+    <xs:attribute name="SoilDBName" type="xs:string" use="required" />
+    <xs:attribute name="MStabFileName" type="xs:string" use="required" />
+  </xs:complexType>
+</xs:schema>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/AndSpecification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/AndSpecification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/AndSpecification.cs	(revision 3305)
@@ -0,0 +1,58 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Dam.Data;
+
+namespace Deltares.Standard.Specifications
+{
+    /// <summary>
+    /// The and specification is a compositable one. 
+    /// </summary>
+    /// <typeparam name="TCandidate">The type of the candidate.</typeparam>
+    public class AndSpecification<TCandidate> : CompositeSpecification<TCandidate>
+    {
+        private readonly ISpecification<TCandidate> one;
+        private readonly ISpecification<TCandidate> other;
+
+        public AndSpecification(ISpecification<TCandidate> one, ISpecification<TCandidate> other)
+        {
+            this.one = one;
+            this.other = other;
+        }
+
+        /// <summary>
+        /// Determines whether this candidate satisfies the specification AND the other.
+        /// </summary>
+        /// <param name="candidate">The candidate.</param>
+        /// <returns>
+        ///   <c>true</c> if the candidate satisfies the specification otherwise, <c>false</c>.
+        /// </returns>
+        public override bool IsSatisfiedBy(TCandidate candidate)
+        {
+            bool satisfied = (this.one.IsSatisfiedBy(candidate) && this.other.IsSatisfiedBy(candidate));
+            if (!satisfied)
+            {
+                base.Description = this.Description;
+            }
+            return satisfied;
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/CompositeSpecification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/CompositeSpecification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/CompositeSpecification.cs	(revision 3305)
@@ -0,0 +1,118 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Standard.Specifications;
+
+namespace Deltares.Dam.Data
+{
+    public abstract class CompositeSpecification<TCandidate> : SpecificationBase<TCandidate>
+    {
+        #region Operator overloads
+
+        /// <summary>
+        /// Implements the operator true.
+        /// </summary>
+        /// <param name="specification">The specification.</param>
+        /// <returns>
+        /// The result of the operator.
+        /// </returns>
+        public static bool operator true(CompositeSpecification<TCandidate> specification)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Implements the operator false.
+        /// </summary>
+        /// <param name="specification">The specification.</param>
+        /// <returns>
+        /// The result of the operator.
+        /// </returns>
+        public static bool operator false(CompositeSpecification<TCandidate> specification)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Implements the operator &amp;.
+        /// </summary>
+        /// <param name="left">The left.</param>
+        /// <param name="right">The right.</param>
+        /// <returns>
+        /// The result of the operator.
+        /// </returns>
+        public static CompositeSpecification<TCandidate> operator &(CompositeSpecification<TCandidate> left, CompositeSpecification<TCandidate> right)
+        {
+            return new AndSpecification<TCandidate>(left, right);
+        }
+
+        /// <summary>
+        /// Ands the specified other.
+        /// </summary>
+        /// <param name="other">The other.</param>
+        /// <returns></returns>
+        public CompositeSpecification<TCandidate> And(ISpecification<TCandidate> other)
+        {
+            return new AndSpecification<TCandidate>(this, other);
+        }
+
+        /// <summary>
+        /// Implements the operator |.
+        /// </summary>
+        /// <param name="left">The left.</param>
+        /// <param name="right">The right.</param>
+        /// <returns>
+        /// The result of the operator.
+        /// </returns>
+        public static CompositeSpecification<TCandidate> operator |(CompositeSpecification<TCandidate> left, CompositeSpecification<TCandidate> right)
+        {
+            return new AndSpecification<TCandidate>(left, right);
+        }
+
+        public OrSpecification<TCandidate> Or(ISpecification<TCandidate> other)
+        {
+            return new OrSpecification<TCandidate>(this, other);
+        }
+
+        /// <summary>
+        /// Implements the operator !.
+        /// </summary>
+        /// <param name="specification">The specification.</param>
+        /// <returns>
+        /// The result of the operator.
+        /// </returns>
+        public static CompositeSpecification<TCandidate> operator !(CompositeSpecification<TCandidate> specification)
+        {
+            return new NotSpecification<TCandidate>(specification);
+        }
+
+        /// <summary>
+        /// Nots this instance.
+        /// </summary>
+        /// <returns></returns>
+        public NotSpecification<TCandidate> Not()
+        {
+            return new NotSpecification<TCandidate>(this);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorImportFromExcelSheet.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorImportFromExcelSheet.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorImportFromExcelSheet.cs	(revision 3305)
@@ -0,0 +1,591 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.OleDb;
+using System.Linq;
+using Deltares.Standard.Extensions;
+using Deltares.Standard.Application;
+//using log4net.Config;
+//using log4net.Repository.Hierarchy;
+
+namespace Deltares.Dam.Data.Sensors
+{
+    /// <summary>
+    /// Import sensor data from Excel sheet
+    /// </summary>
+    public class SensorImportFromExcelSheet
+    {
+        const string SensorProfileSheetName = "SensorProfileID";
+        const string SensorGroupSheetName = "SensorGroupID";
+        const string SensorSheetName = "SensorID";
+        const string DikeLineInProfileSheetName = "DikeLineInProfile";
+        const string IDColumnName = "ID";
+        const string SensorNameColumnName = "SensorName";
+        const string PLLineMappingColumnName = "PLLine-Mapping";
+        const string ProfileColumnName = "Profile";
+
+        internal readonly static LogHelper Logger = LogHelper.Create("Main Program.");
+        
+        /// <summary>
+        /// Reads the sensor data from excel.
+        /// </summary>
+        /// <param name="sourceFile">The source file.</param>
+        /// <param name="dike">The dike.</param>
+        /// <exception cref="System.InvalidOperationException">
+        /// Error reading excel file
+        /// or
+        /// The + PLLineMappingColumnName + column has an error. Make sure the cells are not empty and are formatted as text
+        /// </exception>
+        public static void ReadSensorDataFromExcel(string sourceFile, Dike dike)
+        {
+            var sheets = new[]
+                         {
+                             SensorProfileSheetName, 
+                             SensorGroupSheetName, 
+                             SensorSheetName,
+                             DikeLineInProfileSheetName
+                         };
+
+            DataSet ds = null;
+            string fileName = sourceFile;
+            var connectionString = string.Format("Provider=Microsoft.Jet.OLEDB.4.0; data source={0}; Extended Properties=Excel 8.0;", fileName);
+            using (var conn = new OleDbConnection(connectionString))
+            {
+                ds = FillDataSet(conn, ds, sheets);
+            }
+
+            if (ds == null)
+            {
+                throw new InvalidOperationException("Error reading excel file");
+            }
+
+            var profiles = ds.Tables[SensorProfileSheetName].AsEnumerable();
+            var groups = ds.Tables[SensorGroupSheetName].AsEnumerable();
+            
+            var sensors = ParseSensors(ds);
+
+            var count = 0;
+            foreach (var location in dike.Locations)
+            {
+                var repository = new SensorRepository(location);
+
+                int id;
+                if (ParseSensorProfileWorksheet(location, profiles, out id))
+                {
+                    continue;
+                }
+
+                // Parsing sensor groups
+                if (ParseSensorGroups(groups, id, sensors, repository))
+                {
+                    continue;
+
+                }
+
+                count++;
+            }
+
+            Logger.LogInfo(string.Format("Successfully imported {0} sensor groups(s).", count));
+            Logger.LogInfo(string.Format("Successfully imported {0} sensor profile(s).", count));
+
+        }
+
+
+
+        private static List<Sensor> ParseSensors(DataSet ds)
+        {
+            var sensors = new List<Sensor>();
+            var sensorRows = ds.Tables[SensorSheetName].AsEnumerable();
+            int count = 0;
+
+            foreach (var row in sensorRows)
+            {
+
+                if (row.IsNull(IDColumnName))
+                {
+                    Logger.LogWarning(string.Format(
+                        "Error reading row {0} in worksheet {1}. This row will be skipped.", count + 2, SensorSheetName));
+                    continue;
+                }
+                count++;
+
+                var id = (int) row.Field<double>(IDColumnName);
+                var name = row.Field<string>(SensorNameColumnName);
+                var relativeLocation = row.Field<double>("RelativeLocationSensorAlongProfileManual");
+                var depth = row.Field<double>("DepthSensor");
+                var enumTypeIgnoreCase = row.Field<string>("SensorType").ToEnumTypeIgnoreCase<SensorType>();
+
+                var sensor = new Sensor
+                {
+                    ID = id,
+                    Name = name,
+                    RelativeLocation = relativeLocation,
+                    Depth = depth,
+                    Type = enumTypeIgnoreCase
+                    //1	255364,05597700000	598646,53034800000
+                    //XRd = 255364.05597700000,
+                    //YRd = 598646.53034800000,
+                };
+
+                try
+                {
+                    var mappings = row.Field<string>(PLLineMappingColumnName)
+                        .Split(new[] {';'}, StringSplitOptions.RemoveEmptyEntries)
+                        .Select(tag => tag.Trim())
+                        //.Where(tag => !string.IsNullOrWhiteSpace(tag))
+                        .ToArray();
+
+                    foreach (var mapping in mappings)
+                    {
+                        switch (mapping)
+                        {
+                            case "1":
+                                sensor.Add(PLLineType.PL1);
+                                break;
+                            case "2":
+                                sensor.Add(PLLineType.PL2);
+                                break;
+                            case "3":
+                                sensor.Add(PLLineType.PL3);
+                                break;
+                            case "4":
+                                sensor.Add(PLLineType.PL4);
+                                break;
+                        }
+                    }
+                }
+                catch (Exception e)
+                {
+                    throw new InvalidOperationException(
+                        "The " + PLLineMappingColumnName +
+                        " column has an error. Make sure the cells are not empty and are formatted as text", e);
+                }
+
+                Logger.LogInfo(sensor.ToString());
+                sensors.Add(sensor);
+            }
+
+            Logger.LogInfo(string.Format("Successfully imported {0} sensor(s).", count));
+            return sensors;
+        }
+
+        /// <summary>
+        /// Parses the sensor groups.
+        /// </summary>
+        /// <param name="sensorGroups">The sensor groups.</param>
+        /// <param name="id">The identifier.</param>
+        /// <param name="sensors">The sensors.</param>
+        /// <param name="repository">The repository.</param>
+        /// <returns></returns>
+        /// <exception cref="System.InvalidOperationException">
+        /// </exception>
+        private static bool ParseSensorGroups(IEnumerable<DataRow> sensorGroups, int id, List<Sensor> sensors, SensorRepository repository)
+        {
+            const string sensorSelectionColumnName = "SensorSelection";
+            string currentSensorId = "";
+            try
+            {
+
+                string[] groupIds = null;
+                foreach (var sensorGroup in sensorGroups)
+                {
+                    var idValue = (int)sensorGroup.Field<double>(IDColumnName);
+                    if (idValue != id)
+                    {
+                        continue;
+                    }
+
+                    var groupIdValue = sensorGroup.Field<string>(sensorSelectionColumnName);
+
+                    if (groupIdValue == null)
+                    {
+                        Logger.LogWarning(string.Format("Error reading the value from column {0} for group id {1}",
+                            sensorSelectionColumnName, id));
+                    }
+                    else
+                    {
+                        groupIds = groupIdValue.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
+                        break;
+                    }
+                }
+
+                if (groupIds == null)
+                {
+                    Logger.LogWarning(string.Format("Couldn't find group id '{0}' in worksheet {1}", id,
+                        SensorGroupSheetName));
+                    return true;
+                }
+
+                foreach (var groupId in groupIds)
+                {
+                    currentSensorId = groupId;
+                    var single = sensors.Single(s => s.ID.ToString() == groupId);
+                    repository.Add(single);
+                }
+            }
+            catch (InvalidOperationException ioe)
+            {
+                if (!string.IsNullOrWhiteSpace(currentSensorId))
+                {
+                    string message = string.Format("Error finding sensor. The sensor with ID '{0}' was not found in the Excel worksheet '{1}'", currentSensorId, SensorSheetName);
+                    throw new InvalidOperationException(message, ioe);
+                }
+                throw ioe;
+            }
+            catch (Exception e)
+            {
+                throw new InvalidOperationException(
+                    string.Format("An unknown error occurred in column " + sensorSelectionColumnName + " in the Excel sheet " + SensorGroupSheetName +
+                    ". Used the following location ID: " + id, e));
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Parses the sensor profile worksheet.
+        /// </summary>
+        /// <param name="location">The location.</param>
+        /// <param name="sensorLocations">The sensor locations.</param>
+        /// <param name="id">The identifier.</param>
+        /// <returns></returns>
+        /// <exception cref="System.InvalidOperationException">An error occurred while parsing row in worksheet  + SensorProfileSheetName</exception>
+        private static bool ParseSensorProfileWorksheet(Location location, EnumerableRowCollection<DataRow> sensorLocations, out int id)
+        {
+            id = -1;
+            try
+            {
+                var record = sensorLocations
+                    .Where(x => x.Field<string>(ProfileColumnName) == location.Name)
+                    .Select(x => new
+                    {
+                        ID = GetLocationIDField(x),
+                        GroupID = GetGroupIDField(x),
+                        Alias = GetNameAliasField(x),
+                        InputPL1OuterWaterLevel = GetPL1WaterLevelRiverSide(x),
+                        InputPL1PLLineOffsetBelowDikeTopAtRiver = GetPL1OffsetBelowDikeTopAtRiver(x),
+                        InputPL1PLLineOffsetBelowDikeTopAtPolder = GetPL1OffsetBelowDikeTopAtPolder(x),
+                        InputPL1PLLineOffsetBelowShoulderBaseInside = GetPL1OffsetBelowShoulderBaseInside(x),
+                        InputPL1PLLineOffsetBelowDikeToeAtPolder = GetPL1OffsetBelowDikeToeAtPolder(x),
+                        InputPL1PolderLevel = GetPL1PolderLevelSensorType(x),
+                        InputPL3 = GetInputPl3(x),
+                        InputPL4 = GetInputPl4(x)
+                    }).SingleOrDefault();
+
+                if (record == null)
+                {
+                    Logger.LogWarning(string.Format("Location profile ID '{0}' not found in worksheet {1}. Location profile skipped.",
+                        location.Name, SensorProfileSheetName));
+                    return true;
+                }
+
+                id = record.GroupID;
+
+                var sensorData = location.SensorLocation;
+                sensorData.Group.ID = record.GroupID;
+                sensorData.Alias = record.Alias;
+                sensorData.SourceTypePl1WaterLevelAtRiver = record.InputPL1OuterWaterLevel;
+                sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = record.InputPL1PLLineOffsetBelowDikeTopAtRiver;
+                sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = record.InputPL1PLLineOffsetBelowDikeTopAtPolder;
+                sensorData.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = record.InputPL1PLLineOffsetBelowShoulderBaseInside;
+                sensorData.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = record.InputPL1PLLineOffsetBelowDikeToeAtPolder;
+                sensorData.SourceTypePl1WaterLevelAtPolder = record.InputPL1PolderLevel;
+                sensorData.SourceTypePl3 = record.InputPL3;
+                sensorData.SourceTypePl4 = record.InputPL4;
+            }
+            catch (Exception e)
+            {
+                throw new InvalidOperationException("An error occurred while parsing row in worksheet " + SensorProfileSheetName, e);
+            }
+            return false;
+        }
+        /// <summary>
+        /// Fills the data set.
+        /// </summary>
+        /// <param name="conn">The connection.</param>
+        /// <param name="ds">The ds.</param>
+        /// <param name="sheets">The sheets.</param>
+        /// <returns></returns>
+        private static DataSet FillDataSet(OleDbConnection conn, DataSet ds, string[] sheets)
+        {
+            conn.Open();
+            ds = new DataSet();
+
+            foreach (string sheet in sheets)
+            {
+                // string columns = String.Join(",", columnNames.ToArray());
+                const string columns = "*";
+                using (var da = new OleDbDataAdapter(
+                    "SELECT " + columns + " FROM [" + sheet + "$]", conn))
+                {
+                    var dt = new DataTable(sheet);
+                    da.Fill(dt);
+                    ds.Tables.Add(dt);
+                }
+            }
+            return ds;
+        }
+
+        /// <summary>
+        /// Gets the p l1 water level river side.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <returns></returns>
+        private static DataSourceTypeSensors GetPL1WaterLevelRiverSide(DataRow x)
+        {
+            DataSourceTypeSensors pl1WaterLevelRiverSide;
+
+            try
+            {
+                pl1WaterLevelRiverSide = x.Field<string>("InputPL1OuterWaterLevel").ToEnumTypeIgnoreCase<DataSourceTypeSensors>();
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+
+            return pl1WaterLevelRiverSide;
+        }
+
+        /// <summary>
+        /// Gets the p l1 offset below dike top at river.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <returns></returns>
+        private static DataSourceTypeSensors GetPL1OffsetBelowDikeTopAtRiver(DataRow x)
+        {
+            const string columnName = "InputPL1PLLineOffsetBelowDikeTopAtRiver";
+
+            DataSourceTypeSensors pl1OffsetBelowDikeTopAtRiver;
+            try
+            {
+                pl1OffsetBelowDikeTopAtRiver = x.Field<string>(columnName).ToEnumTypeIgnoreCase<DataSourceTypeSensors>();
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+
+            return pl1OffsetBelowDikeTopAtRiver;
+        }
+
+        /// <summary>
+        /// Gets the p l1 offset below dike top at polder.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <returns></returns>
+        private static DataSourceTypeSensors GetPL1OffsetBelowDikeTopAtPolder(DataRow x)
+        {
+            const string columnName = "InputPL1PLLineOffsetBelowDikeTopAtPolder";
+
+            DataSourceTypeSensors pl1OffsetBelowDikeTopAtPolder;
+            try
+            {
+                pl1OffsetBelowDikeTopAtPolder = x.Field<string>(columnName).ToEnumTypeIgnoreCase<DataSourceTypeSensors>();
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+
+            return pl1OffsetBelowDikeTopAtPolder;
+        }
+
+        /// <summary>
+        /// Gets the p l1 offset below shoulder base inside.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <returns></returns>
+        private static DataSourceTypeSensors GetPL1OffsetBelowShoulderBaseInside(DataRow x)
+        {
+            DataSourceTypeSensors pl1OffsetBelowShoulderBaseInside;
+            try
+            {
+                pl1OffsetBelowShoulderBaseInside = x.Field<string>("InputPL1PLLineOffsetBelowShoulderBaseInside").ToEnumTypeIgnoreCase<DataSourceTypeSensors>();
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+
+            return pl1OffsetBelowShoulderBaseInside;
+        }
+
+        /// <summary>
+        /// Gets the p l1 offset below dike toe at polder.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <returns></returns>
+        private static DataSourceTypeSensors GetPL1OffsetBelowDikeToeAtPolder(DataRow x)
+        {
+            DataSourceTypeSensors pl1OffsetBelowDikeToeAtPolder;
+
+            try
+            {
+                pl1OffsetBelowDikeToeAtPolder = x.Field<string>("InputPL1PLLineOffsetBelowDikeToeAtPolder").ToEnumTypeIgnoreCase<DataSourceTypeSensors>();
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+            return pl1OffsetBelowDikeToeAtPolder;
+        }
+
+        /// <summary>
+        /// Gets the type of the p l1 polder level sensor.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <returns></returns>
+        private static DataSourceTypeSensors GetPL1PolderLevelSensorType(DataRow x)
+        {
+            const string columnName = "InputPL1PolderLevel";
+            DataSourceTypeSensors pl1PolderLevelSensorType;
+
+            try
+            {
+                pl1PolderLevelSensorType = x.Field<string>(columnName).ToEnumTypeIgnoreCase<DataSourceTypeSensors>();
+            }
+            catch (Exception)
+            {
+
+                throw;
+            }
+
+            return pl1PolderLevelSensorType;
+        }
+
+        /// <summary>
+        /// Gets the input PL4.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <returns></returns>
+        private static DataSourceTypeSensors GetInputPl4(DataRow x)
+        {
+            DataSourceTypeSensors dataSourceTypeSensors;
+
+            try
+            {
+                dataSourceTypeSensors = x.Field<string>("InputPL4").ToEnumTypeIgnoreCase<DataSourceTypeSensors>();
+            }
+            catch (Exception)
+            {
+
+                throw;
+            }
+
+            return dataSourceTypeSensors;
+        }
+
+        /// <summary>
+        /// Gets the input PL3.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <returns></returns>
+        private static DataSourceTypeSensors GetInputPl3(DataRow x)
+        {
+            DataSourceTypeSensors pl3;
+
+            try
+            {
+                pl3 = x.Field<string>("InputPL3").ToEnumTypeIgnoreCase<DataSourceTypeSensors>();
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+
+            return pl3;
+        }
+
+        /// <summary>
+        /// Gets the name alias field.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <returns></returns>
+        /// <exception cref="System.ArgumentNullException">nameAliasField</exception>
+        private static string GetNameAliasField(DataRow x)
+        {
+            var nameAliasField = x.Field<string>("NameAlias");
+            if (nameAliasField == null)
+            {
+                throw new ArgumentNullException("nameAliasField");
+            }
+            return nameAliasField;
+        }
+
+        /// <summary>
+        /// Gets the group identifier field.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <returns></returns>
+        /// <exception cref="System.InvalidCastException">Error parsing value :  + x.Field<object>(columnName)</exception>
+        private static int GetGroupIDField(DataRow x)
+        {
+            int groupIdField;
+            const string columnName = "SensorGroup";
+            try
+            {
+                groupIdField = (int)x.Field<double>(columnName);
+            }
+            catch (InvalidCastException)
+            {
+                throw new InvalidCastException("Error parsing value : " + x.Field<object>(columnName));
+            }
+            catch (Exception)
+            {
+
+                throw;
+            }
+
+            return groupIdField;
+        }
+
+        /// <summary>
+        /// Gets the location identifier field.
+        /// </summary>
+        /// <param name="x">The x.</param>
+        /// <returns></returns>
+        /// <exception cref="System.InvalidCastException">Error parsing value :  + x.Field<object>(columnName) + . LocationID should be a numeric value.</exception>
+        private static int GetLocationIDField(DataRow x)
+        {
+            int locationIdField;
+            const string columnName = "locationID";
+
+            try
+            {
+                locationIdField = (int)x.Field<double>(columnName);
+            }
+            catch (InvalidCastException)
+            {
+                throw new InvalidCastException("Error parsing value : " + x.Field<object>(columnName) + ". LocationID should be a numeric value.");
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+            return locationIdField;
+        }
+
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/pi_sharedtypes.xsd
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/pi_sharedtypes.xsd	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/pi_sharedtypes.xsd	(revision 3305)
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) Stichting Deltares 2019. All rights reserved.
+
+This file is part of the DAM - Clients Library.
+
+The DAM - UI is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:fews="http://www.wldelft.nl/fews/PI" targetNamespace="http://www.wldelft.nl/fews/PI" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0">
+	<!--    -->
+	<simpleType name="idString">
+		<restriction base="string"/>
+	</simpleType>
+	<!--    -->
+	<simpleType name="versionString">
+		<restriction base="string"/>
+	</simpleType>
+	<!--    -->
+	<simpleType name="nameString">
+		<restriction base="string"/>
+	</simpleType>
+	<!-- -->
+	<simpleType name="commentString">
+		<restriction base="string"/>
+	</simpleType>
+	<!--    -->
+	<complexType name="TimeStepComplexType">
+		<annotation>
+			<documentation>The timeunit element has three attributes, unit and devider and multiplier.
+            the unit is second, minute, hour, week, month year.
+            The divider attribute is optional (default = 1).</documentation>
+		</annotation>
+		<attribute name="unit" type="fews:timeStepUnitEnumStringType" use="required"/>
+		<attribute name="divider" type="positiveInteger" use="optional" default="1"/>
+		<attribute name="multiplier" type="positiveInteger" use="optional" default="1"/>
+	</complexType>
+	<!--    -->
+	<simpleType name="timeStepUnitEnumStringType">
+		<restriction base="string">
+			<enumeration value="second"/>
+			<enumeration value="minute"/>
+			<enumeration value="hour"/>
+			<enumeration value="day"/>
+			<enumeration value="week"/>
+			<enumeration value="month"/>
+			<enumeration value="year"/>
+			<enumeration value="nonequidistant"/>
+		</restriction>
+	</simpleType>
+	<!--    -->
+	<complexType name="TimeStepUnitComplexType">
+		<annotation>
+			<documentation>The timeunit element has two attributes, unit and divider.
+                the unit is required and can be 1, 2, 3, or 4 meaning: year, month, day and hour.
+                The divider attribute is optional (default = 1).</documentation>
+		</annotation>
+		<attribute name="unit" use="required">
+			<simpleType>
+				<restriction base="int">
+					<enumeration value="1"/>
+					<enumeration value="2"/>
+					<enumeration value="3"/>
+					<enumeration value="4"/>
+				</restriction>
+			</simpleType>
+		</attribute>
+		<attribute name="divider" type="int" use="optional" default="1">
+			<annotation>
+				<documentation>Example: to construct timeSteps op 5 seconds use unit 4 (hours) 
+                and a divider of 720. For daily timeSteps use unit 2 (day) and divider 1.</documentation>
+			</annotation>
+		</attribute>
+	</complexType>
+	<!--    -->
+    <simpleType name="GeoDatumEnumStringType">
+        <annotation>
+            <documentation>The geographical datum for the location data.
+                Presently only WGS-1984, OS 1936 and LOCAL are recognised.
+                LOCAL indicates a local grid.</documentation>
+        </annotation>
+        <restriction base="string">
+            <enumeration value="LOCAL"/>
+            <enumeration value="WGS 1984"/>
+            <enumeration value="Ordnance Survey Great Britain 1936"/>
+            <enumeration value="TWD 1967"/>
+            <enumeration value="Gauss Krueger Meridian3"/>
+            <enumeration value="Gauss Krueger Austria M34"/>
+            <enumeration value="Gauss Krueger Austria M31"/>
+            <enumeration value="Rijks Driehoekstelsel"/>
+            <enumeration value="JRC"/>
+            <enumeration value="DWD"/>
+            <enumeration value="KNMI Radar"/>
+            <enumeration value="PAK1"/>
+            <enumeration value="PAK2"/>
+            <enumeration value="SVY21"/>
+        </restriction>
+    </simpleType>
+    <simpleType name="UtmGeoDatumStringType">
+        <restriction base="string">
+            <pattern value="UTM((0[1-9])|([1-5][0-9])|(UTM60))[NS]"/>
+        </restriction>
+    </simpleType>
+
+    <simpleType name="GeoDatumStringType">
+        <union memberTypes="fews:GeoDatumEnumStringType fews:UtmGeoDatumStringType"/>
+    </simpleType>
+    <!--    -->
+	<simpleType name="LocationIdSimpleType">
+		<annotation>
+			<documentation>Location ID, defined by the model </documentation>
+		</annotation>
+		<restriction base="string"/>
+	</simpleType>
+	<!--    -->
+	<simpleType name="ParameterSimpleType">
+		<annotation>
+			<documentation>Content of the data (Discharge, Precipitation, VPD); defined by the model</documentation>
+		</annotation>
+		<restriction base="string"/>
+	</simpleType>
+	<!--    -->
+	<simpleType name="TimeZoneSimpleType">
+		<annotation>
+			<documentation>The timeZone (in decimal hours shift from GMT) 
+            e.g. -1.0 or 3.5. If not present GMT is assumed</documentation>
+		</annotation>
+		<restriction base="double"/>
+	</simpleType>
+	<!--    -->
+
+
+    <simpleType name="dateType">
+        <restriction base="date">
+            <pattern value="\d\d\d\d-\d\d-\d\d"/>
+        </restriction>
+    </simpleType>
+
+    <simpleType name="timeType">
+        <restriction base="time">
+            <pattern value="\d\d:\d\d:\d\d"/>
+        </restriction>
+    </simpleType>
+
+    <complexType name="DateTimeComplexType">
+		<attribute name="date" type="fews:dateType" use="required"/>
+		<attribute name="time" type="fews:timeType" use="required"/>
+	</complexType>
+	<simpleType name="timeSeriesType">
+		<annotation>
+			<documentation>Type of data, either accumulative or instantaneous.
+                        For accumulative data the time/date of the event is
+                        the moment at which the data was gathered.
+ </documentation>
+		</annotation>
+		<restriction base="string">
+			<enumeration value="accumulative"/>
+			<enumeration value="instantaneous"/>
+		</restriction>
+	</simpleType>
+</schema>
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Services/FeatureImporterTest.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Services/FeatureImporterTest.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Services/FeatureImporterTest.cs	(revision 3305)
@@ -0,0 +1,71 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of the application DAM - UI.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Linq;
+
+using NUnit.Framework;
+
+namespace Deltares.Maps.Tests.Services
+{
+    [TestFixture]
+    public class FeatureImporterTest
+    {
+        #region Setup
+
+        [TestFixtureSetUp]
+        public void FixtureSetup()
+        {
+        }
+
+        [TestFixtureTearDown]
+        public void FixtureTearDown()
+        {
+        }
+
+        [SetUp]
+        public void TestSetup()
+        {
+        }
+
+        [TearDown]
+        public void TestTearDown()
+        {
+        }
+
+        #endregion
+
+        [Test]
+        public void Import_ReadShapeFile_RepositoryContainsGeometries()
+        {
+            var testFile = new ShapeFileLocation(@"..\..\..\Data\ShapeFiles\Gemeenten.shp");
+            IReader<IFeature> reader = new ShapeFileReader(testFile);
+            IFeatureRepository repository = new FeatureRepository();
+
+            IFeatureImporter importer = new FeatureImporter(repository, reader);
+            importer.Import();
+
+            Assert.IsNotNull(repository.Features);
+            Assert.IsTrue(repository.Features.Any());
+
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Specifications/UseLocationAsDataSource.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Specifications/UseLocationAsDataSource.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Specifications/UseLocationAsDataSource.cs	(revision 3305)
@@ -0,0 +1,33 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Standard.Specifications;
+
+namespace Deltares.Dam.Data.Sensors.Specifications
+{
+    internal class UseLocationAsDataSource : PredicateSpecification<DataSourceTypeSensors>
+    {
+        public UseLocationAsDataSource() :
+            base(x => x == DataSourceTypeSensors.LocationData)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs	(revision 3305)
@@ -0,0 +1,659 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Linq;
+using System.Xml.Serialization;
+using System.Collections.Generic;
+using Deltares.Dam.Data.IO;
+using Deltares.Dam.Data.Sensors;
+using Deltares.Standard;
+using Deltares.Standard.Attributes;
+using Deltares.Standard.EventPublisher;
+using Deltares.Standard.Language;
+using Deltares.Standard.Logging;
+using Deltares.Standard.Project;
+using Deltares.Standard.Validation;
+
+namespace Deltares.Dam.Data
+{
+
+    public class DamProjectData : Project, IDomain, IDisposable
+    {
+        public readonly double MissValStabilitySafetyFactor = -1.0;
+        private VersionInfo versionInfo;
+        private WaterBoard waterBoard;
+        private DamProjectCalculationSpecification damProjectCalculationSpecification;
+        private WaterBoardJob waterBoardJob = null;
+        private DamProjectType damProjectType = DamProjectType.Calamity;
+        private string damDataSourceFileName = "";
+        private List<LocationJob> jobs = new List<LocationJob>();
+        private List<CsvExportData> designCalculations = null;
+        private List<DataSourceInfo> dataSources = new List<DataSourceInfo>();
+        private string dataSourceEsriProjection = null;
+        private SensorData sensorData;
+        private int maxCalculationCores = 1;
+        private TimeSerieCollection inputTimeSerieCollection = null;
+        private TimeSerieCollection outputTimeSerieCollection = null;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public DamProjectData()
+        {
+            this.versionInfo = new VersionInfo();
+            this.waterBoard = new WaterBoard();
+            this.waterBoardJob = null;
+            this.damProjectCalculationSpecification = new DamProjectCalculationSpecification();            
+        }
+
+        /// <summary>Gets the version information.</summary>
+        /// <value>The version information.</value>
+        public VersionInfo VersionInfo
+        {
+            get { return versionInfo; }
+            set { versionInfo = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the project working path.
+        /// </summary>
+        /// <value>
+        /// The project working path.
+        /// </value>
+        public string ProjectPath
+        {
+            get
+            {
+                return DamProject.ProjectMap;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the calculation map.
+        /// </summary>
+        /// <value>
+        /// The calculation map.
+        /// </value>
+        public string CalculationMap
+        {
+            get
+            {
+                return DamProject.CalculationMap;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum calculation cores.
+        /// </summary>
+        /// <value>
+        /// The maximum calculation cores.
+        /// </value>
+        public int MaxCalculationCores
+        {
+            get
+            {
+                return maxCalculationCores;
+            }
+            set
+            {
+                maxCalculationCores = value;
+            }
+        }
+        /// <summary>
+        /// Toplevel object to hold waterboard data
+        /// </summary>
+        public virtual WaterBoard WaterBoard
+        {
+            get { return this.waterBoard; }
+            set
+            {
+                this.waterBoard = value;
+                if (this.waterBoardJob != null && this.waterBoardJob.Subject != value)
+                {
+                    this.waterBoardJob = null;
+                }
+            }
+        }
+        /// <summary>
+        /// calculation specification for the project
+        /// </summary>
+        /// <remarks>Composite relationship</remarks>
+        [Validate]
+        public DamProjectCalculationSpecification DamProjectCalculationSpecification
+        {
+            get { return damProjectCalculationSpecification; }
+            set { damProjectCalculationSpecification = value; }
+
+        }
+
+        [Child]
+        public virtual DamJob WaterBoardJob
+        {
+            get
+            {
+                if (waterBoardJob == null)
+                {
+                    waterBoardJob = new WaterBoardJob(this.waterBoard);
+                    waterBoardJob.Subject = this.waterBoard;
+
+                    foreach (Dike dike in waterBoard.Dikes)
+                    {
+                        CompositeJob dikeJob = new DikeJob(dike);
+                        waterBoardJob.Jobs.Add(dikeJob);
+
+                        foreach (Location location in dike.Locations)
+                        {
+                            LocationJob locationJob = new LocationJob(location);
+                            dikeJob.Jobs.Add(locationJob);
+                        }
+                    }
+                }
+
+                return waterBoardJob;
+            }
+            set { waterBoardJob = value as WaterBoardJob; }
+        }
+
+        [ReadOnly(true)]
+        [Label("Calculation type")]
+        [Description("Indicates the purpose of the calculations")]
+        public virtual DamProjectType DamProjectType
+        {
+            get { return damProjectType; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "DamProjectType");
+
+                bool modified = damProjectType != value;
+
+                damProjectType = value;
+                Location.DamProjectType = value;
+                DamFailureMechanismeCalculationSpecification.DamProjectType = value;
+
+                if (modified)
+                {
+                    LocationJob.DamProjectType = damProjectType;
+                    DataEventPublisher.DataListModified(this.LocationJobs);
+                }
+
+                DataEventPublisher.AfterChange(this, "DamProjectType");
+            }
+        }
+        
+        [Label("DAM datasource file")]
+        [Description("Indicates which \".defx\" import definition file to use")]
+        public virtual string DamDataSourceFileName
+        {
+            get { return damDataSourceFileName; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "DamDataSourceFileName");
+                damDataSourceFileName = value;
+                DataEventPublisher.AfterChange(this, "DamDataSourceFileName");
+            }
+        }
+
+        /// <summary>
+        /// Clear all results
+        /// </summary>
+        public void ClearResults()
+        {
+            if (designCalculations != null)
+            {
+                designCalculations.Clear();
+            }
+            foreach (LocationJob locationJob in this.LocationJobs)
+            {
+                locationJob.LocationResult = new LocationResult();
+                foreach (Scenario scenario in locationJob.Location.Scenarios)
+                {
+                    scenario.CalculationResults.Clear();
+                }
+            }
+        }
+
+        private List<Scenario> CreateScenarioListForDeletion()
+        {
+            List<Scenario> scenarios = new List<Scenario>(); ;
+
+            List<Location> locations = this.LocationJobs.Select(x => x.Location).ToList();
+            foreach (Location location in locations)
+            {
+                if (location.Scenarios != null)
+                {
+                    scenarios.AddRange(location.Scenarios);
+                }
+            }
+
+            return scenarios;
+        }
+
+        private List<Scenario> CreateScenarioListForCalculation()
+        {
+            List<Scenario> scenarios = new List<Scenario>(); ;
+
+            List<Location> locations = this.SelectedLocationJobs.Select(x => x.Location).ToList();
+            foreach (Location location in locations)
+            {
+                if (location.Scenarios != null)
+                {
+                    scenarios.AddRange(location.Scenarios);
+                }
+            }
+
+            return scenarios;
+        }
+
+        /// <summary>
+        /// Updates the design calculations.
+        /// </summary>
+        public void UpdateDesignCalculations()
+        {
+            if (designCalculations == null)
+            {
+                designCalculations = new List<CsvExportData>();
+            }
+            else
+            {
+                designCalculations.Clear();    
+            }
+			var scenarios = CreateScenarioListForCalculation();
+            foreach (Scenario scenario in scenarios)
+            {
+                if (scenario.CalculationResults != null && scenario.CalculationResults.Count > 0)
+                {
+                    designCalculations.AddRange(scenario.CalculationResults);
+                }
+            }
+            DataEventPublisher.DataListModified(designCalculations);
+        }
+
+        [XmlIgnore]
+        public List<Standard.Logging.LogMessage> CalculationMessages { get; set; }
+
+        [XmlIgnore]
+        [ReadOnly(true)]
+        public List<CsvExportData> DesignCalculations
+        {
+            get
+            {
+                if (designCalculations == null)
+                {
+                    this.UpdateDesignCalculations();
+                }
+
+                return designCalculations;
+            }
+            set
+            {
+                designCalculations = value;
+            }
+        }
+
+        public CalculationResult Validate()
+        {
+            try
+            {
+                //Todo validation has to extended, handling the actual messages instead of just CalculationResult too.
+                foreach (Dike dike in this.WaterBoard.Dikes)
+                {
+                    dike.Validate();
+                }
+                return CalculationResult.Succeeded;
+            }
+            catch
+            {
+                return CalculationResult.InvalidInputData;
+            }
+        }
+
+        public LocationJob GetLocationJob(Location location)
+        {
+            foreach (LocationJob locationJob in this.LocationJobs)
+            {
+                if (locationJob.Location == location)
+                {
+                    return locationJob;
+                }
+            }
+
+            return null;
+        }
+
+        [XmlIgnore]
+        [ReadOnly(true)]
+        [Browsable(false)]
+        public List<LocationJob> LocationJobs
+        {
+            get
+            {
+                if (jobs.Count == 0)
+                {
+                    CompositeJob waterboardJob = this.WaterBoardJob as CompositeJob;
+                    foreach (CompositeJob dijkJob in waterboardJob.Jobs)
+                    {
+                        foreach (LocationJob locationJob in dijkJob.Jobs)
+                        {
+                            jobs.Add(locationJob);
+                        }
+                    }
+                }
+
+                return jobs;
+            }
+        }
+
+        public LocationJob GetFirstLocationJobWithDesignResults()
+        {
+            foreach (LocationJob locationJob in this.LocationJobs)
+            {
+                if (locationJob.HasDesignScenarioResults)
+                {
+                    return locationJob;
+                }
+            }
+            return null;
+        }
+
+        public LocationJob GetFirstLocationJobWithCalamityResults()
+        {
+            foreach (LocationJob locationJob in this.LocationJobs)
+            {
+                if (locationJob.HasLocationResults)
+                {
+                    return locationJob;
+                }
+            }
+            return null;
+        }
+
+        [XmlIgnore]
+        [ReadOnly(true)]
+        [Browsable(false)]
+        [Validate]
+        public List<LocationJob> SelectedLocationJobs
+        {
+            get
+            {
+                List<LocationJob> selectedLocationJobs = new List<LocationJob>();
+                foreach (LocationJob locationJob in this.LocationJobs)
+                {
+                    if (locationJob.Run.HasValue && locationJob.Run.Value)
+                    {
+                        selectedLocationJobs.Add(locationJob);
+                    }
+                }
+
+                return selectedLocationJobs;
+            }
+        }
+
+        [Validate]
+        public ValidationResult[] ValidateEnoughLocationJobs()
+        {
+            if (this.SelectedLocationJobs.Count == 0)
+            {
+                return new ValidationResult[]
+                           {
+                               new ValidationResult(ValidationResultType.Error,
+                                                    LocalizationManager.GetTranslatedText(this, "NoLocationsSelected"),
+                                                    this)
+                           };
+            }
+            else
+            {
+                return new ValidationResult[0];
+            }
+        }
+
+        [XmlIgnore]
+        [Browsable(false)]
+        [ReadOnly(true)]
+        [Label("Locations")]
+        public List<Location> Locations
+        {
+            get { return this.WaterBoard.Locations; }
+        }
+
+        [Browsable(false)]
+        public List<DataSourceInfo> DataSources
+        {
+            get { return dataSources; }
+            set { dataSources = value; }
+        }
+
+        [Browsable(false)]
+        public string DataSourceEsriProjection
+        {
+            get { return this.dataSourceEsriProjection; }
+            set { this.dataSourceEsriProjection = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the sensor data.
+        /// </summary>
+        /// <value>
+        /// The sensor data.
+        /// </value>      
+        public SensorData SensorData
+        {
+            get { return sensorData; }
+            set { sensorData = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the input time serie collection.
+        /// </summary>
+        /// <value>
+        /// The input time serie collection.
+        /// </value>
+        public TimeSerieCollection InputTimeSerieCollection
+        {
+            get
+            {
+                return inputTimeSerieCollection;
+            }
+            set
+            {
+                inputTimeSerieCollection = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the output time serie collection.
+        /// </summary>
+        /// <value>
+        /// The output time serie collection.
+        /// </value>
+        public TimeSerieCollection OutputTimeSerieCollection
+        {
+            get
+            {
+                return outputTimeSerieCollection;
+            }
+            set
+            {
+                outputTimeSerieCollection = value;
+            }
+        }
+
+        public void DeleteResults()
+        {
+            LogManager.Messages.Clear();
+            if (waterBoardJob != null && waterBoardJob.Jobs != null)
+            {
+                waterBoardJob.Jobs.Clear();
+            }
+            waterBoardJob = null;
+            if (jobs != null)
+            {
+                jobs.Clear();
+            }
+            
+            // Delete calculationresults in scenarios
+            var scenarios = CreateScenarioListForDeletion();
+            foreach (Scenario scenario in scenarios)
+            {
+                scenario.ClearResults();
+                scenario.ClearErrors();
+            }
+
+            if (designCalculations != null)
+            {
+                designCalculations.Clear();
+            }            
+        }
+
+        private int GetNumberOfCalculatedJobs()
+        {
+            var numberOfCalculatedJobs = 0;
+
+            foreach (LocationJob locationJob in this.LocationJobs)
+            {
+                if ((locationJob.Result != JobResult.NoRun) && locationJob.Run != null && locationJob.Run.Value)
+                {
+                    foreach (Dike dike in this.WaterBoard.Dikes)
+                    {
+                        if (dike.Locations.Contains(locationJob.Location))
+                        {
+                            dike.UpdateLocation(locationJob.Location);
+                            break;
+                        }
+                    }
+                    numberOfCalculatedJobs++;                    
+                }
+            }
+
+            return numberOfCalculatedJobs;
+        }
+
+        public bool HasResults()
+        {
+            bool hasResults = waterBoard.Dikes.Count > 0 && waterBoardJob != null && waterBoardJob.Jobs.Count > 0;
+            if (hasResults)
+            {
+                hasResults = GetNumberOfCalculatedJobs() > 0;
+            }
+            return hasResults;
+        }
+
+        /// <summary>
+        /// Check if design with geometry adaption is allowed
+        /// </summary>
+        /// <returns></returns>
+        private bool IsDesignWithGeometryAdaptionAllowed()
+        {
+            bool isAdoption = this.DamProjectType == DamProjectType.Design && DamProjectCalculationSpecification.SelectedAnalysisType != AnalysisType.NoAdaption;
+            bool isStabilityOutside = this.DamProjectCalculationSpecification.DamCalculationSpecifications.Any(specification => specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside);
+            return (!isAdoption || !isStabilityOutside);
+        }
+
+        /// <summary>
+        /// Validates the geometry adaption setting.
+        /// </summary>
+        /// <returns></returns>
+        [Validate]
+        public ValidationResult[] ValidateGeometryAdaptionSetting()
+        {
+            if (!IsDesignWithGeometryAdaptionAllowed())
+            {
+                return new[]{ new ValidationResult(ValidationResultType.Error, LocalizationManager.GetTranslatedText(this, "DesignAndAdaptionNotAllowedForStabilityOutside"),
+                    this, "DamCalculationSpecifications", "DamCalculationSpecifications", null)};
+            }
+            else
+            {
+                return new ValidationResult[0];
+            }
+
+        }
+
+        public override bool IsVisible(string property)
+        {
+            switch (property)
+            {
+                case "SensorData": return damProjectType == DamProjectType.DamLiveConfiguration;
+                case "SchematizationFactors": return false;
+                    //Bka: for now (release 1.4.1), do not show SchematizationFactors return this.HasResults() && this.DamProjectType == Data.DamProjectType.Assessment;
+                case "DesignCalculations": return this.HasResults() && this.DamProjectType == Data.DamProjectType.Design;
+                case "DamProjectCalculationSpecification":
+                    return damProjectCalculationSpecification.DamCalculationSpecifications.Count > 0;
+                default: return true;
+            }            
+        }
+
+        public ICollection GetDomain(string property)
+        {
+            switch (property)
+            {
+                default: return null;
+            }
+        }
+
+        public override string ToString()
+        {
+            return this.WaterBoard != null ? this.WaterBoard.Name : "";
+        }
+
+        public void Dispose()
+        {
+            WaterBoard.Dispose();
+            DamProjectCalculationSpecification.Dispose();
+        }
+
+        public void FillOverallSensorData()
+        {
+            if (sensorData != null)
+            {
+                sensorData.Sensors.Clear();
+                sensorData.SensorGroups.Clear();
+                sensorData.SensorLocations.Clear();
+            }
+            else
+            {
+                sensorData = new SensorData();    
+            }
+            foreach (var location in Locations)
+            {
+                var sd = location.SensorLocation;
+                
+                foreach (var sensor in sd.Sensors )
+                {
+                    if (sensorData.GetSensorById(sensor.ID) == null)
+                    {
+                        sensorData.Sensors.Add(sensor);
+                    }
+                }
+                if (sensorData.GetGroupById(sd.Group.ID) == null && sd.Group.ID != 0)
+                {
+                    sd.Group.PickSensors = sensorData.Sensors;
+                    sensorData.SensorGroups.Add(sd.Group);
+                }
+                if (sensorData.GetSensorLocationByLocationName(sd.LocationName) == null)
+                {
+                    sensorData.SensorLocations.Add(sd);
+                }
+            }            
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs	(revision 3305)
@@ -0,0 +1,314 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Deltares.Standard.Attributes;
+
+namespace Deltares.Dam.Data
+{
+    public enum DamLicenseType
+    {
+        None = 0,
+        Dongle = 1, 
+        FlexNet = 2,
+        FlexLm = 3,
+        LicFile = 4,
+        LFM = 5
+    }
+
+    public enum DamProjectType
+    {
+        Calamity,
+        [XmlOldName("Assessment")]
+        AssessOld,
+        Design,
+        DamLiveConfiguration
+    }
+    
+    public enum StabilityKernelType
+    {
+        // The Classic models all use DGMStabDam.dll to generate a sti file from the input (so also pl-lines only)
+        // DAM classic uses the Delphi version of DGS (as exe) to solve the calculation    
+        [XmlOldName("DamClassic")]
+        DamClassicStability,
+        
+        // WtiMacroStabilityKernel uses the latest MacroStability kernel as used by the new C# version of DGeoStabilty.
+        [XmlOldName("AdvancedWti")]
+        WtiMacroStabilityKernel        
+    };
+
+    public enum AnalysisType
+    {
+        [Label("No adaptation")]
+        [XmlOldName("Normal")]
+        NoAdaption,
+
+        [Label("Adapt geometry")]
+        [XmlOldName("Design")]
+        AdaptGeometry
+    };
+
+    public enum FailureMechanismSystemType
+    {
+        [XmlOldName("Stability", "StabilityInsideMStab")]
+        StabilityInside,
+        StabilityOutside,
+        Piping,
+        HorizontalBalance,
+        FlowSlide
+    }
+
+    public enum MStabModelType
+    {
+        Bishop,
+        Spencer,
+        Fellenius,
+        UpliftVan,
+        UpliftSpencer,
+        BishopRandomField,
+        HorizontalBalance,
+        BishopUpliftVan,
+        SpencerHigh,   // #Bka added SpencerHigh/SpencerLow as quick fix. Should be replaced with options for Spencer later! These enums should be removed.
+        SpencerLow
+    }
+
+    public enum PipingModelType
+    {
+        Bligh,
+        Sellmeijer,
+        Sellmeijer2Forces,
+        Sellmeijer4Forces,
+        Wti2017
+    };
+
+    public enum FlowSlideModelType
+    {
+        All,
+    };
+
+    public enum PLLineAssignment
+    {
+        NoPLLines,
+        ExpertKnowledge        
+    }
+
+    public enum SoilProfileType
+    {
+        [XmlOldName("SoilGeometry1D")]
+        SoilProfile1D,
+        SoilProfile2D,
+        [XmlOldName("SoilGeometry2D")]
+        SoilGeometryStiFile
+    }
+
+    
+
+    public enum MStabShearStrength
+    {
+        CPhi,
+        StressTables,
+        CuCalculated,
+        CuMeasured,
+        CuGradient,
+        Default
+    }
+
+    public enum MStabSearchMethod
+    {
+        Grid,
+        GeneticAlgorithm
+    }
+
+    public enum MStabGridPosition
+    {
+        Left,
+        Right
+    }
+
+    public enum MStabZonesType
+    {
+        [Label("No zones")]
+        NoZones = 0,
+        [Label("Zone areas")]
+        ZoneAreas = 1,
+        [Label("Forbidden zones")]
+        ForbiddenZone = 2
+    }
+
+    public enum StabilityDesignMethod //Design
+    {
+        OptimizedSlopeAndShoulderAdaption,
+        SlopeAdaptionBeforeShoulderAdaption
+    }
+
+    public enum PLLineType
+    {
+        PL1,
+        PL2,
+        PL3,
+        PL4
+    }
+
+    public enum PLLinePointPositionXzType
+    {
+        OnPLLine,
+        AbovePLLine,
+        BelowPLLine,
+        BeyondPLLine // indicates that point is outside the scope of the pl line.
+    };
+
+    public enum ResultEvaluation //RWScenarios
+    {
+        [Label("Accepted")]
+        Accepted,
+
+        [Label("Rejected")]
+        Rejected,
+
+        [Label("Not evaluated")]
+        NotEvaluated
+    }
+
+    public enum LoadSituation //RWScenarios
+    {
+        Dry,
+        Wet
+    }
+
+    public enum DataSourceTypeSensors  //Sensors
+    {
+        Ignore,
+        LocationData,
+        Sensor
+    }
+
+    public enum SensorType  //Sensors
+    {
+        PiezometricHead,
+        WaterLevel,
+        PolderLevel
+    }
+
+    /// <summary>
+    /// Type of output series
+    /// </summary>
+    public enum TimeSerieParameters
+    {
+        [Obsolete("Use StabilityInsideFactor instead")]
+        SafetyFactor, // <- Is same as StabilityInsideFactor, kept for legacy code
+        PipingFactorWti,
+        PipingFactorBligh,
+        PipingFactorSellmeijer,
+        ProbabilityOfFailurePipingSellmeijer,
+        OvertoppingErosion,
+        StabilityInsideFactor,
+        StabilityOutsideFactor
+    }
+
+    public enum UpliftType
+    {
+        Uplift,
+        NoUplift
+    }
+
+    public enum PLLineCreationMethod
+    {
+        ExpertKnowledgeRRD,
+        ExpertKnowledgeLinearInDike,
+        GaugesWithFallbackToExpertKnowledgeRRD,
+        Sensors,
+        None
+    }
+
+    public enum ProjectPathLocation
+    {
+        // Other future possibilties: InProjectMap, InWindowsTemp
+        InApplicationMap,
+        InUserMap,
+        InProjectMap
+    }
+
+    public enum DataSourceType
+    {
+        CsvFiles,
+        Iris,
+        DataShapeFiles,
+        BackgroundShapeFiles,
+        MSoilBase,
+        MGeobase
+    }
+
+    public enum LayerType
+    {
+        Top,
+        Dike,
+        Cover,
+        Aquifer1,
+        Aquifer2,
+        Aquitard
+    }
+
+    public enum JobResult
+    {
+        [Label("Not calculated")]
+        NoRun,
+
+        [Label("Failed")]
+        Failed,
+
+        [Label("Good")]
+        Good,
+
+        [Label("Bad")]
+        Bad,
+
+        [Label("Mixed")]
+        Mixed
+    }
+
+    public enum TimeStepUnit
+    {
+        Second,
+        Minute,
+        Hour,
+        Day,
+        Week,
+        Month,
+        Year,
+        Nonequidistant
+    }
+
+    public enum ConfigurationStatus
+    {
+        Available, // Option is implemented and available
+        NotAvailable, // Option is implemented and available (can be used when combination is in development, so it will be hidden)
+        NotImplemented // Option is not implemented (so also no available)
+    }
+
+    public enum IntrusionVerticalWaterPressureType
+    {
+        Standard,
+        Linear,
+        FullHydroStatic,
+        HydroStatic,
+        SemiTimeDependent
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/TestData/Gemeenten.sbn
===================================================================
diff -u
Binary files differ
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/FailureMechanismeParamatersMStab.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/FailureMechanismeParamatersMStab.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/FailureMechanismeParamatersMStab.cs	(revision 3305)
@@ -0,0 +1,107 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.SurfaceLines;
+using Deltares.Standard;
+using Deltares.Standard.Validation;
+
+namespace Deltares.Dam.Data
+{
+    public class FailureMechanismeParamatersMStab : IAssignable<FailureMechanismeParamatersMStab>, ICloneable<FailureMechanismeParamatersMStab>
+    {
+        /// <summary>
+        /// Additinal specifications/settings of calculation using MStab
+        /// </summary>
+        public FailureMechanismeParamatersMStab()
+        {
+            this.MStabParameters = new MStabParameters();
+            this.IsStabilityCheckOnUplift = false;
+        }
+        public Location Location { get; set; }
+        public SurfaceLine2 SurfaceLine { get; set; }
+        public PLLines PLLines { get; set; }
+        public SoilProfile1D SoilProfile { get; set; }
+        public string SoilGeometry2DName { get; set; }
+        public double RiverLevel { get; set; }
+        public double DikeTableHeight { get; set; }
+        public double TrafficLoad { get; set; }
+        /// <summary>
+        /// Indicates whether in stability calculation a check on uplift will be performed before performin UpliftVan calculation.
+        /// Default it is false (set in constructor)
+        /// </summary>
+        public bool IsStabilityCheckOnUplift { get; set; }
+        public MStabDesignEmbankment Design { get; set; }
+        [Validate]
+        public MStabParameters MStabParameters { get; set; }
+
+        /// <summary>
+        /// Checks whether all rerquired data is there.
+        /// </summary>
+        public bool IsComplete
+        {
+            get
+            {
+                return
+                    !string.IsNullOrEmpty(this.MStabParameters.SoilDatabaseName) &&
+                    this.PLLines != null &&
+                    (this.SoilProfile != null || this.MStabParameters.GeometryCreationOptions.SoilGeometry2DFilename != "") &&
+                    this.Location != null &&
+                    this.SurfaceLine != null &&
+                    !string.IsNullOrEmpty(this.MStabParameters.ProjectFileName);
+            }
+        }
+
+        /// <summary>
+        /// Performs the Assignment
+        /// </summary>
+        /// <param name="failureMechanismeParametersMStab"></param>
+        public void Assign(FailureMechanismeParamatersMStab failureMechanismeParametersMStab)
+        {
+            this.Location = failureMechanismeParametersMStab.Location;
+            this.SurfaceLine = failureMechanismeParametersMStab.SurfaceLine;
+            this.SoilProfile = failureMechanismeParametersMStab.SoilProfile;
+            this.SoilGeometry2DName = failureMechanismeParametersMStab.SoilGeometry2DName;
+            this.PLLines = failureMechanismeParametersMStab.PLLines;
+
+            this.RiverLevel = failureMechanismeParametersMStab.RiverLevel;
+            this.DikeTableHeight = failureMechanismeParametersMStab.DikeTableHeight;
+            this.TrafficLoad = failureMechanismeParametersMStab.TrafficLoad; ;
+            this.Design = failureMechanismeParametersMStab.Design;
+
+            this.MStabParameters.Assign(failureMechanismeParametersMStab.MStabParameters);
+        }
+
+        /// <summary>
+        /// Clones the object.
+        /// </summary>
+        /// <returns>FailureMechanismeParamatersMStab</returns>
+        public FailureMechanismeParamatersMStab Clone()
+        {
+            FailureMechanismeParamatersMStab failureMechanismeParamatersMStab = new FailureMechanismeParamatersMStab();
+            failureMechanismeParamatersMStab.MStabParameters = this.MStabParameters.Clone();
+            failureMechanismeParamatersMStab.Assign(this);
+
+            return failureMechanismeParamatersMStab;
+        }
+
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportColumnAttribute.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportColumnAttribute.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportColumnAttribute.cs	(revision 3305)
@@ -0,0 +1,38 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Dam.Data
+{
+    using System;
+
+    [AttributeUsage(AttributeTargets.Property)]
+    public class CsvExportColumnAttribute : Attribute
+    {
+        public CsvExportColumnAttribute(string name, int index)
+        {
+            Name = name;
+            Index = index;
+        }
+
+        public string Name { get; private set; }
+        public int Index { get; private set; }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/Xsd/FileIdentificationDefinition.xsd
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/Xsd/FileIdentificationDefinition.xsd	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/Xsd/FileIdentificationDefinition.xsd	(revision 3305)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) Stichting Deltares 2019. All rights reserved.
+
+This file is part of the DAM - Clients Library.
+
+The DAM - UI is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+
+<!-- Created with Liquid XML Studio 1.0.8.0 (http://www.liquid-technologies.com) -->
+<xsd:schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://deltares.nl/2008/FileIdentificationDefinition">
+  <xs:complexType name="FileIdentification">
+    <xs:attribute name="Application" type="xs:string" use="required" />
+    <xs:attribute name="Version" type="xs:string" use="required" />
+    <xs:attribute name="Company" type="xs:string" use="required" />
+    <xs:attribute name="License" type="xs:string" use="optional" />
+    <xs:attribute name="Created" type="xs:dateTime" use="required" />
+    <xs:attribute name="Description" type="xs:string" />
+  </xs:complexType>
+</xsd:schema>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/TimeSerie.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/TimeSerie.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/TimeSerie.cs	(revision 3305)
@@ -0,0 +1,240 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+
+namespace Deltares.Dam.Data
+{
+
+    public class TimeSerie
+    {
+        /// <summary>
+        /// List of parameter identifiers used in Fews timeseries
+        /// </summary>
+        public const string WaterLevelParameterId = "Waterlevel";
+        public const string WaterLevelMeanParameterId = "WaterlevelMean";
+        public const string WaterLevelStdParameterId = "WaterlevelStdev";
+        public const string WaterLevelDistParameterId = "WaterlevelDistribution";
+        public const string WaterPressureParameterId = "Waterpressure";
+        public const string PiezoMetricHeadId = "PiezoMetricHead";
+
+        private readonly TimeStep timeStep;
+        //Bka: read only  not possible to serialize to DB private readonly List<TimeSerieEntry> entries;
+        private IList<TimeSerieEntry> entries;
+
+        public const double DefaultMissingValue = -999.0;
+
+        public TimeSerie()
+        {
+            this.timeStep = new TimeStep();
+            this.entries = new List<TimeSerieEntry>();
+            ForecastDateTime = DateTime.MinValue;
+        }
+
+        public string Type { get; set; }
+        public string LocationId { get; set; }
+        public string ParameterId { get; set; }
+        public TimeStep TimeStep { get { return this.timeStep; } }
+        public DateTime StartDateTime { get; set; }
+        public DateTime EndDateTime { get; set; }
+        public DateTime ForecastDateTime { get; set; }
+        public double MissVal { get; set; }
+        public string LongName { get; set; }
+        public string StationName { get; set; }
+        public string Units { get; set; }
+        public string SourceOrganisation { get; set; }
+        public string SourceSystem { get; set; }
+        public string FileDescription { get; set; }
+        public DateTime? CreationDateTime { get; set; }
+        public string Region { get; set; }
+
+        public virtual IList<TimeSerieEntry> Entries
+        {
+            get { return this.entries; }
+            set { this.entries = value; }
+        }
+
+        public string Comment { get; set; }
+
+        /// <summary>
+        /// Creates a shallow copy of the current time serie and applies the map function to each of its entries
+        /// </summary>
+        /// <param name="function">The time serie entry function which maps uses the current value as input</param>
+        /// <returns>Time serie (clone) with new calculated entries</returns>
+        public TimeSerie Map(Func<TimeSerieEntry, TimeSerieEntry> function)
+        {
+            return this.Map(this.ParameterId, function);
+        }
+
+        /// <summary>
+        /// Creates a shallow copy of the current time serie and applies the map function to each of its entries
+        /// </summary>
+        /// <param name="parameterId">The (new) id of the parameter in the cloned time serie</param>
+        /// <param name="locationId">The (new) location id of the cloned time serie</param>
+        /// <param name="function">The time serie entry function which maps uses the current value as input</param>
+        /// <returns>Time serie (clone) with new calculated entries</returns>
+        public TimeSerie Map(string parameterId, string locationId, Func<TimeSerieEntry, TimeSerieEntry> function)
+        {
+            return Map(this, parameterId, locationId, function);
+        }
+
+        /// <summary>
+        /// Creates a shallow copy of the current time serie and applies the map function to each of its entries
+        /// </summary>
+        /// <param name="parameterId">The (new) id of the parameter in the cloned time serie</param>
+        /// <param name="function">The time serie entry function which maps uses the current value as input</param>
+        /// <returns>Time serie (clone) with new calculated entries</returns>
+        public TimeSerie Map(string parameterId, Func<TimeSerieEntry, TimeSerieEntry> function)
+        {
+            return Map(this, parameterId, function);
+        }
+
+        /// <summary>
+        /// Creates a shallow copy of the current time serie and applies the map function to each of its entries
+        /// </summary>
+        /// <param name="timeSerie">The time serie to map from</param>
+        /// <param name="parameterId">The (new) id of the parameter in the cloned time serie</param>        
+        /// <param name="function">The time serie entry function which maps uses the current value as input</param>
+        /// <returns>Time serie (clone) with new calculated entries</returns>
+        public static TimeSerie Map(TimeSerie timeSerie, string parameterId, Func<TimeSerieEntry, TimeSerieEntry> function)
+        {
+            return Map(timeSerie, parameterId, null, function);
+        }
+
+        /// <summary>
+        /// Creates a shallow copy of the current time serie and applies the map function to each of its entries
+        /// </summary>
+        /// <param name="timeSerie">The time serie to map from</param>
+        /// <param name="parameterId">The (new) id of the parameter in the cloned time serie</param>
+        /// <param name="locationId">The (new) location id of the cloned time serie</param>
+        /// <param name="function">The time serie entry function which maps uses the current value as input</param>
+        /// <returns>Time serie (clone) with new calculated entries</returns>
+        public static TimeSerie Map(TimeSerie timeSerie, string parameterId, string locationId, Func<TimeSerieEntry, TimeSerieEntry> function)
+        {
+            var result = CreateTimeSerie(timeSerie, parameterId);
+            if (!(string.IsNullOrEmpty(locationId) || locationId.Trim() == ""))
+                result.LocationId = locationId;
+
+            foreach (var entry in timeSerie.Entries)
+                result.Entries.Add(function(entry));
+            return result;
+        }
+
+        /// <summary>
+        /// Gets a shallow copy of the time serie without the time serie entries
+        /// </summary>
+        /// <returns>A copy of this time serie</returns>
+        public TimeSerie GetShallowCopy()
+        {
+            var serie = new TimeSerie
+                            {
+                                Type = Type,
+                                ParameterId = ParameterId,
+                                LocationId = LocationId,
+                                StartDateTime = StartDateTime,
+                                EndDateTime = EndDateTime,
+                                ForecastDateTime = ForecastDateTime,
+                                MissVal = MissVal,
+                                LongName = LongName,
+                                StationName = StationName,
+                                SourceOrganisation = SourceOrganisation,
+                                SourceSystem = SourceSystem,
+                                FileDescription = FileDescription,
+                                CreationDateTime = CreationDateTime,
+                                Region = Region,
+                                Units = Units,
+                                TimeStep =
+                                    {
+                                        Multiplier = TimeStep.Multiplier,
+                                        Divider = TimeStep.Divider,
+                                        Unit = TimeStep.Unit
+                                    }
+                            };
+
+            serie.Entries.Clear();
+            return serie;
+        }
+
+        public static TimeSerie CreateTimeSerie(string locationId)
+        {
+            var timeSerie = new TimeSerie
+            {
+                MissVal = DefaultMissingValue,
+                ParameterId = WaterLevelParameterId,
+                LocationId = locationId,
+                StationName = locationId,
+                Type = "instantaneous",
+                Units = "m",
+                Comment = ""
+            };
+
+            return timeSerie;
+        }
+
+
+        /// <summary>
+        /// Creates a time serie by copying data from the source time serie without 
+        /// time serie entries (shallow copy)
+        /// </summary>
+        /// <param name="source">The source time serie used to copy from</param>
+        /// <param name="parameterId">The new parameter ID</param>
+        /// <returns>A time serie copy without time entries</returns>
+        public static TimeSerie CreateTimeSerie(TimeSerie source, string parameterId)
+        {
+            var serie = source.GetShallowCopy();
+            serie.ParameterId = parameterId;
+            serie.Units = "-";
+            serie.Comment = "";
+            return serie;
+        }
+
+        public double GetValue(DateTime dateTime)
+        {
+            foreach (TimeSerieEntry entry in this.Entries)
+            {
+                if (entry.DateTime >= dateTime)
+                {
+                    return entry.Value;
+                }
+            }
+
+            return -1;
+        }
+
+        public string GetNearestBasisFileName(DateTime dateTime)
+        {
+            string res = "";
+            double mindiff = 1e99;
+            double diff = 0;
+            foreach (TimeSerieEntry entry in this.Entries)
+            {
+                diff = Math.Abs(entry.DateTime.ToFileTimeUtc() - dateTime.ToFileTimeUtc());
+                if (diff < mindiff)
+                {
+                    res = entry.BasisFileName;
+                    mindiff = diff;
+                }
+            }
+            return res;
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/LogHelper.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/LogHelper.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/LogHelper.cs	(revision 3305)
@@ -0,0 +1,216 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using log4net;
+using log4net.Appender;
+using log4net.Repository;
+
+namespace Deltares.Standard.Application
+{
+    /// <summary>
+    /// LogHelper is a utility class to simplify logging to different appenders. 
+    /// This class uses log4net to delegate the actual logging. See the log4net 
+    /// documentation to configure this API in the client application using either
+    /// the configuration file or programmaticaly.
+    /// 
+    /// TODO: This logger should be able to log to EntLib too! 
+    /// see http://stackoverflow.com/questions/710863/log4net-vs-nlog 
+    /// </summary>
+    public class LogHelper
+    {
+        private readonly object sync = new object();
+        private readonly List<Exception> exceptions = new List<Exception>();
+
+        /// <summary>
+        /// Creates a LogHelper class to simplify logging
+        /// </summary>
+        /// <param name="obj">The target object to log for. This object type name will be used in the log</param>
+        /// <returns>An instance of this helper</returns>
+        public static LogHelper Create(object obj)
+        {
+            if (obj == null) throw new ArgumentNullException("obj");
+            return Create(obj.GetType());
+        }
+
+        /// <summary>
+        /// Creates a LogHelper to simplify logging.
+        /// </summary>
+        /// <param name="type">The target type to log for.</param>
+        /// <returns>An instance of this helper</returns>
+        public static LogHelper Create(Type type)
+        {
+            return new LogHelper(log4net.LogManager.GetLogger(type));
+        }
+
+        /// <summary>
+        /// Creates a LogHelper class to simplify logging
+        /// </summary>
+        /// <typeparam name="T">The target type to log for.</typeparam>
+        /// <returns>An instance of this helper</returns>
+        public static LogHelper Create<T>()
+        {
+            return Create(typeof(T));
+        }
+
+        /// <summary>
+        /// Creates a LogHelper class to simplify logging
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <returns></returns>
+        public static LogHelper Create(string name)
+        {
+            return new LogHelper(log4net.LogManager.GetLogger(name));
+        }
+
+        /// <summary>
+        /// Holds a reference to the log4net logger
+        /// </summary>
+        private readonly ILog logger;
+
+        public LogHelper(ILog logger)
+        {
+            this.logger = logger;
+        }
+
+        /// <summary>
+        /// Logs fatal messages if ALL, DEBUG, INFO, WARN, ERROR or FATAL is enabled in the config.
+        /// </summary>
+        /// <param name="message">The message.</param>
+        /// <param name="exception">The exception.</param>
+        public void LogFatal(string message, Exception exception = null)
+        {
+            if (logger != null && logger.IsFatalEnabled)
+                logger.Fatal(message, exception);
+
+            Add(exception);
+        }
+
+        /// <summary>
+        /// Logs error messages if ALL, DEBUG, INFO, WARN or ERROR level is enabled in the config.
+        /// </summary>
+        /// <param name="message">The message.</param>
+        /// <param name="exception">The exception.</param>
+        public void LogError(string message, Exception exception = null)
+        {
+            if (logger != null && logger.IsErrorEnabled)
+                logger.Error(message, exception);
+
+            Add(exception);
+        }
+
+        /// <summary>
+        /// Logs warning messages if ALL, DEBUG, INFO or WARN level is enabled in the config.
+        /// </summary>
+        /// <param name="message">The message.</param>
+        /// <param name="exception">The exception.</param>
+        public void LogWarning(string message, Exception exception = null)
+        {
+            if (logger != null && logger.IsWarnEnabled)
+                logger.Warn(message, exception);
+
+            Add(exception);
+        }
+
+        /// <summary>
+        /// Logs info messages if ALL, DEBUG or INFO is enabled in the config.
+        /// </summary>
+        /// <param name="message">The message.</param>
+        /// <param name="exception">The exception.</param>
+        public void LogInfo(string message, Exception exception = null)
+        {
+            if (logger != null && logger.IsInfoEnabled)
+                logger.Info(message, exception);
+
+            Add(exception);
+        }
+
+        /// <summary>
+        /// Logs debug messages if ALL or DEBUG is enabled in the config.
+        /// </summary>
+        /// <param name="message">The message.</param>
+        /// <param name="exception">The exception.</param>
+        public void LogDebug(string message, Exception exception = null)
+        {
+            if (logger != null && logger.IsDebugEnabled)
+                logger.Debug(message, exception);
+
+            Add(exception);
+        }
+
+        /// <summary>
+        ///  Flushes all appenders across the whole logging repository
+        /// </summary>
+        /// <remarks>This call is in most cases not needed</remarks>
+        public void Flush()
+        {
+            lock(sync)
+            {
+                ILoggerRepository rep = log4net.LogManager.GetRepository();
+                foreach (IAppender appender in rep.GetAppenders())
+                {
+                    var buffered = appender as BufferingAppenderSkeleton;
+                    if (buffered != null)
+                    {
+                        buffered.Flush();
+                    }
+                }
+
+                exceptions.Clear();
+            }
+        }
+
+        /// <summary>
+        /// Clears the internal exception list
+        /// </summary>
+        public void Clear()
+        {
+            lock(sync)
+            {
+                exceptions.Clear();
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this instance has logged exceptions.
+        /// </summary>
+        /// <value>
+        /// 	<c>true</c> if this instance has logged exceptions; otherwise, <c>false</c>.
+        /// </value>
+        public bool HasLoggedExceptions
+        {
+            get { return exceptions.Count > 0; }
+        }
+
+        /// <summary>
+        /// Adds the specified exception the internal list.
+        /// </summary>
+        /// <param name="exception">The exception.</param>
+        private void Add(Exception exception)
+        {
+            if (exception != null)
+                lock (sync)
+                    exceptions.Add(exception);
+        }
+
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationImportHelper.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationImportHelper.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationImportHelper.cs	(revision 3305)
@@ -0,0 +1,145 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using Deltares.Geotechnics.Soils;
+using Deltares.Standard.Extensions;
+
+namespace Deltares.Dam.Data.Importers
+{
+    internal static class LocationImportHelper
+    {      
+        internal static PLLineCreationMethod ToPLLineCreationMethod(object value)
+        {
+            if (value == null)
+                throw new ArgumentNullException("value");
+
+            return ToPLLineCreationMethod(value.ToString());
+        }
+
+        internal static PLLineCreationMethod ToPLLineCreationMethod(string value)
+        {
+            if (string.IsNullOrEmpty(value) || value.Trim() == "")
+                throw new ArgumentException("value");
+
+            var translationTable = new Dictionary<string, PLLineCreationMethod>()
+                                                   {
+                                                       {"none", PLLineCreationMethod.None},
+                                                       {"expertknowledgelinearindike", PLLineCreationMethod.ExpertKnowledgeLinearInDike},
+                                                       {"expertknowledgerrd", PLLineCreationMethod.ExpertKnowledgeRRD},
+                                                       {"gaugeswithfallbacktoexpertknowledgerrd", PLLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD}
+                                                   };
+
+            var key = value.ToLowerInvariant();
+            return key.ToEnumType(translationTable);
+        }
+
+        internal static IntrusionVerticalWaterPressureType ToIntrusionVerticalWaterPressure(object value)
+        {
+            if (value == null)
+                throw new ArgumentNullException("value");
+
+            return ToIntrusionVerticalWaterPressure(value.ToString());
+        }
+
+        internal static IntrusionVerticalWaterPressureType ToIntrusionVerticalWaterPressure(string value)
+        {
+            if (string.IsNullOrEmpty(value) || value.Trim() == "")
+                throw new ArgumentException("value");
+
+            var translationTable = new Dictionary<string, IntrusionVerticalWaterPressureType>()
+                                                   {
+                                                       {"fullhydrostatic", IntrusionVerticalWaterPressureType.FullHydroStatic},
+                                                       {"hydrostatic", IntrusionVerticalWaterPressureType.HydroStatic},
+                                                       {"linear", IntrusionVerticalWaterPressureType.Linear},
+                                                       {"semitimedependent", IntrusionVerticalWaterPressureType.SemiTimeDependent},
+                                                       {"standard", IntrusionVerticalWaterPressureType.Standard}                                                       
+                                                   };
+
+            var key = value.ToLowerInvariant();
+            return key.ToEnumType(translationTable);
+        }
+
+        internal static MStabZonesType ToMStabZonesTypeMethod(object value)
+        {
+            if (value == null)
+                throw new ArgumentNullException("value");
+
+            return ToMStabZonesTypeMethod(value.ToString());
+        }
+
+        /// <summary>
+        /// Convert string to stability zonetype.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns></returns>
+        internal static MStabZonesType ToMStabZonesTypeMethod(string value)
+        {
+            if (string.IsNullOrEmpty(value) || value.Trim() == "")
+                throw new ArgumentException("value");
+
+            var translationTable = new Dictionary<string, MStabZonesType>()
+                                                   {        
+                                                       {"nozones", MStabZonesType.NoZones},
+                                                       {"zoneareas", MStabZonesType.ZoneAreas},
+                                                       {"forbiddenzone", MStabZonesType.ForbiddenZone}
+                                                   };
+            var key = value.ToLowerInvariant();
+            return key.ToEnumType(translationTable);
+        }
+
+        /// <summary>
+        /// Converts an object type (which IS a string) to a StabilityDesignMethod
+        /// </summary>
+        /// <param name="value">The value to convert</param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentNullException">if <paramref name="value"/> is null</exception>
+        internal static StabilityDesignMethod ToStabilityDesignMethod(object value)
+        {
+            if (value == null)
+                throw new ArgumentNullException("value");
+
+            return ToStabilityDesignMethod(value.ToString());
+        }
+
+
+        /// <summary>
+        /// Convert string to stability design method type.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns></returns>
+        internal static StabilityDesignMethod ToStabilityDesignMethod(string value)
+        {
+            if (string.IsNullOrEmpty(value) || value.Trim() == "")
+                throw new ArgumentException("value");
+
+            var translationTable = new Dictionary<string, StabilityDesignMethod>()
+                                                   {
+                                                       {"optimizedslopeandshoulderadaption", StabilityDesignMethod.OptimizedSlopeAndShoulderAdaption},
+                                                       {"slopeadaptionbeforeshoulderadaption", StabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption}
+                                                   };
+
+            var key = value.ToLowerInvariant();
+            return key.ToEnumType(translationTable);
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/SpecificationBaseAttribute.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/SpecificationBaseAttribute.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/SpecificationBaseAttribute.cs	(revision 3305)
@@ -0,0 +1,93 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Deltares.Standard.Extensions;
+
+namespace Deltares.Standard.Specifications
+{
+    /// <summary>
+    /// Defines the abstract base class for the specification attributes 
+    /// to derive more specific types from
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Property, Inherited = true, AllowMultiple = true)]
+    public abstract class SpecificationBaseAttribute : Attribute
+    {
+        private readonly ISpecification specification;
+
+        protected SpecificationBaseAttribute(Type specification, params object[] args)
+        {
+            if (args == null && !specification.HasDefaultConstructor())
+                throw new ArgumentException("The specification type should have a default constructor or supply ");
+
+            if (!typeof(ISpecification).IsAssignableFrom(specification))
+                throw new ArgumentException("The specification type should implement interface ISpecification");
+
+            this.specification = Activator.CreateInstance(specification, args) as ISpecification;
+        }
+
+        protected SpecificationBaseAttribute(Type specification) : this(specification, null)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the specification.
+        /// </summary>
+        /// <remarks>If this property is not set, the name of the specification (when available) will be used</remarks>
+        /// <value>
+        /// The name.
+        /// </value>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the text in case the specification is not satisfied
+        /// </summary>
+        /// <remarks>If this property is not set, the description of the specification (when available) will be used</remarks>
+        /// <value>
+        /// The not satisfied text.
+        /// </value>
+        public string NotSatisfiedText { get; set; }
+
+
+        public string GroupName { get; set; }
+
+
+        // This is a positional argument
+
+        public ISpecification Specification
+        {
+            get { return this.specification; }
+        }
+    }
+
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Property | AttributeTargets.Property, Inherited = false, AllowMultiple = true)]
+    public sealed class SpecificationAttribute : SpecificationBaseAttribute
+    {
+        public SpecificationAttribute(Type specification, params object[] args)
+            : base(specification, args)
+        {
+        }
+
+        public SpecificationAttribute(Type specification) : base(specification)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/ModelFactorCsvIdentifiers.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/ModelFactorCsvIdentifiers.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/ModelFactorCsvIdentifiers.cs	(revision 3305)
@@ -0,0 +1,51 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Dam.Data.Importers
+{
+    public static class ModelFactorCsvIdentifiers
+    {
+        /// <summary>
+        /// safety_factor_piping
+        /// </summary>
+        public const string SafetyFactorPiping = "safety_factor_piping";
+
+        /// <summary>
+        /// safety_factor_stability_inner_slope
+        /// </summary>
+        public const string SafetyFactorStabilityInnerslope = "safety_factor_stability_inner_slope";
+
+        /// <summary>
+        /// safety_factor_stability_outer_slope
+        /// </summary>
+        public const string SafetyFactorStabilityOuterslope = "safety_factor_stability_outer_slope";
+
+        /// <summary>
+        /// uplift_criterion_piping
+        /// </summary>
+        public const string UpliftCriterionPiping = "uplift_criterion_piping";
+
+        /// <summary>
+        /// uplift_criterion_stability
+        /// </summary>
+        public const string UpliftCriterionStability = "uplift_criterion_stability";
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/ImportDirector.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/ImportDirector.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/ImportDirector.cs	(revision 3305)
@@ -0,0 +1,47 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Dam.Data.DataPlugins.Configuration;
+
+namespace Deltares.Dam.Data
+{
+    public static class ImportDirector
+    {
+        public static WaterBoard Construct(string importFolder, DamEngine.Data.Standard.Calculation.ProgressDelegate progress)
+        {
+
+            var damProject = new DamProject { DamProjectData = new DamProjectData() };
+            var csvSource = new DataSource { DataSourceType = DataSourceType.CsvFiles, DataLocation = "" };
+            var soilSource = new DataSource { DataSourceType = DataSourceType.MSoilBase, DataLocation = "./soilmaterials.mdb" }; 
+            var container = new DataSourceContainer
+            {
+                DataSourceList = {
+                csvSource, soilSource
+            }
+            };
+
+            damProject.Import(importFolder, container, new[] { "Dike from CSV" }, DamProjectType.Design, progress);
+
+            return damProject.DamProjectData.WaterBoard;
+        }
+
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/IExport.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/IExport.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/IExport.cs	(revision 3305)
@@ -0,0 +1,46 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Dam.Data.IO
+{
+    public interface IExport
+    {
+        /// <summary>
+        /// Sets the name of the file without extension
+        /// </summary>
+        string Name { set; }
+
+        /// <summary>
+        /// Sets the path of the output folder
+        /// </summary>
+        string Path { set; }
+
+        /// <summary>
+        /// Sets the data to export
+        /// </summary>
+        object Data { set; }
+
+        /// <summary>
+        /// Exports the data to the file(s)
+        /// </summary>
+        void Export();
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationCharacteristicPointImporter.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationCharacteristicPointImporter.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationCharacteristicPointImporter.cs	(revision 3305)
@@ -0,0 +1,220 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//#define INCLUDE_ALL_LINE_TYPES
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Deltares.Geotechnics.SurfaceLines;
+using Deltares.Maps;
+
+namespace Deltares.Dam.Data.Importers
+{
+    public class LocationCharacteristicPointImporter
+    {
+        // define file names
+        private const string CharacteristicLinesFile = "Kruin_dijkring10.shp";
+        public const string CharacteristicLineAttributeName = "TEMP_ID";
+        private const string LocationsFile = "Locations.shp";
+        public const string LocationDikeAttributeName = "DIKERINGID";
+        public const string LocationIDAttributeName = "LOCATION";
+        
+        const string DikeTopPolderLineID = "kruin-binnen";
+        const string DikeTopAtPolderLineID = "kruin-buiten";
+
+#if INCLUDE_ALL_LINE_TYPES
+        private IEnumerable<string> supportedLineTypes = new[]
+                                                     {
+                                                         DikeTopPolderLineID,
+                                                         DikeTopAtPolderLineID
+                                                     };
+#else
+        private readonly IEnumerable<string> supportedLineTypes = new[]
+                                                             {
+                                                                 DikeTopPolderLineID
+                                                             };
+#endif
+
+
+        private string dataFolder;
+        private readonly IEnumerable<Location> locations;
+
+        public LocationCharacteristicPointImporter(IEnumerable<Location> locations)
+        {
+            if (locations == null)
+                throw new ArgumentNullException("locations");
+
+            this.locations = locations;
+        }
+
+        public LocationCharacteristicPointImporter(string dataFolder, IEnumerable<Location> locations): this(locations)
+        {
+            LoadRepositories(dataFolder);
+        }
+
+        private void LoadRepositories(string dataFolder)
+        {
+            if (dataFolder == null)
+                throw new ArgumentNullException("dataFolder");
+            
+            this.dataFolder = dataFolder;
+
+            ValidateDataFolder();
+
+            var profileLocationsShapeFile = new ShapeFileLocation(this.dataFolder, LocationsFile);
+            // Get all the locations from the profile data shape file using a repository            
+            this.ProfileLocationsRepository = FeatureRepository.CreateFromShapeFile(profileLocationsShapeFile);
+
+            var shapeFile = new ShapeFileLocation(this.dataFolder, CharacteristicLinesFile);
+            this.CharacteristicLineRepository = FeatureRepository.CreateFromShapeFile(shapeFile);
+
+            // Load and validate the attributes required to import the locations
+            ThrowWhenDataFileNotValid(this.ProfileLocationsRepository, LocationIDAttributeName, LocationsFile);
+            ThrowWhenDataFileNotValid(this.ProfileLocationsRepository, LocationDikeAttributeName, LocationsFile);
+            ThrowWhenDataFileNotValid(this.CharacteristicLineRepository, CharacteristicLineAttributeName, CharacteristicLinesFile);
+        }
+
+        public IFeatureRepository CharacteristicLineRepository { get; set; }
+        public IFeatureRepository ProfileLocationsRepository { get; set; }
+
+        /// <summary>
+        /// </summary>
+        /// <remarks>
+        /// Preconditions:
+        /// - A valid data folder needs to given
+        /// - A set of "locations" with their characteristic points table and initialized id's available from the waterboard
+        /// - The required files need to be in the data folder (one for the characteristics points, 
+        /// - A set of (characteristic) lines wich have to be retrieved from the files
+        ///   
+        /// Postconditions:
+        /// - Some locations (the result of a join from the Location shape file and the existing location list from the Waterboard) have new characteristic point values
+        /// 
+        /// </remarks>
+        /// <exception cref="FileNotFoundException" />
+        /// <exception cref="ArgumentNullException" />
+        /// <exception cref="ArgumentException" />
+        /// <exception cref="IOException" />
+        public void Import()
+        {            
+            ThrowWhenRepositoryIsInvalid(this.CharacteristicLineRepository, CharacteristicLineAttributeName);
+            ThrowWhenRepositoryIsInvalid(this.ProfileLocationsRepository, LocationIDAttributeName);
+            ThrowWhenRepositoryIsInvalid(this.ProfileLocationsRepository, LocationDikeAttributeName);
+
+            // TODO Test both repositories on geometry type (must be linestring)
+
+            // Find the intersection points between the geometries
+            
+            var results = this.ProfileLocationsRepository.GetIntersectionPoints(this.CharacteristicLineRepository);
+            var work = results.GetResultsHavingCount(1);
+            foreach (var intersectionResult in work)
+            {
+                IFeature profile, characteristicLine;
+                if (intersectionResult.Source.Attributes.Exists(CharacteristicLineAttributeName))
+                {
+                    profile = intersectionResult.Target;
+                    characteristicLine = intersectionResult.Source;
+                }
+                else
+                {
+                    profile = intersectionResult.Source;
+                    characteristicLine = intersectionResult.Target;
+                }
+
+                string lineTypeID = characteristicLine.Attributes[CharacteristicLineAttributeName].ToString();                
+                if (!supportedLineTypes.Contains(lineTypeID))
+                {
+                    LogMessage();
+                    continue;
+                }
+
+                var locationList = locations.ToList();
+                var locname = profile.Attributes[LocationIDAttributeName].ToString();
+
+                // Get the surface line for the location having the location ID
+                var surfaceLine = locationList.First(loc => loc.Name == locname).SurfaceLine2;
+
+                var dikeTopAtPolder = surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder);
+                dikeTopAtPolder.X = intersectionResult.IntersectionPoints.ElementAt(0).X;
+                dikeTopAtPolder.Y = intersectionResult.IntersectionPoints.ElementAt(0).Y;
+            }
+        }
+
+        private static void LogMessage()
+        {
+            
+        }
+
+        private static IEnumerable<string> GetAllFiles(string path)
+        {
+            if (!Directory.Exists(path))
+                throw new DirectoryNotFoundException(string.Format("Data folder '{0}' not found", path));
+
+            return Directory.GetFiles(path);
+        }
+
+        private static bool IsRepositoryValid(IFeatureRepository repository, string attributeName)
+        {
+            if (repository == null)
+                return false;
+
+            bool keyAndValueExist = !repository.Features.Any(geom => !geom.Attributes.Exists(attributeName) || geom.Attributes[attributeName] == null);
+            return keyAndValueExist;
+        }
+
+        private static void ThrowWhenRepositoryIsInvalid(IFeatureRepository repository, string attributeName)
+        {
+            if (!IsRepositoryValid(repository, attributeName))
+            {
+                throw new InvalidOperationException(
+                    string.Format("The geometry repository doesn't contain the required attribute '{0}'", attributeName));
+            }
+        }
+
+        private static void ThrowWhenDataFileNotValid(IFeatureRepository repository, string attributeName, string fileName)
+        {
+            if (!IsRepositoryValid(repository, attributeName))
+            {
+                throw new ArgumentException(
+                    string.Format("The ShapeFile '{0}' doesn't contain the required attribute '{1}'",
+                                  fileName, attributeName));
+            }
+        }
+
+        private void ValidateDataFolder()
+        {
+            // Get all the shape files from the data folder
+            var files = GetAllFiles(this.dataFolder);
+
+            // Validate the existence of the required files
+
+            if (!files.Any(file => file.EndsWith(CharacteristicLinesFile)))
+                throw new FileNotFoundException(string.Format("The folder '{0}' doesn't contain the required file '{1}'", 
+                                                          this.dataFolder, CharacteristicLinesFile));
+
+            if (!files.Any(file => file.EndsWith(LocationsFile)))
+                throw new FileNotFoundException(
+                    string.Format("The folder '{0}' doesn't contain the required file '{1}'", 
+                                  this.dataFolder, LocationsFile));
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/AttributeMapping.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/AttributeMapping.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/AttributeMapping.cs	(revision 3305)
@@ -0,0 +1,42 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+
+namespace Deltares.Maps
+{
+    /// <summary>
+    ///     Mapping helper class
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public class AttributeMapping<T>
+    {
+        public string Id { get; set; }
+        public string Name { get; set; }
+        public string File { get; set; }
+        public Action<T, object> Action { get; set; }
+
+        public override string ToString()
+        {
+            return Id + "|" + Name + "|" + File;
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterCharacteristicPoints.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterCharacteristicPoints.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterCharacteristicPoints.cs	(revision 3305)
@@ -0,0 +1,498 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using Deltares.Geotechnics.SurfaceLines;
+using Deltares.Standard.IO;
+using Deltares.Standard.Language;
+using LumenWorks.Framework.IO.Csv;
+
+namespace Deltares.Dam.Data.CsvImporters
+{
+    public class CsvImporterCharacteristicPointsException : ApplicationException
+    {
+        public CsvImporterCharacteristicPointsException(string message)
+            : base(message)
+        {
+        }
+    }
+
+    public class CsvImporterCharacteristicPoints
+    {
+        private List<CharacteristicPointsRecord> characteristicPointsRecords = new List<CharacteristicPointsRecord>();
+        private List<string> errorMessages = new List<string>();
+
+        public class CharPoint
+        {
+            public CharacteristicPointType Type { get; set; }
+            public double X { get; set; }
+            public double Y { get; set; }
+            public double Z { get; set; }
+        }
+
+        public class CharacteristicPointsRecord
+        {
+            private IList<CharPoint> points = new List<CharPoint>();
+            public string SurfaceLineId { get; set; }
+
+            public IList<CharPoint> Points
+            {
+                get { return points; }
+                set { points = value; }
+            }
+
+            public int Volgnummer { get; set; }
+        }
+
+        private void CheckColumn(int index, string fileName, string fieldName)
+        {
+            if (index < 0)
+            {
+                var csvHeaderFieldError = LocalizationManager.GetTranslatedText(this.GetType(), "csvHeaderFieldError");
+                throw new CsvImporterCharacteristicPointsException(String.Format("{0} : {1} {2}", fileName, csvHeaderFieldError,
+                                                                         fieldName));
+            }
+        }
+
+        public CsvImporterCharacteristicPoints(string fileName)
+        {
+            const int minimalNumberOfColumns = 49; // Column 53 "volgnummer" is not mandatory; DTH removed
+            errorMessages.Clear();
+            ThrowHelper.ThrowIfStringArgumentNullOrEmpty(fileName, StringResourceNames.CsvFileNotValid);
+            ThrowHelper.ThrowIfFileNotExist(fileName, StringResourceNames.CsvFileNotFound);
+
+            var oldcur = Thread.CurrentThread.CurrentCulture;
+            try
+            {
+                Thread.CurrentThread.CurrentCulture = CsvReaderUtilities.DetermineCultureForFile(fileName);
+                using (CsvReader csv = new CsvReader(new StreamReader(fileName), true, ';'))
+                {
+                    string[] headers = CsvImporterHelper.GetFieldHeaders(this, csv);
+                    if (headers.Count() < minimalNumberOfColumns)
+                    {
+                        var csvHeaderColumnCountError = String.Format(LocalizationManager.GetTranslatedText(this.GetType(), "csvHeaderColumnCountError"), minimalNumberOfColumns);
+                        throw new CsvImporterCharacteristicPointsException(String.Format("{0} : {1}", fileName, csvHeaderColumnCountError));
+                    }
+
+                    int SurfaceLineIdCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.LocationId);
+                    if (SurfaceLineIdCol < 0)
+                    {
+                        // colIndexSurfaceLineId can be defined with 2 identifiers (surfaceLineId is deprecated, locationId is the new one)
+                        SurfaceLineIdCol = CsvReaderUtilities.GetHeaderIndexByString(headers,
+                                                                                     CharacteristicPointCsvIdentifiers.SurfaceLineId);
+                    }
+                    CheckColumn(SurfaceLineIdCol, fileName, CharacteristicPointCsvIdentifiers.SurfaceLineId);
+
+                    int XMaaiveldBinnenwaartsCol = CsvReaderUtilities.GetHeaderIndexByString(headers,
+                                                                                             CharacteristicPointCsvIdentifiers
+                                                                                                 .SurfaceLevelInsideX);
+                    CheckColumn(XMaaiveldBinnenwaartsCol, fileName,
+                                CharacteristicPointCsvIdentifiers.SurfaceLevelInsideX);
+
+                    int YMaaiveldBinnenwaartsCol = CsvReaderUtilities.GetHeaderIndexByString(headers,
+                                                                                             CharacteristicPointCsvIdentifiers
+                                                                                                 .SurfaceLevelInsideY);
+                    CheckColumn(YMaaiveldBinnenwaartsCol, fileName,
+                                CharacteristicPointCsvIdentifiers.SurfaceLevelInsideY);
+
+                    int ZMaaiveldBinnenwaartsCol = CsvReaderUtilities.GetHeaderIndexByString(headers,
+                                                                                             CharacteristicPointCsvIdentifiers
+                                                                                                 .SurfaceLevelInsideZ);
+                    CheckColumn(ZMaaiveldBinnenwaartsCol, fileName,
+                                CharacteristicPointCsvIdentifiers.SurfaceLevelInsideZ);
+
+                    int XInsteekSlootPolderzijdeCol = CsvReaderUtilities.GetHeaderIndexByString(headers,
+                                                                                                CharacteristicPointCsvIdentifiers
+                                                                                                    .DitchPolderSideX);
+                    CheckColumn(XInsteekSlootPolderzijdeCol, fileName,
+                                CharacteristicPointCsvIdentifiers.DitchPolderSideX);
+
+                    int YInsteekSlootPolderzijdeCol = CsvReaderUtilities.GetHeaderIndexByString(headers,
+                                                                                                CharacteristicPointCsvIdentifiers
+                                                                                                    .DitchPolderSideY);
+                    CheckColumn(YInsteekSlootPolderzijdeCol, fileName,
+                                CharacteristicPointCsvIdentifiers.DitchPolderSideY);
+
+                    int ZInsteekSlootPolderzijdeCol = CsvReaderUtilities.GetHeaderIndexByString(headers,
+                                                                                                CharacteristicPointCsvIdentifiers
+                                                                                                    .DitchPolderSideZ);
+                    CheckColumn(ZInsteekSlootPolderzijdeCol, fileName,
+                                CharacteristicPointCsvIdentifiers.DitchPolderSideZ);
+
+                    int XSlootbodemPolderzijdeCol = CsvReaderUtilities.GetHeaderIndexByString(headers,
+                                                                                              CharacteristicPointCsvIdentifiers
+                                                                                                  .BottomDitchPolderSideX);
+                    CheckColumn(XSlootbodemPolderzijdeCol, fileName,
+                                CharacteristicPointCsvIdentifiers.BottomDitchPolderSideX);
+
+                    int YSlootbodemPolderzijdeCol = CsvReaderUtilities.GetHeaderIndexByString(headers,
+                                                                                              CharacteristicPointCsvIdentifiers
+                                                                                                  .BottomDitchPolderSideY);
+                    CheckColumn(YSlootbodemPolderzijdeCol, fileName,
+                                CharacteristicPointCsvIdentifiers.BottomDitchPolderSideY);
+
+                    int ZSlootbodemPolderzijdeCol = CsvReaderUtilities.GetHeaderIndexByString(headers,
+                                                                                              CharacteristicPointCsvIdentifiers
+                                                                                                  .BottomDitchPolderSideZ);
+                    CheckColumn(ZSlootbodemPolderzijdeCol, fileName,
+                                CharacteristicPointCsvIdentifiers.BottomDitchPolderSideZ);
+
+                    int XSlootbodemDijkzijdeCol = CsvReaderUtilities.GetHeaderIndexByString(headers,
+                                                                                            CharacteristicPointCsvIdentifiers
+                                                                                                .BottomDitchDikeSideX);
+                    CheckColumn(XSlootbodemDijkzijdeCol, fileName,
+                                CharacteristicPointCsvIdentifiers.BottomDitchDikeSideX);
+
+                    int YSlootbodemDijkzijdeCol = CsvReaderUtilities.GetHeaderIndexByString(headers,
+                                                                                            CharacteristicPointCsvIdentifiers
+                                                                                                .BottomDitchDikeSideY);
+                    CheckColumn(YSlootbodemDijkzijdeCol, fileName,
+                                CharacteristicPointCsvIdentifiers.BottomDitchDikeSideY);
+
+                    int ZSlootbodemDijkzijdeCol = CsvReaderUtilities.GetHeaderIndexByString(headers,
+                                                                                            CharacteristicPointCsvIdentifiers
+                                                                                                .BottomDitchDikeSideZ);
+                    CheckColumn(ZSlootbodemDijkzijdeCol, fileName,
+                                CharacteristicPointCsvIdentifiers.BottomDitchDikeSideZ);
+
+                    int XInsteekSlootDijkzijdeCol = CsvReaderUtilities.GetHeaderIndexByString(headers,
+                                                                                              CharacteristicPointCsvIdentifiers
+                                                                                                  .DitchDikeSideX);
+                    CheckColumn(XInsteekSlootDijkzijdeCol, fileName, CharacteristicPointCsvIdentifiers.DitchDikeSideX);
+
+                    int YInsteekSlootDijkzijdeCol = CsvReaderUtilities.GetHeaderIndexByString(headers,
+                                                                                              CharacteristicPointCsvIdentifiers
+                                                                                                  .DitchDikeSideY);
+                    // The click program by Erik Vastenburg now delivers "Y_Insteek_sloot dijkzijde" instead of the correct above definition
+                    // Erik will change this in his program but for now, this wrong tag should also be recognized.
+                    if (YInsteekSlootDijkzijdeCol < 0)
+                    {
+                        const string fieldY_Insteekslootdijkzijde = "Y_Insteek_sloot dijkzijde";
+                        YInsteekSlootDijkzijdeCol = CsvReaderUtilities.GetHeaderIndexByString(headers,
+                                                                                              fieldY_Insteekslootdijkzijde);
+                        CheckColumn(YInsteekSlootDijkzijdeCol, fileName, fieldY_Insteekslootdijkzijde);
+                    }
+                    else
+                    {
+                        CheckColumn(YInsteekSlootDijkzijdeCol, fileName,
+                                    CharacteristicPointCsvIdentifiers.DitchDikeSideY);
+                    }
+
+                    int ZInsteekSlootDijkzijdeCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.DitchDikeSideZ);
+                    CheckColumn(ZInsteekSlootDijkzijdeCol, fileName, CharacteristicPointCsvIdentifiers.DitchDikeSideZ);
+
+                    int XTeenDijkBinnenwaartsCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.DikeToeAtPolderX);
+                    CheckColumn(XTeenDijkBinnenwaartsCol, fileName, CharacteristicPointCsvIdentifiers.DikeToeAtPolderX);
+
+                    int YTeenDijkBinnenwaartsCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.DikeToeAtPolderY);
+                    CheckColumn(YTeenDijkBinnenwaartsCol, fileName, CharacteristicPointCsvIdentifiers.DikeToeAtPolderY);
+
+                    int ZTeenDijkBinnenwaartsCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.DikeToeAtPolderZ);
+                    CheckColumn(ZTeenDijkBinnenwaartsCol, fileName, CharacteristicPointCsvIdentifiers.DikeToeAtPolderZ);
+
+                    int XKruinBinnenbermCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.TopShoulderInsideX);
+                    CheckColumn(XKruinBinnenbermCol, fileName, CharacteristicPointCsvIdentifiers.TopShoulderInsideX);
+
+                    int YKruinBinnenbermCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.TopShoulderInsideY);
+                    CheckColumn(YKruinBinnenbermCol, fileName, CharacteristicPointCsvIdentifiers.TopShoulderInsideY);
+
+                    int ZKruinBinnenbermCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.TopShoulderInsideZ);
+                    CheckColumn(ZKruinBinnenbermCol, fileName, CharacteristicPointCsvIdentifiers.TopShoulderInsideZ);
+
+                    int XInsteekBinnenbermCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.InsteekShoulderInsideX);
+                    CheckColumn(XInsteekBinnenbermCol, fileName, CharacteristicPointCsvIdentifiers.InsteekShoulderInsideX);
+
+                    int YInsteekBinnenbermCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.InsteekShoulderInsideY);
+                    CheckColumn(YInsteekBinnenbermCol, fileName, CharacteristicPointCsvIdentifiers.InsteekShoulderInsideY);
+
+                    int ZInsteekBinnenbermCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.InsteekShoulderInsideZ);
+                    CheckColumn(ZInsteekBinnenbermCol, fileName, CharacteristicPointCsvIdentifiers.InsteekShoulderInsideZ);
+
+                    int XKruinBinnentaludCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.DikeTopAtPolderX);
+                    CheckColumn(XKruinBinnentaludCol, fileName, CharacteristicPointCsvIdentifiers.DikeTopAtPolderX);
+
+                    int YKruinBinnentaludCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.DikeTopAtPolderY);
+                    CheckColumn(YKruinBinnentaludCol, fileName, CharacteristicPointCsvIdentifiers.DikeTopAtPolderY);
+
+                    int ZKruinBinnentaludCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.DikeTopAtPolderZ);
+                    CheckColumn(ZKruinBinnentaludCol, fileName, CharacteristicPointCsvIdentifiers.DikeTopAtPolderZ);
+
+                    int XVerkeersbelastingKantBinnenwaartsCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.TrafficLoadInsideX);
+                    CheckColumn(XVerkeersbelastingKantBinnenwaartsCol, fileName, CharacteristicPointCsvIdentifiers.TrafficLoadInsideX);
+
+                    int YVerkeersbelastingKantBinnenwaartsCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.TrafficLoadInsideY);
+                    CheckColumn(YVerkeersbelastingKantBinnenwaartsCol, fileName,
+                                CharacteristicPointCsvIdentifiers.TrafficLoadInsideY);
+
+                    int ZVerkeersbelastingKantBinnenwaartsCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.TrafficLoadInsideZ);
+                    CheckColumn(ZVerkeersbelastingKantBinnenwaartsCol, fileName, CharacteristicPointCsvIdentifiers.TrafficLoadInsideZ);
+
+                    int XVerkeersbelastingKantBuitenwaartsCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.TrafficLoadOutsideX);
+                    CheckColumn(XVerkeersbelastingKantBuitenwaartsCol, fileName, CharacteristicPointCsvIdentifiers.TrafficLoadOutsideX);
+
+                    int YVerkeersbelastingKantBuitenwaartsCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.TrafficLoadOutsideY);
+                    CheckColumn(YVerkeersbelastingKantBuitenwaartsCol, fileName, CharacteristicPointCsvIdentifiers.TrafficLoadOutsideY);
+
+                    int ZVerkeersbelastingKantBuitenwaartsCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.TrafficLoadOutsideZ);
+                    CheckColumn(ZVerkeersbelastingKantBuitenwaartsCol, fileName, CharacteristicPointCsvIdentifiers.TrafficLoadOutsideZ);
+
+                    int XKruinBuitentaludCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.DikeTopAtRiverX);
+                    CheckColumn(XKruinBuitentaludCol, fileName, CharacteristicPointCsvIdentifiers.DikeTopAtRiverX);
+
+                    int YKruinBuitentaludCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.DikeTopAtRiverY);
+                    CheckColumn(YKruinBuitentaludCol, fileName, CharacteristicPointCsvIdentifiers.DikeTopAtRiverY);
+
+                    int ZKruinBuitentaludCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.DikeTopAtRiverZ);
+                    CheckColumn(ZKruinBuitentaludCol, fileName, CharacteristicPointCsvIdentifiers.DikeTopAtRiverZ);
+
+                    int XInsteekBuitenbermCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.InsteekShoulderOutsideX);
+                    CheckColumn(XInsteekBuitenbermCol, fileName, CharacteristicPointCsvIdentifiers.InsteekShoulderOutsideX);
+
+                    int YInsteekBuitenbermCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.InsteekShoulderOutsideY);
+                    CheckColumn(YInsteekBuitenbermCol, fileName, CharacteristicPointCsvIdentifiers.InsteekShoulderOutsideY);
+
+                    int ZInsteekBuitenbermCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.InsteekShoulderOutsideZ);
+                    CheckColumn(ZInsteekBuitenbermCol, fileName, CharacteristicPointCsvIdentifiers.InsteekShoulderOutsideZ);
+
+                    int XKruinBuitenbermCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.TopShoulderOutsideX);
+                    CheckColumn(XKruinBuitenbermCol, fileName, CharacteristicPointCsvIdentifiers.TopShoulderOutsideX);
+
+                    int YKruinBuitenbermCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.TopShoulderOutsideY);
+                    CheckColumn(YKruinBuitenbermCol, fileName, CharacteristicPointCsvIdentifiers.TopShoulderOutsideY);
+
+                    int ZKruinBuitenbermCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.TopShoulderOutsideZ);
+                    CheckColumn(ZKruinBuitenbermCol, fileName, CharacteristicPointCsvIdentifiers.TopShoulderOutsideZ);
+
+                    int XTeenDijkBuitenwaartsCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.DikeToeAtRiverX);
+                    CheckColumn(XTeenDijkBuitenwaartsCol, fileName, CharacteristicPointCsvIdentifiers.DikeToeAtRiverX);
+
+                    int YTeenDijkBuitenwaartsCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.DikeToeAtRiverY);
+                    CheckColumn(YTeenDijkBuitenwaartsCol, fileName, CharacteristicPointCsvIdentifiers.DikeToeAtRiverY);
+
+                    int ZTeenDijkBuitenwaartsCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.DikeToeAtRiverZ);
+                    CheckColumn(ZTeenDijkBuitenwaartsCol, fileName, CharacteristicPointCsvIdentifiers.DikeToeAtRiverZ);
+
+                    int XMaaiveldBuitenwaartsCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.SurfaceLevelOutsideX);
+                    CheckColumn(XMaaiveldBuitenwaartsCol, fileName,
+                                CharacteristicPointCsvIdentifiers.SurfaceLevelOutsideX);
+
+                    int YMaaiveldBuitenwaartsCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.SurfaceLevelOutsideY);
+                    CheckColumn(YMaaiveldBuitenwaartsCol, fileName,
+                                CharacteristicPointCsvIdentifiers.SurfaceLevelOutsideY);
+
+                    int ZMaaiveldBuitenwaartsCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.SurfaceLevelOutsideZ);
+                    CheckColumn(ZMaaiveldBuitenwaartsCol, fileName,CharacteristicPointCsvIdentifiers.SurfaceLevelOutsideZ);
+
+                    //optional, do not check
+                    int XInsteekGeulCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.InsertRiverChannelX);
+                    //optional, do not check
+                    int YInsteekGeulCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.InsertRiverChannelY);
+                    //optional, do not check
+                    int ZInsteekGeulCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.InsertRiverChannelZ);
+
+                    //optional, do not check
+                    int XTeenGeulCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.BottomRiverChannelX);
+                    //optional, do not check
+                    int YTeenGeulCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.BottomRiverChannelY);
+                    //optional, do not check
+                    int ZTeenGeulCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.BottomRiverChannelZ);                    
+
+                    // optional so do not check
+                    const string fieldVolgnummer = "Volgnummer";
+                    int VolgnummerCol = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldVolgnummer);
+
+
+                    while (csv.ReadNextRecord())
+                    {
+                        try
+                        {
+                            CharacteristicPointsRecord characteristicPoints = new CharacteristicPointsRecord();
+                            characteristicPoints.SurfaceLineId = csv[SurfaceLineIdCol];
+                            if (VolgnummerCol > -1)
+                            {
+                                characteristicPoints.Volgnummer = Convert.ToInt32(csv[VolgnummerCol]);
+                            }
+
+                            CharPoint mbi = new CharPoint();
+                            mbi.Type = CharacteristicPointType.SurfaceLevelInside;
+                            mbi.X = Convert.ToDouble(csv[XMaaiveldBinnenwaartsCol]);
+                            mbi.Y = Convert.ToDouble(csv[YMaaiveldBinnenwaartsCol]);
+                            mbi.Z = Convert.ToDouble(csv[ZMaaiveldBinnenwaartsCol]);
+                            characteristicPoints.Points.Add(mbi);
+
+                            CharPoint isp = new CharPoint();
+                            isp.Type = CharacteristicPointType.DitchPolderSide;
+                            isp.X = Convert.ToDouble(csv[XInsteekSlootPolderzijdeCol]);
+                            isp.Y = Convert.ToDouble(csv[YInsteekSlootPolderzijdeCol]);
+                            isp.Z = Convert.ToDouble(csv[ZInsteekSlootPolderzijdeCol]);
+                            characteristicPoints.Points.Add(isp);
+
+                            CharPoint sbp = new CharPoint();
+                            sbp.Type = CharacteristicPointType.BottomDitchPolderSide;
+                            sbp.X = Convert.ToDouble(csv[XSlootbodemPolderzijdeCol]);
+                            sbp.Y = Convert.ToDouble(csv[YSlootbodemPolderzijdeCol]);
+                            sbp.Z = Convert.ToDouble(csv[ZSlootbodemPolderzijdeCol]);
+                            characteristicPoints.Points.Add(sbp);
+
+                            CharPoint sbd = new CharPoint();
+                            sbd.Type = CharacteristicPointType.BottomDitchDikeSide;
+                            sbd.X = Convert.ToDouble(csv[XSlootbodemDijkzijdeCol]);
+                            sbd.Y = Convert.ToDouble(csv[YSlootbodemDijkzijdeCol]);
+                            sbd.Z = Convert.ToDouble(csv[ZSlootbodemDijkzijdeCol]);
+                            characteristicPoints.Points.Add(sbd);
+
+                            CharPoint isd = new CharPoint();
+                            isd.Type = CharacteristicPointType.DitchDikeSide;
+                            isd.X = Convert.ToDouble(csv[XInsteekSlootDijkzijdeCol]);
+                            isd.Y = Convert.ToDouble(csv[YInsteekSlootDijkzijdeCol]);
+                            isd.Z = Convert.ToDouble(csv[ZInsteekSlootDijkzijdeCol]);
+                            characteristicPoints.Points.Add(isd);
+
+                            CharPoint tdbi = new CharPoint();
+                            tdbi.Type = CharacteristicPointType.DikeToeAtPolder;
+                            tdbi.X = Convert.ToDouble(csv[XTeenDijkBinnenwaartsCol]);
+                            tdbi.Y = Convert.ToDouble(csv[YTeenDijkBinnenwaartsCol]);
+                            tdbi.Z = Convert.ToDouble(csv[ZTeenDijkBinnenwaartsCol]);
+                            characteristicPoints.Points.Add(tdbi);
+
+                            CharPoint kbb = new CharPoint();
+                            kbb.Type = CharacteristicPointType.ShoulderTopInside;
+                            kbb.X = Convert.ToDouble(csv[XKruinBinnenbermCol]);
+                            kbb.Y = Convert.ToDouble(csv[YKruinBinnenbermCol]);
+                            kbb.Z = Convert.ToDouble(csv[ZKruinBinnenbermCol]);
+                            characteristicPoints.Points.Add(kbb);
+
+                            CharPoint ibb = new CharPoint();
+                            ibb.Type = CharacteristicPointType.ShoulderBaseInside;
+                            ibb.X = Convert.ToDouble(csv[XInsteekBinnenbermCol]);
+                            ibb.Y = Convert.ToDouble(csv[YInsteekBinnenbermCol]);
+                            ibb.Z = Convert.ToDouble(csv[ZInsteekBinnenbermCol]);
+                            characteristicPoints.Points.Add(ibb);
+
+                            CharPoint kbt = new CharPoint();
+                            kbt.Type = CharacteristicPointType.DikeTopAtPolder;
+                            kbt.X = Convert.ToDouble(csv[XKruinBinnentaludCol]);
+                            kbt.Y = Convert.ToDouble(csv[YKruinBinnentaludCol]);
+                            kbt.Z = Convert.ToDouble(csv[ZKruinBinnentaludCol]);
+                            characteristicPoints.Points.Add(kbt);
+
+                            CharPoint vbbi = new CharPoint();
+                            vbbi.Type = CharacteristicPointType.TrafficLoadInside;
+                            vbbi.X = Convert.ToDouble(csv[XVerkeersbelastingKantBinnenwaartsCol]);
+                            vbbi.Y = Convert.ToDouble(csv[YVerkeersbelastingKantBinnenwaartsCol]);
+                            vbbi.Z = Convert.ToDouble(csv[ZVerkeersbelastingKantBinnenwaartsCol]);
+                            characteristicPoints.Points.Add(vbbi);
+
+                            CharPoint vbbu = new CharPoint();
+                            vbbu.Type = CharacteristicPointType.TrafficLoadOutside;
+                            vbbu.X = Convert.ToDouble(csv[XVerkeersbelastingKantBuitenwaartsCol]);
+                            vbbu.Y = Convert.ToDouble(csv[YVerkeersbelastingKantBuitenwaartsCol]);
+                            vbbu.Z = Convert.ToDouble(csv[ZVerkeersbelastingKantBuitenwaartsCol]);
+                            characteristicPoints.Points.Add(vbbu);
+
+                            CharPoint kbut = new CharPoint();
+                            kbut.Type = CharacteristicPointType.DikeTopAtRiver;
+                            kbut.X = Convert.ToDouble(csv[XKruinBuitentaludCol]);
+                            kbut.Y = Convert.ToDouble(csv[YKruinBuitentaludCol]);
+                            kbut.Z = Convert.ToDouble(csv[ZKruinBuitentaludCol]);
+                            characteristicPoints.Points.Add(kbut);
+
+                            CharPoint ibub = new CharPoint();
+                            ibub.Type = CharacteristicPointType.ShoulderBaseOutside;
+                            ibub.X = Convert.ToDouble(csv[XInsteekBuitenbermCol]);
+                            ibub.Y = Convert.ToDouble(csv[YInsteekBuitenbermCol]);
+                            ibub.Z = Convert.ToDouble(csv[ZInsteekBuitenbermCol]);
+                            characteristicPoints.Points.Add(ibub);
+
+                            CharPoint kbub = new CharPoint();
+                            kbub.Type = CharacteristicPointType.ShoulderTopOutside;
+                            kbub.X = Convert.ToDouble(csv[XKruinBuitenbermCol]);
+                            kbub.Y = Convert.ToDouble(csv[YKruinBuitenbermCol]);
+                            kbub.Z = Convert.ToDouble(csv[ZKruinBuitenbermCol]);
+                            characteristicPoints.Points.Add(kbub);
+
+                            CharPoint tdbu = new CharPoint();
+                            tdbu.Type = CharacteristicPointType.DikeToeAtRiver;
+                            tdbu.X = Convert.ToDouble(csv[XTeenDijkBuitenwaartsCol]);
+                            tdbu.Y = Convert.ToDouble(csv[YTeenDijkBuitenwaartsCol]);
+                            tdbu.Z = Convert.ToDouble(csv[ZTeenDijkBuitenwaartsCol]);
+                            characteristicPoints.Points.Add(tdbu);
+
+                            CharPoint mbu = new CharPoint();
+                            mbu.Type = CharacteristicPointType.SurfaceLevelOutside;
+                            mbu.X = Convert.ToDouble(csv[XMaaiveldBuitenwaartsCol]);
+                            mbu.Y = Convert.ToDouble(csv[YMaaiveldBuitenwaartsCol]);
+                            mbu.Z = Convert.ToDouble(csv[ZMaaiveldBuitenwaartsCol]);
+                            characteristicPoints.Points.Add(mbu);
+
+                            if (XTeenGeulCol > 0)
+                            {
+                                CharPoint brc = new CharPoint();
+                                brc.Type = CharacteristicPointType.BottomRiverChannel;
+                                brc.X = Convert.ToDouble(csv[XTeenGeulCol]);
+                                brc.Y = Convert.ToDouble(csv[YTeenGeulCol]);
+                                brc.Z = Convert.ToDouble(csv[ZTeenGeulCol]);
+                                characteristicPoints.Points.Add(brc);
+                            }
+
+                            if (XInsteekGeulCol > 0)
+                            {
+                                CharPoint irc = new CharPoint();
+                                irc.Type = CharacteristicPointType.InsertRiverChannel;
+                                irc.X = Convert.ToDouble(csv[XInsteekGeulCol]);
+                                irc.Y = Convert.ToDouble(csv[YInsteekGeulCol]);
+                                irc.Z = Convert.ToDouble(csv[ZInsteekGeulCol]);
+                                characteristicPoints.Points.Add(irc);
+                            }
+
+                            characteristicPointsRecords.Add(characteristicPoints);
+                        }
+                        catch (Exception e)
+                        {
+                            var csvCharacteristicPointError = LocalizationManager.GetTranslatedText(this.GetType(),
+                                                                                                    "csvCharacteristicPointError");
+                            errorMessages.Add(csvCharacteristicPointError + e.Message);
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                Thread.CurrentThread.CurrentCulture = oldcur;
+            }
+        }
+
+        public List<CharacteristicPointsRecord> ImportedItems
+        {
+            get { return characteristicPointsRecords; }
+        }
+
+        public List<string> ErrorMessages
+        {
+            get { return errorMessages; }
+            set { errorMessages = value; }
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportCharacteristicPoints.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportCharacteristicPoints.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportCharacteristicPoints.cs	(revision 3305)
@@ -0,0 +1,201 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Globalization;
+using Deltares.Geotechnics.SurfaceLines;
+
+namespace Deltares.Dam.Data
+{
+    public class CsvExportCharacteristicPoints
+    {
+        private readonly SurfaceLine2 surfaceLine;
+        private readonly CsvExportSurfaceLineIdentifiers csvExportSurfaceLineIdentifiers;
+        public CsvExportCharacteristicPoints(CsvExportSurfaceLineIdentifiers csvExportSurfaceLineIdentifiers, SurfaceLine2 surfaceLine)
+        {
+            this.surfaceLine = surfaceLine;
+            this.csvExportSurfaceLineIdentifiers = csvExportSurfaceLineIdentifiers;
+        }
+
+        string GetXfromPoint(SurfaceLine2 line, CharacteristicPointType type)
+        {
+            var point = line.CharacteristicPoints.GetGeometryPoint(type);
+            var result = -1.0;
+            if (point != null)
+            {
+                result = point.X;
+            }
+            return result.ToString("F3", CultureInfo.InvariantCulture);
+        }
+
+        string GetYfromPoint(SurfaceLine2 line, CharacteristicPointType type)
+        {
+            var point = line.CharacteristicPoints.GetGeometryPoint(type);
+            var result = -1.0;
+            if (point != null)
+            {
+                result = point.Y;
+            }
+            return result.ToString("F3", CultureInfo.InvariantCulture);
+        }
+
+        string GetZfromPoint(SurfaceLine2 line, CharacteristicPointType type)
+        {
+            var point = line.CharacteristicPoints.GetGeometryPoint(type);
+            var result = -1.0;
+            if (point != null)
+            {
+                result = point.Z;
+            }
+            return result.ToString("F3", CultureInfo.InvariantCulture);
+        }
+
+        // The following 5 properties are identifiers and should be the first columns. 
+        // Use negative identifers to add them as the first columns
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.LocationId, -4)]
+        public string LocationId { get { return (csvExportSurfaceLineIdentifiers == null) ? "" : csvExportSurfaceLineIdentifiers.LocationId; } }
+
+        [CsvExportColumn(CsvExportSurfaceLineIdentifiers.CsvHeaderSoilProfileId, -3)]
+        public string SoilProfileId { get { return (csvExportSurfaceLineIdentifiers == null) ? "" : csvExportSurfaceLineIdentifiers.SoilProfileId; } }
+
+        [CsvExportColumn(CsvExportSurfaceLineIdentifiers.CsvHeaderScenario, -2)]
+        public string Scenario { get { return (csvExportSurfaceLineIdentifiers == null) ? "" : csvExportSurfaceLineIdentifiers.Scenario; } }
+
+        [CsvExportColumn(CsvExportSurfaceLineIdentifiers.CsvHeaderCalculationMechanism, -1)]
+        public string CalculationMechanism { get { return (csvExportSurfaceLineIdentifiers == null) ? "" : csvExportSurfaceLineIdentifiers.CalculationMechanism; } }
+
+        [CsvExportColumn(CsvExportSurfaceLineIdentifiers.CsvHeaderCalculationModel, 0)]
+        public string CalculationModel { get { return (csvExportSurfaceLineIdentifiers == null) ? "" : csvExportSurfaceLineIdentifiers.CalculationModel; } }
+
+        // The following properties are the real surfaceline characteristic points data 
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.SurfaceLevelOutsideX, 2)]
+        public string SurfaceLevelOutsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.SurfaceLevelOutside); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.SurfaceLevelOutsideY, 3)]
+        public string SurfaceLevelOutsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.SurfaceLevelOutside); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.SurfaceLevelOutsideZ, 4)]
+        public string SurfaceLevelOutsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.SurfaceLevelOutside); } }
+
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeToeAtRiverX, 5)]
+        public string DikeToeAtRiverX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.DikeToeAtRiver); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeToeAtRiverY, 6)]
+        public string DikeToeAtRiverY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.DikeToeAtRiver); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeToeAtRiverZ, 7)]
+        public string DikeToeAtRiverZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.DikeToeAtRiver); } }
+
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.TopShoulderOutsideX, 8)]
+        public string ShoulderTopOutsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.ShoulderTopOutside); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.TopShoulderOutsideY, 9)]
+        public string ShoulderTopOutsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.ShoulderTopOutside); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.TopShoulderOutsideZ, 10)]
+        public string ShoulderTopOutsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.ShoulderTopOutside); } }
+
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.InsteekShoulderOutsideX, 11)]
+        public string ShoulderBaseOutsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.ShoulderBaseOutside); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.InsteekShoulderOutsideY, 12)]
+        public string ShoulderBaseOutsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.ShoulderBaseOutside); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.InsteekShoulderOutsideZ, 13)]
+        public string ShoulderBaseOutsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.ShoulderBaseOutside); } }
+
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeTopAtRiverX, 14)]
+        public string DikeTopAtRiverX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.DikeTopAtRiver); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeTopAtRiverY, 15)]
+        public string DikeTopAtRiverY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.DikeTopAtRiver); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeTopAtRiverZ, 16)]
+        public string DikeTopAtRiverZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.DikeTopAtRiver); } }
+
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.TrafficLoadOutsideX, 17)]
+        public string TrafficLoadOutsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.TrafficLoadOutside); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.TrafficLoadOutsideY, 18)]
+        public string TrafficLoadOutsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.TrafficLoadOutside); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.TrafficLoadOutsideZ, 19)]
+        public string TrafficLoadOutsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.TrafficLoadOutside); } }
+
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.TrafficLoadInsideX, 20)]
+        public string TrafficLoadInsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.TrafficLoadInside); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.TrafficLoadInsideY, 21)]
+        public string TrafficLoadInsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.TrafficLoadInside); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.TrafficLoadInsideZ, 22)]
+        public string TrafficLoadInsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.TrafficLoadInside); } }
+
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeTopAtPolderX, 23)]
+        public string DikeTopAtPolderX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.DikeTopAtPolder); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeTopAtPolderY, 24)]
+        public string DikeTopAtPolderY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.DikeTopAtPolder); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeTopAtPolderZ, 25)]
+        public string DikeTopAtPolderZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.DikeTopAtPolder); } }
+
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.InsteekShoulderInsideX, 26)]
+        public string ShoulderBaseInsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.ShoulderBaseInside); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.InsteekShoulderInsideY, 27)]
+        public string ShoulderBaseInsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.ShoulderBaseInside); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.InsteekShoulderInsideZ, 28)]
+        public string ShoulderBaseInsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.ShoulderBaseInside); } }
+
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.TopShoulderInsideX, 29)]
+        public string ShoulderTopInsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.ShoulderTopInside); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.TopShoulderInsideY, 30)]
+        public string ShoulderTopInsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.ShoulderTopInside); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.TopShoulderInsideZ, 31)]
+        public string ShoulderTopInsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.ShoulderTopInside); } }
+
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeToeAtPolderX, 32)]
+        public string DikeToeAtPolderX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.DikeToeAtPolder); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeToeAtPolderY, 33)]
+        public string DikeToeAtPolderY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.DikeToeAtPolder); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.DikeToeAtPolderZ, 34)]
+        public string DikeToeAtPolderZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.DikeToeAtPolder); } }
+
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.DitchDikeSideX, 35)]
+        public string DitchDikeSideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.DitchDikeSide); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.DitchDikeSideY, 36)]
+        public string DitchDikeSideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.DitchDikeSide); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.DitchDikeSideZ, 37)]
+        public string DitchDikeSideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.DitchDikeSide); } }
+
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.BottomDitchDikeSideX, 38)]
+        public string BottomDitchDikeSideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.BottomDitchDikeSide); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.BottomDitchDikeSideY, 39)]
+        public string BottomDitchDikeSideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.BottomDitchDikeSide); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.BottomDitchDikeSideZ, 40)]
+        public string BottomDitchDikeSideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.BottomDitchDikeSide); } }
+
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.BottomDitchPolderSideX, 41)]
+        public string BottomDitchPolderSideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.BottomDitchPolderSide); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.BottomDitchPolderSideY, 42)]
+        public string BottomDitchPolderSideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.BottomDitchPolderSide); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.BottomDitchPolderSideZ, 43)]
+        public string BottomDitchPolderSideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.BottomDitchPolderSide); } }
+
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.DitchPolderSideX, 44)]
+        public string DitchPolderSideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.DitchPolderSide); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.DitchPolderSideY, 45)]
+        public string DitchPolderSideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.DitchPolderSide); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.DitchPolderSideZ, 46)]
+        public string DitchPolderSideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.DitchPolderSide); } }
+
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.SurfaceLevelInsideX, 47)]
+        public string SurfaceLevelInsideX { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.SurfaceLevelInside); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.SurfaceLevelInsideY, 48)]
+        public string SurfaceLevelInsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.SurfaceLevelInside); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.SurfaceLevelInsideZ, 49)]
+        public string SurfaceLevelInsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.SurfaceLevelInside); } }
+
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/NotSpecification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/NotSpecification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/NotSpecification.cs	(revision 3305)
@@ -0,0 +1,52 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Dam.Data;
+
+namespace Deltares.Standard.Specifications
+{
+    public class NotSpecification<TCandidate> : CompositeSpecification<TCandidate>
+    {
+        private readonly ISpecification<TCandidate> specification;
+
+        public NotSpecification(ISpecification<TCandidate> specification)
+        {
+            this.specification = specification;
+        }
+
+        /// <summary>
+        /// Determines whether the candidate satisfies the specification.
+        /// </summary>
+        /// <param name="candidate">The candidate to test.</param>
+        /// <returns>
+        ///   <c>true</c> if the candidate satisfies the specification otherwise, <c>false</c>.
+        /// </returns>
+        public override bool IsSatisfiedBy(TCandidate candidate)
+        {
+            bool satisfied = !(this.specification.IsSatisfiedBy(candidate));
+            if (!satisfied)
+            {
+                base.Description = this.specification.Description;
+            }
+            return satisfied;
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/ShapeFileReader.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/ShapeFileReader.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/ShapeFileReader.cs	(revision 3305)
@@ -0,0 +1,99 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+
+using NetTopologySuite.Geometries;
+using NetTopologySuite.IO;
+
+namespace Deltares.Maps
+{
+    /// <summary>
+    ///     Reads data from ShapeFiles
+    /// </summary>
+    /// <remarks>
+    /// </remarks>
+    public class ShapeFileReader : FileReader<IFile, IFeature>, IFeatureReader
+    {
+        public ShapeFileReader(IFile file)
+            : base(file)
+        {
+        }
+
+        public ShapeFileReader(string fileName)
+            : base(new ShapeFileLocation(fileName))
+        {
+        }
+
+        /// <summary>
+        ///     Gets or sets the value indicating geometry attribute or feature data should be read
+        ///     If set to false the attribute data will be read form the .dbf file (default)
+        /// </summary>
+        public bool IgnoreAttributeData { get; set; }
+
+        #region IFeatureReader Members
+
+        public override IEnumerable<IFeature> Read()
+        {
+            using (var reader = new ShapefileDataReader(File.FullPath, GeometryFactory.Default))
+            {
+                int count = 0;
+
+                while (reader.Read())
+                {
+                    var feature = new NtsFeature
+                    {
+                        Geometry = reader.Geometry
+                    };
+
+                    if (!IgnoreAttributeData)
+                    {
+                        for (int i = 0; i < reader.DbaseHeader.NumFields; i++)
+                        {
+                            string colName = reader.DbaseHeader.Fields[i].Name;
+                            object rowValue = reader.GetValue(i);
+                            if (!feature.Attributes.Exists(colName))
+                            {
+                                feature.Attributes.AddAttribute(colName, rowValue);
+                            }
+                        }
+                    }
+
+                    count++;
+                    yield return feature;
+                }
+
+                if (reader.RecordCount != count)
+                {
+                    string message = string.Format(
+                        "The shape file '{0}' contains multiple records but only one (composite) shape. " +
+                        "This is not yet supported. The current implementation of the shape file reader only works " +
+                        "with shape files where each shape has exactly one database record.",
+                        File.FullPath);
+                    throw new NotSupportedException(message);
+                }
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Translations.xml	(revision 3305)
@@ -0,0 +1,599 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Stichting Deltares 2019. All rights reserved.
+
+This file is part of the DAM - Clients Library.
+
+The DAM - UI is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+<Translations>
+  <Translation ID="Name" en-US="Name" nl-NL="Naam" />
+  <Translation ID="NameDescription" en-US="Name" nl-NL="Naam" />
+  <Translation ID="ID" en-US="ID" nl-NL="ID" />
+  <Translation ID="SheetPileLength" en-US="Sheet pile length" nl-NL="Damwand lengte" />
+  <Translation ID="SheetPileLengthDescription" en-US="Sheet pile length" nl-NL="Lengte van de damwand" />
+  <Translation ID="RwBankProtectionBottomLevel" en-US="Sheet pile bottom level" nl-NL="Niveau onderkant damwand" />
+  <Translation ID="RwBankProtectionBottomLevelDescription" en-US="Sheet pile bottom level" nl-NL="Onderkant damwand/beschoeiing (t.o.v. NAP) " />
+  <Translation ID="StabilitySlopeAdaptionDeltaX" en-US="Slope adaption delta X" nl-NL="Talud stapgrootte" />
+  <Translation ID="StabilitySlopeAdaptionDeltaXDescription" en-US="Slope adaption delta X for stability design" nl-NL="Horizontale stapgrootte voor aanpassing taludhelling" />
+  <Translation ID="StabilityShoulderGrowDeltaX" en-US="Shoulder growth delta X" nl-NL="Berm stap grootte" />
+  <Translation ID="StabilityShoulderGrowDeltaXDescription" en-US="Shoulder growth delta X for stability design" nl-NL="Horizontale berm stapgrootte voor aanpassing stabiliteitsberm" />
+  <Translation ID="StabilityShoulderGrowSlope" en-US="Shoulder growth slope" nl-NL="Berm ontwikkelings ratio" />
+  <Translation ID="StabilityShoulderGrowSlopeDescription" en-US="Shoulder growth slope for stability design" nl-NL="Berm ontwikkelingsratio voor automatische stabiliteitsberm generatie" />
+  <Translation ID="DikeMaterialType" en-US="Dike material type" nl-NL="Dijkmateriaal" />
+  <Translation ID="DikeMaterialTypeDescription" en-US="Dike material type" nl-NL="Typering dijkmateriaal" />
+  <Translation ID="SegmentId" en-US="Segment" nl-NL="SegmentId" />
+  <Translation ID="RequiredFactorOfSafety" en-US="Required Factor of Safety" nl-NL="Vereiste veiligheidsfactor" />
+  <Translation ID="RequiredFactorOfSafetyDescription" en-US="Required Factor of Safety" nl-NL="Vereiste veiligheidsfactor" />
+  <Translation ID="DistanceToEntryPoint" en-US="Distance to Entrypoint" nl-NL="Afstand tot intrede punt" />
+  <Translation ID="DistanceToEntryPointDescription" en-US="Distance from toe of dike to entry point of river in deep sandlayer" nl-NL="Afstand tussen teen van de dijk en het intrede punt van rivier in de diepe watervoerende zandlagen" />
+  <Translation ID="DikeRingId" en-US="Dike" nl-NL="Kering" />
+  <Translation ID="StabilityZoneType" en-US="Zone type" nl-NL="Zonerings type" />
+  <Translation ID="StabilityZoneTypeDescription" en-US="Type of zone to be used in stability calculations" nl-NL="Zonerings type dat gebruikt wordt in stabiliteits berekeningen" />
+  <Translation ID="ShoulderEmbankmentMaterial" en-US="Shoulder emb. material" nl-NL="Ophoogmateriaal berm" />
+  <Translation ID="ShoulderEmbankmentMaterialDescription" en-US="Shoulder embankment material" nl-NL="Ophoogmateriaal stabiliteitsberm" />
+  <Translation ID="PolderLevel" en-US="Polder level" nl-NL="Polderpeil" />
+  <Translation ID="PolderLevelDescription" en-US="Water level in polder" nl-NL="Polderpeil" />
+  <Translation ID="TrafficLoad" en-US="Traffic load" nl-NL="Verkeersbelasting" />
+  <Translation ID="TrafficLoadDescription" en-US="Traffic load" nl-NL="Verkeersbelasting" />
+  <Translation ID="TL_DegreeOfConsolidation" en-US="Degree of consolidation" nl-NL="Consolidatiegraad" />
+  <Translation ID="TL_DegreeOfConsolidationDescription" en-US="Traffic load Degree of consolidation in the cohesive layers (peat, clay, loam)" nl-NL="Verkeersbelasting aanpassingsgraad voor de cohesieve lagen (veen, klei, leem)" />
+  <Translation ID="Description" en-US="Description" nl-NL="Beschrijving" />
+  <Translation ID="DescriptionDescription" en-US="Description" nl-NL="Beschrijving" />
+  <Translation ID="XRd" en-US="X location (RDS)" nl-NL="X (RD)" />
+  <Translation ID="XRdDescription" en-US="Location according to Rijksdriehoekstelsel" nl-NL="X coördinaat in Rijksdriehoekstelsel" />
+  <Translation ID="X" en-US="X location (RDS)" nl-NL="X (RD)" />
+  <Translation ID="XDescription" en-US="Location according to Rijksdriehoekstelsel" nl-NL="X coördinaat in Rijksdriehoekstelsel" />
+  <Translation ID="DredgingDepth" en-US="Dredging depth" nl-NL="Bagger diepte" />
+  <Translation ID="DredgingDepthDescription" en-US="Maximum dredging depth in storage basin" nl-NL="Maximale baggerdiepte in boezem" />
+  <Translation ID="YRd" en-US="Y location (RDS)" nl-NL="Y (RD)" />
+  <Translation ID="YRdDescription" en-US="Location according to Rijksdriehoekstelsel" nl-NL="Y coördinaat in Rijksdriehoekstelsel" />
+  <Translation ID="Y" en-US="Y location (RDS)" nl-NL="Y (RD)" />
+  <Translation ID="YDescription" en-US="Location according to Rijksdriehoekstelsel" nl-NL="Y coördinaat in Rijksdriehoekstelsel" />
+  <Translation ID="PLLineCreationMethod" en-US="PL-Line creation" nl-NL="Generatie WSP" />
+  <Translation ID="PLLineCreationMethodDescription" en-US="PL-Line creation method" nl-NL="Methode voor genereren waterspanningen" />
+  <Translation ID="PLLineOffsetDryBelowDikeTopAtRiver" en-US="PL1 below top dike (river) in dry situation" nl-NL="PL1-buitenkruin (droog)" />
+  <Translation ID="PLLineOffsetDryBelowDikeTopAtRiverDescription" en-US="PL1 below top dike (riverside) in dry situation" nl-NL="Ligging freatisch vlak (buitenwaterstand minus deze waarde) onder de buitenkruin onder droge omstandigheden." />
+  <Translation ID="PlLineOffsetBelowDikeToeAtPolder" en-US="PL1 below toe of dike (polder)" nl-NL="PL1-binnenteen" />
+  <Translation ID="PlLineOffsetBelowDikeToeAtPolderDescription" en-US="PL1 below toe of dike (polderside)" nl-NL="Ligging freatisch vlak onder de binnenteen van de dijk aan de polderzijde" />
+  <Translation ID="PlLineOffsetBelowShoulderBaseInside" en-US="PL1 below shoulder base (polder)" nl-NL="PL1-Insteek binnenberm" />
+  <Translation ID="PlLineOffsetBelowShoulderBaseInsideDescription" en-US="PL1 below top of shoulder (polderside)" nl-NL="Ligging freatisch vlak onder insteek binnenberm" />
+  <Translation ID="PLLineOffsetDryBelowDikeTopAtPolder" en-US="PL1 below top dike (polder) in dry situation" nl-NL="PL1-binnenkruin (droog)" />
+  <Translation ID="PLLineOffsetDryBelowDikeTopAtPolderDescription" en-US="PL1 below top dike (polderside) in dry situation" nl-NL="Ligging freatisch vlak (buitenwaterstand minus deze waarde) onder de binnenkruin onder droge omstandigheden. /&gt;" />
+  <Translation ID="DikeEmbankmentMaterial" en-US="Dike emb. material" nl-NL="Ophoogmateriaal dijk" />
+  <Translation ID="DikeEmbankmentMaterialDescription" en-US="Dike embankment material" nl-NL="Ophoogmateriaal dijk" />
+  <Translation ID="PLLineOffsetDryBelowDikeToeAtPolder" en-US="PL1 below toe dike (polder) in dry situation" nl-NL="PL1-binnenteen (droog)" />
+  <Translation ID="PLLineOffsetDryBelowDikeToeAtPolderDescription" en-US="PL1 below toe of dike (polderside) in dry situation" nl-NL="Ligging freatisch vlak onder de binnenteen van de dijk aan de polderzijde onder droge condities" />
+  <Translation ID="PLLineOffsetDryBelowShoulderBaseInside" en-US="PL1 below shoulder base (polder) in dry situation" nl-NL="PL1-Insteek binnenberm (droog)" />
+  <Translation ID="PLLineOffsetDryBelowShoulderBaseInsideDescription" en-US="PL1 below shoulder base (polderside) in dry situation" nl-NL="Ligging freatisch vlak onder insteek binnenberm onder droge omstandigheden" />
+  <Translation ID="PlLineOffsetBelowDikeTopAtPolder" en-US="PL1 below top dike (polder)" nl-NL="PL1-binnenkruin" />
+  <Translation ID="PlLineOffsetBelowDikeTopAtPolderDescription" en-US="PL1 below top dike (polderside)" nl-NL="Ligging freatisch vlak (buitenwaterstand minus deze waarde) onder de binnenkruin" />
+  <Translation ID="HeadPl4" en-US="Head PL4" nl-NL="Stijghoogte PL4" />
+  <Translation ID="HeadPl4Description" en-US="Head level for PL4" nl-NL="Stijghoogte PL4" />
+  <Translation ID="HeadPl3" en-US="Head PL3" nl-NL="Stijghoogte PL3" />
+  <Translation ID="HeadPl3Description" en-US="Head level for PL3" nl-NL="Stijghoogte PL3" />
+  <Translation ID="HeadPl2" en-US="Head PL2" nl-NL="Stijghoogte PL2" />
+  <Translation ID="HeadPl2Description" en-US="Head level for PL2" nl-NL="Stijghoogte PL2" />
+  <Translation ID="DampingFactorPL3" en-US="Damping factor PL3" nl-NL="Dempingsfactor PL3" />
+  <Translation ID="DampingFactorPL3Description" en-US="Damping factor PL3" nl-NL="Dempingsfactor PL3" />
+  <Translation ID="PlLineOffsetBelowDikeTopAtRiver" en-US="PL1 below top dike (river)" nl-NL="PL1-buitenkruin" />
+  <Translation ID="PlLineOffsetBelowDikeTopAtRiverDescription" en-US="PL1 below top dike (riverside)" nl-NL="Ligging freatisch vlak (buitenwaterstand minus deze waarde) onder de buitenkruin" />
+  <Translation ID="PenetrationLength" en-US="Penetration length" nl-NL="Indringingslengte" />
+  <Translation ID="PenetrationLengthDescription" en-US="Penetration Length (for PL4)" nl-NL="Indringingslengte (voor PN2)" />
+  <Translation ID="DampingFactorPL4" en-US="Damping factor PL4" nl-NL="Dempingsfactor PL4" />
+  <Translation ID="DampingFactorPL4Description" en-US="Damping factor PL4" nl-NL="Dempingsfactor PL4" />
+  <Translation ID="LocationName" en-US="Location" nl-NL="Locatie" />
+  <Translation ID="FailureMechanismType" en-US="Failure mechanism" nl-NL="Faalmechanisme" />
+  <Translation ID="ResultEvaluation" en-US="Evaluation" nl-NL="Evaluatie" />
+  <Translation ID="Notes" en-US="Notes" nl-NL="Opmerkingen" />
+  <Translation ID="NotesDescription" en-US="Use this area to explain the valuation and for any further remarks" nl-NL="Gebruik dit veld voor opmerkingen" />
+  <Translation ID="CalculationResult" en-US="Calculation result" nl-NL="Berekenings resultaat" />
+  <Translation ID="SafetyFactor" en-US="Safety factor" nl-NL="Stabiliteitsfactor" />
+  <Translation ID="SoilProfileProbability" en-US="Soil profile probability" nl-NL="Kans op grond profiel" />
+  <Translation ID="LoadSituation" en-US="Load situation" nl-NL="Belasting situatie" />
+  <Translation ID="SoilProfileName" en-US="Soil profile (basic schematization)" nl-NL="Grondprofiel" />
+  <Translation ID="MstabModelOption" en-US="Model Stability" nl-NL="Stabiliteits Model" />
+  <Translation ID="PipingModelType" en-US="Model Piping" nl-NL="Piping Model" />
+  <Translation ID="ScenarioType" en-US="Scenario" nl-NL="Scenario" />
+  <Translation ID="UpliftType" en-US="Uplift type" nl-NL="Opdrijven" />
+  <Translation ID="DikeDrySensitivity" en-US="Dry sensitivity" nl-NL="Droogte gevoelige kade" />
+  <Translation ID="HydraulicShortcutType" en-US="Hydraulic shortcut" nl-NL="Hydraulische kortsluiting" />
+  <Translation ID="DecisiveScenarioName" en-US="Decisive scenario" nl-NL="Maatgevend scenario" />
+  <Translation ID="SummedProfileProbability" en-US="Summed profile probability" nl-NL="Gesommeerde waarschijnlijkheid profiel" />
+  <Translation ID="SchematizationType" en-US="Schematization type" nl-NL="Type Schematisatie" />
+  <Translation ID="SchematizationFactor" en-US="Schematization factor" nl-NL="Schematisatie factor" />
+  <Translation ID="OriginalDecisiveSoilProfileName" en-US="Original basic schematization" nl-NL="Oorspronkelijke basis schematisatie" />
+  <Translation ID="Scenario01" en-US="RRD-Scenario01" nl-NL="RRD-Scenario01" />
+  <Translation ID="Location" en-US="Location" nl-NL="Locatie" />
+  <Translation ID="WaterBoard" en-US="WaterBoard" nl-NL="Waterschap" />
+  <Translation ID="Schematization factor" en-US="Schematization factor" nl-NL="Schematiseringsfactor" />
+  <Translation ID="Calculation" en-US="Calculation" nl-NL="Berekening" />
+  <Translation ID="Time Series" en-US="Time Series" nl-NL="Tijdreeksen" />
+  <Translation ID="Scenarios" en-US="Location scenarios" nl-NL="Locatie scenario's" />
+  <Translation ID="Locations" en-US="Locations" nl-NL="Locaties" />
+  <Translation ID="Calculations" en-US="Calculations" nl-NL="Berekeningen" />
+  <Translation ID="SchematizationFactors" en-US="Schematization factors" nl-NL="Schematiseringsfactoren" />
+  <Translation ID="WaterBoardJob" en-US="WaterBoardJob" nl-NL="Waterschapsberekening" />
+  <Translation ID="Run" en-US="Run" nl-NL="Berekening" />
+  <Translation ID="LogMessages" en-US="LogMessages" nl-NL="Programma meldingen" />
+  <Translation ID="DamProjectType" en-US="Calculation type" nl-NL="Berekeningstype" />
+  <Translation ID="InvalidDamProjectType" en-US="The project is for a calculation type that is no longer supported." nl-NL="Het project is opgezet voor een berekeningstype dat niet langer wordt ondersteund." />
+  <Translation ID="DamProjectTypeDescription" en-US="Indicates the purpose of the calculations" nl-NL="Geeft het doel van de berekeningen aan" />
+  <Translation ID="DamDataSourceFileName" en-US="DAM datasource file" nl-NL="DAM databron bestand" />
+  <Translation ID="DamDataSourceFileNameDescription" en-US="Indicates which &quot;.defx&quot; import definition file to use" nl-NL="Geeft aan welk &quot;.defx&quot; import definitie bestand te gebruiken" />
+  <Translation ID="DamProjectFileName" en-US="DAM project file" nl-NL="DAM project bestand" />
+  <Translation ID="DamProjectFileNameDescription" en-US="File where the imported data will be saved" nl-NL="Bestand waar de ge&#239;mporteerde data wordt opgeslagen" />
+  <Translation ID="SensorConfigurationFileName" en-US="Sensor configuration file" nl-NL="Sensor gegevens bestand" />
+  <Translation ID="SensorConfigurationFileNameDescription" en-US="File from which the sensor configuration will be read" nl-NL="Bestand van waaruit de sensor gegevens gelezen wordt" />
+  <Translation ID="SelectedAnalysisType" en-US="Analysis type" nl-NL="Analyse type" />
+  <Translation ID="SelectedAnalysisTypeDescription" en-US="Analysis type" nl-NL="Analyse type" />
+  <Translation ID="SelectProjection" en-US="Projection..." nl-NL="Projectie..." />
+  <Translation ID="SelectSensorConfigurationFile" en-US="..." nl-NL="..." />
+  <Translation ID="AdaptGeometry" en-US="Adapt geometry" nl-NL="Geometrie aanpassen" />
+  <Translation ID="NoAdaptation" en-US="No adaptation" nl-NL="Geen aanpassing" />
+  <Translation ID="DamCalculationSpecifications" en-US="DAM calculation specifications" nl-NL="Specificatie DAM berekening" />
+  <Translation ID="WaterLevelTimeSeriesFileName" en-US="Water level timeseries filename" nl-NL="Filenaam tijdreeksen waterniveau" />
+  <Translation ID="Calamity" en-US="Calamity" nl-NL="Calamiteit" />
+  <Translation ID="DamLiveConfiguration" en-US="DamLive Configuration" nl-NL="DamLive Configuratie" />
+  <Translation ID="NoZones" en-US="No zones" nl-NL="Geen zones" />
+  <Translation ID="ZoneAreas" en-US="Zone areas" nl-NL="Zone gebieden" />
+  <Translation ID="ForbiddenZone" en-US="Forbidden zone" nl-NL="Verboden zone" />
+  <Translation ID="ForbiddenZoneFactor" en-US="Forbidden zone factor" nl-NL="Factor voor verboden zone" />
+  <Translation ID="ZoneAreaRestSlopeCrestWidth" en-US="Zone area rest slope crest width" nl-NL="Breedte top restprofiel voor verboden zone" />
+  <Translation ID="ExpertKnowledgeRRD" en-US="Expert Knowledge" nl-NL="Expert kennis" />
+  <Translation ID="StabilityInsideMStab" en-US="Inside stability (Geostability)" nl-NL="Binnenwaartse stabiliteit (Geostability)" />
+  <Translation ID="NotEvaluated" en-US="NotEvaluated" nl-NL="Niet geëvalueerd" />
+  <Translation ID="Dry" en-US="Dry" nl-NL="Droog" />
+  <Translation ID="UpliftVan" en-US="Uplift Van" nl-NL="Uplift Van" />
+  <Translation ID="BishopUpliftVan" en-US="Bishop/Uplift Van" nl-NL="Bishop/Uplift Van" />
+  <Translation ID="Uplift" en-US="Uplift" nl-NL="Opdrijven" />
+  <Translation ID="HydraulicShortcut" en-US="HydraulicShortcut" nl-NL="Hydraulische kortsluiting" />
+  <Translation ID="MacroStabiltyInnerSideWet" en-US="Macro stabilty innerside (wet)" nl-NL="Macrostabiliteit binnenwaarts (nat)" />
+  <Translation ID="MacroStabiltyInnerSideDry" en-US="Macro stabilty innerside (Dry)" nl-NL="Macrostabiliteit binnenwaarts (droog)" />
+  <Translation ID="NumberOfDikes" en-US="Number of Dikes" nl-NL="Aantal keringen" />
+  <Translation ID="Model" en-US="Model" nl-NL="Model" />
+  <Translation ID="Bishop" en-US="Bishop" nl-NL="Bishop" />
+  <Translation ID="BishopRandomField" en-US="BishopRandomField" nl-NL="BishopRandomField" />
+  <Translation ID="Spencer" en-US="Spencer" nl-NL="Spencer" />
+  <Translation ID="Fellenius" en-US="Fellenius" nl-NL="Fellenius" />
+  <Translation ID="UpliftSpencer" en-US="UpliftSpencer" nl-NL="UpliftSpencer" />
+  <Translation ID="ShearStrength" en-US="Shear Strength" nl-NL="Schuifsterkte" />
+  <Translation ID="CPhi" en-US="CPhi" nl-NL="C-Phi" />
+  <Translation ID="SearchMethod" en-US="Search Method" nl-NL="Zoek methode" />
+  <Translation ID="GridSizeDetermination" en-US="Determination grid" nl-NL="Bepaling grid" />
+  <Translation ID="UpliftVanLeftGridVerticalPointCount" en-US="Number of vertical points grid left (UV)" nl-NL="Aantal verticale punten grid links(UV)" />
+  <Translation ID="UpliftVanLeftGridVerticalPointDistance" en-US="Distance of vertical points grid left (UV)" nl-NL="Afstand verticale punten grid links(UV)" />
+  <Translation ID="UpliftVanLeftGridHorizontalPointCount" en-US="Number of horizontal points grid left(UV)" nl-NL="Aantal horizontale punten grid links(UV)" />
+  <Translation ID="UpliftVanLeftGridHorizontalPointDistance" en-US="Distance of horizontal points grid left (UV)" nl-NL="Afstand horizontale punten grid links(UV)" />
+  <Translation ID="UpliftVanRightGridVerticalPointCount" en-US="Number of vertical points grid right (UV)" nl-NL="Aantal verticale punten grid rechts(UV)" />
+  <Translation ID="UpliftVanRightGridVerticalPointDistance" en-US="Distance of vertical points grid right (UV)" nl-NL="Afstand verticale punten grid rechts(UV)" />
+  <Translation ID="UpliftVanRightGridHorizontalPointCount" en-US="Number of horizontal points grid right(UV)" nl-NL="Aantal horizontale punten grid rechts(UV)" />
+  <Translation ID="UpliftVanRightGridHorizontalPointDistance" en-US="Distance of horizontal points grid right (UV)" nl-NL="Afstand horizontale punten grid rechts(UV)" />
+  <Translation ID="BishopGridVerticalPointCount" en-US="Number of vertical points grid (Bishop)" nl-NL="Aantal verticale punten (Bishop)" />
+  <Translation ID="BishopGridVerticalPointDistance" en-US="Distance of vertical points grid (Bishop)" nl-NL="Afstand verticale punten (Bishop)" />
+  <Translation ID="BishopGridHorizontalPointCount" en-US="Number of horizontal points grid (Bishop)" nl-NL="Aantal horizontale punten (Bishop)" />
+  <Translation ID="BishopGridHorizontalPointDistance" en-US="Distance of horizontal points grid (Bishop)" nl-NL="Afstand horizontale punten (Bishop)" />
+  <Translation ID="UpliftVanTangentLinesDefinition" en-US="Definition tangent lines (UV)" nl-NL="Bepaling tangent lijnen (UV)" />
+  <Translation ID="UpliftVanTangentLinesDistance" en-US="Distance tangent lines definition (UV)" nl-NL="Afstand tangent lijnen (UV)" />
+  <Translation ID="BishopTangentLinesDefinition" en-US="Definition tangent lines (Bishop)" nl-NL="Bepaling tangent lijnen (Bishop)" />
+  <Translation ID="BishopTangentLinesDistance" en-US="Distance tangent lines definition (Bishop)" nl-NL="Afstand tangent lijnen (Bishop)" />
+  <Translation ID="OnBoundaryLines" en-US="On boundary lines" nl-NL="Op laagschedingen" />
+  <Translation ID="Specified" en-US="Specified" nl-NL="Naar opgave afstand" />
+  <Translation ID="Automatic" en-US="Automatic" nl-NL="Automatisch" />
+  <Translation ID="Grid" en-US="Calculation grid" nl-NL="Rekengrid" />
+  <Translation ID="ZonesType" en-US="Geostability zone type" nl-NL="Geostability Zonerings type" />
+  <Translation ID="Assessment" en-US="Assessment" nl-NL="Toetsing" />
+  <Translation ID="Location according to Rijksdriehoekstelsel" en-US="Location in Rijksdriehoekstelsel" nl-NL="Locatie in Rijksdriehoekstelsel" />
+  <Translation ID="Water level in polder" en-US="Water level in polder" nl-NL="Water niveau in polder" />
+  <Translation ID="Head level for PL2" en-US="Head level for PL2" nl-NL="Stijghoogte voor PL2" />
+  <Translation ID="Head level for PL3" en-US="Head level for PL3" nl-NL="Stijghoogte voor PL3" />
+  <Translation ID="Head level for PL4" en-US="Head level for PL4" nl-NL="Stijghoogte voor PL4" />
+  <Translation ID="Damping factor PL3" en-US="Damping factor PL3" nl-NL="Dempingsfactor PL3" />
+  <Translation ID="Damping factor PL4" en-US="Damping factor PL4" nl-NL="Dempingsfactor PL4" />
+  <Translation ID="Dike embankment material" en-US="Dike embankment material" nl-NL="Ophoog material dijk" />
+  <Translation ID="Shoulder embankment material" en-US="Shoulder embankment material" nl-NL="Ophoog material berm" />
+  <Translation ID="Penetration Length (for PL4)" en-US="Penetration Length (for PL2)" nl-NL="Indringingslengte (voor PL2)" />
+  <Translation ID="Shoulder growth slope for stability design" en-US="Shoulder growth slope for stability design" nl-NL="Berm ontwikkelingsratio voor automatische stabiliteitsberm generatie" />
+  <Translation ID="Shoulder growth delta X for stability design" en-US="Shoulder growth delta X for stability design" nl-NL="Horizontale berm stapgrootte voor aanpassing stabiliteitsberm" />
+  <Translation ID="Slope adaption delta X for stability design" en-US="Slope adaption delta X for stability design" nl-NL="Horizontale stapgrootte voor aanpassing taludhelling" />
+  <Translation ID="PL-Line creation method" en-US="PL-Line creation method" nl-NL="Methode voor genereren waterspanningen" />
+  <Translation ID="PL1 below top dike (riverside)" en-US="PL1 below top dike (riverside)" nl-NL="PL1-buitenkruin" />
+  <Translation ID="PL1 below top dike (polderside)" en-US="PL1 below top dike (polderside)" nl-NL="PL1-binnenkruin" />
+  <Translation ID="Type of zone to be used in stability calculations" en-US="Geostability zone type" nl-NL="Geostability Zoneringstype" />
+  <Translation ID="ExpertKnowledgeLinearInDike" en-US="Expert knowledge linear in dike" nl-NL="Expertkennis (lineair in dijk)" />
+  <Translation ID="GaugesWithFallbackToExpertKnowledgeRRD" en-US="Gauges with fallback to expert knowledge" nl-NL="Metingen met terugvaloptie expertkennis" />
+  <Translation ID="None" en-US="None" nl-NL="Geen" />
+  <Translation ID="Identification" en-US="Identification" nl-NL="Identificatie" />
+  <Translation ID="Water" en-US="Water" nl-NL="Water" />
+  <Translation ID="Design" en-US="Design" nl-NL="Ontwerp" />
+  <Translation ID="Load" en-US="Load" nl-NL="Belasting" />
+  <Translation ID="Calculation" en-US="Calculation" nl-NL="Berekening" />
+  <Translation ID="SchematizationFactorMin" en-US="Min schematization factor" nl-NL="Min. schematisatieFactor" />
+  <Translation ID="SchematizationFactorMinDescription" en-US="Minimum schematization factor" nl-NL="Minimale schematisatiefactor" />
+  <Translation ID="SchematizationFactorMax" en-US="Max. schematization factor" nl-NL="Max. schematisatiefactor" />
+  <Translation ID="SchematizationFactorMaxDescription" en-US="Maximum schematization factor" nl-NL="Maxaximale Schematisatiefactor" />
+  <Translation ID="SchematizationFactorDelta" en-US="SchematizationFactorDelta" nl-NL="Schematisatie factor Delta" />
+  <Translation ID="SchematizationFactorDeltaDescription" en-US="Schematization factor delta" nl-NL="Schematisatiefactor Delta" />
+  <Translation ID="Scenario01" en-US="RRD-Scenario01" nl-NL="RRD-Scenario01" />
+  <Translation ID="Scenario02" en-US="RRD-Scenario02" nl-NL="RRD-Scenario02" />
+  <Translation ID="Scenario03" en-US="RRD-Scenario03" nl-NL="RRD-Scenario03" />
+  <Translation ID="Scenario04" en-US="RRD-Scenario04" nl-NL="RRD-Scenario04" />
+  <Translation ID="Scenario05" en-US="RRD-Scenario05" nl-NL="RRD-Scenario05" />
+  <Translation ID="Scenario06" en-US="RRD-Scenario06" nl-NL="RRD-Scenario06" />
+  <Translation ID="Scenario07" en-US="RRD-Scenario07" nl-NL="RRD-Scenario07" />
+  <Translation ID="Scenario08" en-US="RRD-Scenario08" nl-NL="RRD-Scenario08" />
+  <Translation ID="Scenario09" en-US="RRD-Scenario09" nl-NL="RRD-Scenario09" />
+  <Translation ID="Scenario10" en-US="RRD-Scenario10" nl-NL="RRD-Scenario10" />
+  <Translation ID="Scenario11" en-US="RRD-Scenario11" nl-NL="RRD-Scenario11" />
+  <Translation ID="Result" en-US="Result" nl-NL="Resultaat" />
+  <Translation ID="Good" en-US="Good" nl-NL="Goed" />
+  <Translation ID="Bad" en-US="Bad" nl-NL="Slecht" />
+  <Translation ID="NoRun" en-US="Not calculated" nl-NL="Geen resultaat" />
+  <Translation ID="Failed" en-US="Failed" nl-NL="Mislukt" />
+  <Translation ID="NoUplift" en-US="NoUplift" nl-NL="Geen opdrijven" />
+  <Translation ID="Wet" en-US="Wet" nl-NL="Nat" />
+  <Translation ID="HorizontalBalance" en-US="HorizontalBalance" nl-NL="Horizontaal evenwicht" />
+  <Translation ID="Accepted" en-US="Accepted" nl-NL="Goedgekeurd" />
+  <Translation ID="Rejected" en-US="Rejected" nl-NL="Afgekeurd" />
+  <Translation ID="Not evaluated" en-US="Not evaluated" nl-NL="Niet getoetst" />
+  <Translation ID="NoHydraulicShortcut" en-US="NoHydraulicShortcut" nl-NL="Geen hydraulische kortsluiting" />
+  <Translation ID="PipingSellmeijer" en-US="Piping Sellmeijer (VNK)" nl-NL="Piping Sellmeijer (VNK)" />
+  <Translation ID="Input" en-US="Input" nl-NL="Invoer" />
+  <Translation ID="Results" en-US="Results" nl-NL="Resultaten" />
+  <Translation ID="Evaluation" en-US="Evaluation" nl-NL="Evaluatie" />
+  <Translation ID="Naam CaptionCaption" en-US="Name" nl-NL="Naam" />
+  <Translation ID="Progress" en-US="Progress" nl-NL="Voortgang" />
+  <Translation ID="NoLocationsSelected" en-US="No locations selected." nl-NL="Geen locaties geselecteerd." />
+  <Translation ID="Waterboard" en-US="Waterboard" nl-NL="Waterschap" />
+  <Translation ID="csvHeaderError" en-US="The header of the csv file is wrong." nl-NL="De header van de csv file klopt niet." />
+  <Translation ID="csvHeaderFieldError" en-US="The header misses the field: " nl-NL="In de header ontbreekt veld: " />
+  <Translation ID="csvHeaderColumnCountError" en-US="Minimum number of columns in csv file is {0}" nl-NL="Miminum aantal kolommen in csv bestand is {0}" />
+  <Translation ID="csvSegmentCalculationTypeError" en-US="The calculation type must be Stability or Piping." nl-NL="Het calculatie type moet stabiliteit of piping zijn." />
+  <Translation ID="noCharPointsFoundForSurfaceError" en-US="The surfaceline has no characteristic points." nl-NL="De surfaceline heeft geen karakteristieke punten." />
+  <Translation ID="CoincidingCharPointsFoundForSurfaceError" en-US="The surfaceline has coinciding characteristic points." nl-NL="De surfaceline heeft samenvallende karakteristieke punten." />
+  <Translation ID="charPointNotFoundInSurfaceError" en-US="The surfaceline has no (or no correct) characteristic point of type: " nl-NL="De surfaceline heeft geen (of geen correcte) karakteristiek punt van het type: " />
+  <Translation ID="damProjectDataNotAssignedForImport" en-US="The project data was not assigned before import of csv-data." nl-NL="Er is geen project data toegewezen voorafgaand aan het importeren van de csv data." />
+  <Translation ID="csvCharacteristicPointError" en-US="Next error occured whilst reading characteristic points in location {0} column {1} from csv: " nl-NL="Tijdens het lezen van karakteristieke punten in locatie {0} in kolom {1} uit de csv trad de volgende fout op: " />
+  <Translation ID="csvSoilProfileError" en-US="Next error occured whilst reading soil profile {0} column {1}  from csv: " nl-NL="Tijdens het lezen van 1D profiel {0} in kolom {1} uit de csv trad de volgende fout op: " />
+  <Translation ID="csvSegmentError" en-US="Next error occured whilst reading segment {0} column {1}  from csv: " nl-NL="Tijdens het lezen van segment {0} in kolom {1} uit de csv trad de volgende fout op: " />
+  <Translation ID="csvScenarioError" en-US="Next error occured whilst reading scenario in location {0} column {1}  from csv: " nl-NL="Tijdens het lezen van scenario in locatie {0} in kolom {1} uit de csv trad de volgende fout op: " />
+  <Translation ID="csvLocationError" en-US="Next error occured whilst reading location {0} column {1} from csv: " nl-NL="Tijdens het lezen van locatie {0} in kolom {1} uit de csv trad de volgende fout op: " />
+  <Translation ID="csvSurfaceLineError" en-US="Next error occured whilst reading surface line {0} column {1} from csv: " nl-NL="Tijdens het lezen van surface line {0} in kolom {1} uit de csv trad de volgende fout op: " />
+  <Translation ID="noIdOrSoilForSoilProfileRecordError" en-US="This soil profile record has no id and/or soilname." nl-NL="Dit record met grondprofiel data bevat geen Id en/of Soilname." />
+  <Translation ID="noIdSurfaceLineRecordError" en-US="This surface line record has no id." nl-NL="Dit record met maaiveld lijn data bevat geen Id." />
+  <Translation ID="noIdLocationRecordError" en-US="This location record has no id." nl-NL="Dit record met locatie data bevat geen Id." />
+  <Translation ID="noSurfaceLineOrSegementLocationRecordError" en-US="This location record has no surfaceline or segment." nl-NL="Dit record met locatie data bevat geen maaiveld lijn of segment." />
+  <Translation ID="DampingFactorPl3BeyondLimits" en-US="The damping factor for PL 3 in this location record is beyond its limits (0-1)." nl-NL="De demping factor voor PL3 van dit record met locatie data valt buiten de limietwaarden (0-1)." />
+  <Translation ID="DampingFactorPl4BeyondLimits" en-US="The damping factor for PL 4 in this location record is beyond its limits (0-1)." nl-NL="De demping factor voor PL4 van dit record met locatie data valt buiten de limietwaarden (0-1)." />
+  <Translation ID="existingSoilProfileHasNoLayers" en-US="This existing soil profile has no layers." nl-NL="Dit bestaande grondprofiel heeft geen lagen." />
+  <Translation ID="segmentHasNoProfileOrGeometry" en-US="This segment has no soil profile and no geometry." nl-NL="Dit segment heeft geen grondprofiel en geen 2D geometrie." />
+  <Translation ID="segmentHasProfileAndGeometry" en-US="This segment has a soil profile and a geometry." nl-NL="Dit segment heeft een grondprofiel en een 2D geometrie." />
+  <Translation ID="segmentRecordHasNoId" en-US="This segment record has no id." nl-NL="Dit record met segment data bevat geen Id." />
+  <Translation ID="dikeHasNoSoilProfiles" en-US="This dike has no list of soil profiles." nl-NL="Deze dijk heeft geen lijst met grondprofielen." />
+  <Translation ID="soilProfileForSegmentDoesNotExist" en-US="The soil profile of this segment can not be found in the soil profiles list. SoilProfileId" nl-NL="Het grondprofiel behorende bij dit segment staat niet in de lijst van profielen. Grondprofiel Id" />
+  <Translation ID="Design calculations" en-US="Design calculations" nl-NL="Ontwerpberekeningen" />
+  <Translation ID="RiverLevel" en-US="River level" nl-NL="Buitenwaterstand" />
+  <Translation ID="RiverLevelDescription" en-US="Water level in river" nl-NL="De buitenwaterstand, bijvoorbeeld het rivierpeil" />
+  <Translation ID="RiverLevelLow" en-US="River level low" nl-NL="Lage buitenwaterstand" />
+  <Translation ID="RiverLevelLowDescription" en-US="Water level in river (summer)" nl-NL="Lage buitenwaterstand, bijvoorbeeld LWS" />
+  <Translation ID="MinimalCircleDepth" en-US="Minimum circle depth" nl-NL="Minimale cirkel diepte" />
+  <Translation ID="RequiredSafetyFactorStabilityInnerSlope" en-US="Safety factor inner slope" nl-NL="Veiligheidsfactor binnenwaartse stabiliteit" />
+  <Translation ID="RequiredSafetyFactorStabilityInnerSlopeDescription" en-US="Required safety factor for inner slope stability" nl-NL="Vereiste veiligheidsfactor binnenwaartse stabiliteit" />
+  <Translation ID="RequiredSafetyFactorStabilityOuterSlope" en-US="Safety factor outer slope" nl-NL="Veiligheidsfactor buitenwaartse stabiliteit" />
+  <Translation ID="RequiredSafetyFactorStabilityOuterSlopeDescription" en-US="Required safety factor for outer slope stability" nl-NL="Vereiste veiligheidsfactor buitenwaartse stabiliteit" />
+  <Translation ID="RequiredSafetyFactorPiping" en-US="Safety factor piping" nl-NL="Veiligheidsfactor piping" />
+  <Translation ID="RequiredSafetyFactorPipingDescription" en-US="Required safety factor for piping" nl-NL="Vereiste veiligheidsfactor piping" />
+  <Translation ID="RedesignDikeHeight" en-US="Redesign dike height" nl-NL="Dijkhoogte aanpassen bij ontwerpen" />
+  <Translation ID="RedesignDikeShoulder" en-US="Redesign dike shoulder" nl-NL="Berm aanpassen bij ontwerpen" />
+  <Translation ID="DikeTableHeight" en-US="Dike table height" nl-NL="DTH" />
+  <Translation ID="DikeTableHeightDescription" en-US="Dike table height" nl-NL="Dijktafelhoogte" />
+  <Translation ID="StabilityDesignMethod" en-US="Stability design method" nl-NL="Ontwerp methode voor stabiliteit" />
+  <Translation ID="OptimizedSlopeAndShoulderAdaption" en-US="Optimized slope and shoulder adaption" nl-NL="Optimaal taludverflauwing en bermaanleg" />
+  <Translation ID="SlopeAdaptionBeforeShoulderAdaption" en-US="Slope adaption before shoulder adaption" nl-NL="Eerst taludverflauwing en dan bermaanleg" />
+  <Translation ID="SlopeAdaptionStartCotangent" en-US="Slope adaption start cotangent" nl-NL="Taludverflauwing start cotangent" />
+  <Translation ID="SlopeAdaptionEndCotangent" en-US="Slope adaption end dotangent" nl-NL="Taludverflauwing eind cotangent" />
+  <Translation ID="SlopeAdaptionStepCotangent" en-US="Slope adaption step cotangent" nl-NL="Taludverflauwing stap cotangent" />
+  <Translation ID="SlopeDampingPiezometricHeightPolderSide" en-US="Slope damping factor PL3/PL4" nl-NL="Helling demping PL3/PL4" />
+  <Translation ID="SlopeDampingPiezometricHeightPolderSideDescription" en-US="The tangent of the slope damping for piezometric height polderSide (for PL3 and PL4)" nl-NL="De tangent van de helling voor de demping van de piezometrische hoogte aan polderzijde (voor PL3 en PL4)" />
+  <Translation ID="ScenarioDefinitionName" en-US="Scenario" nl-NL="Scenario" />
+  <Translation ID="AnalysisType" en-US="Analysis" nl-NL="Analyse" />
+  <Translation ID="IsUplift" en-US="Uplift" nl-NL="Opdrijven" />
+  <Translation ID="StabilityProfileName" en-US="Profile (Stability)" nl-NL="Profiel (Stabiliteit)" />
+  <Translation ID="StabilityProfileProbability" en-US="Probability (Stability)" nl-NL="Kans van voorkomen ondergrond (Stabiliteit)" />
+  <Translation ID="StabilitySafetyFactor" en-US="Safety Factor (Stability)" nl-NL="Veiligheidsfactor (Stabiliteit)" />
+  <Translation ID="StabilityShoulderHeight" en-US="Shoulder Height (Stability)" nl-NL="Bermhoogte (Stabiliteit)" />
+  <Translation ID="ShoulderHeight" en-US="Shoulder Height" nl-NL="Bermhoogte" />
+  <Translation ID="StabilityToeAtPolderX" en-US="Location Toe Polder (Stability)" nl-NL="Locatie binnenteen (Stabiliteit)" />
+  <Translation ID="StabilityToeAtPolderZ" en-US="Height Toe Polder (Stability)" nl-NL="Hoogte binnenteen (Stabiliteit)" />
+  <Translation ID="PipingProfileName" en-US="Profile (Piping)" nl-NL="Profiel (Piping)" />
+  <Translation ID="PipingProfileProbability" en-US="Probability (Piping)" nl-NL="Kans van voorkomen ondergrond (Piping)" />
+  <Translation ID="PipingSafetyFactor" en-US="Safety Factor (Piping)" nl-NL="Veiligheidsfactor (Piping)" />
+  <Translation ID="PipingShoulderHeight" en-US="Shoulder Height (Piping)" nl-NL="Bermhoogte (Piping)" />
+  <Translation ID="PipingToeAtPolderX" en-US="Location Toe Polder (Piping)" nl-NL="Locatie binnenteen (Piping)" />
+  <Translation ID="PipingToeAtPolderZ" en-US="Height Toe Polder (Piping)" nl-NL="Hoogte binnenteen (Piping)" />
+  <Translation ID="Zone1SafetyFactorStability" en-US="Zone 1 Safety Factor" nl-NL="Zone 1 veiligheidsfactor" />
+  <Translation ID="LocalZone1ExitPointX" en-US="Zone 1 Exit point Slip Circle (X-local)" nl-NL="Zone 1 uittredepunt glijcirkel (X-lokaal)" />
+  <Translation ID="Zone1ExitPointX" en-US="Zone 1 Exit Point Slip Circle (X-global)" nl-NL="Zone 1 uittredepunt glijcirkel (X-globaal)" />
+  <Translation ID="Zone1ExitPointY" en-US="Zone 1 Exit Point Slip Circle (Y-global)" nl-NL="Zone 1 uittredepunt glijcirkel (Y-globaal)" />
+  <Translation ID="Zone1ExitPointZ" en-US="Zone 1 Exit Point Slip Circle (Z)" nl-NL="Zone 1 uittredepunt glijcirkel (Z)" />
+  <Translation ID="Zone2SafetyFactorStability" en-US="Zone 2 Safety Factor" nl-NL="Zone 2 veiligheidsfactor" />
+  <Translation ID="LocalZone2ExitPointX" en-US="Zone 2 Exit Point Slip Circle (X-local)" nl-NL="Zone 2 uittredepunt glijcirkel (X-lokaal)" />
+  <Translation ID="Zone2ExitPointX" en-US="Zone 2 Exit Point Slip Circle (X-global)" nl-NL="Zone 2 uittredepunt glijcirkel (X-globaal)" />
+  <Translation ID="Zone2ExitPointY" en-US="Zone 2 Exit Point Slip Circle (Y-global)" nl-NL="Zone 2 uittredepunt glijcirkel (Y-globaal)" />
+  <Translation ID="Zone2ExitPointZ" en-US="Zone 2 Exit Point Slip Circle (Z)" nl-NL="Zone 2 uittredepunt glijcirkel (Z)" />
+  <Translation ID="DikeLength" en-US="Dike Length" nl-NL="DIjklengte" />
+  <Translation ID="Pl3MinUplift" en-US="PL3 Uplift" nl-NL="PL3 opdrijven" />
+  <Translation ID="Pl3HeadAdjusted" en-US="PL3 Head Adjusted" nl-NL="PL3 stijghoogte aangepast" />
+  <Translation ID="Pl3LocalLocationXMinUplift" en-US="PL3 Location Uplift (X-local)" nl-NL="PL3 locatie opdrijven (X-lokaal)" />
+  <Translation ID="Pl3LocationXMinUplift" en-US="PL3 Location Uplift (X-global)" nl-NL="PL3 locatie opdrijven (X-globaal)" />
+  <Translation ID="Pl3LocationYMinUplift" en-US="PL3 Location Uplift (Y-global)" nl-NL="PL3 locatie opdrijven (Y-globaal)" />
+  <Translation ID="Pl4MinUplift" en-US="PL4 Uplift" nl-NL="PL4 opdrijven" />
+  <Translation ID="Pl4HeadAdjusted" en-US="PL4 Head Adjusted" nl-NL="PL4 stijghoogte aangepast" />
+  <Translation ID="Pl4LocalLocationXMinUplift" en-US="PL4 Uplift (X-local)" nl-NL="PL4 locatie opdrijven (X-lokaal)" />
+  <Translation ID="Pl4LocationXMinUplift" en-US="PL4 Uplift (X-global)" nl-NL="PL4 locatie opdrijven (X-globaal)" />
+  <Translation ID="Pl4LocationYMinUplift" en-US="PL4 Uplift (Y-global)" nl-NL="PL4 locatie opdrijven (Y-globaal)" />
+  <Translation ID="BlighPipingFactor" en-US="Bligh Piping Factor" nl-NL="Bligh piping factor" />
+  <Translation ID="BlighHCritical" en-US="Bligh H critical" nl-NL="Bligh H kritiek" />
+  <Translation ID="Sellmeijer2ForcesPipingFactor" en-US="Sellmeijer 2-forces piping factor" nl-NL="Sellmeijer 2-krachten piping factor" />
+  <Translation ID="Sellmeijer2ForcesHCritical" en-US="Sellmeijer 2-forces H Critical" nl-NL="Sellmeijer 2 krachten H kritiek" />
+  <Translation ID="Sellmeijer4ForcesPipingFactor" en-US="Sellmeijer 4-forces piping factor" nl-NL="Sellmeijer 4-krachten piping factor" />
+  <Translation ID="Sellmeijer4ForcesHCritical" en-US="Sellmeijer 4-forces H Critical" nl-NL="Sellmeijer 4-krachten H kritiek" />
+  <Translation ID="SellmeijerPipingFactor" en-US="Sellmeijer piping factor" nl-NL="Sellmeijer piping factor" />
+  <Translation ID="SellmeijerHCritical" en-US="Sellmeijer H Critical" nl-NL="Sellmeijer H kritiek" />
+  <Translation ID="GridPosition" en-US="Calculation grid position" nl-NL="Positie rekengrid" />
+  <Translation ID="Right" en-US="Right" nl-NL="Rechts" />
+  <Translation ID="DesignCalculations" en-US="Design Calculations" nl-NL="Ontwerpberekeningen" />
+  <Translation ID="Deterministic" en-US="Deterministic" nl-NL="Deterministisch" />
+  <Translation ID="CurrentScenario" en-US="Current Scenario" nl-NL="Beschouwd scenario" />
+  <Translation ID="ScenarioDefinition" en-US="Scenario Definition" nl-NL="Scenario definitie" />
+  <Translation ID="noLocationIdForScenarioRecordError" en-US="This scenario record has no location id." nl-NL="Dit scenario record heeft geen location id." />
+  <Translation ID="duplicateScenarioRecordError" en-US="In location '{0}' the scenario '{1}' in this record already exist." nl-NL="In locatie '{0}' bestaat het scenario '{1}' al." />
+  <Translation ID="missingPolderLevel" en-US="No polder level is defined for this scenario." nl-NL="Polderlevel is niet gedefinieerd voor dit scenario." />
+  <Translation ID="locationNotFoundForScenarioRecordError" en-US="The location of this scenario record can not be found." nl-NL="De locatie die bij dit scenario record hoort kan niet gevonden worden." />
+  <Translation ID="CouldNotExtractSafetyFactor" en-US="Could not extract safety factor." nl-NL="Kon geen veiligheidsfactor afleiden" />
+  <Translation ID="locationIdNotFoundError" en-US="Location ID in defx ({0}) does not match location ID in shapefile." nl-NL="De locatie ID in de defx ({0}) komt niet overeen met de locatie ID in de shapefile." />
+  <Translation ID="dikeRingIdNotFoundError" en-US="Dike ring ID in defx ({0}) does not match dike ring ID in shapefile." nl-NL="De dijkring ID in de defx ({0}) komt niet overeen met de dijkring ID in de shapefile." />
+  <Translation ID="NoDikeEmbankmentMaterial" en-US="No valid dike embankment material defined" nl-NL="Dijk ophoog materiaal niet gevonden" />
+  <Translation ID="NoRequiredSafetyForZones" en-US="To use zone areas, a required safety factor (stability inner) should have been provided." nl-NL="Om met zonering te kunnen rekenen had er een vereiste veiligheidsfactor (stabiliteit binnenzijde) opgegeven moeten zijn." />
+  <Translation ID="NoRequiredSafetyForZonesRepair" en-US="Copy the value of the detriment factor to the required safety factor to use that value." nl-NL="Kopieer de waarde van de schade factor naar de vereiste veiligheidsfactor en gebruik dit." />
+  <Translation ID="NoRequiredSafetyForZonesScenario" en-US="To use zone areas, a required safety factor (stability inner) should have been provided per scenario." nl-NL="Om met zonering te kunnen rekenen had er een vereiste veiligheidsfactor (stabiliteit binnenzijde) per scenario opgegeven moeten zijn." />
+  <Translation ID="NoShoulderEmbankmentMaterial" en-US="No valid shoulder embankment material defined" nl-NL="Berm ophoog materiaal niet gevonden" />
+  <Translation ID="NoDikeEmbankmentMaterialAndNeeded" en-US="No valid dike embankment material defined, while surfaceline higher than one or more of the soilprofiles" nl-NL="Dijk ophoog materiaal niet gevonden en maaiveld hoger dan een of meer van de grond profielen" />
+  <Translation ID="riverLevelHighIsBelowSurfaceLevelOutside" en-US="River level ({0}) is below surface level at river side ({1})." nl-NL="De buitenwaartse waterstand ({0}) ligt onder het buitenwaartse maaiveld ({1})." />
+  <Translation ID="MaxOneCalculationSpecification" en-US="Only one specification allowed" nl-NL="Slechts 1 specificatie toegestaan" />
+  <Translation ID="KeepFirstCalculationSpecification" en-US="Keep first specification" nl-NL="Alleen de 1e specificatie bewaren" />
+  <Translation ID="DesignAndAdaptionNotAllowedForStabilityOutside" en-US="For failuremechanism stability outside the option of design with geometry adaption is not allowed" nl-NL="Voor faalmechanisme buitenwaartse stabiliteit is ontwerp met aanpassing geometrie niet toegestaan" />
+  <Translation ID="Assessment calculations" en-US="Assessment calculations" nl-NL="Toetsings berekeningen" />
+  <Translation ID="HasSensorData" en-US="Has sensor data" nl-NL="Heeft sensor data" />
+  <Translation ID="SurfaceLine2" en-US="Surface Line" nl-NL="Hoogte dwarsprofiel" />
+  <Translation ID="XRdDikeLine" en-US="XRd Dike Line" nl-NL="XRd dijk lijn" />
+  <Translation ID="ProfileName" en-US="Profile Name" nl-NL="Profielnaam" />
+  <Translation ID="ProfileProbability" en-US="Profile Probability" nl-NL="Probabiliteit Profiel" />
+  <Translation ID="StabilityModel" en-US="Stability Model" nl-NL="Stabiliteitsmodel" />
+  <Translation ID="ShoulderHeightFromToe" en-US="Shoulder Height" nl-NL="Hoogte berm" />
+  <Translation ID="ToeAtPolderX" en-US="X Bottom New Slope" nl-NL="X onderkant nieuw talud" />
+  <Translation ID="ToeAtPolderZ" en-US="Z Bottom New Slope" nl-NL="Z onderkant nieuw talud" />
+  <Translation ID="RequiredSafetyFactor" en-US="Required Safety Factor" nl-NL="Vereiste veiligheidsfactor" />
+  <Translation ID="LocalZone1EntryPointX" en-US="Zone 1 Entry Point X-local" nl-NL="X-lokaal Intredepunt zone 1" />
+  <Translation ID="Zone1EntryPointX" en-US="Zone 1 Entry Point X-global" nl-NL="X-globaal Intredepunt zone 1" />
+  <Translation ID="Zone1EntryPointY" en-US="Zone 1 Entry Point Y-global" nl-NL="Y-globaal Intredepunt zone 1" />
+  <Translation ID="Zone1EntryPointZ" en-US="Zone 1 Entry Point Z" nl-NL="Z Intredepunt zone 1" />
+  <Translation ID="LocalZone2EntryPointX" en-US="Zone 2 Entry Point X-local" nl-NL="X-lokaal Intredepunt zone 2" />
+  <Translation ID="Zone2EntryPointX" en-US="Zone 2 Entry Point X-global" nl-NL="X-globaal Intredepunt zone 2" />
+  <Translation ID="Zone2EntryPointY" en-US="Zone 2 Entry Point Y-global" nl-NL="Y-globaal Intredepunt zone 2" />
+  <Translation ID="Zone2EntryPointZ" en-US="Zone 2 Entry Point Z" nl-NL="Z Intredepunt zone 2" />
+  <Translation ID="PipingModel" en-US="Piping Model" nl-NL="Model piping" />
+  <Translation ID="PipingFactor" en-US="Piping Factor" nl-NL="Factor piping" />
+  <Translation ID="HCritical" en-US="H critical" nl-NL="Kritische hoogte" />
+  <Translation ID="LocalPipingEntryPointX" en-US="Entry Point Piping X local" nl-NL="Intredepunt piping x lokaal" />
+  <Translation ID="PipingEntryPointX" en-US="Entry Point Piping X global" nl-NL="Intredepunt piping x globaal" />
+  <Translation ID="PipingEntryPointY" en-US="Entry Point Piping Y global" nl-NL="Intredepunt piping y globaal" />
+  <Translation ID="LocalPipingExitPointX" en-US="Exit Point Piping X local" nl-NL="Uittredepunt piping x lokaal" />
+  <Translation ID="PipingExitPointX" en-US="Exit Point Piping X global" nl-NL="Uittredepunt piping x globaal" />
+  <Translation ID="PipingExitPointY" en-US="Exit Point Piping Y global" nl-NL="Uittredepunt piping y globaal" />
+  <Translation ID="SeepageLength" en-US="Seepage Length Piping" nl-NL="Kwelweglengte piping" />
+  <Translation ID="ResultMessage" en-US="Result Message" nl-NL="Melding resultaat" />
+  <Translation ID="NumberOfIterations" en-US="Number of Iterations" nl-NL="Aantal iteraties" />
+  <Translation ID="Background" en-US="Background" nl-NL="Achtergrond" />
+  <Translation ID="LocationScenarioID" en-US="ID Location Scenario" nl-NL="ID Locatie scenario" />
+  <Translation ID="UpliftCriterionPiping" en-US="Uplift Criterion Piping" nl-NL="Criterium opdrijven bij piping" />
+  <Translation ID="UpliftCriterionPipingDescription" en-US="The uplift criterion for piping" nl-NL="Het criterium voor opdrijven bij piping" />
+  <Translation ID="UpliftCriterionStability" en-US="Uplift Criterion Stability" nl-NL="Criterium opdrijven bij stabiliteit" />
+  <Translation ID="UpliftCriterionStabilityDescription" en-US="The uplift criterion for stability" nl-NL="Het criterium voor opdrijven bij stabiliteit" />
+  <Translation ID="ScenarioName" en-US="Scenario Name" nl-NL="Scenarionaam" />
+  <Translation ID="NoAdaption" en-US="No Adaption" nl-NL="Geen aanpassing" />
+  <Translation ID="StabilityInside" en-US="Stability Inside" nl-NL="Binnenwaartse stabiliteit" />
+  <Translation ID="StabilityOutside" en-US="Stability Outside" nl-NL="Buitenwaartse stabiliteit" />
+  <Translation ID="FlowSlide" en-US="Flow Slide" nl-NL="Zettingsvloeiing" />
+  <Translation ID="HorizontalBalance" en-US="Horizontal Balance" nl-NL="Horizontaal evenwicht" />
+  <Translation ID="FailureMechanismSystemType" en-US="Failure Mechanism System Type" nl-NL="Systeem type faalmechanisme" />
+  <Translation ID="CalculationModel" en-US="Calculation Model" nl-NL="Berekeningsmodel" />
+  <Translation ID="CurrentSpecification" en-US="Current Specification" nl-NL="Huidige specificatie" />
+  <Translation ID="GeneticAlgorithm" en-US="Genetic Algorithm" nl-NL="Genetisch algoritme" />
+  <Translation ID="Sensors" en-US="Sensors" nl-NL="Sensoren" /> 
+  <Translation ID="All" en-US="All" nl-NL="Allen" />
+  <Translation ID="Dike" en-US="Dike" nl-NL="Dijk" />
+  <Translation ID="Sellmeijer" en-US="Sellmeijer (VNK)" nl-NL="Sellmeijer (VNK)" />
+  <Translation ID="Piping" en-US="Piping" nl-NL="Piping" />
+  <Translation ID="Bligh" en-US="Bligh" nl-NL="Bligh" />
+  <Translation ID="Sellmeijer2Forces" en-US="Sellmeijer 2-forces" nl-NL="Sellmeijer 2-krachten" />
+  <Translation ID="Sellmeijer4Forces" en-US="Sellmeijer 4-forces" nl-NL="Sellmeijer 4-krachten" />
+  <Translation ID="Wti2017" en-US="Sellmeijer Revised (WBI)" nl-NL="Sellmeijer Revised (WBI)" />
+  <Translation ID="SlopeErrorNoIntersection" en-US="Adapting the slope of the dike failed. Probably the slope is too steep or too shallow." 
+               nl-NL="Het aanpassen van de helling van het dijkprofiel is mislukt. Waarschijnlijk is de nieuwe helling te steil of te flauw." />
+  <Translation ID="SurfaceLineAdapterDikeHeightError" en-US="No valid dike. Dike top polder or river has a height of 0." 
+               nl-NL="Het dijkprofiel is ongeldig omdat de kruin geen hoogte heeft aan rivier- en/of polderzijde." />
+  <Translation ID="SurfaceLineAdapterShoulderHeightError" en-US="The shoulder defined on the dike is not valid. The height is zero." 
+               nl-NL="De berm in het dijkprofiel is ongeldig omdat deze geen hoogte heeft." />
+  <Translation ID="SurfaceLineAdapterSurfaceLevelError" en-US="There is no surface level inside defined on the dike." 
+               nl-NL="De definitie van het einde van het dijkprofiel aan polderzijde ontbreekt." />
+  <Translation ID="SurfaceLineAdapterInvalidDikeError" en-US="There is no valid dike defined. Missing characteristic points dike toe at polder, dike top at river, dike top at polder and/or dike toe at river." 
+               nl-NL="Het dijkprofiel is ongeldig. Er ontbreken verplichte karakteristieke punten." />
+  <Translation ID="SurfaceLineAdapterNoDikeError" en-US="The surface line is null or empty." 
+               nl-NL="Het dijkprofiel is niet gedefinieerd." />
+  <Translation ID="SurfaceLineAdapterNoDikePointsError" en-US="No valid point data in the surface line. It should have at least 4 points to be valid." 
+               nl-NL="Het dijkprofiel bevat geen punten en is daarom ongeldig." />
+  <Translation ID="SurfaceLineAdapterDikeDitchError" en-US="The ditch as part of the surface line is incorrect. This makes a redesign of the surface line impossible." 
+               nl-NL="De sloot in het dijkprofiel is ongeldig gedefinieerd." />
+  <Translation ID="SurfaceLineAdapterDitchSlopeError" en-US="The new slope of the ditch does not intersect with the surface line (new bottom of ditch probably to high). This makes a redesign of the surface line impossible."
+               nl-NL="De nieuwe helling van de sloot snijdt het maaiveld niet (waarschijnlijk ligt de nieuwe slootbodem te hoog)" />  
+  <Translation ID="SurfaceLineShoulderAdapterMaxShoulderHeightError" en-US="The heigth of the dike top is equal too or lower then the dike toe so redesign is NOT possible." 
+               nl-NL="De kruin van het dijkprofiel ligt beneden of is gelijk aan de dijkteen. Bermontwikkeling is daardoor niet mogelijk." />
+  <Translation ID="SurfaceLineShoulderAdapterNewShoulderWidthError" en-US="New shoulder width is smaller than current shoulder width." 
+               nl-NL="De nieuwe berm is minder breed dan de huidige berm." />
+  <Translation ID="SurfaceLineShoulderAdapterNewShoulderHeightError" en-US="New shoulder height is smaller than current shoulder height." 
+               nl-NL="De nieuwe berm is lager dan de huidige berm." />
+  <Translation ID="SurfaceLineShoulderAdapterNewShoulderHeightZeroError" en-US="New shoulder height should be larger than 0." 
+               nl-NL="De hoogte van de nieuwe berm moet groter zijn dan 0." />
+  <Translation ID="SurfaceLineShoulderAdapterNewShoulderHeightTooLargeError" en-US="The new shoulder height is too large to fit in the current surface line." 
+               nl-NL="De nieuwe hoogte van de berm past niet in het dijkprofiel (is hoger dan toegestaan)." />
+  <Translation ID="SurfaceLineShoulderAdapterNewShoulderHeightTooLargeTopSlopeError" en-US="The new shoulder height with topslope exceeds the allowed maximum height."
+               nl-NL="De nieuwe hoogte van de berm met afschot is groter dan de maximaal toegestane hoogte." />
+  <Translation ID="SurfaceLineShoulderAdapterNewShoulderNoIntersectionError" en-US="The new shoulder does not intersect the surface. This can be caused by a very strange surfaceline or the new shoulderwidth is too large." 
+               nl-NL="De nieuwe berm snijdt het dijkprofiel niet. Ofwel het dijkprofiel verloopt heel vreemd of de nieuwe bermbreedte is te groot." />
+  <Translation ID="SurfaceLineShoulderAdapterNewShoulderWidthTooLargeError"  en-US="The new shoulder width is too large to fit in the current surface line." 
+               nl-NL="De nieuwe breedte van de berm past niet in het dijkprofiel (is breder dan toegestaan)." />
+  <Translation ID="SurfaceLineHeightAdapterDitchOutsideSurfaceLine"  en-US="After height adaption ditch does not fit inside surfaceline anymore."
+               nl-NL="Na aanpassen van de hoogte past de sloot niet meer binnen  het dijkprofiel." />
+  <Translation ID="PipingModelType" en-US="Piping model" nl-NL="Model piping" />
+  <Translation ID="UseNewDikeTopWidth" en-US="Use new width crest" nl-NL="Gebruik nieuwe breedte kruin" />
+  <Translation ID="NewDikeTopWidth" en-US="New width crest" nl-NL="Nieuwe breedte kruin" />
+  <Translation ID="NewDikeTopWidthRangeError" en-US="New width crest may not be less than {0}" nl-NL="Nieuwe breedte kruin mag niet kleiner zijn dan {0}" />
+  <Translation ID="AssignMinValue" en-US="Assign minimum value" nl-NL="Minimum waarde toekennen" />
+  <Translation ID="AssignMaxValue" en-US="Assign maximum value" nl-NL="Maximum waarde toekennen" />
+  <Translation ID="UseNewDikeSlopeInside" en-US="Use new slope inside" nl-NL="Gebruik nieuwe helling binnenzijde" />
+  <Translation ID="NewDikeSlopeInside" en-US="New slope inside" nl-NL="Nieuwe helling binnenzijde" />
+  <Translation ID="NewDikeSlopeInsideRangeError" en-US="New slope inside may not be less than {0}" nl-NL="Nieuwe helling binnenzijde mag niet kleiner zijn dan {0}" />
+  <Translation ID="UseNewDikeSlopeOutside" en-US="Use new slope outside" nl-NL="Gebruik nieuwe helling buitenzijde" />
+  <Translation ID="NewDikeSlopeOutside" en-US="New slope outside" nl-NL="Nieuwe helling buitenzijde" />
+  <Translation ID="UseOfPenetrationLengthError" en-US="Penetration length > {0} with 2D soil geometries can only be used when 'Intrusion vertical water pressure' is set to 'Semi time dependent'" nl-NL="Penetratie lengte > {0} met 2D grond opbouw kan alleen gebruikt worden als voor 'Verloop waterspanning' gekozen is voor 'semi tijdsafhankelijk'" />
+  <Translation ID="NewDikeSlopeOutsideRangeError" en-US="New slope outside may not be less than {0}" nl-NL="Nieuwe helling buitenzijde mag niet kleiner zijn dan {0}" />
+  <Translation ID="UseNewShoulderTopSlope" en-US="Use new top slope shoulder" nl-NL="Gebruik nieuwe helling bovenkant berm" />
+  <Translation ID="NewShoulderTopSlope" en-US="New top slope shoulder" nl-NL="Nieuwe helling bovenkant berm" />
+  <Translation ID="UseNewShoulderBaseSlope" en-US="Use new base slope shoulder" nl-NL="Gebruik nieuwe helling berm" />
+  <Translation ID="NewShoulderBaseSlope" en-US="New base slope shoulder" nl-NL="Nieuwe helling berm" />
+  <Translation ID="UseNewMaxHeightShoulderAsFraction" en-US="Use new allowed height shoulder" nl-NL="Gebruik nieuwe toegestane hoogte berm" />
+  <Translation ID="NewMaxHeightShoulderAsFraction" en-US="New allowed height shoulder" nl-NL="Nieuwe toegestane hoogte berm" />
+  <Translation ID="UseNewMinDistanceDikeToeStartDitch" en-US="Use new allowed distance toe-ditch" nl-NL="Gebruik nieuwe toegestane afstand teen-sloot" />
+  <Translation ID="NewMinDistanceDikeToeStartDitch" en-US="New allowed distance toe-ditch" nl-NL="Nieuwe toegestane afstand teen-sloot" />
+  <Translation ID="UseNewDitchDefinition" en-US="Use new definition ditch" nl-NL="Gebruik nieuwe definitie sloot" />
+  <Translation ID="NewWidthDitchBottom" en-US="New width ditch bottom" nl-NL="Nieuwe breedte slootbodem" />
+  <Translation ID="NewSlopeAngleDitch" en-US="New slope ditch" nl-NL="Nieuwe helling sloot" />
+  <Translation ID="NewDepthDitch" en-US="New depth ditch" nl-NL="Nieuwe diepte sloot" />
+  <Translation ID="UseNewDikeTopWidthDescription" en-US="Use the value for new width of dike top" nl-NL="Gebruik de waarde voor de nieuwe breedte voor de kruin van de dijk" />
+  <Translation ID="NewDikeTopWidthDescription" en-US="Value for new width of dike top" nl-NL="Waarde voor de nieuwe breedte voor de kruin van de dijk" />
+  <Translation ID="UseNewDikeSlopeInsideDescription" en-US="Use the value for new angle of the inside slope" nl-NL="Gebruik de waarde voor de nieuwe helling voor het binnentalud van de dijk" />
+  <Translation ID="NewDikeSlopeInsideDescription" en-US="Value for new angle of the inside slope" nl-NL="Waarde voor de nieuwe helling voor het binnentalud van de dijk" />
+  <Translation ID="UseNewDikeSlopeOutsideDescription" en-US="Use the value for new angle of the outside slope" nl-NL="Gebruik de waarde voor de nieuwe helling voor het buitentalud van de dijk" />
+  <Translation ID="NewDikeSlopeOutsideDescription" en-US="Value for new angle of the outside slope" nl-NL="Waarde voor de nieuwe helling voor het buitentalud van de dijk" />
+  <Translation ID="UseNewShoulderTopSlopeDescription" en-US="Use the value for new angle of the top slope of shoulder" nl-NL="Gebruik de waarde voor de nieuwe helling aan de bovenkant (afschot) van de binnenberm van de dijk" />
+  <Translation ID="NewShoulderTopSlopeDescription" en-US="Value for new angle of the top slope of shoulder" nl-NL="Waarde voor de nieuwe helling aan de bovenkant (afschot) van de binnenberm van de dijk" />
+  <Translation ID="UseNewShoulderBaseSlopeDescription" en-US="Use the value for new angle of the base slope of shoulder" nl-NL="Gebruik de waarde voor de nieuwe helling aan het eind (teen) van de binnenberm van de dijk" />
+  <Translation ID="NewShoulderBaseSlopeDescription" en-US="Value for new angle of the base slope of shoulder" nl-NL="waarde voor de nieuwe helling aan het eind (teen) van de binnenberm van de dijk" />
+  <Translation ID="UseNewMaxHeightShoulderAsFractionDescription" en-US="Use the value for new allowed height of shoulder as fraction of dike height" nl-NL="Gebruik de waarde voor de nieuwe maximale hoogte van de berm als fractie van de hoogte van de dijk" />
+  <Translation ID="NewMaxHeightShoulderAsFractionDescription" en-US="Value for new allowed height of shoulder as fraction of dike height" nl-NL="Waarde voor de nieuwe maximale hoogte van de berm als fractie van dehoogte van de dijk" />
+  <Translation ID="UseNewMinDistanceDikeToeStartDitchDescription" en-US="Use the value for new minimum distance dike toe - start ditch" nl-NL="Gebruik de waarde voor de nieuwe minimale afstand tussen de teen van de dijk (binnenzijde) en insteek van de sloot" />
+  <Translation ID="NewMinDistanceDikeToeStartDitchDescription" en-US="Value for new minimum distance dike toe - start ditch" nl-NL="Waarde voor de nieuwe minimale afstand tussen de teen van de dijk (binnenzijde) en insteek van de sloot" />
+  <Translation ID="UseNewDitchDefinitionDescription" en-US="Use the values for new ditch definition" nl-NL="Gebruik de nieuwe definitie voor de sloot" />
+  <Translation ID="NewWidthDitchBottomDescription" en-US="Value for the new width of ditch bottom" nl-NL="Waarde voor de breedte van de bodem van de nieuwe sloot" />
+  <Translation ID="NewSlopeAngleDitchDescription" en-US="Value for the new angle of ditch slopes" nl-NL="Waarde voor de hellingen van de nieuwe sloot" />
+  <Translation ID="NewDepthDitchDescription" en-US="Value for the new depth (ref. Polder level) of ditch bottom" nl-NL="Waarde voor de diepte (tov Polderpeil) van de bodem van de nieuwe sloot" />
+  <Translation ID="NoUpliftCriterionForStability" en-US="No uplift criterion for Stability defined in location {0} scenario {1}" nl-NL="Geen opdrijfcriterium voor stablititeit gedfinieerd in locatie {0} scenario {1}" />
+  <Translation ID="NoUpliftCriterionForPiping" en-US="No uplift criterion for Piping defined in location {0} scenario {1}" nl-NL="Geen opdrijfcriterium voor piping gedefinieerd in locatie {0} scenario {1}" />
+  <Translation ID="NoRequiredSafetyFactorPiping" en-US="No required safety factor for Piping defined in location {0} scenario {1}" nl-NL="Geen vereiste veiligheidsfactor voor piping gedfinieerd in locatie {0} scenario {1}" />
+  <Translation ID="ErrorReadingCsvColumnNames" en-US="Error reading CSV column headers; check for duplicate column names ('{0}' exception in {1})" nl-NL="Fout bij het lezen van de CSV kolom namen; controleer op dubbele namen ('{0}' exception in {1})" />
+  <Translation ID="MainItems" en-US="Main items" nl-NL="Hoofd gegevens" />
+  <Translation ID="LocationHasNoSegment" en-US="The location has no segment." nl-NL="De locatie heeft geen segment." />
+  <Translation ID="LocationHasNoSurfaceLine" en-US="Location {0} not added, because no valid surfaceline is assigned." nl-NL="locatie {0} is niet toegevoegd omdat hieraan geen geldige dijkprofiel is toegekend." />
+  <Translation ID="LocationHasProfileWithInvalidSoils" en-US="Location {0} not added, because soilprofile {1} has an invalid soil ({2})." nl-NL="Locatie {0} is niet toegevoegd omdat het grondprofiel {1} een ongeldig materiaal ({2}) bevat." />
+  <Translation ID="LocationWitNameHasNoSegment" en-US="Location {0} not added, because it has no segment assigned." nl-NL="locatie {0} is niet toegevoegd omdat er geen segment is toegekend." />
+  <Translation ID="OpenCalculationFile" en-US="Open calculation" nl-NL="Open berekening" />
+  <Translation ID="SelectedStabilityKernelType" en-US="Selected stability kernel" nl-NL="Geselecteerde stabiliteits rekenkern" />
+  <Translation ID="DamClassicStability" en-US="D-Geostability 18.1" nl-NL="D-Geostability 18.1" />
+  <Translation ID="WtiMacroStabilityKernel" en-US="D-Stability 2019" nl-NL="D-Stability 2019" />
+  <Translation ID="OldStiLayerHasNoSoilError" en-US="The old sti layer has no soil." nl-NL="De oude sti grondlaag heeft geen materiaal." />
+  <Translation ID="Depth" en-US="Depth" nl-NL="Diepte" />
+  <Translation ID="RelativeLocation" en-US="Relative location along profile" nl-NL="Relatieve locatie tov profiel" />
+  <Translation ID="RelativeLocationSpecified" en-US="Is relative location specified" nl-NL="Is de relatieve locatie tov profiel opgegeven" />
+  <Translation ID="Type" en-US="Type" nl-NL="Type" />
+  <Translation ID="PLLineMappings" en-US="PL-Line mappings" nl-NL="Bijbehorende PL-lijnen" />
+  <Translation ID="PLLineMappingsAsString" en-US="PL-line mappings" nl-NL="Bijbehorende PL-lijnen" />
+  <Translation ID="Sensor Configuration" en-US="Sensor configuration" nl-NL="Sensor configuratie" />
+  <Translation ID="Sensor Group Configuration" en-US="Sensor group configuration" nl-NL="Sensor groep configuratie" />
+  <Translation ID="Sensor Location Data" en-US="Sensor location data" nl-NL="Sensor locatie data" />
+  <Translation ID="SelectionAsString" en-US="Selection" nl-NL="Selectie" />
+  <Translation ID="MStabFile" en-US="MStab file" nl-NL="Bestand MStab" />
+  <Translation ID="Profile" en-US="Profile" nl-NL="Profiel" />
+  <Translation ID="Alias" en-US="Alias" nl-NL="Alias" />
+  <Translation ID="Group" en-US="Group ID" nl-NL="Groep ID" />
+  <Translation ID="PL3" en-US="Definition PL3" nl-NL="Definitie PL3" />
+  <Translation ID="PL4" en-US="Definition PL4" nl-NL="Definitie PL4" />
+  <Translation ID="PL1WaterLevelAtRiver" en-US="PL1 water level at river" nl-NL="PL1 waterstand rivier" />
+  <Translation ID="PL1WaterLevelAtPolder" en-US="PL1 water level at polder" nl-NL="PL1 waterstand polder" />
+  <Translation ID="Ignore" en-US="Ignore" nl-NL="Negeer" />
+  <Translation ID="LocationData" en-US="Location Data" nl-NL="Locatie data" />
+  <Translation ID="Sensor" en-US="Sensor" nl-NL="Sensor" />
+  <Translation ID="PiezometricHead" en-US="Piezometric Head" nl-NL="Stijghoogte" />
+  <Translation ID="WaterLevel" en-US="Water Level" nl-NL="Water niveau" />
+  <Translation ID="SpencerHigh" en-US="Spencer High" nl-NL="Spencer hoog" />
+  <Translation ID="SpencerLow" en-US="Spencer Low" nl-NL="Spencer laag" />
+  <Translation ID="UpliftFactor" en-US="Uplift Safety Factor" nl-NL="Veiligheidsfactor opdrijven" />
+  <Translation ID="HeaveFactor" en-US="Heave Saftey Factor" nl-NL="Veiligheidsfactor opbarsten" />
+  <Translation ID="Wti2017BackwardErosionSafetyFactor" en-US="Backward Erosion Safety Factor (WBI)" nl-NL="Terugschrijdende erosie veiligheidsfactor (WBI)" />
+  <Translation ID="Wti2017BackwardErosionHcritical" en-US="Backward Erosion hc (WBI)" nl-NL="Terugschrijdende erosie hc (WBI)" />
+  <Translation ID="Wti2017BackwardErosionDeltaPhiC" en-US="Backward Erosion DeltaHc (WBI)" nl-NL="Terugschrijdende erosie DeltaHc (WBI)" />
+  <Translation ID="Wti2017BackwardErosionDeltaPhiReduced" en-US="Backward Erosion Reduced DeltaHc (WBI)" nl-NL="Terugschrijdende erosie gereduceerd verval (WBI)" />
+  <Translation ID="Wti2017CCreep" en-US="Backward Erosion CCreep (WBI)" nl-NL="Terugschrijdende erosie CCreep (WBI)" />
+  <Translation ID="Wti2017UpliftSafetyFactor" en-US="Uplift Safety Factor (WBI)" nl-NL="Opbarsten veiligheidsfactor (WBI)" />
+  <Translation ID="Wti2017UpliftHcritical" en-US="Uplift hc (WBI)" nl-NL="Opbarsten hc (WBI)" />
+  <Translation ID="Wti2017UpliftDeltaPhiC" en-US="Uplift DeltaHc (WBI)" nl-NL="Opbarsten DeltaHc (WBI)" />
+  <Translation ID="Wti2017HeaveSafetyFactor" en-US="Heave Safety Factor (WBI)" nl-NL="Heave veiligheidsfactor (WBI)" />
+  <Translation ID="Wti2017HeaveHcritical" en-US="Heave hc (WBI)" nl-NL="Heave hc (WBI)" />
+  <Translation ID="Wti2017Gradient" en-US="Heave Gradient (WBI)" nl-NL="Heave gradient (WBI)" />
+  <Translation ID="Wti2017SafetyFactorOverall" en-US="Piping Safety Factor (WBI)" nl-NL="Piping veiligheidsfactor (WBI)" />
+  <Translation ID="Wti2017HcriticalOverall" en-US="Piping hc (WBI)" nl-NL="Piping hc (WBI)" />
+  <Translation ID="Wti2017EffectiveStress" en-US="Effective Stress Exit Point(WBI)" nl-NL="Opbarsten effectieve spanning (WBI)" />
+  <Translation ID="InsideStabilityScenarioCategory" en-US="Inside stability" nl-NL="Binnenstabiliteit" />
+  <Translation ID="PipingScenarioCategory" en-US="Piping" nl-NL="Piping" />
+  <Translation ID="PlLineSchematizationScenarioCategory" en-US="PL line schematization" nl-NL="PL line schematisatie" />
+  <Translation ID="PlLineOffsetBelowDikeCrestMiddle" en-US="PL1 below middle of dike crest" nl-NL="PL1-kruin midden" />
+  <Translation ID="PlLineOffsetBelowDikeCrestMiddleDescription" en-US="PL1 below the middle of the dike crest" nl-NL="Ligging freatisch vlak (buitenwaterstand minus deze waarde) onder het midden van de kruin" />
+  <Translation ID="PlLineOffsetFactorBelowShoulderCrest" en-US="PL1 factor below shoulder crest inside" nl-NL="PL1-factor kruin binnenberm" />
+  <Translation ID="PlLineOffsetFactorBelowShoulderCrestDescription" en-US="PL1 below shoulder crest inside defined by factor of shoulder height" nl-NL="Ligging freatisch vlak (als factor van het hoogteverschil tussen bermkruin en bermteen) onder de kruin van de berm (polderzijde)" />
+  <Translation ID="PlLineOffsetDryBelowDikeCrestMiddle" en-US="PL1 below middle of dike crest (dry)" nl-NL="PL1-kruin midden (droog)" />
+  <Translation ID="PlLineOffsetDryBelowDikeCrestMiddleDescription" en-US="PL1 below the middle of the dike crest in dry situation" nl-NL="Ligging freatisch vlak (buitenwaterstand minus deze waarde) onder het midden van de kruin voor de droge situatie" />
+  <Translation ID="PlLineOffsetDryFactorBelowShoulderCrest" en-US="PL1 factor below shoulder crest inside (dry)" nl-NL="PL1-factor kruin binnenberm (droog)" />
+  <Translation ID="PlLineOffsetDryFactorBelowShoulderCrestDescription" en-US="PL1 below shoulder crest inside defined by factor of shoulder height in dry situation" nl-NL="Ligging freatisch vlak (als factor van het hoogteverschil tussen bermkruin en bermteen) onder de kruin van de berm (polderzijde) voor de droge situatie" />
+  <Translation ID="UsePlLineOffsetBelowDikeCrestMiddle" en-US="Use PL1 below middle of dike crest" nl-NL="Gebruik PL1-kruin midden" />
+  <Translation ID="UsePlLineOffsetBelowDikeCrestMiddleDescription" en-US="Use PL1 below the middle of the dike crest" nl-NL="Gebruik de ligging freatisch vlak (buitenwaterstand minus deze waarde) onder het midden van de kruin" />
+  <Translation ID="UsePlLineOffsetFactorBelowShoulderCrest" en-US="Use PL1 factor below shoulder crest inside" nl-NL="Gebruik PL1-factor kruin binnenberm" />
+  <Translation ID="UsePlLineOffsetFactorBelowShoulderCrestDescription" en-US="Use PL1 below shoulder crest inside defined by factor of shoulder height" nl-NL="Gebruik de ligging freatisch vlak (als factor van het hoogteverschil tussen bermkruin en bermteen) onder de kruin van de berm (polderzijde)" />
+  <Translation ID="UsePlLineOffsetDryBelowDikeCrestMiddle" en-US="Use PL1 below middle of dike crest (dry)" nl-NL="Gebruik PL1-kruin midden (droog)" />
+  <Translation ID="UsePlLineOffsetDryBelowDikeCrestMiddleDescription" en-US="Use PL1 below the middle of the dike crest in dry situation" nl-NL="Gebruik de ligging freatisch vlak (buitenwaterstand minus deze waarde) onder het midden van de kruin voor de droge situatie" />
+  <Translation ID="UsePlLineOffsetDryFactorBelowShoulderCrest" en-US="Use PL1 factor below shoulder crest inside (dry)" nl-NL="Gebruik PL1-factor kruin binnenberm (droog)" />
+  <Translation ID="UsePlLineOffsetDryFactorBelowShoulderCrestDescription" en-US="Use PL1 below shoulder crest inside defined by factor of shoulder height in dry situation" nl-NL="Gebruik de ligging freatisch vlak (als factor van het hoogteverschil tussen bermkruin en bermteen) onder de kruin van de berm (polderzijde) voor de droge situatie" />
+  <Translation ID="PlLineOffsetFactorBelowShoulderCrestTooSmall" en-US="The PL1 factor below shoulder crest inside is too small" nl-NL="De PL1-factor kruin binnenberm is te klein" />
+  <Translation ID="PlLineOffsetFactorBelowShoulderCrestTooLarge" en-US="The PL1 factor below shoulder crest inside is too large" nl-NL="De PL1-factor kruin binnenberm is te groot" />
+  <Translation ID="IntrusionVerticalWaterPressure" en-US="Intrusion vertical water pressure" nl-NL="Verloop waterspanning (verticaal)" />
+  <Translation ID="Standard" en-US="DAM Standard" nl-NL="DAM Standaard" />
+  <Translation ID="Linear" en-US="Linear" nl-NL="Lineair" />
+  <Translation ID="FullHydroStatic" en-US="Full hydrostatic" nl-NL="Volledig hydrostatisch" />
+  <Translation ID="HydroStatic" en-US="Hydrostatic" nl-NL="Hydrostatisch" />
+  <Translation ID="SemiTimeDependent" en-US="Semi time dependent" nl-NL="Semi tijdsafhankelijk" />
+  <Translation ID="ProjectType" en-US="Project Type" nl-NL="Semi tijdsafhankelijk" />
+</Translations>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Feature.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Feature.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Feature.cs	(revision 3305)
@@ -0,0 +1,265 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+
+using GeoAPI.Geometries;
+
+using NetTopologySuite.Geometries;
+using NetTopologySuite.IO;
+
+namespace Deltares.Maps
+{
+    public class Feature : NetTopologySuite.Features.Feature, IFeature
+    {
+        private string geomWkt;
+        private IGeometry geometry;
+        private int? oldHashCode;
+        private Guid id;
+
+        private Feature(string geomWkt)
+        {
+            this.geomWkt = geomWkt;
+            ParseGeometryString();
+            IntializeGeometry();
+        }
+
+        private Feature(IGeometry geometry)
+        {
+            this.geometry = geometry;
+            WriteWktString();
+            IntializeGeometry();
+        }
+
+        private void IntializeGeometry()
+        {
+            id = Guid.NewGuid();
+            Attributes = new AttributesDictionary();
+        }
+
+        public virtual string WktFormat
+        {
+            get
+            {
+                if (geometry == null)
+                {
+                    if (string.IsNullOrEmpty(geomWkt))
+                    {
+                        WriteWktString();
+                    }
+                }
+                return geomWkt;
+            }
+        }
+
+        /// <summary>
+        ///     Gets the geometry. It parses the geometry wkt string when needed
+        /// </summary>
+        new public IGeometry Geometry
+        {
+            get
+            {
+                if (geometry == null)
+                {
+                    if (!string.IsNullOrEmpty(geomWkt))
+                    {
+                        ParseGeometryString();
+                    }
+                    else
+                    {
+                        throw new InvalidOperationException(
+                            "The internal state for this object is not valid. The internal geometry is empty.");
+                    }
+                }
+                return geometry;
+            }
+        }
+
+        public virtual Guid Id
+        {
+            get { return id; }
+            protected set { id = value; }
+        }
+
+        public static Feature Create(string geomWkt, IEnumerable<KeyValuePair<string, object>> attributes)
+        {
+            Feature feature = Create(geomWkt);
+            foreach (var attribute in attributes)
+            {
+                feature.AddAttribute(attribute.Key, attribute.Value);
+            }
+            return feature;
+        }
+
+        /// <summary>
+        ///     Creates a feature with a geometry parsed from the argument string
+        /// </summary>
+        /// <param name="geomWkt">The well known geometry string</param>
+        /// <returns>A feature </returns>
+        public static Feature Create(string geomWkt)
+        {
+            if (geomWkt == null)
+            {
+                throw new ArgumentNullException("geomWkt");
+            }
+
+            try
+            {
+                return new Feature(geomWkt);
+            }
+            catch (Exception exception)
+            {
+                if (exception.Message.Contains("','"))
+                {
+                    throw new ArgumentException(
+                        "There was an error parsing the WKT geometry string, maybe due to an incorrect culture format conversion",
+                        "geomWkt",
+                        exception);
+                }
+            }
+
+            throw new InvalidOperationException();
+        }
+
+        /// <summary>
+        ///     Creates an empty feature with a point geometry
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns></returns>
+        private static Feature Create(double x, double y)
+        {
+            return new Feature(new Point(x, y));
+        }
+
+        public static Feature Create(double x, double y, IEnumerable<KeyValuePair<string, object>> attributes)
+        {
+            Feature feature = Create(x, y);
+            foreach (var attribute in attributes)
+            {
+                feature.AddAttribute(attribute.Key, attribute.Value);
+            }
+            return feature;
+        }
+
+        public static Feature Create(Coordinate coordinate)
+        {
+            if (coordinate == null)
+            {
+                throw new ArgumentNullException("coordinate");
+            }
+
+            return new Feature(new Point(coordinate));
+        }
+
+        public static Feature Create(IGeometry geometry)
+        {
+            if (geometry == null)
+            {
+                throw new ArgumentNullException("geometry");
+            }
+
+            return new Feature(geometry);
+        }
+
+        private void WriteWktString()
+        {
+            var writer = new WKTWriter();
+            geomWkt = CultureHelper.InvokeWithUSCulture(() => writer.Write(geometry));
+        }
+
+        private void ParseGeometryString()
+        {
+            var reader = new WKTReader(GeometryFactory.Default);
+            geometry = reader.Read(geomWkt);
+        }
+
+        public override bool Equals(object obj)
+        {
+            var other = obj as Feature;
+            if (other == null)
+            {
+                return false;
+            }
+
+            // handle the case of comparing two NEW objects
+            bool otherIsTransient = Equals(other.Id, Guid.Empty);
+            bool thisIsTransient = Equals(Id, Guid.Empty);
+            if (otherIsTransient && thisIsTransient)
+            {
+                return ReferenceEquals(other, this);
+            }
+
+            return other.Id.Equals(Id);
+        }
+
+        public override int GetHashCode()
+        {
+            // Once we have a hash code we'll never change it
+            if (oldHashCode.HasValue)
+            {
+                return oldHashCode.Value;
+            }
+
+            bool thisIsTransient = Equals(Id, Guid.Empty);
+
+            // When this instance is transient, we use the base GetHashCode()
+            // and remember it, so an instance can NEVER change its hash code.
+            if (thisIsTransient)
+            {
+                oldHashCode = base.GetHashCode();
+                return oldHashCode.Value;
+            }
+            return Id.GetHashCode();
+        }
+
+        public static bool operator ==(Feature x, Feature y)
+        {
+            return Equals(x, y);
+        }
+
+        public static bool operator !=(Feature x, Feature y)
+        {
+            return !(x == y);
+        }
+
+        public void AddAttribute(string attributeName, object value)
+        {
+            try
+            {
+                Attributes.AddAttribute(attributeName, value);
+            }
+            catch (ArgumentException exception)
+            {
+                throw new ArgumentException(attributeName, exception);
+            }
+        }
+
+        public object this[string attributeName]
+        {
+            get { return Attributes[attributeName]; }
+            set { Attributes[attributeName] = value; }
+        }
+
+        public object Tag { get; set; }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Packages.xml
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Packages.xml	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Packages.xml	(revision 3305)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) Stichting Deltares 2019. All rights reserved.
+
+This file is part of the DAM - Clients Library.
+
+The DAM - UI is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+<packages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Application="D-Geo Stability">
+  <package>
+    <title en="Basic" nl="Basis" />
+    <module>0</module>
+  </package>
+  <package>
+    <title en="Basic, Uplift, Spencer" nl="Basic, Uplift, Spencer" />
+    <module>0</module>
+    <module>1</module>
+    <module>2</module>
+  </package>
+  <package>
+    <title en="Full" nl="Volledig" />
+    <module>0</module>
+    <module>1</module>
+    <module>2</module>
+    <module>3</module>
+    <module>5</module>
+  </package>
+</packages>
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CompositeJob.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CompositeJob.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CompositeJob.cs	(revision 3305)
@@ -0,0 +1,94 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using System.ComponentModel;
+using Deltares.Standard.Attributes;
+
+namespace Deltares.Dam.Data
+{
+    public class CompositeJob : DamJob
+    {
+        private IList<DamJob> jobs = new List<DamJob>();
+
+        public CompositeJob()
+        {
+        }
+
+        public CompositeJob(object subject) : base(subject)
+        {
+        }
+
+        public override bool? Run
+        {
+            get
+            {
+                bool containsRun = false;
+                bool containsNoRun = false;
+
+                foreach (DamJob job in jobs)
+                {
+                    if (!job.Run.HasValue)
+                    {
+                        containsRun = true;
+                        containsNoRun = true;
+                    }
+                    else if (job.Run.Value)
+                    {
+                        containsRun = true;
+                    }
+                    else
+                    {
+                        containsNoRun = true;
+                    }
+                }
+
+                if (containsRun && containsNoRun)
+                {
+                    return null;
+                }
+                else if (containsRun)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            set
+            {
+                foreach (DamJob job in jobs)
+                {
+                    job.Run = value;
+                }
+            }
+        }
+
+        [Child]
+        [Browsable(false)]
+        public virtual IList<DamJob> Jobs
+        {
+            get { return jobs; }
+            set { jobs = value;  }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IFeatureReader.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IFeatureReader.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IFeatureReader.cs	(revision 3305)
@@ -0,0 +1,32 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Maps
+{
+    public interface IFeatureReader : IFileReader<IFile, IFeature>
+    {
+        /// <summary>
+        ///     Gets or sets the value indicating geometry attribute or feature data should be read
+        ///     If set to false the attribute data will be read form the .dbf file (default)
+        /// </summary>
+        bool IgnoreAttributeData { get; set; }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactoryException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactoryException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/EntityFactoryException.cs	(revision 3305)
@@ -0,0 +1,52 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Deltares.Dam.Data
+{
+
+    [Serializable]
+    public class EntityFactoryException : Exception
+    {
+        public EntityFactoryException()
+        {
+        }
+
+        public EntityFactoryException(string message)
+            : base(message)
+        {
+        }
+
+        public EntityFactoryException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+
+        protected EntityFactoryException(
+            SerializationInfo info,
+            StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Services/PolygonAttributeImporterTest.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Services/PolygonAttributeImporterTest.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Services/PolygonAttributeImporterTest.cs	(revision 3305)
@@ -0,0 +1,313 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of the application DAM - UI.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using GeoAPI.Geometries;
+
+using NetTopologySuite.Geometries;
+
+using NUnit.Framework;
+
+using Rhino.Mocks;
+
+namespace Deltares.Maps.Tests.Services
+{
+    [TestFixture]
+    public class PolygonAttributeImporterTest
+    {
+        private MockRepository mocks;
+        private IFeatureRepository repository;
+
+        #region Setup
+
+        [TestFixtureSetUp]
+        public void FixtureSetup()
+        {
+            mocks = new MockRepository();
+            repository = mocks.DynamicMock<IFeatureRepository>();
+        }
+
+        [TestFixtureTearDown]
+        public void FixtureTearDown()
+        {
+        }
+
+        [SetUp]
+        public void TestSetup()
+        {
+        }
+
+        [TearDown]
+        public void TestTearDown()
+        {
+            mocks.VerifyAll();
+        }
+
+        #endregion
+
+        class MockTarget
+        {
+            public double X { get; set; }
+            public double Y { get; set; }
+            public double Property1 { get; set; }
+        }
+
+        [Test]
+        public void Import_TargetPointIsInPolygon_TargetPropertyIsSet()
+        {
+            const string attributeName = "TrafLoad";
+            const double expected = 20;
+
+            var target = new MockTarget { X = 0, Y = 0 };
+
+            var geometryRepository = new FeatureRepository();
+            var importer = new PolygonAttributeImporter<MockTarget>
+            {
+                XGetter = t => t.X,
+                YGetter = t => t.Y,
+                Targets = new[] { target },
+                AttributeMappings = new[]
+                {
+                    new AttributeMapping<MockTarget>
+                    {
+                        Name = attributeName,
+                        Action = (t, value) => t.Property1 = (double)value
+                    }
+                },
+                AttributeRepository = geometryRepository
+            };
+
+            var square = new Polygon(new LinearRing(new[]
+            {
+                new Coordinate(-1, 1),
+                new Coordinate(1, 1),
+                new Coordinate(1, -1),
+                new Coordinate(-1, -1),
+                new Coordinate(-1, 1)
+            }));
+
+            Feature geom = Feature.Create(square);
+            geom.AddAttribute(attributeName, expected);
+            geometryRepository.Add(geom);
+
+            mocks.ReplayAll();
+
+            importer.Import();
+
+            Assert.AreEqual(expected, target.Property1);
+        }
+
+        [Test]
+        public void Import_TargetPointTouchesPolygon_TargetPropertyIsSet()
+        {
+            const string attributeName = "TrafLoad";
+            const double expected = 20;
+
+            var target = new MockTarget { X = -1, Y = 1 };
+
+            var geometryRepository = new FeatureRepository();
+            var importer = new PolygonAttributeImporter<MockTarget>
+            {
+                XGetter = t => t.X,
+                YGetter = t => t.Y,
+                Targets = new[] { target },
+                AttributeMappings = new[]
+                {
+                    new AttributeMapping<MockTarget>
+                    {
+                        Name = attributeName,
+                        Action = (t, value) => t.Property1 = (double)value
+                    }
+                },
+                AttributeRepository = geometryRepository
+            };
+
+            var square = new Polygon(new LinearRing(new[]
+            {
+                new Coordinate(-1, 1),
+                new Coordinate(1, 1),
+                new Coordinate(1, -1),
+                new Coordinate(-1, -1),
+                new Coordinate(-1, 1)
+            }));
+
+            Feature geom = Feature.Create(square);
+            geom.AddAttribute(attributeName, expected);
+            geometryRepository.Add(geom);
+
+            mocks.ReplayAll();
+
+            importer.Import();
+
+            Assert.AreEqual(expected, target.Property1);
+        }
+
+        [Test]
+        public void Import_TargetPointOutsidePolygon_TargetPropertyIsNotSet()
+        {
+            const string attributeName = "TrafLoad";
+            const double expected = -999;
+
+            var target = new MockTarget { X = -2, Y = 2, Property1 = expected };
+
+            var geometryRepository = new FeatureRepository();
+            var importer = new PolygonAttributeImporter<MockTarget>
+            {
+                XGetter = t => t.X,
+                YGetter = t => t.Y,
+                Targets = new[] { target },
+                AttributeMappings = new[]
+                {
+                    new AttributeMapping<MockTarget>
+                    {
+                        Name = attributeName,
+                        Action = (t, value) => t.Property1 = (double)value
+                    }
+                },
+                AttributeRepository = geometryRepository
+            };
+
+            var square = new Polygon(new LinearRing(new[]
+            {
+                new Coordinate(-1, 1),
+                new Coordinate(1, 1),
+                new Coordinate(1, -1),
+                new Coordinate(-1, -1),
+                new Coordinate(-1, 1)
+            }));
+
+            Feature geom = Feature.Create(square);
+            geom.AddAttribute(attributeName, expected);
+            geometryRepository.Add(geom);
+
+            mocks.ReplayAll();
+
+            importer.Import();
+
+            Assert.AreEqual(expected, target.Property1);
+        }
+
+        [Test]
+        [ExpectedException(typeof(InvalidOperationException))]
+        public void Import_RepositoryContainsNoAttributes_Throws()
+        {
+            const string attributeName = "TrafLoad";
+
+            var target = new MockTarget { X = 0, Y = 0 };
+
+            var importer = new PolygonAttributeImporter<MockTarget>
+            {
+                XGetter = t => t.X,
+                YGetter = t => t.Y,
+                Targets = new[] { target },
+                AttributeMappings = new[]
+                {
+                    new AttributeMapping<MockTarget>
+                    {
+                        Name = attributeName,
+                        Action = (t, value) => t.Property1 = (double)value
+                    }
+                },
+                AttributeRepository = repository
+            };
+
+            Expect.Call(repository.SupportedAttributes).Return(new List<string>());
+            mocks.ReplayAll();
+
+            importer.Import();
+        }
+
+        [Test]
+        [ExpectedException(typeof(InvalidOperationException))]
+        public void Import_RepositoryNotSet_Throws()
+        {
+            const string attributeName = "TrafLoad";
+
+            var target = new MockTarget { X = 0, Y = 0 };
+
+            var importer = new PolygonAttributeImporter<MockTarget>
+            {
+                XGetter = t => t.X,
+                YGetter = t => t.Y,
+                Targets = new[] { target },
+                AttributeMappings = new[]
+                {
+                    new AttributeMapping<MockTarget>
+                    {
+                        Name = attributeName,
+                        Action = (t, value) => t.Property1 = (double)value
+                    }
+                }
+            };
+
+            mocks.ReplayAll();
+
+            importer.Import();
+        }
+
+        [Test]
+        public void Import_AttributeNameMissing_ErrorIsAddedToList()
+        {
+            const string attributeName = "TrafLoad";
+
+            var target = new MockTarget { X = 0, Y = 0 };
+
+            var importer = new PolygonAttributeImporter<MockTarget>
+            {
+                XGetter = t => t.X,
+                YGetter = t => t.Y,
+                Targets = new[] { target },
+                AttributeMappings =
+                    new[]
+                    {
+                        new AttributeMapping<MockTarget> { Name = attributeName, Action = (t, value) => t.Property1 = (double)value }
+                    },
+                AttributeRepository = repository
+            };
+
+            var square = new Polygon(new LinearRing(new[]
+            {
+                new Coordinate(-1, 1),
+                new Coordinate(1, 1),
+                new Coordinate(1, -1),
+                new Coordinate(-1, -1),
+                new Coordinate(-1, 1)
+            }));
+
+            Feature feature = Feature.Create(square);
+            const string testAttribute = "test";
+            feature.AddAttribute(testAttribute, new object());
+
+            //Expect.Call(repository.Features).Return(new[] { feature });
+            Expect.Call(repository.Query((IGeometry)null)).IgnoreArguments().Return(new[] { feature });
+            Expect.Call(repository.SupportedAttributes).Return(new[] { testAttribute });
+
+            mocks.ReplayAll();
+
+            importer.Import();
+
+            Assert.AreEqual(1, importer.Errors.OfType<AttributeMissingException>().Count());
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorTimeSeriesProcessorException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorTimeSeriesProcessorException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorTimeSeriesProcessorException.cs	(revision 3305)
@@ -0,0 +1,48 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Deltares.Dam.Data.Sensors
+{
+    [Serializable]
+    public class SensorTimeSeriesProcessorException : Exception
+    {
+        public SensorTimeSeriesProcessorException()
+        {
+        }
+
+        public SensorTimeSeriesProcessorException(string message) : base(message)
+        {
+        }
+
+        public SensorTimeSeriesProcessorException(string message, Exception inner) : base(message, inner)
+        {
+        }
+
+        protected SensorTimeSeriesProcessorException(
+            SerializationInfo info,
+            StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilProfileDataSet.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilProfileDataSet.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilProfileDataSet.cs	(revision 3305)
@@ -0,0 +1,29 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Dam.Data.Xsd
+{
+
+
+    public partial class SoilProfileDataSet
+    {
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/PL1Line.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/PL1Line.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/PL1Line.cs	(revision 3305)
@@ -0,0 +1,57 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Deltares.Geometry;
+
+namespace Deltares.Dam.Data
+{
+
+    public class PL1LineException : Exception
+    {
+        public PL1LineException(string message) : base(message)
+        {
+        }
+    }
+
+    public class PL1Line : GeometryPointString
+    {
+        public void Assign(PL1Line pl1Line)
+        {
+            this.Points.Clear();
+
+            foreach (GeometryPoint point in pl1Line.Points)
+            {
+                GeometryPoint newPoint = (GeometryPoint) point.Clone();
+                this.Points.Add(newPoint);
+            }
+        }
+
+        public PL1Line Clone()
+        {
+            var newPL1Line = new PL1Line();
+
+            newPL1Line.Assign(this);
+
+            return newPL1Line;
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/ICsvImporter.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/ICsvImporter.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/ICsvImporter.cs	(revision 3305)
@@ -0,0 +1,39 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Dam.Data.Importers
+{
+    using System.Collections.Generic;
+
+    public interface ICsvImporter
+    {
+        bool IsImportFileValid { get; }   
+    }
+
+    public interface IImporter<T>
+    {
+        IEnumerable<T> ImportedItems { get; }
+    }
+
+    public interface ICsvImporter<T> : ICsvImporter, IImporter<T>
+    {                        
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilProfileDataSet.xsc
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilProfileDataSet.xsc	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilProfileDataSet.xsc	(revision 3305)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--<autogenerated>
+     This code was generated by a tool.
+     Changes to this file may cause incorrect behavior and will be lost if
+     the code is regenerated.
+</autogenerated>-->
+<DataSetUISetting Version="1.00" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+  <TableUISettings />
+</DataSetUISetting>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Settings.Designer.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Settings.Designer.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Settings.Designer.cs	(revision 3305)
@@ -0,0 +1,317 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Deltares.Dam.Data.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("segments")]
+        public string SegmentImportFileName {
+            get {
+                return ((string)(this["SegmentImportFileName"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("locations")]
+        public string LocationImportFileName {
+            get {
+                return ((string)(this["LocationImportFileName"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("soilprofiles")]
+        public string SoilProfileImportFileName {
+            get {
+                return ((string)(this["SoilProfileImportFileName"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("surfacelines")]
+        public string SurfaceLineImportFileName {
+            get {
+                return ((string)(this["SurfaceLineImportFileName"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("characteristicpoints")]
+        public string CharacteristicPointsImportFileName {
+            get {
+                return ((string)(this["CharacteristicPointsImportFileName"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("csv")]
+        public string ImportFileExtension {
+            get {
+                return ((string)(this["ImportFileExtension"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("Soilbase\\soilbase.mdb")]
+        public string SoilDatabaseFile {
+            get {
+                return ((string)(this["SoilDatabaseFile"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("modelparameters")]
+        public string ModelParametersImportFileName {
+            get {
+                return ((string)(this["ModelParametersImportFileName"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0.66")]
+        public double IJkdijkPipingLengthPredictionParameter {
+            get {
+                return ((double)(this["IJkdijkPipingLengthPredictionParameter"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("pl1lines")]
+        public string PL1LineImportFileName {
+            get {
+                return ((string)(this["PL1LineImportFileName"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("gauges")]
+        public string GaugesImportFileName {
+            get {
+                return ((string)(this["GaugesImportFileName"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute(".\\DGeoStability.exe")]
+        public string MStabExePath {
+            get {
+                return ((string)(this["MStabExePath"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute(".\\GeoStudio.exe")]
+        public string SlopeWExePath {
+            get {
+                return ((string)(this["SlopeWExePath"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("Automatic")]
+        public global::Deltares.Dam.Data.GridSizeDetermination SlipCircleGridSizeDetermination {
+            get {
+                return ((global::Deltares.Dam.Data.GridSizeDetermination)(this["SlipCircleGridSizeDetermination"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("36")]
+        public int SlipCircleUpliftVanLeftGridVerticalPointCount {
+            get {
+                return ((int)(this["SlipCircleUpliftVanLeftGridVerticalPointCount"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("2")]
+        public double SlipCircleUpliftVanLeftGridVerticalPointDistance {
+            get {
+                return ((double)(this["SlipCircleUpliftVanLeftGridVerticalPointDistance"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("14")]
+        public int SlipCircleUpliftVanLeftGridHorizontalPointCount {
+            get {
+                return ((int)(this["SlipCircleUpliftVanLeftGridHorizontalPointCount"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("2")]
+        public double SlipCircleUpliftVanLeftGridHorizontalPointDistance {
+            get {
+                return ((double)(this["SlipCircleUpliftVanLeftGridHorizontalPointDistance"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("3")]
+        public int SlipCircleUpliftVanRightGridVerticalPointCount {
+            get {
+                return ((int)(this["SlipCircleUpliftVanRightGridVerticalPointCount"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("2")]
+        public double SlipCircleUpliftVanRightGridVerticalPointDistance {
+            get {
+                return ((double)(this["SlipCircleUpliftVanRightGridVerticalPointDistance"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("6")]
+        public int SlipCircleUpliftVanRightGridHorizontalPointCount {
+            get {
+                return ((int)(this["SlipCircleUpliftVanRightGridHorizontalPointCount"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("2")]
+        public double SlipCircleUpliftVanRightGridHorizontalPointDistance {
+            get {
+                return ((double)(this["SlipCircleUpliftVanRightGridHorizontalPointDistance"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("10")]
+        public int SlipCircleBishopGridVerticalPointCount {
+            get {
+                return ((int)(this["SlipCircleBishopGridVerticalPointCount"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("2.5")]
+        public double SlipCircleBishopGridVerticalPointDistance {
+            get {
+                return ((double)(this["SlipCircleBishopGridVerticalPointDistance"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("10")]
+        public int SlipCircleBishopGridHorizontalPointCount {
+            get {
+                return ((int)(this["SlipCircleBishopGridHorizontalPointCount"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("2.5")]
+        public double SlipCircleBishopGridHorizontalPointDistance {
+            get {
+                return ((double)(this["SlipCircleBishopGridHorizontalPointDistance"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("OnBoundaryLines")]
+        public global::Deltares.Dam.Data.TangentLinesDefinition SlipCircleUpliftVanTangentLinesDefinition {
+            get {
+                return ((global::Deltares.Dam.Data.TangentLinesDefinition)(this["SlipCircleUpliftVanTangentLinesDefinition"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0.25")]
+        public double SlipCircleUpliftVanTangentLinesDistance {
+            get {
+                return ((double)(this["SlipCircleUpliftVanTangentLinesDistance"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("OnBoundaryLines")]
+        public global::Deltares.Dam.Data.TangentLinesDefinition SlipCircleBishopTangentLinesDefinition {
+            get {
+                return ((global::Deltares.Dam.Data.TangentLinesDefinition)(this["SlipCircleBishopTangentLinesDefinition"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0.25")]
+        public double SlipCircleBishopTangentLinesDistance {
+            get {
+                return ((double)(this["SlipCircleBishopTangentLinesDistance"]));
+            }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.DamClientsLibrary.Version/Deltares.DamClientsLibrary.Version.csproj
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.DamClientsLibrary.Version/Deltares.DamClientsLibrary.Version.csproj	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.DamClientsLibrary.Version/Deltares.DamClientsLibrary.Version.csproj	(revision 3305)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{48691761-637B-4EFF-A04C-2047E5FA9843}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Deltares.DamClientsLibrary.Version</RootNamespace>
+    <AssemblyName>Deltares.DamClientsLibrary.Version</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>..\..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\Copying.GPL.licenseheader">
+      <Link>Copying.GPL.licenseheader</Link>
+    </None>
+    <None Include="GlobalAssembly.cs.svn" />
+  </ItemGroup>
+  <Import Project="$(ProjectDir)..\build\Deltares.DamClientsLibrary.Version.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>"$(ProjectDir)..\..\..\utils\svn_insert_version.cmd" "$(ProjectDir)" GlobalAssembly.cs.svn GlobalAssembly.cs</PreBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.DamClientsLibrary.Version/GlobalAssembly.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.DamClientsLibrary.Version/GlobalAssembly.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.DamClientsLibrary.Version/GlobalAssembly.cs	(revision 3305)
@@ -0,0 +1,13 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Deltares")]
+[assembly: AssemblyCopyright("Copyright © Deltares 2019")]
+[assembly: AssemblyProduct("DAM (Dijksterkte Analyse Module)")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: AssemblyVersion("19.1.0.0")]
+[assembly: AssemblyFileVersion("19.1.0.0")]
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/MaximumAttribute.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/MaximumAttribute.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/MaximumAttribute.cs	(revision 3305)
@@ -0,0 +1,41 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+
+namespace Deltares.Standard.Specifications
+{
+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, Inherited = false, AllowMultiple = true)]
+    public sealed class MaximumAttribute : Attribute
+    {
+        private readonly double attribteValue;
+
+        public MaximumAttribute(double maxValue)
+        {
+            this.attribteValue = maxValue;
+        }
+
+        public double AttributeValue
+        {
+            get { return this.attribteValue; }
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/ICalculator.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/ICalculator.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/ICalculator.cs	(revision 3305)
@@ -0,0 +1,33 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Dam.Data
+{
+    public interface ICalculator
+    {
+        double? Calculate(params object[] args);
+    }
+
+    public interface ICalculator<in T> : ICalculator
+    {
+        double? Calculate(T args);
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Specifications/PolderLevelSensorSpecification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Specifications/PolderLevelSensorSpecification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Specifications/PolderLevelSensorSpecification.cs	(revision 3305)
@@ -0,0 +1,33 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Standard.Specifications;
+
+namespace Deltares.Dam.Data.Sensors.Specifications
+{
+    internal class PolderLevelSensorSpecification : PredicateSpecification<Sensor>
+    {
+        public PolderLevelSensorSpecification() :
+            base(s => s.Type == SensorType.PolderLevel)
+        {
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoAssembler.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoAssembler.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoAssembler.cs	(revision 3305)
@@ -0,0 +1,269 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Xml.Linq;
+using Deltares.Standard.Extensions;
+using Deltares.Standard.IO.DtoAssembler;
+
+namespace Deltares.Standard
+{
+
+    #region DtoAssembler<TDomainObject, TDataTransferObject> definition
+
+    /// <summary>
+    /// Default implementation for the <see cref="IDtoAssembler"/> interface
+    /// </summary>
+    /// <typeparam name="T">The domain object type</typeparam>
+    public abstract class DtoAssembler<TDomainObject, TDataTransferObject> : IDtoAssembler<TDomainObject, TDataTransferObject>
+        where TDomainObject : new()
+    {
+        /// <summary>
+        /// Holds the property mappings
+        /// </summary>
+        private DtoPropertyAttributeMap map = new DtoPropertyAttributeMap();
+
+        /// <summary>
+        /// Gets the property mappings collection
+        /// </summary>
+        protected DtoPropertyAttributeMap Mappings
+        {
+            get { return this.map; }
+        }
+
+        #region IDtoAssembler<TDomainObject,TDataTransferObject> Members
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="dtoObj"></param>
+        /// <returns></returns>
+        public abstract TDomainObject CreateDomainObject(TDataTransferObject dtoObj);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="domainObj"></param>
+        /// <returns></returns>
+        public abstract TDataTransferObject CreateDataTransferObject(TDomainObject domainObj);
+
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        protected void InitializeMappings()
+        {
+            var tmp = new TDomainObject();
+            this.map.AddOrUpdateRange(tmp.ToPropertyMap());
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected void InitializeMappings(string elementName, XDocument xsdReferenceDocument)
+        {
+            var tmp = new TDomainObject();
+            IEnumerable<DtoPropertyAttriubteMapping> tmpMap = tmp.ToPropertyMap(elementName, xsdReferenceDocument);
+            this.map.AddOrUpdateRange(tmpMap);
+        }
+
+        /// <summary>
+        /// Adds or updates a property-to-attribute mapping item into the property map
+        /// </summary>
+        /// <param name="propertyName">The name of the property</param>
+        /// <param name="attributeName">The name of the attribute to map to</param>
+        protected void AddOrUpdateMapping(string propertyName, string attributeName)
+        {
+            this.AddOrUpdateMapping(propertyName, attributeName, DtoPropertyImportance.Optional);
+        }
+
+        /// <summary>
+        /// Adds or updates a property-to-attribute mapping item into the property map
+        /// </summary>
+        /// <param name="propertyName">The name of the property</param>
+        /// <param name="attributeName">The name of the attribute to map to</param>
+        /// <param name="importance">The usage or importance of the value i.e. reguired or optional</param>
+        protected void AddOrUpdateMapping(string propertyName, string attributeName, DtoPropertyImportance importance)
+        {
+            if (!propertyName.HasValidStringValue())
+                throw new DtoPropertyMapException("propertyName is not valid (empty or null)");
+
+            bool q = (from x in new TDomainObject().GetType().GetProperties()
+                      where x.Name == propertyName
+                      select x).Any();
+
+            if (!q)
+                throw new DtoPropertyMapException("The property you want to add or update doesnt exist in the property list of the domain object.");
+
+            this.Mappings.AddOrUpdate(propertyName, attributeName, importance);
+        }
+    }
+
+    #endregion
+
+    #region DtoAssembler<TDomainObject, XElement>
+
+    /// <summary>
+    /// Default implementation for the <see cref="IDtoAssembler"/> interface
+    /// </summary>
+    /// <remarks>
+    /// This base class inherits from <see cref="DtoAssembler"/> this class just fixes 
+    /// the dto type to XElement
+    /// </remarks>
+    /// <typeparam name="T">The domain object type</typeparam>
+    public abstract class DtoAssembler<TDomainObject> : DtoAssembler<TDomainObject, XElement>, IDtoAssembler<TDomainObject>
+        where TDomainObject : new()
+    {
+        /// <summary>
+        /// Initializes a new instance of the DtoAssembler class
+        /// </summary>
+        /// <param name="elementName">Sets the element name</param>
+        /// <param name="xsdStream">The text reader stream for reading in ther xsd file which is embedded as an resource</param>
+        public DtoAssembler(string elementName, Stream xsdStream)
+            : this(elementName, null, xsdStream)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the DtoAssembler class
+        /// </summary>
+        /// <param name="elementName">Sets the element name</param>
+        /// <param name="xsdStream">The text reader stream for reading in ther xsd file which is embedded as an resource</param>
+        public DtoAssembler(string elementName, string elementNamespace)
+            : this(elementName, elementNamespace, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the DtoAssembler class
+        /// </summary>
+        /// <param name="elementName">Sets the element name</param>
+        /// <param name="xsdStream">The text reader stream for reading in ther xsd file which is embedded as an resource</param>
+        public DtoAssembler(string elementName, string elementNamespace, Stream xsdStream)
+        {
+            this.ElementName = elementName;
+            this.ElementNamespace = elementNamespace;
+
+            if (xsdStream == null)
+                xsdStream = this.GetXsdStreamFromEmbeddedResource();
+
+            XDocument doc = XDocument.Load(new StreamReader(xsdStream));
+            this.Schema = doc;
+            base.InitializeMappings(elementName, doc);
+        }
+
+        /// <summary>
+        /// Gets or sets the namespace value for the element
+        /// </summary>
+        public string ElementNamespace { get; private set; }
+
+        /// <summary>
+        /// Gets the xml schema (if any)
+        /// </summary>
+        public XDocument Schema { get; private set; }
+
+        #region IDtoAssembler<TDomainObject> Members
+
+        /// <summary>
+        /// Gets the xml element name
+        /// </summary>
+        public string ElementName { get; private set; }
+
+        /// <summary>
+        /// Creates and materialized a data transfer object (dto) from a domain object
+        /// </summary>
+        /// <param name="domainObj">The domain object</param>
+        /// <returns>An XElement instance</returns>
+        public override XElement CreateDataTransferObject(TDomainObject domainObj)
+        {
+            if (domainObj == null)
+                return null;
+
+            if (!this.ElementName.HasValidStringValue())
+                throw new DtoAssemblerException("There is no element name specified");
+
+            if (this.ElementNamespace.HasValidStringValue())
+            {
+                XNamespace ns = this.ElementNamespace;
+                return new XElement(ns + this.ElementName)
+                    .Materialize(domainObj, this.Mappings);
+            }
+
+            return new XElement(this.ElementName)
+                .Materialize(domainObj, this.Mappings);
+        }
+
+        /// <summary>
+        /// Creates and materializes a domain object from a data transfer object (dto)
+        /// </summary>
+        /// <param name="dtoObj">The dto object</param>
+        /// <returns>The materialized domain object</returns>
+        public override TDomainObject CreateDomainObject(XElement dto)
+        {
+            return new TDomainObject().Materialize(dto, this.Mappings);
+        }
+
+        #endregion
+
+        public Stream GetXsdStreamFromEmbeddedResource()
+        {
+            if (string.IsNullOrEmpty(this.ElementNamespace))
+                return null;
+
+            Assembly assembly = this.GetType().Assembly;
+            string schemaName = this.ElementNamespace.Substring(this.ElementNamespace.LastIndexOf('/') + 1);
+            schemaName += schemaName.EndsWith(".xsd") ? "" : ".xsd";
+
+            string resourceName = (from string name in assembly.GetManifestResourceNames()
+                                   where name.EndsWith(schemaName)
+                                   select name).Single();
+
+            return assembly.GetEmbeddedFile(resourceName);
+        }
+
+        public virtual TDomainObject CreateDomainObject(XDocument dtoDocument)
+        {
+            if (dtoDocument == null)
+                throw new ArgumentNullException("dtoDocument");
+
+            XElement el = null;
+            try
+            {
+                el = (from x in dtoDocument.Descendants()
+                      where x.Name.LocalName == this.ElementName
+                      select x).Single();
+            }
+            catch
+            {
+                throw;
+            }
+
+            return this.CreateDomainObject(el);
+        }
+    }
+
+    #endregion
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/DAMNewProjectData.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/DAMNewProjectData.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/DAMNewProjectData.cs	(revision 3305)
@@ -0,0 +1,198 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Xml.Serialization;
+using Deltares.Standard;
+using Deltares.Standard.Attributes;
+using Deltares.Standard.EventPublisher;
+using DotSpatial.Projections;
+
+namespace Deltares.Dam.Data.UISupport
+{
+    public class DAMNewProjectData : IVisibleEnabled, IDomain
+    {
+        private DamProjectType damProjectType;
+        private string damDataSourceFileName;
+        private string damProjectFileName;
+        private string sensorConfigurationFileName;
+        private List<string> selectedDikeRingIds = new List<string>();
+        private string dataSourceEsriProjection;
+        private string dataSourceProjectionName;
+        private bool dataSourceProjectionUserDefined;
+
+        [Label("Calculation type")]
+        [Description("Indicates the purpose of the calculations")]
+        [XmlIgnore]
+        public DamProjectType DamProjectType
+        {
+            get { return damProjectType; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "DamProjectType");
+                damProjectType = value;
+                DataEventPublisher.AfterChange(this, "DamProjectType");
+            }
+        }
+
+        [Label("DAM datasource file")]
+        [Description("Indicates which \".defx\" import definition file to use")]
+        [XmlIgnore]
+        public string DamDataSourceFileName
+        {
+            get { return damDataSourceFileName; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "DamDataSourceFileName");
+                damDataSourceFileName = value;
+                DataEventPublisher.AfterChange(this, "DamDataSourceFileName");
+            }
+        }
+
+        [XmlIgnore]
+        public string SensorConfigurationFileName
+        {
+            get { return sensorConfigurationFileName; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "SensorConfigurationFileName");
+                sensorConfigurationFileName = value;
+                DataEventPublisher.AfterChange(this, "SensorConfigurationFileName");
+            }
+        }
+
+        [XmlIgnore]
+        public string DamProjectFileName
+        {
+            get { return damProjectFileName; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "DamProjectFileName");
+                damProjectFileName = value;
+                DataEventPublisher.AfterChange(this, "DamProjectFileName");
+            }
+        }
+
+        [XmlIgnore]
+        public string DataSourceEsriProjection
+        {
+            get { return dataSourceEsriProjection; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "DataSourceEsriProjection");
+                dataSourceEsriProjection = value;
+                DataEventPublisher.AfterChange(this, "DataSourceEsriProjection");
+                try
+                {
+                    var projection =  ProjectionInfo.FromEsriString(value);
+                    DataSourceProjectionName = projection.Name ?? projection.ToString();
+                }
+                catch (Exception)
+                {
+                    DataSourceProjectionName = "Invalid projection";
+                }
+            }
+        }
+
+        [XmlIgnore]
+        [ReadOnly(true)]
+        public string DataSourceProjectionName
+        {
+            get { return dataSourceProjectionName; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "DataSourceProjectionName");
+                dataSourceProjectionName = value;
+                DataEventPublisher.AfterChange(this, "DataSourceProjectionName");
+            }
+        }
+
+        /// <summary>
+        /// Selects the sensor configuration file.
+        /// </summary>
+        [Label("...")]
+        public void SelectSensorConfigurationFile()
+        {
+            // This method is needed for the databinding to DamNewProjectDialog 
+            // The IsEnabled is implemented in this class
+            // The UI code itself is implemented in the DamNewProjectDialog itself
+        }
+
+        /// <summary>
+        /// Selects the projection.
+        /// </summary>
+        public void SelectProjection()
+        {
+            // This method is needed for the databinding to DamNewProjectDialog 
+            // The IsEnabled is implemented in this class
+            // The UI code itself is implemented in the DamNewProjectDialog itself
+        }
+
+        public List<string> SelectedDikeRingIds
+        {
+            get { return selectedDikeRingIds; }
+            set { selectedDikeRingIds = value; }
+        }
+
+        public bool DataSourceProjectionUserDefined
+        {
+            get { return dataSourceProjectionUserDefined; }
+            set { dataSourceProjectionUserDefined = value; }
+        }
+
+        public bool IsVisible(string property)
+        {
+            if (property == "SelectProjection")
+            {
+                return (string.IsNullOrEmpty(DataSourceEsriProjection) || DataSourceProjectionUserDefined);
+            }
+            return true;
+        }
+
+        public bool IsEnabled(string property)
+        {
+            if ((property == "SensorConfigurationFileName") || (property == "SelectSensorConfigurationFile"))
+            {
+                return (DamProjectType == DamProjectType.DamLiveConfiguration);
+            }
+            return true;
+        }
+
+        public ICollection GetDomain(string property)
+        {
+            switch (property)
+            {
+                case "DamProjectType":
+                    return new[]
+                    {
+                        DamProjectType.Design,
+                        DamProjectType.Calamity,
+                        DamProjectType.DamLiveConfiguration
+                    };
+                default:
+                    return null;
+            }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/FileWriterUtil.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/FileWriterUtil.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/FileWriterUtil.cs	(revision 3305)
@@ -0,0 +1,40 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.IO;
+
+namespace Deltares.Dam.Data
+{
+    public static class FileWriterUtil
+    {
+        public static void RemoveThreeBytesFromXml(string outputFilename)
+        {
+            byte[] uncorrectedXmlData = File.ReadAllBytes(outputFilename);
+            byte[] correctedXmlData = new byte[uncorrectedXmlData.Length - 3];
+            for (int byteIndex = 3; byteIndex < uncorrectedXmlData.Length; byteIndex++)
+            {
+                correctedXmlData[byteIndex - 3] = uncorrectedXmlData[byteIndex];
+            }
+            File.WriteAllBytes(outputFilename, correctedXmlData);
+
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/ISpecification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/ISpecification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/ISpecification.cs	(revision 3305)
@@ -0,0 +1,70 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Standard.Specifications
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public interface ISpecification
+    {
+        /// <summary>
+        /// Gets or sets the name of the specification. (Short description)
+        /// </summary>
+        /// <value>
+        /// The name string value should be a required property for each specification.
+        /// </value>
+        string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the description of the specification. (Long description)
+        /// </summary>
+        /// <value>
+        /// The description string value.
+        /// </value>
+        string Description { get; set; }
+
+        /// <summary>
+        /// Determines whether the candidate satisfies the specification.
+        /// </summary>
+        /// <param name="candidate">The candidate.</param>
+        /// <returns>
+        ///   <c>true</c> if the candidate satisfies the specification otherwise, <c>false</c>.
+        /// </returns>
+        bool IsSatisfiedBy(object candidate);
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <typeparam name="TCandidate">The type of the candidate.</typeparam>
+    public interface ISpecification<in TCandidate> : ISpecification
+    {
+        /// <summary>
+        /// Determines whether the candidate satisfies the specification.
+        /// </summary>
+        /// <param name="candidate">The candidate.</param>
+        /// <returns>
+        ///   <c>true</c> if the candidate satisfies the specification otherwise, <c>false</c>.
+        /// </returns>
+        bool IsSatisfiedBy(TCandidate candidate);
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Services/FeatueRepositoryExtensionsTest.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Services/FeatueRepositoryExtensionsTest.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Services/FeatueRepositoryExtensionsTest.cs	(revision 3305)
@@ -0,0 +1,228 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of the application DAM - UI.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using System.Linq;
+
+using GeoAPI.Geometries;
+
+using NetTopologySuite.Geometries;
+
+using NUnit.Framework;
+
+using Rhino.Mocks;
+
+namespace Deltares.Maps.Tests.Services
+{
+    [TestFixture]
+    public class FeatueRepositoryExtensionsTest
+    {
+        private MockRepository mocks;
+        private IFeatureRepository rep1, rep2;
+        private LineString dikeRing;
+
+        #region Setup
+
+        [TestFixtureSetUp]
+        public void FixtureSetup()
+        {
+            mocks = new MockRepository();
+        }
+
+        [TestFixtureTearDown]
+        public void FixtureTearDown()
+        {
+        }
+
+        [SetUp]
+        public void TestSetup()
+        {
+            rep1 = mocks.DynamicMock<IFeatureRepository>();
+            rep2 = mocks.DynamicMock<IFeatureRepository>();
+
+            dikeRing = new LineString(new[]
+            {
+                new Coordinate(-2, 2),
+                new Coordinate(2, 2),
+                new Coordinate(2, -2),
+                new Coordinate(-2, -2),
+                new Coordinate(-2, 2)
+            });
+        }
+
+        [TearDown]
+        public void TestTearDown()
+        {
+            mocks.VerifyAll();
+        }
+
+        #endregion
+
+        [Test]
+        public void GetLineIntersectionPoints_OneValidProfileIntersects_ListContainsOneElement()
+        {
+            var profile1 = new LineString(new[]
+            {
+                new Coordinate(-3, 1),
+                new Coordinate(0, 1)
+            });
+
+            var profile2 = new LineString(new[]
+            {
+                new Coordinate(-3, -3),
+                new Coordinate(0, -3)
+            });
+
+            Feature geom1 = Feature.Create(profile1);
+            Feature geom2 = Feature.Create(profile2);
+            Expect.Call(rep1.Features).Return(new[]
+            {
+                geom1,
+                geom2
+            });
+
+            Feature dikeGeom = Feature.Create(dikeRing);
+            Expect.Call(rep2.Query((IFeature)null)).IgnoreArguments().Return(new[]
+            {
+                dikeGeom
+            });
+
+            mocks.ReplayAll();
+
+            IEnumerable<IGrouping<int, IntersectionResult>> results = rep1.GetIntersectionPoints(rep2);
+            Assert.IsNotNull(results);
+            Assert.AreEqual(2, results.Count());
+            Assert.IsTrue(results.Any(r => r.Key == 1));
+            Assert.IsTrue(results.Any(r => r.Key == 0));
+
+            IntersectionResult result = results.GetResultsHavingCount(1).Single();
+            Assert.AreEqual(result.Source.Id, geom1.Id);
+            Assert.AreEqual(result.Target.Id, dikeGeom.Id);
+            Assert.AreEqual(-2, result.IntersectionPoints.ElementAt(0).X, 0.0001);
+            Assert.AreEqual(1, result.IntersectionPoints.ElementAt(0).Y, 0.0001);
+        }
+
+        [Test]
+        public void GetLineIntersectionPoints_TwoValidProfilesIntersects_ListContainsTwoElements()
+        {
+            var profile1 = new LineString(new[]
+            {
+                new Coordinate(-3, 1),
+                new Coordinate(0, 1)
+            });
+
+            var profile2 = new LineString(new[]
+            {
+                new Coordinate(-3, -1),
+                new Coordinate(0, -1)
+            });
+
+            Feature geom1 = Feature.Create(profile1);
+            Feature geom2 = Feature.Create(profile2);
+            Expect.Call(rep1.Features).Return(new[]
+            {
+                geom1,
+                geom2
+            });
+
+            Feature dikeGeom = Feature.Create(dikeRing);
+            Expect.Call(rep2.Query((IFeature)null)).IgnoreArguments().Return(new[]
+            {
+                dikeGeom
+            });
+            mocks.ReplayAll();
+
+            IEnumerable<IGrouping<int, IntersectionResult>> results = rep1.GetIntersectionPoints(rep2);
+
+            Assert.IsNotNull(results);
+            Assert.AreEqual(1, results.Count());
+            Assert.IsTrue(results.Any(r => r.Key == 1));
+
+            Assert.AreEqual(2, results.GetResultsHavingCount(1).Count());
+            IntersectionResult result = results.ElementAt(0).First();
+            Assert.AreEqual(result.Source.Id, geom1.Id);
+            Assert.AreEqual(result.Target.Id, dikeGeom.Id);
+            Assert.AreEqual(-2, result.IntersectionPoints.ElementAt(0).X, 0.0001);
+            Assert.AreEqual(1, result.IntersectionPoints.ElementAt(0).Y, 0.0001);
+        }
+
+        [Test]
+        public void GetLineIntersectionPoints_ProfileIntersectsOnTwoSegements_ListContainsOneElementAndTwoIntersectionPoints()
+        {
+            var profile1 = new LineString(new[]
+            {
+                new Coordinate(-3, 1),
+                new Coordinate(3, 1)
+            });
+
+            Feature geom1 = Feature.Create(profile1);
+            Expect.Call(rep1.Features).Return(new[]
+            {
+                geom1
+            });
+
+            Feature dikeGeom = Feature.Create(dikeRing);
+            Expect.Call(rep2.Query((IFeature)null)).IgnoreArguments().Return(new[]
+            {
+                dikeGeom
+            });
+
+            mocks.ReplayAll();
+
+            IEnumerable<IGrouping<int, IntersectionResult>> results = rep1.GetIntersectionPoints(rep2);
+            Assert.IsNotNull(results);
+            Assert.AreEqual(1, results.Count());
+            Assert.AreEqual(1, results.GetResultsHavingCount(2).Count());
+            IntersectionResult result = results.ElementAt(0).First();
+            Assert.AreEqual(result.Source.Id, geom1.Id);
+            Assert.AreEqual(result.Target.Id, dikeGeom.Id);
+        }
+
+        [Test]
+        public void GetLineIntersectionPoints_ProfileDoesNotIntersects_ListContainsOneElementAndZeroIntersectionPoints()
+        {
+            var profile1 = new LineString(new[]
+            {
+                new Coordinate(-3, -3),
+                new Coordinate(3, -3)
+            });
+
+            Feature geom1 = Feature.Create(profile1);
+            Expect.Call(rep1.Features).Return(new[]
+            {
+                geom1
+            });
+
+            Feature dikeGeom = Feature.Create(dikeRing);
+            Expect.Call(rep2.Query((IFeature)null)).IgnoreArguments().Return(new[]
+            {
+                dikeGeom
+            });
+
+            mocks.ReplayAll();
+
+            IEnumerable<IGrouping<int, IntersectionResult>> results = rep1.GetIntersectionPoints(rep2);
+            Assert.IsNotNull(results);
+            Assert.AreEqual(1, results.Count());
+            Assert.AreEqual(1, results.GetResultsHavingCount(0).Count());
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs	(revision 3305)
@@ -0,0 +1,864 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Deltares.Dam.Data.CsvImporters;
+using Deltares.Geotechnics.Exception;
+using Deltares.Geotechnics.GeotechnicalGeometry;
+using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.SurfaceLines;
+using Deltares.Standard.EventPublisher;
+using Deltares.Standard.Language;
+using Deltares.Standard.Logging;
+
+namespace Deltares.Dam.Data.IO
+{
+
+    public class CombineImportedDataException : ApplicationException
+    {
+        public CombineImportedDataException(string message)
+            : base(message)
+        {
+        }
+    }
+
+    public class CombineImportedData
+    {
+        private WaterBoard waterBoard;
+        private readonly IList<LogMessage> errorMessages = new List<LogMessage>();
+
+        public WaterBoard WaterBoard
+        {
+            get { return waterBoard; }
+            set { waterBoard = value; }
+        }
+
+        public IEnumerable<CsvImporterLocations.LocationRecord> LocationRecords { get; set; }
+
+        public IEnumerable<CsvImporterSegments.SegmentRecord> SegmentRecords { get; set; }
+
+        public IEnumerable<CsvImporterSoilProfiles.SoilProfileRecord> SoilProfilerecords { get; set; }
+
+        public IEnumerable<CsvImporterSurfaceLines.SurfaceLineRecord> SurfaceLineRecords { get; set; }
+
+        public IEnumerable<CsvImporterCharacteristicPoints.CharacteristicPointsRecord> CharacteristicPointsRecords { get; set; }
+
+        public IEnumerable<CsvImporterScenarios.ScenarioRecord> ScenarioRecords { get; set; }
+
+        public IList<LogMessage> ErrorMessages
+        {
+            get { return errorMessages; }
+        }
+
+        /// <summary>
+        /// Adds the dikes from locations to water board.
+        /// </summary>
+        /// <param name="targetWaterBoard">The water board.</param>
+        private void AddDikesFromLocationsToWaterBoard(WaterBoard targetWaterBoard)
+        {
+            if (LocationRecords == null)
+                return;
+
+            // Create list of unique dikering ids
+            var dikeRingIdList = new List<string>();
+            foreach (var locationRecord in LocationRecords)
+            {
+                if (!String.IsNullOrEmpty(locationRecord.DikeRingId))
+                {
+                    if (!dikeRingIdList.Contains(locationRecord.DikeRingId))
+                    {
+                        dikeRingIdList.Add(locationRecord.DikeRingId);
+                    }
+                }
+            }
+
+            // if no dikeringIds assigned, then use default dike and assign it to the locations (if there are any)
+            if ((dikeRingIdList.Count <= 0) && LocationRecords.Any())
+            {
+                string defaultDikeRingId = "Dike from CSV";
+                if (targetWaterBoard.Dikes.Count > 0)
+                {
+                    defaultDikeRingId = targetWaterBoard.Dikes[0].Name;
+                }
+                foreach (var locationRecord in LocationRecords)
+                {
+                    locationRecord.DikeRingId = defaultDikeRingId;
+                }
+                dikeRingIdList.Add(defaultDikeRingId);
+            }
+
+            // Add dikeringids if not yet in waterboard
+            foreach (var dikeRingId in dikeRingIdList)
+            {
+                var dike = targetWaterBoard.Dikes.FirstOrDefault(d => d.Name.Equals(dikeRingId));
+                if (dike == null)
+                {
+                    targetWaterBoard.Dikes.Add(new Dike() { Name = dikeRingId });
+                }
+            }
+        }
+
+        /// <summary>
+        /// Adds the imported CSV data to dikes.
+        /// </summary>
+        public void AddCsvDataToDikes()
+        {
+            if (waterBoard == null)
+            {
+                var damProjectDataNotAssignedForImport = LocalizationManager.GetTranslatedText(GetType(), "damProjectDataNotAssignedForImport");
+                throw new CombineImportedDataException(damProjectDataNotAssignedForImport);
+            }
+            AddDikesFromLocationsToWaterBoard(waterBoard);
+
+            foreach (var dike in waterBoard.Dikes)
+            {
+                TransferLocationsData(dike);
+                TransferSoilProfilesData(dike);
+                TransferSegmentData(dike);
+                // Use InvokeWithoutPublishingEvents for performance reasons after introducing SurfaceLine2
+                DataEventPublisher.InvokeWithoutPublishingEvents(() => { TransferSurfaceLines(dike); });
+            }
+        }
+
+        public void AddScenarioDataToDikes()
+        {
+            foreach (var dike in waterBoard.Dikes)
+            {
+                if (ScenarioRecords != null)
+                {
+                    TransferScenarios(dike);
+                }
+            }
+        }
+
+        private bool CheckForValidSegmentId(int segmentRecordId, string segmentId)
+        {
+            if (String.IsNullOrEmpty(segmentId))
+            {
+                var segmentRecordHasNoId = LocalizationManager.GetTranslatedText(GetType(), "segmentRecordHasNoId");
+                LogMessage logmessage = new LogMessage(LogMessageType.Error, null,
+                                                       String.Format("Record {0} : {1}", segmentRecordId, segmentRecordHasNoId));
+                ErrorMessages.Add(logmessage);
+                return false;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Check if either a 1D-geometry or a 2D-geometry is specified
+        /// </summary>
+        /// <param name="segmentId"></param>
+        /// <param name="soilProfileId"></param>
+        /// <param name="soilGeometry2DName"></param>
+        private bool CheckForAnySoilGeometry(string segmentId, string soilProfileId, string soilGeometry2DName)
+        {
+            if ((String.IsNullOrEmpty(soilProfileId)) && (String.IsNullOrEmpty(soilGeometry2DName)))
+            {
+                var segmentHasNoProfileOrGeometry = LocalizationManager.GetTranslatedText(GetType(), "segmentHasNoProfileOrGeometry");
+                LogMessage logmessage = new LogMessage(LogMessageType.Error, null,
+                                                       String.Format("{0} : {1}", segmentId, segmentHasNoProfileOrGeometry));
+                ErrorMessages.Add(logmessage);
+                return false;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Check if both a 1D-geometry or a 2D-geometry is specified (which is not allowed)
+        /// </summary>
+        /// <param name="segmentId"></param>
+        /// <param name="soilProfileId"></param>
+        /// <param name="soilGeometry2DName"></param>
+        private bool CheckForDoubleSoilGeometry(string segmentId, string soilProfileId, string soilGeometry2DName)
+        {
+            if ((!String.IsNullOrEmpty(soilProfileId)) && (!String.IsNullOrEmpty(soilGeometry2DName)))
+            {
+                var segmentHasProfileAndGeometry = LocalizationManager.GetTranslatedText(GetType(), "segmentHasProfileAndGeometry");
+                LogMessage logmessage = new LogMessage(LogMessageType.Error, null,
+                                                       String.Format("{0} : {1}", segmentId, segmentHasProfileAndGeometry));
+                ErrorMessages.Add(logmessage);
+                return false;
+            }
+            return true;
+        }
+
+        // Before using this, the Locations and (for 1D profiles) SoilProfiles must be known!?
+        private void TransferSegmentData(Dike dike)
+        {
+            if (SegmentRecords == null)
+                return;
+
+            if (waterBoard.Segments.Count > 0)
+            {
+                foreach (var segmentRecord in SegmentRecords)
+                {
+                    // look for existing segments by Id. If found, remove them from the waterboard as they are to be (re)read here.
+                    var oldSegments = waterBoard.Segments.Where(s => s.Name == segmentRecord.SegmentId).ToList();
+                    foreach (var oldSegment in oldSegments)
+                    {
+                        waterBoard.Segments.Remove(oldSegment);
+                    }
+                }
+            }
+
+            var soilProfileLookup = dike.SoilProfiles != null ? dike.SoilProfiles.ToDictionary(sp => sp.Name, sp => sp) : null;
+            foreach (var segmentRecord in SegmentRecords)
+            {
+
+                if (CheckForValidSegmentId(segmentRecord.SegmentRecordId, segmentRecord.SegmentId) &&
+                        (CheckForDoubleSoilGeometry(segmentRecord.SegmentId, segmentRecord.SoilProfileId,
+                                                  segmentRecord.SoilGeometry2DName)) &&
+                      (CheckForAnySoilGeometry(segmentRecord.SegmentId, segmentRecord.SoilProfileId,
+                                               segmentRecord.SoilGeometry2DName)))
+                {
+                    bool newSegment = false;
+                    //check if new segment is needed
+                    var segment = waterBoard.GetSegmentByName(segmentRecord.SegmentId);
+                    if (segment == null)
+                    {
+                        newSegment = true;
+                        segment = new Segment();
+                    }
+
+                    segment.Name = segmentRecord.SegmentId;
+                    if (!String.IsNullOrEmpty(segmentRecord.SoilGeometry2DName))
+                    {
+                        segment.AddSoilGeometry2DProbability(segmentRecord.SoilGeometry2DName,
+                                                                segmentRecord.Probability,
+                                                             segmentRecord.SegmentFailureMechanismType);
+                    }
+                    if (!String.IsNullOrEmpty(segmentRecord.SoilProfileId))
+                    {
+                        if (soilProfileLookup == null)
+                        {
+                            var dikeHasNoSoilProfiles = LocalizationManager.GetTranslatedText(GetType(), "dikeHasNoSoilProfiles");
+                            LogMessage logmessage = new LogMessage(LogMessageType.Error, null,
+                                                                   String.Format("{0} : {1}", dike.Name,
+                                                                                 dikeHasNoSoilProfiles));
+                            ErrorMessages.Add(logmessage);
+                        }
+                        else
+                        {
+                            var soilProfileName = segmentRecord.SoilProfileId;
+                            SoilProfile1D soilProfile = soilProfileLookup.ContainsKey(soilProfileName) ? soilProfileLookup[soilProfileName] : null;
+                            if (soilProfile == null)
+                            {
+                                //#Bka: do not give message here as it might be that an old project is being loaded which does not have a full
+                                // dataset (such as old HHNK projects by Irene), leading to a very large list with non relevant errors as the locations
+                                // for which this check is performed are not all used.
+                                //                                var soilProfileForSegmentDoesNotExist =
+                                //                                    LocalizationManager.GetTranslatedText(this.GetType(),
+                                //                                                                          "soilProfileForSegmentDoesNotExist");
+                                //                                LogMessage logmessage = new LogMessage(LogMessageType.Error, null,
+                                //                                                                       String.Format("{0} : {1}:{2}",
+                                //                                                                                     segmentRecord.SegmentId,
+                                //                                                                                     soilProfileForSegmentDoesNotExist,
+                                //                                                                                     segmentRecord.SoilProfileId));
+                                //                                ErrorMessages.Add(logmessage);
+                            }
+                            else
+                            {
+                                segment.AddSoilProfileProbability(soilProfile, segmentRecord.Probability,
+                                                                  segmentRecord.SegmentFailureMechanismType);
+                            }
+                        }
+                    }
+                    // Note Bka: coupling of segment to location still needs to be done. But can only be achieved when location has info on segment or segment id
+                    //segment.Locations.AddRange(dike.Locations.Where(l => l.Segment.Name == segmentRecord.SegmentId));
+                    //                    var segId = dike.Locations[0].SegmentId;
+                    //                    if (segId == segmentRecord.SegmentId)
+                    //                        dike.Locations[0].Segment = segment;
+                    if (newSegment)
+                    {
+                        waterBoard.Segments.Add(segment);
+                        var segmentId = segmentRecord.SegmentId;
+                        var locationsWithSegmentId = waterBoard.Locations.Where(x => x.SegmentId == segmentId);
+                        foreach (var location in locationsWithSegmentId)
+                        {
+                            location.Segment = segment;
+                        }
+                    }
+
+                }
+            }
+        }
+
+        private void TransferSoilProfilesData(Dike dike)
+        {
+            if (SoilProfilerecords == null)
+                return;
+
+            bool newSoilProfile = false;
+            var orgId = "";
+            SoilProfile1D soilProfile = null;
+            var layerIndex = 0;
+
+            foreach (var soilProfileRecord in SoilProfilerecords)
+            {
+                if ((String.IsNullOrEmpty(soilProfileRecord.SoilProfileId)) || (String.IsNullOrEmpty(soilProfileRecord.SoilName)))
+                {
+                    var noIdForSoilProfileRecordError = LocalizationManager.GetTranslatedText(this.GetType(), "noIdOrSoilForSoilProfileRecordError");
+                    LogMessage logmessage = new LogMessage(LogMessageType.Error, this,
+                                                           String.Format("Record {0} : {1}", soilProfileRecord.SoilProfileRecordId, noIdForSoilProfileRecordError));
+                    ErrorMessages.Add(logmessage);
+                    AddErrorMessage("noIdOrSoilForSoilProfileRecordError", soilProfileRecord);
+                }
+                else
+                {
+                    // see if a next profile is to be converted from the csv data. If not, layer needs to be added to the current profile
+                    if (orgId != soilProfileRecord.SoilProfileId)
+                    {
+                        // first add current profile (if it exists) to dike.
+                        if (soilProfile != null)
+                        {
+                            if (newSoilProfile)
+                            {
+                                try
+                                {
+                                    soilProfile.ValidateDirect();
+                                    dike.SoilProfiles.Add(soilProfile);
+                                }
+                                catch (SoilProfileLayersNotSortedDescendingException e)
+                                {
+                                    LogMessage logmessage = new LogMessage(LogMessageType.Error, null, e.Message);
+                                    ErrorMessages.Add(logmessage);
+                                }
+                                layerIndex = 0;
+                            }
+                            newSoilProfile = false;
+                        }
+                        // determine the next profile (existing or new)
+                        soilProfile = dike.SoilProfiles.FirstOrDefault(s => s.Name == soilProfileRecord.SoilProfileId);
+                        if (soilProfile == null)
+                        {
+                            soilProfile = new SoilProfile1D();
+                            newSoilProfile = true;
+                        }
+                        // clear layers of existing profile
+                        if (soilProfile.Layers != null)
+                        {
+                            soilProfile.Layers.Clear();
+                        }
+                        else
+                        {
+                            var existingSoilProfileHasNoLayers = LocalizationManager.GetTranslatedText(this.GetType(), "existingSoilProfileHasNoLayers");
+                            LogMessage logmessage = new LogMessage(LogMessageType.Error, null,
+                                                                   String.Format("{0} : {1}", soilProfileRecord.SoilProfileId, existingSoilProfileHasNoLayers));
+                            ErrorMessages.Add(logmessage);
+
+                        }
+                        soilProfile.Name = soilProfileRecord.SoilProfileId;
+                        orgId = soilProfileRecord.SoilProfileId;
+                    }
+                    // if this is a dummy layer to set the bottom level for the entire profile, then do so
+                    if (soilProfileRecord.SoilName == SoilProfile1D.SoilProfileBottomLevelId)
+                    {
+                        soilProfile.BottomLevel = soilProfileRecord.TopLevel;
+                    }
+                    else
+                    {
+                        // else set the layer
+                        SoilLayer1D layer = new SoilLayer1D();
+                        layer.TopLevel = soilProfileRecord.TopLevel;
+                        var soilIndex = dike.SoilList.GetSoilIndexByName(soilProfileRecord.SoilName);
+                        if (soilIndex == -1)
+                        {
+                            var soil = new Soil
+                            {
+                                Name = soilProfileRecord.SoilName
+                            };
+                            dike.SoilList.Soils.Add(soil);
+                            soilIndex = dike.SoilList.Soils.Count - 1;
+                        }
+                        layer.Soil = dike.SoilList.Soils[soilIndex];
+                        layer.Name = "Layer" + (layerIndex);
+                        layerIndex++;
+                        soilProfile.Layers.Add(layer);
+                    }
+                }
+            }
+            // finally add last current profile to dike.
+            if ((soilProfile != null) && (newSoilProfile))
+            {
+                try
+                {
+                    if ((soilProfile.Layers == null) || (soilProfile.Layers.Count == 0))
+                    {
+                        throw new SoilProfileLayersNotSortedDescendingException(String.Format("Soilprofile '{0}' has no layers", soilProfile.Name));
+                    }
+                    soilProfile.ValidateDirect();
+
+                    dike.SoilProfiles.Add(soilProfile);
+                }
+                catch (SoilProfileLayersNotSortedDescendingException e)
+                {
+                    LogMessage logmessage = new LogMessage(LogMessageType.Error, null, e.Message);
+                    ErrorMessages.Add(logmessage);
+                }
+            }
+
+            // Make sure all soilprofiles last layer have a height
+            foreach (var soilProfile1 in dike.SoilProfiles)
+            {
+                try
+                {
+                    soilProfile1.EnsureLastLayerHasHeight();
+                }
+                catch (Exception e)
+                {
+                    //var error = new StringBuilder();
+                    string error = String.Format("Error postprocessing soilprofile '{0}': {1}", soilProfile1.Name, e.Message);
+                    LogMessage logmessage = new LogMessage(LogMessageType.Error, null, error);
+                    ErrorMessages.Add(logmessage);
+                }
+            }
+        }
+
+        internal bool CheckCharacteristicPointsForCoincidingLocations(SurfaceLine2 surfaceLine2, 
+            out CharacteristicPointType type1, out CharacteristicPointType type2)
+        {
+            var doubleFound = false;
+            type1 = CharacteristicPointType.None;
+            type2 = CharacteristicPointType.None;
+            var points = surfaceLine2.CharacteristicPoints;
+            foreach (var characteristicPoint in surfaceLine2.CharacteristicPoints)
+            {
+                if (!doubleFound)
+                {
+                    // Find the coinciding points
+                    var doublePoints = points.Where(x =>
+                        Math.Abs(x.X - characteristicPoint.X) < 1e-4 && Math.Abs(x.Y - characteristicPoint.Y) < 1e-4 &&
+                        Math.Abs(x.Z - characteristicPoint.Z) < 1e-4);
+                    if (doublePoints.Count() > 1)
+                    {
+                        // if there are coinciding points, see if the types clash. Only valid coinciding points are traffic loads
+                        // which may coincide with any other type of point 
+                        var firstType = doublePoints.First().CharacteristicPointType;
+                        var skip = 0;
+                        foreach (var doublePoint in doublePoints)
+                        {
+                            if (skip > 0 && !doubleFound && firstType != CharacteristicPointType.TrafficLoadInside &&
+                                firstType != CharacteristicPointType.TrafficLoadOutside)
+                            {
+                                if (doublePoint.CharacteristicPointType != CharacteristicPointType.TrafficLoadInside &&
+                                    doublePoint.CharacteristicPointType != CharacteristicPointType.TrafficLoadOutside)
+                                {
+                                    doubleFound = doublePoint.CharacteristicPointType != firstType;
+                                    if (doubleFound)
+                                    {
+                                        type1 = firstType;
+                                        type2 = doublePoint.CharacteristicPointType;
+                                    }
+                                }
+                            }
+                            firstType = doublePoint.CharacteristicPointType;
+                            skip++;
+                        }
+                    }
+                }                
+            }
+            return !doubleFound;
+        }
+
+        private void TransferSurfaceLines(Dike dike)
+        {
+            if (SurfaceLineRecords == null)
+                return;
+
+            foreach (var surfaceLineRecord in SurfaceLineRecords)
+            {
+                if (String.IsNullOrEmpty(surfaceLineRecord.SurfaceLineId))
+                {
+                    var noIdForSurfaceLineRecordError = LocalizationManager.GetTranslatedText(GetType(), "noIdSurfaceLineRecordError");
+                    LogMessage logmessage = new LogMessage(LogMessageType.Error, null,
+                                                           String.Format("Record {0} : {1}", surfaceLineRecord.SurfaceLineRecordId, noIdForSurfaceLineRecordError));
+                    ErrorMessages.Add(logmessage);
+                }
+                else
+                {
+                    bool newSurfaceLine = false;
+                    SurfaceLine2 surfaceLine =
+                        dike.SurfaceLines2.FirstOrDefault(s => s.Name == surfaceLineRecord.SurfaceLineId);
+                    if (surfaceLine == null)
+                    {
+                        surfaceLine = new SurfaceLine2
+                        {
+                            Geometry = new LocalizedGeometryPointString(),
+                            CharacteristicPoints = { GeometryMustContainPoint = true }
+                        };
+                        newSurfaceLine = true;
+                    }
+                    surfaceLine.Name = surfaceLineRecord.SurfaceLineId;
+                    // first add all points from the surface line csv
+                    for (int i = 0; i < surfaceLineRecord.Xcoors.Count; i++)
+                    {
+                        // empty points will not be added 
+                        if (surfaceLineRecord.Xcoors[i] != -1 || surfaceLineRecord.Ycoors[i] != -1 || surfaceLineRecord.Zcoors[i] != -1)
+                            surfaceLine.EnsurePointOfType(surfaceLineRecord.Xcoors[i], surfaceLineRecord.Ycoors[i], surfaceLineRecord.Zcoors[i], null);
+                    }
+                    // Add the surface line to the dike
+                    if (newSurfaceLine)
+                    {
+                        dike.SurfaceLines2.Add(surfaceLine);
+                    }
+                    // now see if all characteristic points belonging to this surface line are part of the surface line
+                    var characteristicPointsRecord =
+                        CharacteristicPointsRecords.FirstOrDefault(s => s.SurfaceLineId == surfaceLine.Name);
+                    bool charCheck = true;
+                    if (characteristicPointsRecord != null)
+                    {
+                        foreach (var point in characteristicPointsRecord.Points)
+                        {
+                            // ignore unset points
+                            if (!((point.X == -1) && (point.Y == -1) && (point.Z == -1)))
+                            {
+                                var tppoint = surfaceLine.Geometry.GetPointAt(point.X, point.Y, point.Z);
+
+                                if (tppoint != null)
+                                {
+                                    surfaceLine.EnsurePointOfType(point.X, point.Y, point.Z, point.Type);
+                                }
+                                else
+                                {
+                                    var charPointNotFoundInSurfaceError =
+                                        LocalizationManager.GetTranslatedText(GetType(), "charPointNotFoundInSurfaceError");
+                                    LogMessage logmessage = new LogMessage(LogMessageType.Error, null, String.Format("{0} : {1} {2}",
+                                                                                         surfaceLine.Name, charPointNotFoundInSurfaceError, point.Type));
+                                    ErrorMessages.Add(logmessage);
+                                    charCheck = false;
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        var noCharPointsFoundForSurfaceError = LocalizationManager.GetTranslatedText(GetType(), "noCharPointsFoundForSurfaceError");
+                        LogMessage logmessage = new LogMessage(LogMessageType.Error, null,
+                                                               String.Format("{0} : {1}", surfaceLine.Name,
+                                                                             noCharPointsFoundForSurfaceError));
+                        ErrorMessages.Add(logmessage);
+                        charCheck = false;
+                    }
+                    // Check on illegal coinciding characteristic points
+                    if (charCheck)
+                    {
+                        charCheck = CheckOnCoincidingPoints(surfaceLine);
+                    }                        
+                    if (!charCheck)
+                    {
+                        surfaceLine.Dispose();
+                        dike.SurfaceLines2.Remove(surfaceLine);
+                    }
+                }
+            }
+        }
+
+        internal bool CheckOnCoincidingPoints(SurfaceLine2 surfaceLine)
+        {
+            bool charCheck;
+            CharacteristicPointType firstType;
+            CharacteristicPointType secondType;
+            charCheck = CheckCharacteristicPointsForCoincidingLocations(surfaceLine, out firstType, out secondType);
+            if (!charCheck)
+            {
+                var coincidingCharPointsFoundForSurfaceError =
+                    LocalizationManager.GetTranslatedText(GetType(), "CoincidingCharPointsFoundForSurfaceError");
+                LogMessage logmessage = new LogMessage(LogMessageType.Error, null, String.Format("{0} : {1} : {2} : {3}",
+                    surfaceLine.Name, coincidingCharPointsFoundForSurfaceError, firstType.ToString(), secondType.ToString()));
+                ErrorMessages.Add(logmessage);
+            }
+
+            return charCheck;
+        }
+
+        private void TransferScenarios(Dike dike)
+        {
+            if (ScenarioRecords == null)
+                return;
+
+            var dikeLocationLookup = dike.Locations.ToDictionary(l => l.Name, l => l);
+            foreach (var scenarioRecord in ScenarioRecords)
+            {
+                bool recordError = false;
+                if (string.IsNullOrEmpty(scenarioRecord.LocationId))
+                {
+                    var noLocationIdForScenarioRecordError = LocalizationManager.GetTranslatedText(GetType(),
+                                                                                                 "noLocationIdForScenarioRecordError");
+                    LogMessage logmessage = new LogMessage(LogMessageType.Error, null,
+                                                           string.Format("Record {0} : {1}",
+                                                                         scenarioRecord.ScenarioRecordId,
+                                                                         noLocationIdForScenarioRecordError));
+                    ErrorMessages.Add(logmessage);
+                    recordError = true;
+                }
+
+                // faassen: location id was of type int with default value -1 if empty. Now it is string and null as the default value
+                if (scenarioRecord.LocationScenarioId == null)
+                {
+                    var invalidLocationScenarioIdForScenarioRecordError =
+                        LocalizationManager.GetTranslatedText(GetType(), "invalidLocationScenarioIdForScenarioRecordError");
+                    LogMessage logmessage = new LogMessage(LogMessageType.Error, null, string.Format("Record {0} : {1}",
+                        scenarioRecord.ScenarioRecordId, invalidLocationScenarioIdForScenarioRecordError));
+                    ErrorMessages.Add(logmessage);
+                    recordError = true;
+                }
+
+                var dikeLocation = dikeLocationLookup.ContainsKey(scenarioRecord.LocationId) ? dikeLocationLookup[scenarioRecord.LocationId] : null;
+                if (dikeLocation == null)
+                {
+                    var locationNotFoundForScenarioRecordError = LocalizationManager.GetTranslatedText(GetType(), "locationNotFoundForScenarioRecordError");
+                    LogMessage logmessage = new LogMessage(LogMessageType.Error, this, string.Format("Record {0} : {1}",
+                        scenarioRecord.ScenarioRecordId, locationNotFoundForScenarioRecordError));
+                    ErrorMessages.Add(logmessage);
+                    recordError = true;
+                }
+                if (!recordError)
+                {
+                    // Add to location scenario list 
+                    var dikeScenario = dikeLocation.Scenarios.FirstOrDefault(s => s.Location.Name == scenarioRecord.LocationId &&
+                        s.LocationScenarioID == scenarioRecord.LocationScenarioId);
+                    if (dikeScenario != null)
+                    {
+                        var duplicateScenarioRecordError = LocalizationManager.GetTranslatedText(GetType(), "duplicateScenarioRecordError");
+                        string errorMessage = string.Format(duplicateScenarioRecordError, dikeLocation.Name, dikeScenario.LocationScenarioID);
+                        LogMessage logmessage = new LogMessage(LogMessageType.Error, null, string.Format("Record {0} : {1}",
+                            scenarioRecord.ScenarioRecordId, errorMessage));
+                        ErrorMessages.Add(logmessage);
+                    }
+                    else
+                    {
+                        var locationRecord = LocationRecords.FirstOrDefault(l => l.LocationId == scenarioRecord.LocationId);
+                        
+                        // Check if polder is present in either the location or the scenario record. This 
+                        // value is mandatory and must be present in either one.
+                        if (locationRecord?.PolderLevel == null && scenarioRecord.PolderLevel == null)
+                        {
+                            string missingPolderLevelError = LocalizationManager.GetTranslatedText(GetType(), "missingPolderLevel");
+                            LogMessage logmessage = new LogMessage(LogMessageType.Error, null, string.Format("Record {0} : {1}",
+                                scenarioRecord.ScenarioRecordId, missingPolderLevelError));
+                            ErrorMessages.Add(logmessage);
+                        }
+                        else
+                        {
+                            var scenario = CreateScenario(dikeLocation, scenarioRecord, locationRecord);
+                            dikeLocation.Scenarios.Add(scenario);
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Creates a <see cref="Scenario"/> based on its input arguments.
+        /// </summary>
+        /// <param name="dikeLocation">The <see cref="Location"/> that belongs to the <see cref="Scenario"/>.</param>
+        /// <param name="scenarioRecord">The <see cref="CsvImporterScenarios.ScenarioRecord"/> to retrieve the data from.</param>
+        /// <param name="locationRecord">The <see cref="CsvImporterLocations.LocationRecord"/> to retrieve the data from.</param>
+        /// <returns>A <see cref="Scenario"/>.</returns>
+        private static Scenario CreateScenario(Location dikeLocation, CsvImporterScenarios.ScenarioRecord scenarioRecord,
+            CsvImporterLocations.LocationRecord locationRecord)
+        {
+            // set values in scenario (1 from scenariorecord, 2 from locationrecord, 3 default)
+            var modelFactors = new ModelFactors();
+            modelFactors.RequiredSafetyFactorStabilityInnerSlope = scenarioRecord.RequiredSafetyFactorStabilityInnerSlope ??
+                                                                   (locationRecord.RequiredSafetyFactorStabilityInnerSlope ?? modelFactors.RequiredSafetyFactorStabilityInnerSlope);
+            modelFactors.RequiredSafetyFactorStabilityOuterSlope = scenarioRecord.RequiredSafetyFactorStabilityOuterSlope ??
+                                                                   (locationRecord.RequiredSafetyFactorStabilityOuterSlope ?? modelFactors.RequiredSafetyFactorStabilityOuterSlope);
+            modelFactors.RequiredSafetyFactorPiping = scenarioRecord.RequiredSafetyFactorPiping ??
+                                                      (locationRecord.RequiredSafetyFactorPiping ?? modelFactors.RequiredSafetyFactorPiping);
+            modelFactors.UpliftCriterionStability = scenarioRecord.UpliftCriterionStability ??
+                                                    (locationRecord.UpliftCriterionStability ?? modelFactors.UpliftCriterionStability);
+            modelFactors.UpliftCriterionPiping = scenarioRecord.UpliftCriterionPiping ??
+                                                 (locationRecord.UpliftCriterionPiping ?? modelFactors.UpliftCriterionPiping);
+            var scenario = new Scenario
+            {
+                Location = dikeLocation,
+                LocationScenarioID = scenarioRecord.LocationScenarioId,
+                ModelFactors = modelFactors
+            };
+            scenario.PlLineOffsetBelowDikeToeAtPolder = scenarioRecord.PlLineOffsetBelowDikeToeAtPolder ??
+                                                        (locationRecord.PlLineOffsetBelowDikeToeAtPolder ?? scenario.PlLineOffsetBelowDikeToeAtPolder);
+            scenario.PlLineOffsetBelowDikeTopAtPolder = scenarioRecord.PlLineOffsetBelowDikeTopAtPolder ??
+                                                        (locationRecord.PlLineOffsetBelowDikeTopAtPolder ?? scenario.PlLineOffsetBelowDikeTopAtPolder);
+            scenario.PlLineOffsetBelowDikeTopAtRiver = scenarioRecord.PlLineOffsetBelowDikeTopAtRiver ??
+                                                       (locationRecord.PlLineOffsetBelowDikeTopAtRiver ?? scenario.PlLineOffsetBelowDikeTopAtRiver);
+            scenario.PlLineOffsetBelowShoulderBaseInside = scenarioRecord.PlLineOffsetBelowShoulderBaseInside ??
+                                                           (locationRecord.PlLineOffsetBelowShoulderBaseInside ?? scenario.PlLineOffsetBelowShoulderBaseInside);
+            // set values in scenario (1 from scenariorecord, 2 from locationrecord, 3 stays null)
+            scenario.PlLineOffsetBelowDikeCrestMiddle = scenarioRecord.PlLineOffsetBelowDikeCrestMiddle ??
+                                                        locationRecord.PlLineOffsetBelowDikeCrestMiddle;
+            scenario.PlLineOffsetFactorBelowShoulderCrest = scenarioRecord.PlLineOffsetFactorBelowShoulderCrest ??
+                                                            locationRecord.PlLineOffsetFactorBelowShoulderCrest;
+            scenario.UsePlLineOffsetBelowDikeCrestMiddle = scenarioRecord.UsePlLineOffsetBelowDikeCrestMiddle ??
+                                                           locationRecord.UsePlLineOffsetBelowDikeCrestMiddle;
+            scenario.UsePlLineOffsetFactorBelowShoulderCrest = scenarioRecord.UsePlLineOffsetFactorBelowShoulderCrest ??
+                                                               locationRecord.UsePlLineOffsetFactorBelowShoulderCrest;
+            scenario.HeadPl3 = scenarioRecord.HeadPl3 ?? locationRecord.HeadPl3;
+            scenario.HeadPl4 = scenarioRecord.HeadPl4 ?? locationRecord.HeadPl4;
+            scenario.PolderLevel = scenarioRecord.PolderLevel ?? locationRecord.PolderLevel.Value;
+            scenario.HeadPl2 = scenarioRecord.HeadPl2 ?? locationRecord.HeadPl2;
+            scenario.DikeTableHeight = scenarioRecord.DikeTableHeight ?? locationRecord.DikeTableHeight;
+            scenario.RiverLevel = scenarioRecord.RiverLevel ?? locationRecord.RiverLevel;
+            scenario.RiverLevelLow = scenarioRecord.RiverLevelLow ?? locationRecord.RiverLevelLow;
+            return scenario;
+        }
+
+        /// <summary>
+        /// Transfers the locations data.
+        /// </summary>
+        /// <param name="dike">The dike.</param>
+        private void TransferLocationsData(Dike dike)
+        {
+            if (LocationRecords == null)
+                return;
+
+            foreach (var locationRecord in LocationRecords)
+            {
+                if (locationRecord.DikeRingId.Equals(dike.Name))
+                {
+                    // Check if id is defined
+                    if (String.IsNullOrEmpty(locationRecord.LocationId))
+                    {
+                        AddErrorMessage("noIdLocationRecordError", locationRecord);
+                        continue;
+                    }
+
+                    // See if location already exist; else create one and add it to the dike
+                    Location location = dike.Locations.FirstOrDefault(s => s.Name == locationRecord.LocationId);
+                    if (location == null)
+                    {
+                        var errorInrecord = false;
+                        location = new Location();
+
+                        location.SetDefaultValues();
+                        location.Name = locationRecord.LocationId;
+                        location.SurfaceLineId = locationRecord.SurfaceLineId;
+                        location.SegmentId = locationRecord.SegmentId;
+
+                        if (locationRecord.DikeRingId != null)
+                        {
+                            location.DikeRingId = locationRecord.DikeRingId;
+                        }
+                        if (location.DampingFactorPL3 < 0 || location.DampingFactorPL3 > 1)
+                        {
+                            AddErrorMessage("DampingFactorPl3BeyondLimits", locationRecord);
+                            errorInrecord = true;
+                        }
+                        if (location.DampingFactorPL4 < 0 || location.DampingFactorPL4 > 1)
+                        {
+                            AddErrorMessage("DampingFactorPl4BeyondLimits", locationRecord);
+                            errorInrecord = true;
+                        }
+
+                        if (null != locationRecord.DikeEmbankmentMaterial)
+                        {
+                            location.DikeEmbankmentMaterial = locationRecord.DikeEmbankmentMaterial;
+                        }
+                        if (null != locationRecord.ShoulderEmbankmentMaterial)
+                        {
+                            location.ShoulderEmbankmentMaterial = locationRecord.ShoulderEmbankmentMaterial;
+                        }
+
+                        location.XRd = locationRecord.GeoX.GetValueOrDefault(location.XRd);
+                        location.YRd = locationRecord.GeoY.GetValueOrDefault(location.YRd);
+                        location.XSoilGeometry2DOrigin = locationRecord.XSoilGeometry2DOrigin.GetValueOrDefault(location.XSoilGeometry2DOrigin);
+                        location.DampingFactorPL3 = locationRecord.DampingFactorPl3.GetValueOrDefault(location.DampingFactorPL3);
+                        location.DampingFactorPL4 = locationRecord.DampingFactorPl4.GetValueOrDefault(location.DampingFactorPL4);
+                        location.PenetrationLength = locationRecord.PenetrationLength.GetValueOrDefault(location.PenetrationLength);
+                        location.TrafficLoad = locationRecord.TrafficLoad.GetValueOrDefault(location.TrafficLoad);
+                        location.TL_DegreeOfConsolidation = locationRecord.TL_DegreeOfConsolidation;
+                        location.PLLineCreationMethod = locationRecord.PLLineCreationMethod.GetValueOrDefault(location.PLLineCreationMethod);
+                        if (locationRecord.IntrusionVerticalWaterPressure.HasValue)
+                        {
+                            location.IntrusionVerticalWaterPressure = locationRecord.IntrusionVerticalWaterPressure.Value;
+                        }
+                        location.StabilityShoulderGrowSlope = locationRecord.StabilityShoulderGrowSlope.GetValueOrDefault(location.StabilityShoulderGrowSlope);
+                        location.StabilityShoulderGrowDeltaX = locationRecord.StabilityShoulderGrowDeltaX.GetValueOrDefault(location.StabilityShoulderGrowDeltaX);
+                        location.StabilitySlopeAdaptionDeltaX = locationRecord.StabilitySlopeAdaptionDeltaX.GetValueOrDefault(location.StabilitySlopeAdaptionDeltaX);
+                        location.MinimalCircleDepth = locationRecord.MinimalCircleDepth.GetValueOrDefault(location.MinimalCircleDepth);
+                        location.DistanceToEntryPoint = locationRecord.DistanceToEntryPoint.GetValueOrDefault(location.DistanceToEntryPoint);
+                        location.SlopeDampingPiezometricHeightPolderSide = locationRecord.SlopeDampingPiezometricHeightPolderSide.GetValueOrDefault(location.SlopeDampingPiezometricHeightPolderSide);
+                        location.StabilityDesignMethod = locationRecord.StabilityDesignMethod.GetValueOrDefault(location.StabilityDesignMethod);
+                        location.SlopeAdaptionStartCotangent = locationRecord.SlopeAdaptionStartCotangent.GetValueOrDefault(location.SlopeAdaptionStartCotangent);
+                        location.SlopeAdaptionEndCotangent = locationRecord.SlopeAdaptionEndCotangent.GetValueOrDefault(location.SlopeAdaptionEndCotangent);
+                        location.SlopeAdaptionStepCotangent = locationRecord.SlopeAdaptionStepCotangent.GetValueOrDefault(location.SlopeAdaptionStepCotangent);
+                        location.StabilityZoneType = locationRecord.StabilityZoneType.GetValueOrDefault(location.StabilityZoneType);
+                        location.ForbiddenZoneFactor = locationRecord.ForbiddenZoneFactor.GetValueOrDefault(location.ForbiddenZoneFactor);
+                        location.ZoneAreaRestSlopeCrestWidth = locationRecord.ZoneAreaRestSlopeCrestWidth.GetValueOrDefault(location.ZoneAreaRestSlopeCrestWidth);
+                        location.NewDepthDitch = locationRecord.NewDepthDitch.GetValueOrDefault(location.NewDepthDitch);
+                        location.NewDikeSlopeInside = locationRecord.NewDikeSlopeInside.GetValueOrDefault(location.NewDikeSlopeInside);
+                        location.NewDikeSlopeOutside = locationRecord.NewDikeSlopeOutside.GetValueOrDefault(location.NewDikeSlopeOutside);
+                        location.NewDikeTopWidth = locationRecord.NewDikeTopWidth.GetValueOrDefault(location.NewDikeTopWidth);
+                        location.NewMaxHeightShoulderAsFraction = locationRecord.NewMaxHeightShoulderAsFraction.GetValueOrDefault(location.NewMaxHeightShoulderAsFraction);
+                        location.NewMinDistanceDikeToeStartDitch = locationRecord.NewMinDistanceDikeToeStartDitch.GetValueOrDefault(location.NewMinDistanceDikeToeStartDitch);
+                        location.NewShoulderBaseSlope = locationRecord.NewShoulderBaseSlope.GetValueOrDefault(location.NewShoulderBaseSlope);
+                        location.NewShoulderTopSlope = locationRecord.NewShoulderTopSlope.GetValueOrDefault(location.NewShoulderTopSlope);
+                        location.NewSlopeAngleDitch = locationRecord.NewSlopeAngleDitch.GetValueOrDefault(location.NewSlopeAngleDitch);
+                        location.NewWidthDitchBottom = locationRecord.NewWidthDitchBottom.GetValueOrDefault(location.NewWidthDitchBottom);
+                        location.UseNewDikeSlopeInside = locationRecord.UseNewDikeSlopeInside.GetValueOrDefault(location.UseNewDikeSlopeInside);
+                        location.UseNewDikeSlopeOutside = locationRecord.UseNewDikeSlopeOutside.GetValueOrDefault(location.UseNewDikeSlopeOutside);
+                        location.UseNewDikeTopWidth = locationRecord.UseNewDikeTopWidth.GetValueOrDefault(location.UseNewDikeTopWidth);
+                        location.UseNewDitchDefinition = locationRecord.UseNewDitchDefinition.GetValueOrDefault(location.UseNewDitchDefinition);
+                        location.UseNewMaxHeightShoulderAsFraction = locationRecord.UseNewMaxHeightShoulderAsFraction.GetValueOrDefault(location.UseNewMaxHeightShoulderAsFraction);
+                        location.UseNewMinDistanceDikeToeStartDitch = locationRecord.UseNewMinDistanceDikeToeStartDitch.GetValueOrDefault(location.UseNewMinDistanceDikeToeStartDitch);
+                        location.UseNewShoulderBaseSlope = locationRecord.UseNewShoulderBaseSlope.GetValueOrDefault(location.UseNewShoulderBaseSlope);
+                        location.UseNewShoulderTopSlope = locationRecord.UseNewShoulderTopSlope.GetValueOrDefault(location.UseNewShoulderTopSlope);
+                        
+                        if (!errorInrecord)
+                        {
+                            dike.Locations.Add(location);
+                        }
+                        else
+                        {
+                            location.Dispose();
+                        }
+                    }
+                }
+            }
+        }
+
+        private void AddErrorMessage(string errorMessageTranslationId, CsvImporterLocations.LocationRecord locationRecord)
+        {
+            AddErrorMessage(errorMessageTranslationId, locationRecord.LocationRecordId);
+        }
+
+        private void AddErrorMessage(string errorMessageTranslationId, CsvImporterSoilProfiles.SoilProfileRecord soilProfileRecord)
+        {
+            AddErrorMessage(errorMessageTranslationId, soilProfileRecord.SoilProfileRecordId);
+        }
+
+        private void AddErrorMessage(string errorMessageTranslationId, int id)
+        {
+            var noIdForSoilProfileRecordError = LocalizationManager.GetTranslatedText(GetType(), errorMessageTranslationId);
+            var logmessage = new LogMessage(
+                LogMessageType.Error, this,
+                String.Format("Record {0} : {1}",
+                    id,
+                    noIdForSoilProfileRecordError
+                )
+            );
+            ErrorMessages.Add(logmessage);
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/CultureHelper.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/CultureHelper.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/CultureHelper.cs	(revision 3305)
@@ -0,0 +1,84 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Globalization;
+using System.Threading;
+
+namespace Deltares.Maps
+{
+    public static class CultureHelper
+    {
+        public static void InvokeWithDutchCulture(Action action)
+        {
+            var nlCulture = new CultureInfo("nl-NL");
+            InvokeWithCulture(nlCulture, action);
+        }
+
+        public static void InvokeWithUSCulture(Action action)
+        {
+            var usCulture = new CultureInfo("en-US");
+            InvokeWithCulture(usCulture, action);
+        }
+
+        public static T InvokeWithDutchCulture<T>(Func<T> func)
+        {
+            var culture = new CultureInfo("nl-NL");
+            return InvokeWithCulture(culture, func);
+        }
+
+        public static T InvokeWithUSCulture<T>(Func<T> func)
+        {
+            var culture = new CultureInfo("en-US");
+            return InvokeWithCulture(culture, func);
+        }
+
+        public static T InvokeWithCulture<T>(CultureInfo targetCulture, Func<T> func)
+        {
+            CultureInfo currentCulture = Thread.CurrentThread.CurrentCulture;
+            try
+            {
+                // set the current thread to dutch culture to mimic floating piont numbers with a comma
+                Thread.CurrentThread.CurrentCulture = targetCulture;
+                return func();
+            }
+            finally
+            {
+                Thread.CurrentThread.CurrentCulture = currentCulture;
+            }
+        }
+
+        public static void InvokeWithCulture(CultureInfo targetCulture, Action testAction)
+        {
+            CultureInfo currentCulture = Thread.CurrentThread.CurrentCulture;
+            try
+            {
+                // set the current thread to dutch culture to mimic floating piont numbers with a comma
+                Thread.CurrentThread.CurrentCulture = targetCulture;
+                testAction();
+            }
+            finally
+            {
+                Thread.CurrentThread.CurrentCulture = currentCulture;
+            }
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Group.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Group.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Group.cs	(revision 3305)
@@ -0,0 +1,261 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Xml.Serialization;
+using Deltares.Standard.Attributes;
+using Deltares.Standard.EventPublisher;
+using Deltares.Standard.IO.Xml;
+using ValidationResult = Deltares.Dam.Data.Specifications.ValidationResult;
+using Validator = Deltares.Standard.Specifications.Validator;
+using XmlSerializer = Deltares.Standard.IO.Xml.XmlSerializer;
+
+namespace Deltares.Dam.Data.Sensors
+{
+    [Serializable]
+    public class Group
+    {
+        /// <summary>
+        /// Holds a reference to the set of selected sensors 
+        /// </summary>
+        private readonly HashSet<Sensor> sensors;
+        private List<Sensor> pickSensors;
+        private int id;
+
+        /// <summary>
+        /// Holds a reference to a set of relative loctions along the profile
+        /// </summary>
+        private readonly IDictionary<Sensor, double> relativeLocationAlongProfileDictionary;
+
+        public Group()
+        {
+            sensors = new HashSet<Sensor>();
+            relativeLocationAlongProfileDictionary = new Dictionary<Sensor, double>();
+            ID = -1;
+            DataEventPublisher.AfterChange(this);
+        }
+
+        /// <summary>
+        /// Gets or sets the ID.
+        /// </summary>
+        /// <value>
+        /// The ID value should be unique.
+        /// </value>
+        [PropertyOrder(1, 1)]
+        public int ID
+        {
+            get { return id; }
+            set
+            {
+                id = value;
+                DataEventPublisher.AfterChange(this, g => g.ID);
+            }
+        }
+
+        /// <summary>
+        /// Gets the selected sensors.
+        /// </summary>
+        [XmlIgnore]
+        [Browsable(false)]
+        public IEnumerable<Sensor> Selection
+        {
+            get { return sensors; }
+        }
+
+        /// <summary>
+        /// Gets or sets the selection as list for UI (table) purposes.
+        /// </summary>
+        /// <value>
+        /// The selection as list.
+        /// </value>
+        [XmlIgnore]
+        [PropertyOrder(1, 2)]
+        public string SelectionAsString
+        {
+            get
+            {
+                string res = "";
+                foreach (var sensor in sensors)
+                {
+                    res = res + sensor.ID + "; ";
+                }
+                return res;
+            }
+            set
+            {
+                ClearSelection();
+                var locSensors = ParseStringToSensorIDs(value);
+                if (pickSensors != null)
+                {
+                    foreach (var sensorID in locSensors)
+                    {
+                        var sensor = PickSensors.Find(x => x.ID == sensorID);
+                        if (sensor != null)
+                        {
+                            Add(sensor);
+                        }
+                    }
+                }
+            }
+        }
+
+        private List<int> ParseStringToSensorIDs(string value)
+        {
+            value = value.Trim();
+            var ids = new List<int>();
+            var idsarr = value.Split(new Char [] {';'}, StringSplitOptions.RemoveEmptyEntries);
+            foreach (var s in idsarr)
+            {
+                try
+                {
+                    var val = Int32.Parse(s);
+                    ids.Add(val);
+                }
+                catch (Exception)
+                {
+                    // surpress errors, just do not use value
+                }                
+            }
+            return ids;
+        }
+
+        /// <summary>
+        /// Persistable sensor array. Only for internal use
+        /// </summary>
+        [Browsable(false)]
+        public Sensor[] SensorArray
+        {
+            get { return sensors.ToArray(); }
+            set { 
+                ClearSelection();
+                foreach (var sensor in value)
+                {
+                    Add(sensor);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the sensor count.
+        /// </summary>
+        [Browsable(false)]
+        public int SensorCount
+        {
+            get { return sensors.Count; }
+        }
+
+        [XmlIgnore]
+        [Browsable(false)]
+        public IEnumerable<KeyValuePair<Sensor, double>> SensorRelativeLocations
+        {
+            get { return relativeLocationAlongProfileDictionary; }
+        }
+
+        [XmlIgnore]
+        [ReadOnly(true)]
+        public List<Sensor> PickSensors
+        {
+            get { return pickSensors; }
+            set { pickSensors = value; }
+        }
+
+        /// <summary>
+        /// Determines whether this instance is valid.
+        /// </summary>
+        /// <returns></returns>
+        public bool IsValid()
+        {
+            IEnumerable<ValidationResult> validationResults = Validator.Validate(this);
+            return !validationResults.Any();
+        }
+
+        /// <summary>
+        /// Determines whether this instance is transient (associated with an invalid ID).
+        /// </summary>
+        /// <returns>
+        ///   <c>true</c> if this instance is transient; otherwise, <c>false</c>.
+        /// </returns>
+        public bool IsTransient()
+        {
+            return ID <= 0;
+        }
+
+        /// <summary>
+        /// Sets the relative location.
+        /// </summary>
+        /// <param name="sensor">The sensor.</param>
+        /// <param name="value">The value.</param>
+        public void SetRelativeLocation(Sensor sensor, double value)
+        {
+            relativeLocationAlongProfileDictionary[sensor] = value;
+        }
+
+        /// <summary>
+        /// Adds the specified sensor to the selected sensor list for this group.
+        /// </summary>
+        /// <param name="sensor">The sensor to add.</param>
+        public void Add(Sensor sensor)
+        {
+            sensors.Add(sensor);
+            if (!relativeLocationAlongProfileDictionary.ContainsKey(sensor))
+                relativeLocationAlongProfileDictionary.Add(sensor, 0);
+
+        }
+
+        /// <summary>
+        /// Removes the specified sensor from the selected sensor list from this group.
+        /// </summary>
+        /// <param name="sensor">The sensor to remove.</param>
+        public void Remove(Sensor sensor)
+        {
+            sensors.Remove(sensor);
+            if (relativeLocationAlongProfileDictionary.ContainsKey(sensor))
+                relativeLocationAlongProfileDictionary.Remove(sensor);
+        }
+
+        /// <summary>
+        /// Clears the sensor selection
+        /// </summary>
+        public void ClearSelection()
+        {
+            sensors.Clear();
+            relativeLocationAlongProfileDictionary.Clear();
+        }
+
+        public string Serialize()
+        {
+            return new XmlSerializer().SerializeToString(this);
+        }
+
+        public static Group Deserialize(string xml)
+        {
+            return (Group)new XmlDeserializer().XmlDeserializeFromString(xml, typeof(Group));
+        }
+
+        public override string ToString()
+        {
+            return ID.ToString();
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterSoilProfiles.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterSoilProfiles.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterSoilProfiles.cs	(revision 3305)
@@ -0,0 +1,137 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using Deltares.Standard.IO;
+using Deltares.Standard.Language;
+using LumenWorks.Framework.IO.Csv;
+
+namespace Deltares.Dam.Data.CsvImporters
+{
+    public class CsvImporterSoilProfilesException : ApplicationException
+    {
+        public CsvImporterSoilProfilesException(string message)
+            : base(message)
+        {
+        }
+    }
+
+    public class CsvImporterSoilProfiles
+    {
+        private List<SoilProfileRecord> soilProfileRecords = new List<SoilProfileRecord>();
+        private List<string> errorMessages = new List<string>();
+
+        public class SoilProfileRecord
+        {
+            public int SoilProfileRecordId { get; set; } 
+            public string SoilProfileId { get; set; }
+            public double TopLevel { get; set; }
+            public string SoilName { get; set; }            
+        }
+
+        private void CheckColumn(int index, string fileName, string fieldName)
+        {
+            if (index < 0)
+            {
+                var csvHeaderFieldError = LocalizationManager.GetTranslatedText(this.GetType(), "csvHeaderFieldError");
+                throw new CsvImporterSoilProfilesException(String.Format("{0} : {1} {2}", fileName, csvHeaderFieldError,
+                                                                         fieldName));
+            }
+        }
+
+        public CsvImporterSoilProfiles(string fileName)
+        {
+            errorMessages.Clear();
+            ThrowHelper.ThrowIfStringArgumentNullOrEmpty(fileName, StringResourceNames.CsvFileNotValid);
+            ThrowHelper.ThrowIfFileNotExist(fileName, StringResourceNames.CsvFileNotFound);
+
+            var oldcur = Thread.CurrentThread.CurrentCulture;
+            try
+            {
+                Thread.CurrentThread.CurrentCulture = CsvReaderUtilities.DetermineCultureForFile(fileName);
+                using (CsvReader csv = new CsvReader(new StreamReader(fileName), true, ';'))
+                {
+                    string[] headers = CsvImporterHelper.GetFieldHeaders(this, csv);
+                    // The definition of the csv contains one extra column (soiltype) which is now obsolete. 
+                    // So number of columns may be 3 or 4.
+                    if ((headers.Count() < 3) || (headers.Count() > 4))
+                    {
+                        var csvHeaderError = LocalizationManager.GetTranslatedText(this.GetType(), "csvHeaderError");
+                        throw new CsvImporterSoilProfilesException(String.Format("{0} : {1}", fileName, csvHeaderError));                        
+                    }
+                    const string fieldsoilprofile_id = "soilprofile_id";
+                    int colIndexSoilProfileId = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldsoilprofile_id);
+                    CheckColumn(colIndexSoilProfileId, fileName, fieldsoilprofile_id);
+                    
+                    const string fieldtop_level = "top_level";
+                    int colIndexTopLevel = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldtop_level);
+                    CheckColumn(colIndexTopLevel, fileName, fieldtop_level);
+                    
+                    const string fieldsoil_name = "soil_name";
+                    int colIndexSoilName = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldsoil_name);
+                    CheckColumn(colIndexSoilName, fileName, fieldsoil_name);
+                    var index = 1;
+                    while (csv.ReadNextRecord())
+                    {
+                        var soilProfile = new SoilProfileRecord();
+                        int colIndex = -1;  // Keep track of column for error message
+                        try
+                        {
+                            soilProfile.SoilProfileRecordId = index;
+                            index++;
+                            colIndex = colIndexSoilProfileId;
+                            soilProfile.SoilProfileId = csv[colIndexSoilProfileId];
+                            colIndex = colIndexTopLevel;
+                            soilProfile.TopLevel = Convert.ToDouble(csv[colIndexTopLevel]);
+                            colIndex = colIndexSoilName;
+                            soilProfile.SoilName = csv[colIndexSoilName];
+                            soilProfileRecords.Add(soilProfile);
+                        }
+                        catch (Exception e)
+                        {
+                            var csvSoilProfileError = String.Format(LocalizationManager.GetTranslatedText(this.GetType(), "csvSoilProfileError"), soilProfile.SoilProfileId, colIndex + 1);
+                            errorMessages.Add(String.Format("Record {0} : {1}", index, csvSoilProfileError + e.Message));
+                        }                        
+                    }
+                }
+            }
+            finally
+            {
+                Thread.CurrentThread.CurrentCulture = oldcur;
+            }
+        }
+
+        public List<SoilProfileRecord> ImportedItems
+        {
+            get { return soilProfileRecords; }
+        }
+
+        public List<string> ErrorMessages
+        {
+            get { return errorMessages; }
+            set { errorMessages = value; }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/Configuration/DataSourceContainer.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/Configuration/DataSourceContainer.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/Configuration/DataSourceContainer.cs	(revision 3305)
@@ -0,0 +1,212 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Serialization;
+using Deltares.Geotechnics;
+using Deltares.Geotechnics.SurfaceLines;
+using Deltares.Standard;
+using Deltares.Standard.IO;
+using Deltares.Standard.IO.Xml;
+using XmlSerializer = Deltares.Standard.IO.Xml.XmlSerializer;
+
+namespace Deltares.Dam.Data.DataPlugins.Configuration
+{
+    public class DataSourceContainer
+    {
+        private string mapSoilProfile2D = null;
+        private string sensorConfigurationFilename = null;
+        private bool isImportAsRelativeProfiles;
+        private CharacteristicPointType soilProfileCharacteristicPointReference;
+        private List<DataAttribute> dataAttributes;
+        private List<DataSource> dataSourceList = new List<DataSource>();
+        private string dataSourceEsriProjection = null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataSourceContainer"/> class.
+        /// </summary>
+        public DataSourceContainer()
+        {
+            this.dataAttributes = new List<DataAttribute>();
+        }
+
+        /// <summary>
+        /// Adds the specified attribute.
+        /// </summary>
+        /// <param name="attribute">The attribute.</param>
+        public void Add(DataAttribute attribute)
+        {
+            this.dataAttributes.Add(attribute);
+        }
+
+        /// <summary>
+        /// Gets or sets the data source esri projection.
+        /// </summary>
+        /// <value>
+        /// The data source esri projection.
+        /// </value>
+        public string DataSourceEsriProjection
+        {
+            get { return this.dataSourceEsriProjection; }
+            set { this.dataSourceEsriProjection = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the map soil profile2 d.
+        /// </summary>
+        /// <value>
+        /// The map soil profile2 d.
+        /// </value>
+        public string MapSoilProfile2D
+        {
+            get { return this.mapSoilProfile2D; }
+            set { this.mapSoilProfile2D = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the sensor configuration filename.
+        /// </summary>
+        /// <value>
+        /// The sensor configuration filename.
+        /// </value>
+        public string SensorConfigurationFilename
+        {
+            get { return this.sensorConfigurationFilename; }
+            set { this.sensorConfigurationFilename = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the soil profile characteristic point reference.
+        /// </summary>
+        /// <value>
+        /// The soil profile characteristic point reference.
+        /// </value>
+        public CharacteristicPointType SoilProfileCharacteristicPointReference
+        {
+            get { return this.soilProfileCharacteristicPointReference; }
+            set { this.soilProfileCharacteristicPointReference = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is import as relative profiles.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if this instance is import as relative profiles; otherwise, <c>false</c>.
+        /// </value>
+        public bool IsImportAsRelativeProfiles
+        {
+            get { return this.isImportAsRelativeProfiles; }
+            set { this.isImportAsRelativeProfiles = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the data source list.
+        /// </summary>
+        /// <value>
+        /// The data source list.
+        /// </value>
+        public List<DataSource> DataSourceList
+        {
+            get { return this.dataSourceList; }
+            set { this.dataSourceList = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the data attributes.
+        /// </summary>
+        /// <value>
+        /// The data attributes.
+        /// </value>
+        [XmlArrayItem("Attribute")]
+        public List<DataAttribute> DataAttributes
+        {
+            get { return this.dataAttributes; }
+            set { this.dataAttributes = value; }
+        }
+
+        /// <summary>
+        /// Serializes the specified container.
+        /// </summary>
+        /// <param name="container">The container.</param>
+        /// <param name="file">The file.</param>
+        /// <exception cref="System.ArgumentNullException">
+        /// container
+        /// or
+        /// file
+        /// </exception>
+        public static void Serialize(DataSourceContainer container, string file)
+        {
+            if (container == null)
+                throw new ArgumentNullException("container");
+            if (file == null)
+                throw new ArgumentNullException("file");
+
+            var xmlSerializer = new XmlSerializer();
+            xmlSerializer.Serialize(container, file);
+        }
+
+        /// <summary>
+        /// Deserializes the specified file.
+        /// </summary>
+        /// <param name="file">The file.</param>
+        /// <returns></returns>
+        /// <exception cref="System.ArgumentNullException">file</exception>
+        public static DataSourceContainer Deserialize(string file)
+        {
+            if (file == null)
+                throw new ArgumentNullException("file");
+
+            var xmlDeserializer = new XmlDeserializer();
+            var classFactory = new DefaultClassFactory();
+            var container = (DataSourceContainer)xmlDeserializer.XmlDeserialize(file, typeof(DataSourceContainer), classFactory);
+            return container;
+        }
+
+        /// <summary>
+        /// Validates the specified container.
+        /// </summary>
+        /// <param name="container">The container.</param>
+        /// <param name="allowedAttributes">The allowed attributes.</param>
+        /// <returns></returns>
+        /// <exception cref="System.ArgumentNullException">
+        /// container
+        /// or
+        /// allowedAttributes
+        /// </exception>
+        public static IEnumerable<Exception> Validate(DataSourceContainer container, IEnumerable<string> allowedAttributes)
+        {
+            if (container == null)
+                throw new ArgumentNullException("container");
+            if (allowedAttributes == null)
+                throw new ArgumentNullException("allowedAttributes");
+
+            if (container.DataAttributes != null)
+            {
+                foreach (var attribute in container.DataAttributes.Where(attribute => !allowedAttributes.Contains(attribute.AttributeName)))
+                {
+                    yield return new NotSupportedException(string.Format("The attribute {0} is not supported.", attribute)); 
+                }
+            }            
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs	(revision 3305)
@@ -0,0 +1,822 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.ComponentModel;
+using System.Xml.Serialization;
+using Deltares.Standard.Attributes;
+using Deltares.Standard.EventPublisher;
+using Deltares.Standard.Validation;
+
+namespace Deltares.Dam.Data
+{
+    using Deltares.Standard;
+
+    public enum TangentLinesDefinition
+    {
+        OnBoundaryLines = 0,
+        Specified = 1
+    }
+
+    public enum GridSizeDetermination
+    {
+        Automatic = 0,
+        Specified = 1
+    }
+
+    public class SheetPiling : IAssignable<SheetPiling>, ICloneable<SheetPiling>
+    {
+        public double XCoordinate { get; set; }
+        public double YCoordinate { get; set; }
+        public double ZCoordinate { get; set; }
+        public double Length { get; set; }
+
+        public void Assign(SheetPiling sheetPiling)
+        {
+            this.XCoordinate = sheetPiling.XCoordinate;
+            this.YCoordinate = sheetPiling.YCoordinate;
+            this.ZCoordinate = sheetPiling.ZCoordinate;
+            this.Length = sheetPiling.Length;
+        }
+
+        public SheetPiling Clone()
+        {
+            var sheetPiling = new SheetPiling();
+            sheetPiling.Assign(this);
+            return sheetPiling;
+        }
+    }
+
+    public class HorizontalBalanceArea : IAssignable<HorizontalBalanceArea>, ICloneable<HorizontalBalanceArea>
+    {
+        public double XLeft { get; set; }
+        public double XRight { get; set; }
+        public double YTop { get; set; }
+        public double YBottom { get; set; }
+        public int PlaneCount { get; set; }
+        public void Assign(HorizontalBalanceArea horizontalBalanceArea)
+        {
+            this.XLeft = horizontalBalanceArea.XLeft;
+            this.XRight = horizontalBalanceArea.XRight;
+            this.YTop = horizontalBalanceArea.YTop;
+            this.YBottom = horizontalBalanceArea.YBottom;
+            this.PlaneCount = horizontalBalanceArea.PlaneCount;
+        }
+
+        public HorizontalBalanceArea Clone()
+        {
+            var horizontalBalanceArea = new HorizontalBalanceArea();
+            horizontalBalanceArea.Assign(this);
+            return horizontalBalanceArea;
+        }
+    }
+
+    public class SlipCircleDefinition : IVisibleEnabled, IAssignable<SlipCircleDefinition>, ICloneable<SlipCircleDefinition>
+    {
+        private double xCoordinateLastUpliftPoint;
+        private int upliftVanLeftGridVerticalPointCount;
+        private double upliftVanTangentLinesDistance;
+        private double bishopTangentLinesDistance;
+        private double upliftVanLeftGridVerticalPointDistance;
+        private int upliftVanLeftGridHorizontalPointCount;
+        private double upliftVanLeftGridHorizontalPointDistance;
+        private int upliftVanRightGridVerticalPointCount;
+        private double upliftVanRightGridVerticalPointDistance;
+        private int upliftVanRightGridHorizontalPointCount;
+        private double upliftVanRightGridHorizontalPointDistance;
+        private int bishopGridHorizontalPointCount;
+        private double bishopGridHorizontalPointDistance;
+        private int bishopGridVerticalPointCount;
+        private double bishopGridVerticalPointDistance;
+
+        [Format("F2")]
+        public double XCoordinateLastUpliftPoint
+        {
+            get
+            {
+                return xCoordinateLastUpliftPoint;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "XCoordinateLastUpliftPoint");
+                xCoordinateLastUpliftPoint = value;
+                DataEventPublisher.AfterChange(this, "XCoordinateLastUpliftPoint");
+            }
+        }
+        public TangentLinesDefinition UpliftVanTangentLinesDefinition { get; set; }
+        [Format("F2")]
+        [Minimum(0.01)]
+        [Maximum(1000.0)]
+        public double UpliftVanTangentLinesDistance
+        {
+            get
+            {
+                return upliftVanTangentLinesDistance;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "UpliftVanTangentLinesDistance");
+                upliftVanTangentLinesDistance = value;
+                DataEventPublisher.AfterChange(this, "UpliftVanTangentLinesDistance");
+            }
+        }
+        public TangentLinesDefinition BishopTangentLinesDefinition { get; set; }
+        [Format("F2")]
+        [Minimum(0.01)]
+        [Maximum(1000.0)]
+        public double BishopTangentLinesDistance
+        {
+            get
+            {
+                return bishopTangentLinesDistance;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "BishopTangentLinesDistance");
+                bishopTangentLinesDistance = value;
+                DataEventPublisher.AfterChange(this, "BishopTangentLinesDistance");
+            }
+        }
+        public GridSizeDetermination GridSizeDetermination { get; set; }
+        [Minimum(1)]
+        [Maximum(100)]
+        public int UpliftVanLeftGridVerticalPointCount
+        {
+            get
+            {
+                return upliftVanLeftGridVerticalPointCount;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "UpliftVanLeftGridVerticalPointCount");
+                upliftVanLeftGridVerticalPointCount = value;
+                DataEventPublisher.AfterChange(this, "UpliftVanLeftGridVerticalPointCount");
+            }
+        }
+        [Format("F2")]
+        [Minimum(0.01)]
+        [Maximum(1000.0)]
+        public double UpliftVanLeftGridVerticalPointDistance
+        {
+            get
+            {
+                return upliftVanLeftGridVerticalPointDistance;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "UpliftVanLeftGridVerticalPointDistance");
+                upliftVanLeftGridVerticalPointDistance = value;
+                DataEventPublisher.AfterChange(this, "UpliftVanLeftGridVerticalPointDistance");
+            }
+        }
+        [Minimum(1)]
+        [Maximum(100)]
+        public int UpliftVanLeftGridHorizontalPointCount
+        {
+            get
+            {
+                return upliftVanLeftGridHorizontalPointCount;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "UpliftVanLeftGridHorizontalPointCount");
+                upliftVanLeftGridHorizontalPointCount = value;
+                DataEventPublisher.AfterChange(this, "UpliftVanLeftGridHorizontalPointCount");
+            }
+        }
+        [Format("F2")]
+        [Minimum(0.01)]
+        [Maximum(1000.0)]
+        public double UpliftVanLeftGridHorizontalPointDistance
+        {
+            get
+            {
+                return upliftVanLeftGridHorizontalPointDistance;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "UpliftVanLeftGridHorizontalPointDistance");
+                upliftVanLeftGridHorizontalPointDistance = value;
+                DataEventPublisher.AfterChange(this, "UpliftVanLeftGridHorizontalPointDistance");
+            }
+        }
+        [Minimum(1)]
+        [Maximum(100)]
+        public int UpliftVanRightGridVerticalPointCount
+        {
+            get
+            {
+                return upliftVanRightGridVerticalPointCount;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "UpliftVanRightGridVerticalPointCount");
+                upliftVanRightGridVerticalPointCount = value;
+                DataEventPublisher.AfterChange(this, "UpliftVanRightGridVerticalPointCount");
+            }
+        }
+        [Format("F2")]
+        [Minimum(0.01)]
+        [Maximum(1000.0)]
+        public double UpliftVanRightGridVerticalPointDistance
+        {
+            get
+            {
+                return upliftVanRightGridVerticalPointDistance;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "UpliftVanRightGridVerticalPointDistance");
+                upliftVanRightGridVerticalPointDistance = value;
+                DataEventPublisher.AfterChange(this, "UpliftVanRightGridVerticalPointDistance");
+            }
+        }
+        [Minimum(1)]
+        [Maximum(100)]
+        public int UpliftVanRightGridHorizontalPointCount
+        {
+            get
+            {
+                return upliftVanRightGridHorizontalPointCount;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "UpliftVanRightGridHorizontalPointCount");
+                upliftVanRightGridHorizontalPointCount = value;
+                DataEventPublisher.AfterChange(this, "UpliftVanRightGridHorizontalPointCount");
+            }
+        }
+        [Format("F2")]
+        [Minimum(0.01)]
+        [Maximum(1000.0)]
+        public double UpliftVanRightGridHorizontalPointDistance
+        {
+            get
+            {
+                return upliftVanRightGridHorizontalPointDistance;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "UpliftVanRightGridHorizontalPointDistance");
+                upliftVanRightGridHorizontalPointDistance = value;
+                DataEventPublisher.AfterChange(this, "UpliftVanRightGridHorizontalPointDistance");
+            }
+        }
+        [Minimum(1)]
+        [Maximum(100)]
+        public int BishopGridVerticalPointCount
+        {
+            get
+            {
+                return bishopGridVerticalPointCount;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "BishopGridVerticalPointCount");
+                bishopGridVerticalPointCount = value;
+                DataEventPublisher.AfterChange(this, "BishopGridVerticalPointCount");
+            }
+        }
+        [Format("F2")]
+        [Minimum(0.01)]
+        [Maximum(1000.0)]
+        public double BishopGridVerticalPointDistance
+        {
+            get
+            {
+                return bishopGridVerticalPointDistance;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "BishopGridVerticalPointDistance");
+                bishopGridVerticalPointDistance = value;
+                DataEventPublisher.AfterChange(this, "BishopGridVerticalPointDistance");
+            }
+        }
+        [Minimum(1)]
+        [Maximum(100)]
+        public int BishopGridHorizontalPointCount
+        {
+            get
+            {
+                return bishopGridHorizontalPointCount;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "BishopGridHorizontalPointCount");
+                bishopGridHorizontalPointCount = value;
+                DataEventPublisher.AfterChange(this, "BishopGridHorizontalPointCount");
+            }
+        }
+        [Format("F2")]
+        [Minimum(0.01)]
+        [Maximum(1000.0)]
+        public double BishopGridHorizontalPointDistance
+        {
+            get
+            {
+                return bishopGridHorizontalPointDistance;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "BishopGridHorizontalPointDistance");
+                bishopGridHorizontalPointDistance = value;
+                DataEventPublisher.AfterChange(this, "BishopGridHorizontalPointDistance");
+            }
+        }
+
+        public DamFailureMechanismeCalculationSpecification Specification { get; set; }
+
+        public bool IsVisible(string property)
+        {
+            if (Specification == null)
+                return true;
+
+            switch (property)
+            {
+                case "GridSizeDetermination": return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan() || IsStabiltyBishop();
+                // Uplift Van
+                case "UpliftVanTangentLinesDefinition":
+                    return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
+                case "UpliftVanTangentLinesDistance":
+                    return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
+                case "UpliftVanLeftGridVerticalPointCount":
+                    return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
+                case "UpliftVanLeftGridVerticalPointDistance":
+                    return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
+                case "UpliftVanLeftGridHorizontalPointCount":
+                    return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
+                case "UpliftVanLeftGridHorizontalPointDistance":
+                    return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
+                case "UpliftVanRightGridVerticalPointCount":
+                    return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
+                case "UpliftVanRightGridVerticalPointDistance":
+                    return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
+                case "UpliftVanRightGridHorizontalPointCount":
+                    return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
+                case "UpliftVanRightGridHorizontalPointDistance":
+                    return IsStabiltyUpliftVan() || IsStabiltyBishopUpliftVan();
+
+                // Bishop
+                case "BishopTangentLinesDefinition":
+                    return false; //IsStabiltyBishop() || IsStabiltyBishopUpliftVan(); False for now. See MWDAM-640. 
+                case "BishopTangentLinesDistance":
+                    return false; //IsStabiltyBishop() || IsStabiltyBishopUpliftVan(); False for now. See MWDAM-640. 
+                case "BishopGridVerticalPointCount":
+                    return IsStabiltyBishop() || IsStabiltyBishopUpliftVan();
+                case "BishopGridVerticalPointDistance":
+                    return IsStabiltyBishop() || IsStabiltyBishopUpliftVan();
+                case "BishopGridHorizontalPointCount":
+                    return IsStabiltyBishop() || IsStabiltyBishopUpliftVan();
+                case "BishopGridHorizontalPointDistance":
+                    return IsStabiltyBishop() || IsStabiltyBishopUpliftVan();
+                default: return true;
+            }
+        }
+
+        private bool IsStabiltyBishop()
+        {
+            return ((Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside ||
+                     Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) &&
+                    (MStabModelType)Specification.CalculationModel == MStabModelType.Bishop);
+        }
+
+        private bool IsStabiltyUpliftVan()
+        {
+            return ((Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside ||
+                     Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) &&
+                    (MStabModelType)Specification.CalculationModel == MStabModelType.UpliftVan);
+        }
+
+        private bool IsStabiltyBishopUpliftVan()
+        {
+            return ((Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside ||
+                     Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) &&
+                    (MStabModelType)Specification.CalculationModel == MStabModelType.BishopUpliftVan);
+        }
+
+        public bool IsEnabled(string property)
+        {
+            if (Specification == null)
+                return true;
+
+            switch (property)
+            {
+                // Uplift Van
+                case "UpliftVanTangentLinesDefinition":
+                    return true;
+                case "UpliftVanTangentLinesDistance":
+                    return UpliftVanTangentLinesDefinition == TangentLinesDefinition.Specified;
+                case "UpliftVanLeftGridVerticalPointCount":
+                    return GridSizeDetermination == GridSizeDetermination.Specified;
+                case "UpliftVanLeftGridVerticalPointDistance":
+                    return GridSizeDetermination == GridSizeDetermination.Specified;
+                case "UpliftVanLeftGridHorizontalPointCount":
+                    return GridSizeDetermination == GridSizeDetermination.Specified;
+                case "UpliftVanLeftGridHorizontalPointDistance":
+                    return GridSizeDetermination == GridSizeDetermination.Specified;
+                case "UpliftVanRightGridVerticalPointCount":
+                    return GridSizeDetermination == GridSizeDetermination.Specified;
+                case "UpliftVanRightGridVerticalPointDistance":
+                    return GridSizeDetermination == GridSizeDetermination.Specified;
+                case "UpliftVanRightGridHorizontalPointCount":
+                    return GridSizeDetermination == GridSizeDetermination.Specified;
+                case "UpliftVanRightGridHorizontalPointDistance":
+                    return GridSizeDetermination == GridSizeDetermination.Specified;
+
+                // Bishop
+                case "BishopTangentLinesDefinition":
+                    return true;
+                case "BishopTangentLinesDistance":
+                    return BishopTangentLinesDefinition == TangentLinesDefinition.Specified;
+                case "BishopGridVerticalPointCount":
+                    return GridSizeDetermination == GridSizeDetermination.Specified;
+                case "BishopGridVerticalPointDistance":
+                    return GridSizeDetermination == GridSizeDetermination.Specified;
+                case "BishopGridHorizontalPointCount":
+                    return GridSizeDetermination == GridSizeDetermination.Specified;
+                case "BishopGridHorizontalPointDistance":
+                    return GridSizeDetermination == GridSizeDetermination.Specified;
+                default: return true;
+            }
+        }
+
+        public void Assign(SlipCircleDefinition slipCircleDefinition)
+        {
+            this.XCoordinateLastUpliftPoint = slipCircleDefinition.XCoordinateLastUpliftPoint;
+            this.UpliftVanTangentLinesDefinition = slipCircleDefinition.UpliftVanTangentLinesDefinition;
+            this.UpliftVanTangentLinesDistance = slipCircleDefinition.UpliftVanTangentLinesDistance;
+            this.BishopTangentLinesDefinition = slipCircleDefinition.BishopTangentLinesDefinition;
+            this.BishopTangentLinesDistance = slipCircleDefinition.BishopTangentLinesDistance;
+            this.GridSizeDetermination = slipCircleDefinition.GridSizeDetermination;
+            this.UpliftVanLeftGridVerticalPointCount = slipCircleDefinition.UpliftVanLeftGridVerticalPointCount;
+            this.UpliftVanLeftGridVerticalPointDistance = slipCircleDefinition.UpliftVanLeftGridVerticalPointDistance;
+            this.UpliftVanLeftGridHorizontalPointCount = slipCircleDefinition.UpliftVanLeftGridHorizontalPointCount;
+            this.UpliftVanLeftGridHorizontalPointDistance = slipCircleDefinition.UpliftVanLeftGridHorizontalPointDistance;
+            this.UpliftVanRightGridVerticalPointCount = slipCircleDefinition.UpliftVanRightGridVerticalPointCount;
+            this.UpliftVanRightGridVerticalPointDistance = slipCircleDefinition.UpliftVanRightGridVerticalPointDistance;
+            this.UpliftVanRightGridHorizontalPointCount = slipCircleDefinition.UpliftVanRightGridHorizontalPointCount;
+            this.UpliftVanRightGridHorizontalPointDistance = slipCircleDefinition.UpliftVanRightGridHorizontalPointDistance;
+            this.BishopGridVerticalPointCount = slipCircleDefinition.BishopGridVerticalPointCount;
+            this.BishopGridVerticalPointDistance = slipCircleDefinition.BishopGridVerticalPointDistance;
+            this.BishopGridHorizontalPointCount = slipCircleDefinition.BishopGridHorizontalPointCount;
+            this.BishopGridHorizontalPointDistance = slipCircleDefinition.BishopGridHorizontalPointDistance;
+        }
+
+        public SlipCircleDefinition Clone()
+        {
+            var slipCircleDefinition = new SlipCircleDefinition();
+            slipCircleDefinition.Assign(this);
+            return slipCircleDefinition;
+        }
+    }
+
+    public class MStabZoneAreas : IAssignable<MStabZoneAreas>, ICloneable<MStabZoneAreas>
+    {
+        public double DikeTableHeight { get; set; }
+        public double DikeTableWidth { get; set; }
+        public double XCoordinateDikeTopAtRiver { get; set; }
+        public double XCoordinateDikeTopAtPolder { get; set; }
+        public double XCoordinateStartRestProfile { get; set; }
+        public double SafetyFactorZone1A { get; set; }
+        public double SafetyFactorZone1B { get; set; }
+        public void Assign(MStabZoneAreas mstabZoneAreas)
+        {
+            this.DikeTableHeight = mstabZoneAreas.DikeTableHeight;
+            this.DikeTableWidth = mstabZoneAreas.DikeTableWidth;
+            this.XCoordinateDikeTopAtRiver = mstabZoneAreas.XCoordinateDikeTopAtRiver;
+            this.XCoordinateDikeTopAtPolder = mstabZoneAreas.XCoordinateDikeTopAtPolder;
+            this.XCoordinateStartRestProfile = mstabZoneAreas.XCoordinateStartRestProfile;
+            this.SafetyFactorZone1A = mstabZoneAreas.SafetyFactorZone1A;
+            this.SafetyFactorZone1B = mstabZoneAreas.SafetyFactorZone1B;
+        }
+
+        public MStabZoneAreas Clone()
+        {
+            var mstabZoneAreas = new MStabZoneAreas();
+            mstabZoneAreas.Assign(this);
+            return mstabZoneAreas;
+        }
+    }
+
+    public class MStabForbiddenZone : IAssignable<MStabForbiddenZone>, ICloneable<MStabForbiddenZone>
+    {
+        public bool IsXEntryMinUsed { get; set; }
+        public bool IsXEntryMaxUsed { get; set; }
+        public double XEntryMin { get; set; }
+        public double XEntryMax { get; set; }
+        public void Assign(MStabForbiddenZone mstabForbiddenZone)
+        {
+            this.IsXEntryMinUsed = mstabForbiddenZone.IsXEntryMinUsed;
+            this.IsXEntryMaxUsed = mstabForbiddenZone.IsXEntryMaxUsed;
+            this.XEntryMin = mstabForbiddenZone.XEntryMin;
+            this.XEntryMax = mstabForbiddenZone.XEntryMax;
+        }
+
+        public MStabForbiddenZone Clone()
+        {
+            var mstabForbiddenZone = new MStabForbiddenZone();
+            mstabForbiddenZone.Assign(this);
+            return mstabForbiddenZone;
+        }
+    }
+
+    public class MStabDesignEmbankment : IAssignable<MStabDesignEmbankment>, ICloneable<MStabDesignEmbankment>
+    {
+        public string EmbankmentMaterialname { get; set; }
+        public string PreviousGeometry2DFilename { get; set; }
+        public void Assign(MStabDesignEmbankment mstabDesignEmbankment)
+        {
+            this.EmbankmentMaterialname = mstabDesignEmbankment.EmbankmentMaterialname;
+            this.PreviousGeometry2DFilename = mstabDesignEmbankment.PreviousGeometry2DFilename;
+        }
+
+        public MStabDesignEmbankment Clone()
+        {
+            var mstabDesignEmbankment = new MStabDesignEmbankment();
+            mstabDesignEmbankment.Assign(this);
+            return mstabDesignEmbankment;
+        }
+    }
+
+    public class MStabGeometryCreationOptions : IAssignable<MStabGeometryCreationOptions>, ICloneable<MStabGeometryCreationOptions>
+    {
+        public MStabGeometryCreationOptions()
+        {
+            SoilProfileType = SoilProfileType.SoilProfile1D;
+            SoilGeometry2DFilename = "";
+            XOffsetSoilGeometry2DOrigin = 0.0;
+            MaterialForDike = "";
+            MaterialForShoulder = "";
+            IsDrySituation = false;
+            PLLineAssignment = PLLineAssignment.ExpertKnowledge;
+            IntrusionVerticalWaterPressureType = IntrusionVerticalWaterPressureType.Standard;
+            PenetrationLength = 0.0;
+            IsDesign = false;
+        }
+        [XmlOldName("SoilGeometryType")]
+        public SoilProfileType SoilProfileType { get; set; }
+        public string SoilGeometry2DFilename { get; set; }
+        public double XOffsetSoilGeometry2DOrigin { get; set; }
+        public string MaterialForDike { get; set; }
+        public string MaterialForShoulder { get; set; }
+        public bool IsDrySituation { get; set; }
+        public PLLineAssignment PLLineAssignment { get; set; }
+        public IntrusionVerticalWaterPressureType IntrusionVerticalWaterPressureType { get; set; }
+        public double PenetrationLength { get; set; }
+        public bool IsDesign { get; set; }
+
+        public void Assign(MStabGeometryCreationOptions mstabGeometryCreationOptions)
+        {
+            this.SoilProfileType = mstabGeometryCreationOptions.SoilProfileType;
+            this.SoilGeometry2DFilename = mstabGeometryCreationOptions.SoilGeometry2DFilename;
+            this.XOffsetSoilGeometry2DOrigin = mstabGeometryCreationOptions.XOffsetSoilGeometry2DOrigin;
+            this.MaterialForDike = mstabGeometryCreationOptions.MaterialForDike;
+            this.MaterialForShoulder = mstabGeometryCreationOptions.MaterialForShoulder;
+            this.IsDrySituation = mstabGeometryCreationOptions.IsDrySituation;
+            this.PLLineAssignment = mstabGeometryCreationOptions.PLLineAssignment;
+            this.IntrusionVerticalWaterPressureType = mstabGeometryCreationOptions.IntrusionVerticalWaterPressureType;
+            this.PenetrationLength = mstabGeometryCreationOptions.PenetrationLength;
+            this.IsDesign = mstabGeometryCreationOptions.IsDesign;
+        }
+
+        public MStabGeometryCreationOptions Clone()
+        {
+            var mstabGeometryCreationOptions = new MStabGeometryCreationOptions();
+            mstabGeometryCreationOptions.Assign(this);
+            return mstabGeometryCreationOptions;
+        }
+    }
+
+    public class MStabCalculationOptions : IAssignable<MStabCalculationOptions>, ICloneable<MStabCalculationOptions>
+    {
+        public double MinimalCircleDepth { get; set; }
+        [Label("MStab Zone Types")]
+        [ReadOnly(true)]
+        public MStabZonesType ZonesType { get; set; }
+
+        public void Assign(MStabCalculationOptions mstabCalculationOptions)
+        {
+            this.MinimalCircleDepth = mstabCalculationOptions.MinimalCircleDepth;
+            this.ZonesType = mstabCalculationOptions.ZonesType;
+        }
+
+        public MStabCalculationOptions Clone()
+        {
+            var mstabCalculationOptions = new MStabCalculationOptions();
+            mstabCalculationOptions.Assign(this);
+            return mstabCalculationOptions;
+        }
+    }
+
+    public class MStabParameters : ICloneable<MStabParameters>, IVisibleEnabled
+    {
+        private MStabGridPosition gridPosition;
+
+        public MStabParameters()
+        {
+            this.IsCalculateAllStabilityProjectsAtOnce = true;
+            this.IsOverrulePLLineCreationMethod = false;
+            this.PLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD;
+            this.Model = MStabModelType.Bishop;
+            this.SearchMethod = MStabSearchMethod.Grid;
+            this.ZoneAreas = null;
+            this.gridPosition = MStabGridPosition.Right;
+            this.CalculationOptions = new MStabCalculationOptions();
+            this.GeometryCreationOptions = new MStabGeometryCreationOptions();
+            this.SheetPiling = null;
+            this.HorizontalBalanceArea = new HorizontalBalanceArea();
+            this.SlipCircleDefinition = new SlipCircleDefinition();
+        }
+
+        public bool IsCombinedBishopUpliftVanCalculation { get { return (Model == MStabModelType.BishopUpliftVan); } }
+        // IsCombinedBishopUpliftVanCalculation (formerly IsAutoSelectCalculation) is the same as Model == MStabModel.BishopUpliftVan
+        // This property was first implemented for FewsDam and later MStabModel.BishopUpliftVan was implemented for normal DAM operation
+        // Now we will use Model == MStabModel.BishopUpliftVan for  both FewsDam and DAM
+        // This readonly property is implemented for backward compatibiity
+
+        public bool IsCalculateAllStabilityProjectsAtOnce { get; set; }
+        // Normally PLLine creation is specified per location.
+        // If IsOverrulePLLineCreationMethod is set to true the settings in the locations will be 
+        // overruled with the value in PLLineCreationMethod
+        public bool IsOverrulePLLineCreationMethod { get; set; }
+        public PLLineCreationMethod PLLineCreationMethod { get; set; }
+        [Label("Model")]
+        public MStabModelType Model { get; set; }
+        [Label("Shear Strength")]
+        public MStabShearStrength ShearStrength { get; set; }
+        [Label("Search Method")]
+        public MStabSearchMethod SearchMethod { get; set; }
+        public bool IsProbabilistic { get; set; }
+        public string ProjectFileName { get; set; }
+        public string SoilDatabaseName { get; set; }
+        public MStabZoneAreas ZoneAreas { get; set; }
+        public MStabForbiddenZone ForbiddenZone { get; set; }
+        public MStabGeometryCreationOptions GeometryCreationOptions { get; set; }
+        public SheetPiling SheetPiling { get; set; }
+        public HorizontalBalanceArea HorizontalBalanceArea { get; set; }
+        [Validate]
+        public SlipCircleDefinition SlipCircleDefinition { get; set; }
+        public MStabCalculationOptions CalculationOptions { get; set; }
+
+        public MStabGridPosition GridPosition
+        {
+            get { return gridPosition; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "GridPosition");
+                gridPosition = value;
+                DataEventPublisher.AfterChange(this, "GridPosition");
+            }
+        }
+
+        public void Assign(MStabParameters mstabParameters)
+        {
+            this.Model = mstabParameters.Model;
+            this.ShearStrength = mstabParameters.ShearStrength;
+            this.SearchMethod = mstabParameters.SearchMethod;
+            this.IsProbabilistic = mstabParameters.IsProbabilistic;
+            this.GridPosition = mstabParameters.GridPosition;
+            this.ProjectFileName = mstabParameters.ProjectFileName;
+            this.SoilDatabaseName = mstabParameters.SoilDatabaseName;
+            if (this.ZoneAreas != null)
+            {
+                this.ZoneAreas.Assign(mstabParameters.ZoneAreas);
+            }
+            else
+            {
+                this.ZoneAreas = null;
+            }
+            if (this.ForbiddenZone != null)
+            {
+                this.ForbiddenZone.Assign(mstabParameters.ForbiddenZone);
+            }
+            else
+            {
+                this.ForbiddenZone = null;
+            }
+            if (this.CalculationOptions != null)
+            {
+                this.CalculationOptions.Assign(mstabParameters.CalculationOptions);
+            }
+            else
+            {
+                this.CalculationOptions = null;
+            }
+            if (this.GeometryCreationOptions != null)
+            {
+                this.GeometryCreationOptions.Assign(mstabParameters.GeometryCreationOptions);
+            }
+            else
+            {
+                this.GeometryCreationOptions = null;
+            }
+            if (this.SheetPiling != null)
+            {
+                this.SheetPiling.Assign(mstabParameters.SheetPiling);
+            }
+            else
+            {
+                this.SheetPiling = null;
+            }
+            if (this.HorizontalBalanceArea != null)
+            {
+                this.HorizontalBalanceArea.Assign(mstabParameters.HorizontalBalanceArea);
+            }
+            else
+            {
+                this.HorizontalBalanceArea = null;
+            }
+            this.SoilDatabaseName = mstabParameters.SoilDatabaseName;
+            if (this.SlipCircleDefinition != null)
+            {
+                this.SlipCircleDefinition.Assign(mstabParameters.SlipCircleDefinition);
+            }
+            else
+            {
+                this.SlipCircleDefinition = null;
+            }
+        }
+
+        [Label("MStab Zone Types")]
+        [ReadOnly(true)]
+        [XmlIgnore]
+        public MStabZonesType ZonesType
+        {
+            get { return this.CalculationOptions.ZonesType; }
+            set { this.CalculationOptions.ZonesType = value; }
+        }
+
+        public MStabParameters Clone()
+        {
+            var mstabParameters = new MStabParameters();
+            if (this.ZoneAreas != null)
+                mstabParameters.ZoneAreas = this.ZoneAreas.Clone();
+            if (this.ForbiddenZone != null)
+                mstabParameters.ForbiddenZone = this.ForbiddenZone.Clone();
+            if (this.GeometryCreationOptions != null)
+                mstabParameters.GeometryCreationOptions = this.GeometryCreationOptions.Clone();
+            if (this.SheetPiling != null)
+                mstabParameters.SheetPiling = this.SheetPiling.Clone();
+            if (this.HorizontalBalanceArea != null)
+                mstabParameters.HorizontalBalanceArea = this.HorizontalBalanceArea.Clone();
+            if (this.SlipCircleDefinition != null)
+                mstabParameters.SlipCircleDefinition = this.SlipCircleDefinition.Clone();
+            if (this.CalculationOptions != null)
+                mstabParameters.CalculationOptions = this.CalculationOptions.Clone();
+
+            mstabParameters.Assign(this);
+
+            return mstabParameters;
+        }
+
+        #region IVisibleEnabled Members
+
+        public bool IsEnabled(string property)
+        {
+            switch (property)
+            {
+                case "SearchMethod": return Location.DamProjectType == DamProjectType.Design;
+                case "GridPosition": return false; // position depends on failuremechanisme type (inside or outside)
+                case "ZonesType": return false; // Is set per location!
+                default: return true;
+            }
+        }
+
+        public bool IsVisible(string property)
+        {
+            switch (property)
+            {
+                case "Model": return true;
+                case "SearchMethod": return
+                   (SlipCircleDefinition.Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside ||
+                   SlipCircleDefinition.Specification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) &&
+                    (Model == MStabModelType.Bishop ||
+                    Model == MStabModelType.BishopUpliftVan || Model == MStabModelType.UpliftVan);
+                case "ZonesType": return false; // Is set per location!
+                case "GridPosition": return false; // position depends on failuremechanisme type (inside or outside)
+                default: return true;
+            }
+        }
+
+        #endregion
+
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/ObjectMaterializer.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/ObjectMaterializer.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/ObjectMaterializer.cs	(revision 3305)
@@ -0,0 +1,130 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Deltares.Dam.Data
+{
+
+    public class ObjectMaterializer<T>
+    {
+        private struct SetterInfo
+        {
+            public Action<T, string> Function;
+            public bool Required;
+        }
+
+        /// <summary>
+        /// Holds the property setter actions with the name as the key of the setter
+        /// </summary>
+        private readonly Dictionary<string, SetterInfo> dict;
+        
+        /// <summary>
+        /// Holds the list of actions in a list so it is accessible with an index
+        /// </summary>
+        private List<SetterInfo> setters;
+
+        public ObjectMaterializer()
+        {
+            this.dict = new Dictionary<string, SetterInfo>();
+            this.setters = new List<SetterInfo>();
+        }
+
+
+        /// <summary>
+        /// Adds a new property setter
+        /// </summary>
+        /// <param name="setterName">The name of the setter</param>
+        /// <param name="func">The setter lambda expression</param>
+        /// <param name="required"></param>
+        public void Add(string setterName, Action<T, string> func, bool required)
+        {
+            SetterInfo columnInfo = new SetterInfo() { Function = func, Required = required };
+            dict.Add(setterName, columnInfo);
+        }
+
+        public void Add(string setterName, Action<T, string> func)
+        {
+            Add(setterName, func, true);
+        }
+
+        /// <summary>
+        /// Removes a property setter
+        /// </summary>
+        /// <param name="setterName">The name of the setter</param>
+        public void Remove(string setterName)
+        {
+            dict.Remove(setterName);
+            setters = dict.Values.ToList();
+        }
+
+        /// <summary>
+        /// Returns the mapped keys
+        /// </summary>
+        public IEnumerable<string> MappingKeys
+        {
+            get { return this.dict.Keys; }
+        }
+
+        public bool IsRequired(string setterName)
+        {
+            return this.dict.ContainsKey(setterName) && this.dict[setterName].Required;
+        }
+
+        /// <summary>
+        /// Gets the setter action by index
+        /// </summary>
+        /// <param name="index">The index of the property set expression</param>
+        /// <returns></returns>
+        public Action<T, string> this[int index]
+        {
+            get
+            {
+                if (setters == null)
+                    setters = dict.Values.ToList();
+                return setters[index].Function;
+            }
+        }
+
+        /// <summary>
+        /// Gets the setter action by name
+        /// </summary>
+        /// <param name="name">The name of the property set expression</param>
+        /// <returns></returns>
+        public Action<T, string> this[string name]
+        {
+            get
+            {
+                return dict[name].Function;
+            }
+        }
+
+        /// <summary>
+        /// Gets the number of setter items
+        /// </summary>
+        public int Count
+        {
+            get { return dict.Count; }
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/LocationJob.cs	(revision 3305)
@@ -0,0 +1,379 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using System.ComponentModel;
+using Deltares.Geographic;
+using Deltares.Standard.Attributes;
+using Deltares.Standard.EventPublisher;
+using Deltares.Standard.Validation;
+
+namespace Deltares.Dam.Data
+{
+    using System;
+    using System.Xml.Serialization;
+    using Deltares.Standard;
+
+    public interface ILocationJob
+    {
+        Location Location { get; }        
+    }
+
+    public class LocationJob : DamJob, ILocationJob, IGeographicPoint, IVisibleEnabled
+    {
+        private TimeSerie waterLevelTimeSerie = new TimeSerie();
+        private LocationResult locationResult = new LocationResult();
+
+        private static string currentProfileName = "";
+        private static string currentScenarioName = "";
+        private static string currentCalculation = "";
+        private static DateTime currentTime = DateTime.Today;
+        private static DamProjectType damProjectType = DamProjectType.Calamity;
+        
+        private double designRequiredFactor = 0.0;
+
+        public LocationJob()
+        {
+        }
+
+        public LocationJob(object subject)
+            : base(subject)
+        {
+        }
+
+        /// <summary>
+        /// TODO: what todo when location is null?
+        /// </summary>
+        public double XRd { get { return this.Location == null ? 0 : this.Location.XRd; } }
+        public double YRd { get { return this.Location == null ? 0 : this.Location.YRd; } }
+
+        [XmlIgnore]
+        [Validate]
+        public Location Location
+        {
+            get
+            {
+                return this.Subject as Location;
+            }
+            set
+            {
+                this.Subject = value;
+            }
+        }
+
+        public TimeSerie WaterLevelTimeSerie
+        {
+            get { return waterLevelTimeSerie; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "WaterLevelTimeSerie");
+                waterLevelTimeSerie = value;
+                DataEventPublisher.AfterChange(this, "WaterLevelTimeSerie");
+            }
+        }
+
+        public virtual LocationResult LocationResult
+        {
+            get { return locationResult; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "LocationResult");
+                locationResult = value;
+                DataEventPublisher.AfterChange(this, "LocationResult");
+            }
+        }
+
+        private bool HasUsableStabilityTimeSerieEntries()
+        {
+            var res = false;
+            foreach (var timeSerieEntry in locationResult.StabilityTimeSerie.Entries)
+            {
+                if (timeSerieEntry.Value != Double.NaN)
+                {
+                    res = true;
+                    break;
+                }
+            }
+            return res;
+        }
+
+        public bool HasLocationResults
+        {
+            get
+            {
+                if (locationResult == null)
+                    return false;
+                return ((locationResult.PipingTimeSerie != null && locationResult.PipingTimeSerie.Entries.Count > 0) ||
+                        (locationResult.StabilityTimeSerie != null && 
+                        locationResult.StabilityTimeSerie.Entries.Count > 0 && HasUsableStabilityTimeSerieEntries()));
+            }
+        }
+
+        public LocationResult GetLocationResultWithStabilityTimeSerie(string locationName)
+        {
+            LocationResult result = null;
+            if (locationResult != null && locationResult.StabilityTimeSerie != null &&
+                locationResult.StabilityTimeSerie.LocationId == locationName &&
+                locationResult.StabilityTimeSerie.Entries != null && locationResult.StabilityTimeSerie.Entries.Count > 1)
+            {
+                result = locationResult;
+            }
+            return result;
+        }
+        
+        public LocationResult GetFirstLocationResultWithStabilityTimeSerie()
+        {
+            LocationResult result = null;
+            if (locationResult != null && locationResult.StabilityTimeSerie != null && 
+                locationResult.StabilityTimeSerie.Entries != null && locationResult.StabilityTimeSerie.Entries.Count > 1)
+            {
+                result = locationResult;
+            }
+            return result;
+        }
+
+        public CsvExportData GetFirstDesignResult()
+        {
+            if (this.HasDesignScenarioResults)
+            {
+                Scenario scenario = Location.Scenarios[0]; 
+                if (scenario != null && scenario.CalculationResults.Count > 0)
+                {
+                    return scenario.CalculationResults[0];
+                }
+            }
+            return null;
+        }
+
+        public CsvExportData GetDesignResultByProfileScenarioAndCalculationName(string profileName, string scenarioName, 
+            string calculationName)
+        {
+            if (this.HasDesignScenarioResults)
+            {
+                foreach (var scenario in Location.Scenarios)
+                {
+                    foreach (var calculationResult in scenario.CalculationResults)
+                    {
+                        if (calculationResult.ProfileName == profileName &&
+                            calculationResult.ScenarioName == scenarioName &&
+                            calculationResult.StabilityModel.ToString() == calculationName)
+                            return calculationResult;
+                    }                    
+                }                
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this instance has (Design) scenario results.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if this instance has scenario results; otherwise, <c>false</c>.
+        /// </value>
+        public bool HasDesignScenarioResults
+        {
+            get
+            {
+                List<Scenario> scenarios = Location.Scenarios;
+                foreach (var scenario in scenarios)
+                {
+                    foreach (var calculationResult in scenario.CalculationResults)
+                    {
+                        if ((calculationResult.SafetyFactor != null) || (calculationResult.CalculationResult == CalculationResult.UnexpectedError) )
+                        {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Get lowest safetyfactor of all scenarios
+        /// </summary>
+        /// <returns></returns>
+        private double GetLowestRealSafetyFactorFromDesignScenarios()
+        {
+            var res = double.MaxValue;
+            List<Scenario> scenarios = Location.Scenarios;
+            foreach (var scenario in scenarios)
+            {
+                foreach (var calculationResult in scenario.CalculationResults)
+                {
+                    if (calculationResult.CalculationResult == CalculationResult.UnexpectedError)
+                    {
+                        res = -1;
+                    }
+                    if (calculationResult.SafetyFactor != null)
+                    {
+                        if (calculationResult.SafetyFactor.Value < res)
+                        {
+                            res = calculationResult.SafetyFactor.Value;
+                            if (calculationResult.RequiredSafetyFactor != null)
+                            {
+                                designRequiredFactor = calculationResult.RequiredSafetyFactor.Value;
+                            }
+                        }
+                    }
+                }
+            }
+            if (res == double.MaxValue) res = DamGlobalConstants.NoRunValue;
+            return res;
+        }
+
+        [Data]
+        [Label("Safety factor")]
+        [XmlIgnore]
+        [Format("F3")]
+        public double SafetyFactor
+        {
+            get
+            {
+                if (DamProjectType == DamProjectType.Calamity)
+                {
+                    if (HasLocationResults)
+                    {
+                        TimeSerie timeSerie = this.LocationResult.StabilityTimeSerie;
+                        return timeSerie.GetValue(CurrentTime);
+                    }
+                    return DamGlobalConstants.NoRunValue;                    
+                }
+                if (DamProjectType == DamProjectType.Design)
+                {
+                    return GetLowestRealSafetyFactorFromDesignScenarios();
+                }
+                return DamGlobalConstants.NoRunValue;                
+            }
+        }
+
+        [Data]
+        [Format("F3")]
+        public double RequiredFactorOfSafety
+        {
+            get
+            {
+                if (DamProjectType == DamProjectType.Design)
+                {
+                    return designRequiredFactor;
+                }
+                return 1.0;
+            }
+        }
+
+        [Data]
+        [XmlIgnore]
+        [Label("Result")]
+        public JobResult Result
+        {
+            get
+            {
+                return JobResultInterpreter.GetJobResult(SafetyFactor, RequiredFactorOfSafety, true);                
+            }
+        }
+
+        [XmlIgnore]
+        [Browsable(false)]
+        public double X
+        {
+            get { return this.XRd; }
+            set
+            {
+                if (Location != null)
+                    Location.XRd = value;
+            }
+        }
+
+        [XmlIgnore]
+        [Browsable(false)]
+        public double Y
+        {
+            get { return this.YRd; }
+            set
+            {
+                if (Location != null)
+                    Location.YRd = value;
+            }
+        }
+
+        [XmlIgnore]
+        [Browsable(false)]
+        public static string CurrentProfileName
+        {
+            get { return currentProfileName; }
+            set { currentProfileName = value; }
+        }
+
+        [XmlIgnore]
+        [Browsable(false)]
+        public static string CurrentScenarioName
+        {
+            get { return currentScenarioName; }
+            set { currentScenarioName = value; }
+        }
+
+        [XmlIgnore]
+        [Browsable(false)]
+        public static string CurrentCalculation
+        {
+            get { return currentCalculation; }
+            set { currentCalculation = value; }
+        }
+
+        [XmlIgnore]
+        [Browsable(false)]
+        public static DateTime CurrentTime
+        {
+            get { return currentTime; }
+            set { currentTime = value; }
+        }
+
+        [XmlIgnore]
+        [Browsable(false)]
+        public static DamProjectType DamProjectType
+        {
+            get { return damProjectType; }
+            set { damProjectType = value; }
+        }
+
+        public bool IsEnabled(string property)
+        {
+            return true;
+        }
+
+        public bool IsVisible(string property)
+        {
+            switch (property)
+            {
+                case "SafetyFactor": return this.Result != JobResult.NoRun && this.Result != JobResult.Failed;
+                case "RequiredFactorOfSafety": return this.Result != JobResult.NoRun && this.Result != JobResult.Failed;
+                case "WaterLevelTimeSerie":
+                    return HasLocationResults;
+                default: return true;
+            }
+        }
+
+        public override string ToString()
+        {
+            return this.Location != null ? this.Location.ToString() : "";
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs	(revision 3305)
@@ -0,0 +1,807 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Deltares.Dam.Data.CsvImporters;
+using Deltares.Standard.Extensions;
+using DataAttribute = Deltares.Dam.Data.DataPlugins.Configuration.DataAttribute;
+
+namespace Deltares.Dam.Data.Importers
+{
+    public class LocationShapeFileAttributeMap
+    {
+        #region Attribute ID Constants
+
+        /// <summary>
+        /// location_id 
+        /// </summary>
+        public const string LocationAttributeId = CsvColumnNames.LocationColumnName;
+
+        /// <summary>
+        /// DikeringId
+        /// </summary>
+        public const string DikeRingAttributeId = CsvColumnNames.DikeRingColumnName;
+
+        /// <summary>
+        /// crosssection 	
+        /// CustomShape 	
+        /// crosssection.shp 	
+        /// LocationId 	
+        /// string, string         
+        /// </summary>
+        public const string CrossSectionAttributId = "crossection";
+
+        /// <summary>
+        /// segment_id 	
+        /// segment_id.shp 
+        /// segmentid 	
+        /// string
+        /// </summary>
+        public const string SegmentAttributeId = CsvColumnNames.SegmentColumnName;
+
+        /// <summary>
+        /// PolderLevel 
+        /// PolderLevel.shp 
+        /// PLHigh 
+        /// double
+        /// </summary>
+        public const string PolderLevelAttributeId = CsvColumnNames.PolderLevelColumnName;
+
+        /// <summary>
+        /// head_pl2 HeadPL2.shp 	HeadPL2 	double
+        /// </summary>
+        public const string HeadPl2AttributeId = CsvColumnNames.HeadPl2ColumnName;
+
+        /// <summary>
+        /// head_pl3 	CustomShape 	HeadPL3.shp 	HeadPL3 	double
+        /// </summary>
+        public const string HeadPl3AttributeId = CsvColumnNames.HeadPl3ColumnName;
+
+        /// <summary>
+        /// head_pl4 	CustomShape 	HeadPL4.shp 	HeadPL4 	double
+        /// </summary>
+        public const string HeadPl4AttributeId = CsvColumnNames.HeadPl4ColumnName;
+
+        /// <summary>
+        /// x_soilgeometry2D_origin 	
+        /// CustomShape 	
+        /// XSoilGeometry2DOrigin.shp 
+        /// XG2DOrg 	
+        /// double
+        /// </summary>
+        public const string XSoilGeometry2DOriginAttributeId = CsvColumnNames.XSoilGeometry2DOriginColumnName;
+
+        /// <summary>
+        /// ophoogmateriaaldijk 	
+        /// CustomShape 	
+        /// ShoulderMaterial.shp 	
+        /// DikeMtrl 	
+        /// string
+        /// </summary>
+        public const string DikeEmbankmentMaterialAttributeId = CsvColumnNames.DikeEmbankmentMaterialColumnName;
+
+        /// <summary>
+        /// ophoogmateriaalberm 	
+        /// CustomShape 	
+        /// ShoulderMaterial.shp 
+        /// ShlderMtrl 	
+        /// string
+        /// </summary>
+        public const string ShoulderEmbankmentMaterialAttributeId = CsvColumnNames.ShoulderEmbankmentMaterialColumnName;
+
+        /// <summary>
+        /// dempingsfactor_pl3 	
+        /// CustomShape 	
+        /// DampingFactorPL3.shp 	
+        /// DampingPL3 	double
+        /// </summary>
+        public const string DampingFactorPl3AttributeId = CsvColumnNames.DampingFactorPl3ColumnName;
+
+        /// <summary>
+        /// dempingsfactor_pl4 	
+        /// CustomShape 	
+        /// DampingFactorPL4.shp 	
+        /// DampingPL4 	
+        /// double
+        /// </summary>
+        public const string DampingFactorPl4AttributeId = CsvColumnNames.DampingFactorPl4ColumnName;
+
+        /// <summary>
+        /// PenetrationLength
+        /// CustomShape 	
+        /// PenetrationLength.shp 
+        /// PenLength 	
+        /// double
+        /// </summary>
+        public const string PenetrationLengthAttributeId = CsvColumnNames.PenetrationLengthColumnName;
+
+        /// <summary>
+        /// TrafficLoad 
+        /// CustomShape 	
+        /// TrafficLoad.shp 	
+        /// TrafLoad 	
+        /// double
+        /// </summary>
+        public const string TrafficLoadAttributeId = CsvColumnNames.TrafficLoadColumnName;
+
+
+        /// <summary>
+        /// TL_DegreeOfConsolidation 
+        /// CustomShape 	
+        /// TL_DegreeOfConsolidation.shp 	
+        /// TL_DegOfCo 	
+        /// double
+        /// </summary>
+        public const string TL_DegreeOfConsolidationAttributeId = CsvColumnNames.TlDegreeOfConsolidationColumnName;
+
+
+        /// <summary>
+        /// PLLineCreationMethod
+        /// CustomShape
+        /// PLLineCreationMethod.shp 
+        /// PLCrtMthd 	
+        /// string
+        /// </summary>
+        public const string PlLineCreationMethodAttributeId = CsvColumnNames.PlLineCreationMethodColumnName;
+
+ 
+        /// <summary>
+        /// PlLineOffsetBelowDikeTopAtRiver
+        /// CustomShape 	
+        /// PlLineOffsetBelowDikeTopAtRiver.shp 
+        /// PLBlwTDRvr 	
+        /// double
+        /// </summary>
+        public const string PlLineOffsetBelowDikeTopAtRiverAttributeId = CsvColumnNames.PlLineOffsetBelowDikeTopAtRiverColumnName;
+
+        /// <summary>
+        /// PlLineOffsetBelowDikeTopAtPolder
+        /// CustomShape 	
+        /// PlLineOffsetBelowDikeTopAtPolder.shp 
+        /// PLBlwTDPld 	
+        /// double
+        /// </summary>
+        public const string PlLineOffsetBelowDikeTopAtPolderAttributeId = CsvColumnNames.PlLineOffsetBelowDikeTopAtPolderColumnName;
+
+        /// <summary>
+        /// PlLineOffsetBelowShoulderBaseInside
+        /// CustomShape 	
+        /// PlLineOffsetBelowShoulderBaseInside.shp 
+        /// PLBlwTDSh 	
+        /// double
+        /// </summary>
+        public const string PlLineOffsetBelowShoulderBaseInsideAttributeId = CsvColumnNames.PlLineOffsetBelowShoulderBaseInsideColumnName;
+
+        /// <summary>
+        /// PlLineOffsetBelowDikeToeAtPolder
+        /// CustomShape
+        /// PlLineOffsetBelowDikeToeAtPolder.shp 
+        /// PLBlwDTPld
+        /// double
+        /// </summary>
+        public const string PlLineOffsetBelowDikeToeAtPolderAttributeId = CsvColumnNames.PlLineOffsetBelowDikeToeAtPolderColumnName;
+
+        /// <summary>
+        /// PlLineOffsetBelowDikeCrestMiddle
+        /// CustomShape
+        /// PlLineOffsetBelowDikeCrestMiddle.shp
+        /// PLBlDCM
+        /// double
+        /// </summary>
+        public const string PlLineOffsetBelowDikeCrestMiddleAttributeId = CsvColumnNames.PlLineOffsetBelowDikeCrestMiddleColumnName;
+
+        /// <summary>
+        /// PlLineOffsetFactorBelowShoulderCrest
+        /// CustomShape
+        /// PlLineOffsetFactorBelowShoulderCrest.shp
+        /// PLFBlSC
+        /// double
+        /// </summary>
+        public const string PlLineOffsetFactorBelowShoulderCrestAttributeId = CsvColumnNames.PlLineOffsetFactorBelowShoulderCrestColumnName;
+
+        /// <summary>
+        /// UsePlLineOffsetBelowDikeCrestMiddle
+        /// CustomShape
+        /// UsePlLineOffsetBelowDikeCrestMiddle.shp
+        /// UPLBlDCM
+        /// double
+        /// </summary>
+        public const string UsePlLineOffsetBelowDikeCrestMiddleAttributeId = CsvColumnNames.UsePlLineOffsetBelowDikeCrestMiddleColumnName;
+
+        /// <summary>
+        /// UsePlLineOffsetFactorBelowShoulderCrest
+        /// CustomShape
+        /// UsePlLineOffsetFactorBelowShoulderCrest.shp
+        /// UPLFBlSC
+        /// double
+        /// </summary>
+        public const string UsePlLineOffsetFactorBelowShoulderCrestAttributeId = CsvColumnNames.UsePlLineOffsetFactorBelowShoulderCrestColumnName;
+
+        /// <summary>
+        /// The intrusion vertical water pressure attribute identifier
+        /// CustomShape
+        /// IntrusionVerticalWaterPressure.shp
+        /// IVWP
+        /// string
+        /// </summary>
+        public const string IntrusionVerticalWaterPressureAttributeId = CsvColumnNames.IntrusionVerticalWaterPressureColumnName;
+
+        /// <summary>
+        /// StabilityShoulderGrowSlope
+        /// CustomShape 	
+        /// StabilityShoulderGrowSlope.shp 
+        /// StShSlpGr 	
+        /// double
+        /// </summary>
+        public const string StabilityShoulderGrowSlopeAttributeId = CsvColumnNames.StabilityShoulderGrowSlopeColumnName;
+
+        /// <summary>
+        /// StabilityShoulderGrowDeltaX
+        /// CustomShape 	
+        /// StabilityShoulderGrowDeltaX.shp 
+        /// StShDXGr 	
+        /// double
+        /// </summary>
+        public const string StabilityShoulderGrowDeltaXAttributeId = CsvColumnNames.StabilityShoulderGrowDeltaXColumnName;
+
+        /// <summary>
+        /// StabilitySlopeAdaptionDeltaX
+        /// CustomShape 	
+        /// StabilitySlopeAdaptionDeltaX.shp 
+        /// StSlAdaptDX 	
+        /// double
+        /// </summary>
+        public const string StabilitySlopeAdaptionDeltaXAttributeId = CsvColumnNames.StabilitySlopeAdaptionDeltaXColumnName;
+
+        /// <summary>
+        /// minimal_circle_depth 	
+        /// CustomShape 	
+        /// minimal_circle_depth.shp 
+        /// mincrcldepth 	
+        /// double
+        /// </summary>
+        public const string MinimalCircleDepthAtrributeId = CsvColumnNames.MinimalCircleDepthColumnName;
+        
+        /// <summary>
+        /// safety_factor_piping 	
+        /// CustomShape 	
+        /// safety_factor_piping.shp 
+        /// fpiping 	
+        /// double
+        /// </summary>
+        public const string RequiredSafetyFactorPipingAttributeId = CsvColumnNames.RequiredSafetyFactorPipingColumnName;
+
+        /// <summary>
+        /// safety_factor_stability_inner_slope 	
+        /// CustomShape 	
+        /// safety_factor_stability_inner_slope.shp 
+        /// fstabinner 	
+        /// double
+        /// </summary>
+        public const string RequiredSafetyFactorStabilityInnerSlopeAttributeId = CsvColumnNames.RequiredSafetyFactorStabilityInnerSlopeColumnName;
+
+        /// <summary>
+        /// safety_factor_stability_outer_slope 	
+        /// CustomShape 	
+        /// safety_factor_stability_outer_slope.shp 
+        /// fstabouter 	
+        /// double
+        /// </summary>
+        public const string RequiredSafetyFactorStabilityOuterSlopeAttributeId = CsvColumnNames.RequiredSafetyFactorStabilityOuterSlopeColumnName;
+
+        /// <summary>
+        /// uplift_criterion_piping 	
+        /// CustomShape 	
+        /// uplift_criterion_piping.shp 
+        /// uplpiping 	
+        /// double
+        /// </summary>
+        public const string UpliftCriterionPipingAttributeId = CsvColumnNames.UpliftCriterionPipingColumnName;
+
+        /// <summary>
+        /// uplift_criterion_stability
+        /// CustomShape 	
+        /// uplift_criterion_stability.shp 
+        /// uplstab 	
+        /// double
+        /// </summary>
+        public const string UpliftCriterionStabilityAttributeId = CsvColumnNames.UpliftCriterionStabilityColumnName;
+
+        /// <summary>
+        /// distance_to_entry_point
+        /// CustomShape 	
+        /// distance_to_entry_point.shp  
+        /// distentry 	
+        /// double 
+        /// </summary>
+        public const string DistanceToEntryPointAttributeId = CsvColumnNames.DistanceToEntryPointColumnName;
+
+        /// <summary>
+        /// SlopeDampingPiezometricHeightPolderSideAttributeId 
+        /// CustomShape 	
+        /// DTH.shp 	
+        /// DTH 	
+        /// double
+        /// </summary>
+        public const string SlopeDampingPiezometricHeightPolderSideAttributeId = CsvColumnNames.SlopeDampingPiezometricHeightPolderSideColumnName;
+
+        /// <summary>
+        /// ZoneType
+        /// CustomShape
+        /// StabilityZones.shp 
+        /// zonetype 	
+        /// string
+        /// </summary>
+        public const string ZoneTypeAttributeId = CsvColumnNames.ZoneTypeColumnName;
+
+        /// <summary>
+        /// ForbiddenZoneFactor
+        /// CustomShape
+        /// StabilityZones.shp 
+        /// ForbiddenZoneFactor 	
+        /// double
+        /// </summary>
+        public const string ForbiddenZoneFactorAttributeId = CsvColumnNames.ForbiddenZoneFactorColumnName; 
+
+        /// <summary>
+        /// ZoneAreaRestSlopeCrestWidth
+        /// CustomShape
+        /// StabilityZones.shp 
+        /// ZoneAreaRestSlopeCrestWidth 	
+        /// double
+        /// </summary>
+        public const string ZoneAreaRestSlopeCrestWidthAttributeId = CsvColumnNames.ZoneAreaRestSlopeCrestWidthColumnName;
+
+        /// <summary>
+        /// StabilityDesignMethodColumnName
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// StabilityDesignMethodColumnName 	
+        /// string
+        /// </summary>
+        public const string StabilityDesignMethodAttributeId = CsvColumnNames.StabilityDesignMethodColumnName;
+
+        /// <summary>
+        /// SlopeAdaptionStartCotangentColumnName
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// SlopeAdaptionStartCotangentColumnName 	
+        /// double
+        /// </summary>
+        public const string SlopeAdaptionStartCotangentAttributeId = CsvColumnNames.SlopeAdaptionStartCotangentColumnName;
+
+        /// <summary>
+        /// SlopeAdaptionEndCotangentColumnName
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// SlopeAdaptionEndCotangentColumnName 	
+        /// double
+        /// </summary>
+        public const string SlopeAdaptionEndCotangentAttributeId = CsvColumnNames.SlopeAdaptionEndCotangentColumnName; 
+        
+        /// <summary>
+        /// SlopeAdaptionStepCotangentColumnName
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// SlopeAdaptionStepCotangentColumnName 	
+        /// double
+        /// </summary>
+        public const string SlopeAdaptionStepCotangentAttributeId = CsvColumnNames.SlopeAdaptionStepCotangentColumnName; 
+
+        /// <summary>
+        /// UseNewDikeTopWidth
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// UseNewDikeTopWidth 	
+        /// double
+        /// </summary>
+        public const string UseNewDikeTopWidthAttributeId = CsvColumnNames.UseNewDikeTopWidthColumnName; 
+
+        /// <summary>
+        /// NewDikeTopWidth
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// NewDikeTopWidth 	
+        /// double
+        /// </summary>
+        public const string NewDikeTopWidthAttributeId = CsvColumnNames.NewDikeTopWidthColumnName; 
+
+        /// <summary>
+        /// UseNewDikeSlopeInside
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// UseNewDikeSlopeInside 	
+        /// double
+        /// </summary>
+        public const string UseNewDikeSlopeInsideAttributeId = CsvColumnNames.UseNewDikeSlopeInsideColumnName; 
+
+        /// <summary>
+        /// NewDikeSlopeInside
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// NewDikeSlopeInside 	
+        /// double
+        /// </summary>
+        public const string NewDikeSlopeInsideAttributeId = CsvColumnNames.NewDikeSlopeInsideColumnName; 
+
+        /// <summary>
+        /// UseNewDikeSlopeOutside
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// UseNewDikeSlopeOutside 	
+        /// double
+        /// </summary>
+        public const string UseNewDikeSlopeOutsideAttributeId = CsvColumnNames.UseNewDikeSlopeOutsideColumnName; 
+
+        /// <summary>
+        /// NewDikeSlopeOutside
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// NewDikeSlopeOutside 	
+        /// double
+        /// </summary>
+        public const string NewDikeSlopeOutsideAttributeId = CsvColumnNames.NewDikeSlopeOutsideColumnName; 
+
+        /// <summary>
+        /// UseNewShoulderTopSlope
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// UseNewShoulderTopSlope 	
+        /// double
+        /// </summary>
+        public const string UseNewShoulderTopSlopeAttributeId = CsvColumnNames.UseNewShoulderTopSlopeColumnName; 
+
+        /// <summary>
+        /// NewShoulderTopSlope
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// NewShoulderTopSlope 	
+        /// double
+        /// </summary>
+        public const string NewShoulderTopSlopeAttributeId = CsvColumnNames.NewShoulderTopSlopeColumnName; 
+
+        /// <summary>
+        /// UseNewShoulderBaseSlope
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// UseNewShoulderBaseSlope 	
+        /// double
+        /// </summary>
+        public const string UseNewShoulderBaseSlopeAttributeId = CsvColumnNames.UseNewShoulderBaseSlopeColumnName; 
+
+        /// <summary>
+        /// NewShoulderBaseSlope
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// NewShoulderBaseSlope 	
+        /// double
+        /// </summary>
+        public const string NewShoulderBaseSlopeAttributeId = CsvColumnNames.NewShoulderBaseSlopeColumnName; 
+
+        /// <summary>
+        /// UseNewMaxHeightShoulderAsFraction
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// UseNewMaxHeightShoulderAsFraction 	
+        /// double
+        /// </summary>
+        public const string UseNewMaxHeightShoulderAsFractionAttributeId = CsvColumnNames.UseNewMaxHeightShoulderAsFractionColumnName; 
+
+        /// <summary>
+        /// NewMaxHeightShoulderAsFraction
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// NewMaxHeightShoulderAsFraction 	
+        /// double
+        /// </summary>
+        public const string NewMaxHeightShoulderAsFractionAttributeId = CsvColumnNames.NewMaxHeightShoulderAsFractionColumnName; 
+
+        /// <summary>
+        /// UseNewMinDistanceDikeToeStartDitch
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// UseNewMinDistanceDikeToeStartDitch 	
+        /// double
+        /// </summary>
+        public const string UseNewMinDistanceDikeToeStartDitchAttributeId = CsvColumnNames.UseNewMinDistanceDikeToeStartDitchColumnName; 
+
+        /// <summary>
+        /// NewMinDistanceDikeToeStartDitch
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// NewMinDistanceDikeToeStartDitch 	
+        /// double
+        /// </summary>
+        public const string NewMinDistanceDikeToeStartDitchAttributeId = CsvColumnNames.NewMinDistanceDikeToeStartDitchColumnName; 
+
+        /// <summary>
+        /// UseNewDitchDefinition
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// UseNewDitchDefinition 	
+        /// double
+        /// </summary>
+        public const string UseNewDitchDefinitionAttributeId = CsvColumnNames.UseNewDitchDefinitionColumnName; 
+
+        /// <summary>
+        /// NewWidthDitchBottom
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// NewWidthDitchBottom 	
+        /// double
+        /// </summary>
+        public const string NewWidthDitchBottomAttributeId = CsvColumnNames.NewWidthDitchBottomColumnName; 
+
+        /// <summary>
+        /// NewDepthDitch
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// NewDepthDitch 	
+        /// double
+        /// </summary>
+        public const string NewDepthDitchAttributeId = CsvColumnNames.NewDepthDitchColumnName; 
+
+        /// <summary>
+        /// NewSlopeAngleDitch
+        /// CustomShape
+        /// DesignParameters.shp 
+        /// NewSlopeAngleDitch 	
+        /// double
+        /// </summary>
+        public const string NewSlopeAngleDitchAttributeId = CsvColumnNames.NewSlopeAngleDitchColumnName;
+
+        /// <summary>
+        /// DikeTableHeight
+        /// CustomShape
+        /// DikeTableHeight.shp
+        /// DikeTableHeight
+        /// double
+        /// </summary>
+        public const string DikeTableHeightAttributeId = CsvColumnNames.DikeTableHeightColumnName;
+
+        /// <summary>
+        /// water_height
+        /// CustomShape
+        /// RiverLevel.shp
+        /// RiverLevel
+        /// double
+        /// </summary>
+        public const string RiverLevelAttributeId = CsvColumnNames.RiverLevelColumnName;
+
+        /// <summary>
+        /// water_height_low
+        /// CustomShape
+        /// RiverLevelLow.shp
+        /// RiverLevelLow
+        /// double
+        /// </summary>
+        public const string RiverLevelLowAttributeId = CsvColumnNames.RiverLevelLowColumnName;
+
+        #endregion
+
+        internal static readonly IDictionary<string, LocationAttributeMapping> AttributePropertyMap;
+        internal static readonly IDictionary<string, LocationAttributeMapping> ConstructionalMap;
+        
+        internal const string LocationShapeFileName = "Location.shp";
+        internal const string ShoulderMaterialShapeFileName = "ShoulderMaterial.shp";
+        internal const string PolderLevelShapeFileName = "PolderLevel.shp";
+        internal const string PlLineShapeFileName = "PLLines.shp";
+
+        static LocationShapeFileAttributeMap()
+        {
+            // Note: the reason that I create a keyValPair lists here is that I can see which keys are alredy added 
+            // when using a dictionary initializer you cant see which attribute is already added which gives you a headache when you have duplicate keys :)
+
+            #region Attribute Map
+
+            Func<string, string,string, Action<CsvImporterLocations.LocationRecord, object>,KeyValuePair<string,LocationAttributeMapping>> createItem = 
+                (id, f, c, a) => new KeyValuePair<string, LocationAttributeMapping>(id, new LocationAttributeMapping(){Id = id.ToLower(), File = f, Name = c, Action = a});
+
+            var mappings = new List<KeyValuePair<string, LocationAttributeMapping>>
+            {
+                // direct property mappings
+                createItem(SegmentAttributeId, "segment_id.shp", "segmentid", (t, value) => t.SegmentId = value.ToString()),
+                createItem(DampingFactorPl3AttributeId, "DampingFactoPL3.shp", "DampingPL3", (t, value) => t.DampingFactorPl3 = value.ToType<double>() ),
+                createItem(DampingFactorPl4AttributeId, "DampingFactoPL4.shp", "DampingPL4", (t, value) => t.DampingFactorPl4 = value.ToType<double>() ),
+                createItem(DikeEmbankmentMaterialAttributeId, "Dikematerial.shp", "DikeMtrl", (t, value) => t.DikeEmbankmentMaterial = value.ToType<string>() ),  
+                createItem(DistanceToEntryPointAttributeId, "distance_to_entry_point.shp", "dist_entry", (t, value) => t.DistanceToEntryPoint = value.ToType<double>()),
+                createItem(HeadPl2AttributeId, "HeadPL2.shp", "HeadPL2", (t, value) => t.HeadPl2 = value.ToType<double>() ),
+                createItem(HeadPl3AttributeId, "HeadPL3.shp", "HeadPL3", (t, value) => t.HeadPl3 = value.ToType<double>() ),
+                createItem(HeadPl4AttributeId, "HeadPL4.shp", "HeadPL4", (t, value) => t.HeadPl4 = value.ToType<double>() ),
+                createItem(MinimalCircleDepthAtrributeId, "minimal_circle_depth.shp", "mincrcldepth", (t, value) => t.MinimalCircleDepth = value.ToType<double>()),                
+                createItem(PenetrationLengthAttributeId, "PenetrationLength.shp", "PenLength", (t, value) => t.PenetrationLength = value.ToType<double>()),
+                createItem(PolderLevelAttributeId, PolderLevelShapeFileName, "PLHigh", (t, value) => t.PolderLevel = value.ToType<double>()),
+                createItem(PlLineCreationMethodAttributeId, "PLLineCreationMethod.shp", "PLCrtMthd", (t, value) => t.PLLineCreationMethod = LocationImportHelper.ToPLLineCreationMethod(value)),
+                createItem(ZoneTypeAttributeId, "StabilityZones.shp", "ZoneType", (t, value) => t.StabilityZoneType = LocationImportHelper.ToMStabZonesTypeMethod(value)),
+                createItem(ForbiddenZoneFactorAttributeId, "StabilityZones.shp", "ForbiddenZoneFactor", (t, value) => t.ForbiddenZoneFactor = value.ToType<double>()),
+                createItem(ZoneAreaRestSlopeCrestWidthAttributeId, "StabilityZones.shp", "ZoneAreaRestSlopeCrestWidth", (t, value) => t.ZoneAreaRestSlopeCrestWidth = value.ToType<double>()),
+                createItem(PlLineOffsetBelowDikeTopAtRiverAttributeId, PlLineShapeFileName, "PLBlwTDRvr", (t, value) => t.PlLineOffsetBelowDikeTopAtRiver = value.ToType<double>()),
+                createItem(PlLineOffsetBelowDikeTopAtPolderAttributeId, PlLineShapeFileName, "PLBlwTDPld", (t, value) => t.PlLineOffsetBelowDikeTopAtPolder = value.ToType<double>()),
+                createItem(PlLineOffsetBelowShoulderBaseInsideAttributeId, PlLineShapeFileName, "PLBlwTDSh", (t, value) => t.PlLineOffsetBelowShoulderBaseInside = value.ToType<double>()),
+                createItem(PlLineOffsetBelowDikeToeAtPolderAttributeId, PlLineShapeFileName, "PLBlwDTPld", (t, value) => t.PlLineOffsetBelowDikeToeAtPolder = value.ToType<double>()),
+                createItem(PlLineOffsetBelowDikeCrestMiddleAttributeId, PlLineShapeFileName, "PLBlDCM", (t, value) => t.PlLineOffsetBelowDikeCrestMiddle = value.ToType<double>()),
+                createItem(PlLineOffsetFactorBelowShoulderCrestAttributeId, PlLineShapeFileName, "PLFBlSC", (t, value) => t.PlLineOffsetFactorBelowShoulderCrest = value.ToType<double>()),
+                createItem(UsePlLineOffsetBelowDikeCrestMiddleAttributeId, PlLineShapeFileName, "UPLBlDCM", (t, value) => t.UsePlLineOffsetBelowDikeCrestMiddle = value.ToType<bool>()),
+                createItem(UsePlLineOffsetFactorBelowShoulderCrestAttributeId, PlLineShapeFileName, "UPLFBlSC", (t, value) => t.UsePlLineOffsetFactorBelowShoulderCrest = value.ToType<bool>()),
+                createItem(IntrusionVerticalWaterPressureAttributeId, "IntrusionVerticalWaterPressure.shp", "IVWP", (t, value) => t.IntrusionVerticalWaterPressure = LocationImportHelper.ToIntrusionVerticalWaterPressure(value)),
+                createItem(TrafficLoadAttributeId, "trafficload.shp", "TrafLoad", (t, value) => t.TrafficLoad = value.ToType<double>() ),
+                createItem(TL_DegreeOfConsolidationAttributeId, "TL_DegreeOfConsolidation.shp", "TL_DegOfCo", (t, value) => t.TL_DegreeOfConsolidation = value.ToType<double>() ),
+                createItem(RequiredSafetyFactorPipingAttributeId, "safety_factor_piping.shp", "fpiping", (t, value) => t.RequiredSafetyFactorPiping = value.ToType<double>()),
+                createItem(RequiredSafetyFactorStabilityInnerSlopeAttributeId, "safety_factor_stability_inner_slope.shp", "fstabinner", (t, value) => t.RequiredSafetyFactorStabilityInnerSlope = value.ToType<double>()),
+                createItem(RequiredSafetyFactorStabilityOuterSlopeAttributeId, "safety_factor_stability_outer_slope.shp", "fstabouter", (t, value) => t.RequiredSafetyFactorStabilityOuterSlope = value.ToType<double>()),
+                createItem(ShoulderEmbankmentMaterialAttributeId, ShoulderMaterialShapeFileName, "ShlderMtrl", (t, value) => t.ShoulderEmbankmentMaterial = value.ToType<string>() ),           
+                createItem(StabilityShoulderGrowSlopeAttributeId, "StabilityShoulderGrowSlope.shp", "StShSlpGr", (t, value) => t.StabilityShoulderGrowSlope = value.ToType<double>()),
+                createItem(StabilityShoulderGrowDeltaXAttributeId, "StabilityShoulderGrowDeltaX.shp", "StShDXGr", (t, value) => t.StabilityShoulderGrowDeltaX = value.ToType<double>()),
+                createItem(StabilitySlopeAdaptionDeltaXAttributeId, "StabilitySlopeAdaptionDeltaX.shp", "StSlAdaptDX", (t, value) => t.StabilitySlopeAdaptionDeltaX = value.ToType<double>()),
+                createItem(UpliftCriterionPipingAttributeId, "uplift_criterion_piping.shp", "uplpiping", (t, value) => t.UpliftCriterionPiping = value.ToType<double>()),
+                createItem(UpliftCriterionStabilityAttributeId, "uplift_criterion_stability.shp", "uplstab", (t, value) => t.UpliftCriterionStability = value.ToType<double>()),
+                createItem(XSoilGeometry2DOriginAttributeId, "XSoilGeometry2DOrigin.shp", "XG2DOrg", (t, value) => t.XSoilGeometry2DOrigin = value.ToType<double>()),
+                createItem(SlopeDampingPiezometricHeightPolderSideAttributeId, "SlopeDampingPiezometricHeightPolderSide.shp", "SlopeDampingPiezometricHeightPolderSide", (t, value) => t.SlopeDampingPiezometricHeightPolderSide = value.ToType<double>() ),
+                createItem(DikeTableHeightAttributeId, "DikeTableHeight.shp", "DikeTableHeight", (t, value) => t.DikeTableHeight = value.ToType<double>() ),
+                createItem(RiverLevelAttributeId, "RiverLevel.shp", "RiverLevel", (t, value) => t.RiverLevel = value.ToType<double>() ),
+                createItem(RiverLevelLowAttributeId, "RiverLevelLow.shp", "RiverLevelLow", (t, value) => t.RiverLevelLow = value.ToType<double>() ),
+                
+                createItem(StabilityDesignMethodAttributeId, "DesignParameters.shp", "StabilityDesignMethod", (t, value) => t.StabilityDesignMethod = LocationImportHelper.ToStabilityDesignMethod(value) ),
+                createItem(SlopeAdaptionStartCotangentAttributeId, "DesignParameters.shp", "SlopeAdaptionStartCotangent", (t, value) => t.SlopeAdaptionStartCotangent = value.ToType<double>() ),
+                createItem(SlopeAdaptionEndCotangentAttributeId, "DesignParameters.shp", "SlopeAdaptionEndCotangent", (t, value) => t.SlopeAdaptionEndCotangent = value.ToType<double>() ),
+                createItem(SlopeAdaptionStepCotangentAttributeId, "DesignParameters.shp", "SlopeAdaptionStepCotangent", (t, value) => t.SlopeAdaptionStepCotangent = value.ToType<double>() ),
+                createItem(UseNewDikeTopWidthAttributeId, "DesignParameters.shp", "UseNewDikeTopWidth", (t, value) => t.UseNewDikeTopWidth = value.ToType<bool>() ),
+                createItem(NewDikeTopWidthAttributeId, "DesignParameters.shp", "NewDikeTopWidth", (t, value) => t.NewDikeTopWidth = value.ToType<double>() ),
+                createItem(UseNewDikeSlopeInsideAttributeId, "DesignParameters.shp", "UseNewDikeSlopeInside", (t, value) => t.UseNewDikeSlopeInside = value.ToType<bool>() ),
+                createItem(NewDikeSlopeInsideAttributeId, "DesignParameters.shp", "NewDikeSlopeInside", (t, value) => t.NewDikeSlopeInside = value.ToType<double>() ),
+                createItem(UseNewDikeSlopeOutsideAttributeId, "DesignParameters.shp", "UseNewDikeSlopeOutside", (t, value) => t.UseNewDikeSlopeOutside = value.ToType<bool>() ),
+                createItem(NewDikeSlopeOutsideAttributeId, "DesignParameters.shp", "NewDikeSlopeOutside", (t, value) => t.NewDikeSlopeOutside = value.ToType<double>() ),
+                createItem(UseNewShoulderTopSlopeAttributeId, "DesignParameters.shp", "UseNewShoulderTopSlope", (t, value) => t.UseNewShoulderTopSlope = value.ToType<bool>() ),
+                createItem(NewShoulderTopSlopeAttributeId, "DesignParameters.shp", "NewShoulderTopSlope", (t, value) => t.NewShoulderTopSlope = value.ToType<double>() ),
+                createItem(UseNewShoulderBaseSlopeAttributeId, "DesignParameters.shp", "UseNewShoulderBaseSlope", (t, value) => t.UseNewShoulderBaseSlope = value.ToType<bool>() ),
+                createItem(NewShoulderBaseSlopeAttributeId, "DesignParameters.shp", "NewShoulderBaseSlope", (t, value) => t.NewShoulderBaseSlope = value.ToType<double>() ),
+                createItem(UseNewMaxHeightShoulderAsFractionAttributeId, "DesignParameters.shp", "UseNewMaxHeightShoulderAsFraction", (t, value) => t.UseNewMaxHeightShoulderAsFraction = value.ToType<bool>() ),
+                createItem(NewMaxHeightShoulderAsFractionAttributeId, "DesignParameters.shp", "NewMaxHeightShoulderAsFraction", (t, value) => t.NewMaxHeightShoulderAsFraction = value.ToType<double>() ),
+                createItem(UseNewMinDistanceDikeToeStartDitchAttributeId, "DesignParameters.shp", "UseNewMinDistanceDikeToeStartDitch", (t, value) => t.UseNewMinDistanceDikeToeStartDitch = value.ToType<bool>() ),
+                createItem(NewMinDistanceDikeToeStartDitchAttributeId, "DesignParameters.shp", "NewMinDistanceDikeToeStartDitch", (t, value) => t.NewMinDistanceDikeToeStartDitch = value.ToType<double>() ),
+                createItem(UseNewDitchDefinitionAttributeId, "DesignParameters.shp", "UseNewDitchDefinition", (t, value) => t.UseNewDitchDefinition = value.ToType<bool>() ),
+                createItem(NewWidthDitchBottomAttributeId, "DesignParameters.shp", "NewWidthDitchBottom", (t, value) => t.NewWidthDitchBottom = value.ToType<double>() ),
+                createItem(NewDepthDitchAttributeId, "DesignParameters.shp", "NewDepthDitch", (t, value) => t.NewDepthDitch = value.ToType<double>() ),
+                createItem(NewSlopeAngleDitchAttributeId, "DesignParameters.shp", "NewSlopeAngleDitch", (t, value) => t.NewSlopeAngleDitch = value.ToType<double>() )
+
+            };
+
+            AttributePropertyMap = new Dictionary<string, LocationAttributeMapping>();
+            foreach (var keyValuePair in mappings)
+            {
+                var key = keyValuePair.Key.ToLower();
+                if (AttributePropertyMap.ContainsKey(key))
+                {
+                    throw new TypeInitializationException(typeof (LocationShapeFileAttributeMap).FullName,
+                                                          new ArgumentException(string.Format("The item with the key '{0}' has already been added", key)));
+                }
+                AttributePropertyMap.Add(key, keyValuePair.Value);
+            }
+
+            ConstructionalMap = new Dictionary<string, LocationAttributeMapping>()
+            {
+                {LocationAttributeId.ToLower(), new LocationAttributeMapping() { File = LocationShapeFileName, Id = LocationAttributeId, Name = "LocationId"}},
+                {DikeRingAttributeId.ToLower(), new LocationAttributeMapping() { File = LocationShapeFileName, Id = DikeRingAttributeId, Name = "DikeringId"}},
+                {CrossSectionAttributId.ToLower(), new LocationAttributeMapping() { File = "crosssection.shp", Id = CrossSectionAttributId, Name = "LocationId"}}
+            };
+
+            #endregion
+        }
+
+        private static IEnumerable<string> NonPropertyAttributes
+        {
+            get
+            {
+                yield return LocationAttributeId.ToLower();
+                yield return DikeRingAttributeId.ToLower();
+                //yield return SegmentAttributeId.ToLower();
+                yield return CrossSectionAttributId.ToLower();
+            }
+        }
+
+        public static bool IsPropertyAttribute(string attributeId)
+        {
+            if (string.IsNullOrEmpty(attributeId) || attributeId.Trim() == "")
+                throw new ArgumentNullException("attributeId");
+
+            var id = attributeId.ToLowerInvariant();
+            return !NonPropertyAttributes.Contains(id);
+        }
+
+        public static LocationAttributeMapping GetAttributeMapping(string attributeId)
+        {
+            if (string.IsNullOrEmpty(attributeId) || attributeId.Trim() == "")
+                throw new ArgumentNullException("attributeId");
+
+            return GetAttributeMapping(null, attributeId);
+        }
+
+        public static LocationAttributeMapping GetAttributeMapping(DataAttribute dataAttribute)
+        {
+            if (dataAttribute == null)
+                throw new ArgumentNullException("dataAttribute");
+
+            return GetAttributeMapping(dataAttribute, dataAttribute.AttributeId);
+        }
+
+        public static LocationAttributeMapping GetAttributeMapping(DataAttribute dataAttribute, string attributeId)
+        {
+            if (string.IsNullOrEmpty(attributeId) || attributeId.Trim() == "")
+                throw new ArgumentNullException("attributeId");
+
+            var map = ConstructionalMap;
+
+            string file = string.Empty, attrName = string.Empty;
+            Action<CsvImporterLocations.LocationRecord, object> action = (t, value) => { };
+
+            var id = attributeId.ToLower();
+
+            if (ConstructionalMap.ContainsKey(id))
+            {
+                file = dataAttribute == null || string.IsNullOrEmpty(dataAttribute.DataSource) || dataAttribute.DataSource.Trim() == string.Empty ?
+                    map[id].File : dataAttribute.DataSource;
+
+                attrName = dataAttribute == null || string.IsNullOrEmpty(dataAttribute.AttributeName) || dataAttribute.AttributeName.Trim() == ""
+                                   ? map[id].Name // return the default shape file colum name
+                                   : dataAttribute.AttributeName.ToLower();
+
+                action = map[id].Action;
+            }
+            else if (AttributePropertyMap.ContainsKey(id))
+            {
+                map = AttributePropertyMap;
+                file = dataAttribute == null || string.IsNullOrEmpty(dataAttribute.DataSource) || dataAttribute.DataSource.Trim() == string.Empty ?                                                                                                                                                          
+                    map[id].File : dataAttribute.DataSource;
+
+                attrName = dataAttribute == null || string.IsNullOrEmpty(dataAttribute.AttributeName) || dataAttribute.AttributeName.Trim() == ""
+                                   ? map[id].Name // return the default shape file colum name
+                                   : dataAttribute.AttributeName;
+
+                action = map[id].Action;
+            }
+
+            return new LocationAttributeMapping
+            {
+                Id = attributeId,
+                File = file,
+                Name = attrName,
+                Action = action
+            };
+        }
+
+        /// <summary>
+        /// Checks if the given attribute id is supported by this importer.
+        /// The id check is case sensitive!
+        /// </summary>
+        /// <param name="attributeId"></param>
+        /// <returns>True if the attribute id is in the key map</returns>
+        public static bool IsAttributeIdSupported(string attributeId)
+        {
+            if (string.IsNullOrEmpty(attributeId) || attributeId.Trim() == "")
+                throw new ArgumentNullException("attributeId");
+
+            var id = attributeId.ToLower();
+            return AttributePropertyMap.ContainsKey(id);
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/pi_timeseries.xsd
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/pi_timeseries.xsd	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/pi_timeseries.xsd	(revision 3305)
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) Stichting Deltares 2019. All rights reserved.
+
+This file is part of the DAM - Clients Library.
+
+The DAM - UI is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+<schema xmlns:fews="http://www.wldelft.nl/fews/PI" xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.wldelft.nl/fews/PI" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0">
+<include schemaLocation="pi_sharedtypes.xsd"/>
+<element name="TimeSeries" type="fews:TimeSeriesCollectionComplexType">
+<annotation>
+<documentation>
+Time series data represent data collected over a given period of time at a specific location
+</documentation>
+</annotation>
+</element>
+<complexType name="TimeSeriesCollectionComplexType">
+<annotation>
+<documentation>
+Time series data represent data collected over a given period of time at a specific location
+</documentation>
+</annotation>
+<sequence>
+<element name="timeZone" type="fews:TimeZoneSimpleType" default="0.0" minOccurs="0"/>
+<element name="series" type="fews:TimeSeriesComplexType" maxOccurs="unbounded">
+<annotation>
+<documentation>
+Time series data represent data collected over a given period of time at a specific location
+</documentation>
+</annotation>
+</element>
+</sequence>
+<attribute name="version" type="fews:versionString" use="optional" default="1.2">
+<annotation>
+<documentation>The version of the published interface schemas</documentation>
+</annotation>
+</attribute>
+</complexType>
+<complexType name="TimeSeriesComplexType">
+<annotation>
+<documentation>
+Time series data represent data collected over a given period of time at a specific location
+</documentation>
+</annotation>
+<sequence>
+<element name="header" type="fews:HeaderComplexType">
+<annotation>
+<documentation>
+The header is used to specify the link to the location and the contents
+</documentation>
+</annotation>
+</element>
+<element name="event" type="fews:EventComplexType" minOccurs="0" maxOccurs="unbounded">
+<annotation>
+<documentation>
+unlimited number of events with a constant timeStep. The date, time and value attributes are required, the quality flag is optional. When no events exists the event values are stored in a bin file. The binary file has the same name as the xml file only the extension is "bin" instead of "xml". The bin file contains only IEEE 32 bit reals. The length of the bin file is 4 times the number of events for all time series in the file. The byte order in the bin file is always Intel x86. The bin file is only allowed for equidistant time steps.
+</documentation>
+</annotation>
+</element>
+<element name="comment" type="fews:commentString" minOccurs="0">
+<annotation>
+<documentation>
+use this field as a notebook to add comments, suggestions description of data entered etc.
+</documentation>
+</annotation>
+</element>
+</sequence>
+</complexType>
+<complexType name="HeaderComplexType">
+<annotation>
+<documentation>
+The header is used to specify the link to the location and the contents
+</documentation>
+</annotation>
+<sequence>
+<element name="type" type="fews:timeSeriesType">
+<annotation>
+<documentation>
+Type of data, either accumulative or instantaneous. For accumulative data the time/date of the event is the moment at which the data was gathered.
+</documentation>
+</annotation>
+</element>
+<element name="locationId" type="fews:LocationIdSimpleType"/>
+<element name="parameterId" type="fews:ParameterSimpleType"/>
+<element name="qualifierId" type="fews:idString" minOccurs="0" maxOccurs="unbounded">
+<annotation>
+<documentation>
+Since version 1.4 Further clarification of the time series, when the parameter, location and time step are not enough to identify a time series. Multiple qualifiers are allowed, the order of the qualifiers is insignificant. A different order of the qualifier ids should not map to the an other time series.
+</documentation>
+</annotation>
+</element>
+<sequence minOccurs="0">
+<element name="ensembleId" type="fews:idString" minOccurs="0">
+<annotation>
+<documentation>
+Since version 1.4 An ensemble forecast consists of a number of simulations made by making small changes to the estimate of the current state used to initialize the simulation. These small changes are designed to reflect the uncertainty in the estimate. Every simulation has it's own ensembleMemberIndex When specified the ensembleMemberIndex is required
+</documentation>
+</annotation>
+</element>
+<element name="ensembleMemberIndex" type="nonNegativeInteger">
+<annotation>
+<documentation>
+Since version 1.4 An ensemble forecast consists of a number of simulations made by making small changes to the estimate of the current state used to initialize the simulation. These small changes are designed to reflect the uncertainty in the estimate. Every simulation has it's own ensembleMemberIndex. Ensemble id is not required when the ensembleMemberIndex is specified
+</documentation>
+</annotation>
+</element>
+</sequence>
+<element name="timeStep" type="fews:TimeStepComplexType">
+<annotation>
+<documentation>The timeStep element provides three choices</documentation>
+</annotation>
+</element>
+<element name="startDate" type="fews:DateTimeComplexType">
+<annotation>
+<documentation>date/time of the first event</documentation>
+</annotation>
+</element>
+<element name="endDate" type="fews:DateTimeComplexType">
+<annotation>
+<documentation>date/time of the last event</documentation>
+</annotation>
+</element>
+<element name="forecastDate" type="fews:DateTimeComplexType" minOccurs="0">
+<annotation>
+<documentation>
+Since version 1.5 date/time of the forecast. By default the forecastDate equals the start time
+</documentation>
+</annotation>
+</element>
+<element name="missVal" type="double" default="NaN">
+<annotation>
+<documentation>
+Missing value definition for this TimeSeries. Defaults to NaN if left empty
+</documentation>
+</annotation>
+</element>
+<element name="longName" type="string" minOccurs="0">
+<annotation>
+<documentation>Optional long (descriptive) name</documentation>
+</annotation>
+</element>
+<element name="stationName" type="fews:nameString" minOccurs="0">
+<annotation>
+<documentation>Station name</documentation>
+</annotation>
+</element>
+<element name="lat" type="double" minOccurs="0">
+<annotation>
+<documentation>Latitude of station</documentation>
+</annotation>
+</element>
+<element name="lon" type="double" minOccurs="0">
+<annotation>
+<documentation>Longitude of station</documentation>
+</annotation>
+</element>
+<element name="x" type="double" minOccurs="0">
+<annotation>
+<documentation>X coordinate of station</documentation>
+</annotation>
+</element>
+<element name="y" type="double" minOccurs="0">
+<annotation>
+<documentation>Y coordinate of station</documentation>
+</annotation>
+</element>
+<element name="z" type="double" minOccurs="0">
+<annotation>
+<documentation>Z coordinate of station</documentation>
+</annotation>
+</element>
+<element name="units" type="string" minOccurs="0">
+<annotation>
+<documentation>Optional string that identifies the units used</documentation>
+</annotation>
+</element>
+<element name="sourceOrganisation" type="string" minOccurs="0"/>
+<element name="sourceSystem" type="string" minOccurs="0"/>
+<element name="fileDescription" type="string" minOccurs="0">
+<annotation>
+<documentation>
+Description of (the content of) this file
+</documentation>
+</annotation>
+</element>
+<element name="creationDate" type="date" minOccurs="0">
+<annotation>
+<documentation>
+Date on which this TimeSeries was created
+</documentation>
+</annotation>
+</element>
+<element name="creationTime" type="time" minOccurs="0">
+<annotation>
+<documentation>
+Time on which this TimeSeries was created
+</documentation>
+</annotation>
+</element>
+<element name="region" type="string" minOccurs="0">
+<annotation>
+<documentation>
+code/description of the region. Needed if the id's can be the same in different regions.
+</documentation>
+</annotation>
+</element>
+<element name="thresholds" type="fews:ThresholdComplexType" minOccurs="0"/>
+</sequence>
+</complexType>
+<complexType name="ThresholdComplexType">
+<sequence>
+<element name="highLevelThreshold" type="fews:HighLevelThresholdsComplexType" maxOccurs="unbounded"/>
+</sequence>
+</complexType>
+<complexType name="HighLevelThresholdsComplexType">
+<attribute name="id" type="string" use="required"/>
+<attribute name="name" type="string" use="optional"/>
+<attribute name="value" type="float" use="required"/>
+</complexType>
+<complexType name="EventComplexType">
+<annotation>
+<documentation>
+unlimited number of events with a constant timeStep. Each TimeSeries should contain at least one element (records). The date, time and value attributes are required, the quality flag is optional.
+</documentation>
+</annotation>
+<attribute name="date" type="fews:dateType" use="required">
+<annotation>
+<documentation>ISO 8601 (yyyy-mm-dd)</documentation>
+</annotation>
+</attribute>
+<attribute name="time" type="fews:timeType" use="required">
+<annotation>
+<documentation>ISO 8601 (hh:mm:ss.dsec e.g. 16:30:0.001)</documentation>
+</annotation>
+</attribute>
+<attribute name="value" type="double" use="required"/>
+<attribute name="flag" type="int" use="optional"/>
+<attribute name="comment" type="string" use="optional">
+<annotation>
+<documentation>Since version 1.3</documentation>
+</annotation>
+</attribute>
+</complexType>
+</schema>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoAssemblerException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoAssemblerException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoAssemblerException.cs	(revision 3305)
@@ -0,0 +1,56 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Deltares.Standard
+{
+    [Serializable]
+    public class DtoAssemblerException : Exception
+    {
+        //
+        // For guidelines regarding the creation of new exception types, see
+        //    http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpgenref/html/cpconerrorraisinghandlingguidelines.asp
+        // and
+        //    http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dncscol/html/csharp07192001.asp
+        //
+
+        public DtoAssemblerException()
+        {
+        }
+
+        public DtoAssemblerException(string message) : base(message)
+        {
+        }
+
+        public DtoAssemblerException(string message, Exception inner) : base(message, inner)
+        {
+        }
+
+        protected DtoAssemblerException(
+            SerializationInfo info,
+            StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/ApplicationLogger.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/ApplicationLogger.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/ApplicationLogger.cs	(revision 3305)
@@ -0,0 +1,59 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Dam.Data
+{
+    using System;
+    using System.Diagnostics;
+    using System.IO;
+
+    public class ApplicationLogger
+    {
+        public const string errorLogExtension = "errorlog.txt";
+        public static StreamWriter AppendErrorLog(string workingPath, Dike dike)
+        {
+            StreamWriter errorLog = null;
+            try
+            {
+                errorLog = File.AppendText(workingPath + dike.Name + errorLogExtension);
+            }
+            catch (Exception e)
+            {
+                Trace.Assert(false, "Could not append to errorlog." + e.ToString());
+            }
+            return errorLog;
+        }
+
+        public static StreamWriter CreateErrorLog(string workingPath, Dike dike)
+        {
+            StreamWriter errorLog = null;
+            try
+            {
+                errorLog = File.CreateText(workingPath + dike.Name + errorLogExtension);
+            }
+            catch (Exception e)
+            {
+                Trace.Assert(false, "Could not create errorlog." + e.ToString());
+            }
+            return errorLog;
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardJobImporter.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardJobImporter.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardJobImporter.cs	(revision 3305)
@@ -0,0 +1,44 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Dam.Data
+{
+    public static class WaterBoardJobImporter
+    {
+        public static void ImportWaterlevels(WaterBoardJob waterBoardJob, TimeSerieCollection timeSerieCollection)
+        {
+            foreach (DamJob dikeJob in waterBoardJob.Jobs)
+            {
+                if (dikeJob.GetType() == typeof(DikeJob))
+                {
+                    foreach (DamJob locationJob in ((DikeJob)dikeJob).Jobs)
+                    {
+                        if (locationJob.GetType() == typeof(LocationJob))
+                        {
+                            ((LocationJob)locationJob).WaterLevelTimeSerie = timeSerieCollection.FindSerie
+                                 ("WaterLevel", ((LocationJob)locationJob).Location.Name);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/build/Deltares.DamClientsLibrary.Version.targets
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/build/Deltares.DamClientsLibrary.Version.targets	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/build/Deltares.DamClientsLibrary.Version.targets	(revision 3305)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition="$(Configuration) == ''">Debug</Configuration>
+    <Platform Condition="$(Platform) == ''">x86</Platform>
+    <OutputType Condition="$(OutputType) == ''">Library</OutputType>
+    <CheckForOverflowUnderflow Condition="$(CheckForOverflowUnderflow) == ''">true</CheckForOverflowUnderflow>
+    <SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
+    <OutputPath Condition="$(OutputPath) == ''">$(SolutionDir)\bin\$(Configuration)\</OutputPath>
+    <OutDir>$(OutputPath)</OutDir>
+    <PlatformTarget>x86</PlatformTarget>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <WarningLevel>4</WarningLevel>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <DefineConstants>TRACE</DefineConstants>
+    <DebugType>pdbonly</DebugType>
+    <AllowedReferenceRelatedFileExtensions>none</AllowedReferenceRelatedFileExtensions>
+  </PropertyGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <Compile Include="$(ProjectDir)..\Deltares.DamClientsLibrary.Version\GlobalAssembly.cs">
+      <Link>GlobalAssembly.cs</Link>
+    </Compile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Resources.resx
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Resources.resx	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Resources.resx	(revision 3305)
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CsvFileNotFound" xml:space="preserve">
+    <value>Couldn't find the csv data file {0}</value>
+  </data>
+  <data name="CsvFileNotValid" xml:space="preserve">
+    <value>The file name is not valid or empty</value>
+  </data>
+  <data name="CsvHeaderNotValid" xml:space="preserve">
+    <value>The header in the import file is not valid</value>
+  </data>
+  <data name="CsvHeaderNullOrEmpty" xml:space="preserve">
+    <value>The header in the import file is not valid</value>
+  </data>
+  <data name="CsvObjectMaterializerNotValid" xml:space="preserve">
+    <value>The object materializer is not valid</value>
+  </data>
+  <data name="CsvSplitterPatternNotValid" xml:space="preserve">
+    <value>The given pattern to split the data values of the CSV files is not valid</value>
+  </data>
+  <data name="DataImportArgumentNull" xml:space="preserve">
+    <value>The data import argument is not valid</value>
+  </data>
+  <data name="EntityAlreadyExist" xml:space="preserve">
+    <value>Cannot create or add the entity with the the given id because it already exist</value>
+  </data>
+  <data name="EntityFactoryArgumentNull" xml:space="preserve">
+    <value>The factory argument is null but is a required</value>
+  </data>
+  <data name="ImportDataNotValid" xml:space="preserve">
+    <value>The imported data is not valid. Reason: {0}</value>
+  </data>
+  <data name="ImportedLocationDoesntHaveValidSurfaceLines" xml:space="preserve">
+    <value>No dike points in location surface line. Please check if the surface line ID defined in the locations import file matches the ID's in the surface line import file</value>
+  </data>
+  <data name="ImportFileNotExist" xml:space="preserve">
+    <value>The import file {0} couldn't be found. This file is required.</value>
+  </data>
+  <data name="ImportFilesNotValidated" xml:space="preserve">
+    <value>The file which are required for the import are not validated</value>
+  </data>
+  <data name="ImportFolderNotExist" xml:space="preserve">
+    <value>The import folder {0} does not exist</value>
+  </data>
+  <data name="ImportFolderNullOrEmpty" xml:space="preserve">
+    <value>The import folder is not valid</value>
+  </data>
+  <data name="MStabExecutableFileNameNotFound" xml:space="preserve">
+    <value>Couldn't find the MStab executable at location {0}</value>
+  </data>
+  <data name="OutputFileHasNoContent" xml:space="preserve">
+    <value>Couldn't parse the file because it has no valid content</value>
+  </data>
+  <data name="OutputFileNameNotValid" xml:space="preserve">
+    <value>The file name is not valid</value>
+  </data>
+  <data name="OutputFileNotExist" xml:space="preserve">
+    <value>Couldn't find the output file {0}</value>
+  </data>
+  <data name="ProjectFileNameNullOrEmpty" xml:space="preserve">
+    <value>Project file name is not valid</value>
+  </data>
+  <data name="ProjectFileNotExist" xml:space="preserve">
+    <value>Project file not found </value>
+  </data>
+  <data name="RequiredEntityDoesNotExist" xml:space="preserve">
+    <value>The required entity '{0}' with ID '{1}' doesn't exist</value>
+  </data>
+  <data name="RequiredParameterMissing" xml:space="preserve">
+    <value>The required parameter {0} which should be contained in object {1} is missing</value>
+  </data>
+  <data name="SegmentIdArgumentNullOrEmpty" xml:space="preserve">
+    <value>The segment id value is null or empty which is not allowed</value>
+  </data>
+  <data name="SoilAttachedToLayerNotValid" xml:space="preserve">
+    <value>The soil material in the layer could not be converted to local type</value>
+  </data>
+  <data name="SoilProfileIdArgumentNullOrEmpty" xml:space="preserve">
+    <value>The soil profile name or id value is null or empty which is not allowed</value>
+  </data>
+  <data name="SurfaceLineIdArgumentNullOrEmpty" xml:space="preserve">
+    <value>The surface line id argument is null or empty but it is required</value>
+  </data>
+  <data name="SurfacelineIsNotInsideSoilprofile" xml:space="preserve">
+    <value>Surfaceline is not inside soil profile</value>
+  </data>
+  <data name="TopLayerToBeEvaluatedNotInsideSoilprofile" xml:space="preserve">
+    <value>The top layer to be evaluated is not inside the soil profile</value>
+  </data>
+  <data name="SurfaceLinePointNotExtists" xml:space="preserve">
+    <value>The required characteristic point type '{0}' with coordinate '{1}' does not exist in the point collection of surfaceline '{2}'</value>
+  </data>
+  <data name="NonExistentLocation" xml:space="preserve">
+    <value>Location '{0}' does not exist in the location collection.</value>
+  </data>
+  <data name="TwoSandlayersRequiredInSoilProfile" xml:space="preserve">
+    <value>Two sandlayers are mandatory in soil profile</value>
+  </data>
+  <data name="CsvColumnIndexAlreadyExists" xml:space="preserve">
+    <value>The column index of {0} defined on property {1} in the CSV export object class already exists</value>
+  </data>
+  <data name="WaterLevelInputFileNullOrEmpty" xml:space="preserve">
+    <value>The water level input file is not null or empty</value>
+  </data>
+  <data name="NoSoilProfileDefinedForLocation" xml:space="preserve">
+    <value>No soil profiles have been defined for location '{0}'.</value>
+  </data>
+  <data name="LocationHasNoSegment" xml:space="preserve">
+    <value>Location '{0}' has no segment.</value>
+  </data>
+  <data name="FileNameNotValid" xml:space="preserve">
+    <value>The file name is not valid. Maybe due to a null or empty string and or invalid characters. Please use a valid file name</value>
+  </data>
+  <data name="GaugeIdArgumentNullOrEmpty" xml:space="preserve">
+    <value>The gauge id value is null or empty which is not allowed</value>
+  </data>
+  <data name="LocationIdArgumentNullOrEmpty" xml:space="preserve">
+    <value>The location id value is null or empty which is not allowed</value>
+  </data>
+  <data name="ImportedLocationDoesntHaveSoilprofile" xml:space="preserve">
+    <value>This location does not have a soilprofile</value>
+  </data>
+  <data name="ImportedLocationDoesntHaveValidPL1Lines" xml:space="preserve">
+    <value>No points in location PL1 line. Please check if the PL1 line ID defined in the locations import file matches the ID's in the PL1 line import file</value>
+  </data>
+  <data name="SoildatabaseNotFound" xml:space="preserve">
+    <value>Soildatabase '{0}' is not found</value>
+  </data>
+  <data name="SoilProfileNotAssigned" xml:space="preserve">
+    <value>The soilprofile is not assigned</value>
+  </data>
+  <data name="SurfaceLineNotAssigned" xml:space="preserve">
+    <value>The surfaceline is not assigned</value>
+  </data>
+  <data name="SlopeWExecutableFileNameNotFound" xml:space="preserve">
+    <value>Couldn't find the SlopeW (GeoStudio) executable at location {0}</value>
+  </data>
+  <data name="SoilListIsNull" xml:space="preserve">
+    <value>The soil list is not yet created.</value>
+  </data>
+  <data name="PL1NotCreated" xml:space="preserve">
+    <value>PL1 has not been created</value>
+  </data>
+  <data name="DikeShouldContainExactly1Dike" xml:space="preserve">
+    <value>The project should contain exactly 1 dike</value>
+  </data>
+  <data name="LocationInvalidName" xml:space="preserve">
+    <value>Location has an invalid name {0}</value>
+  </data>
+  <data name="NoCalculationTypeSpecified" xml:space="preserve">
+    <value>No calculation type specified</value>
+  </data>
+  <data name="NoDikeDefined" xml:space="preserve">
+    <value>No dike defined in this project</value>
+  </data>
+  <data name="NoLocationsDefined" xml:space="preserve">
+    <value>No locations defined in this project</value>
+  </data>
+  <data name="NoRiverLevel" xml:space="preserve">
+    <value>Location '{0}', scenario '{1}' has no river level</value>
+  </data>
+  <data name="NoRiverLevelLow" xml:space="preserve">
+    <value>Location '{0}', scenario '{1}' has no river level low</value>
+  </data>
+  <data name="NoScenariosDefinedInLocation" xml:space="preserve">
+    <value>No scenarios defined in location</value>
+  </data>
+  <data name="NoSoilprofiles1DDefinedInProject" xml:space="preserve">
+    <value>No soilprofiles1D defined in this project</value>
+  </data>
+  <data name="NoSoilsDefinedInProject" xml:space="preserve">
+    <value>No soils defined in this project</value>
+  </data>
+  <data name="NoSurfaceLines" xml:space="preserve">
+    <value>No surfacelines defined in this project</value>
+  </data>
+  <data name="SegmentInvalidName" xml:space="preserve">
+    <value>Segment has an invalid name {0}</value>
+  </data>
+  <data name="SoilInvalidName" xml:space="preserve">
+    <value>Soil has an invalid name {0}</value>
+  </data>
+  <data name="SoilProfileInvalidName" xml:space="preserve">
+    <value>Soilprofile has an invalid name {0}</value>
+  </data>
+  <data name="SurfaceLineHasNoCharacteristicPoints" xml:space="preserve">
+    <value>Surfaceline '{0}' has no characteristic points</value>
+  </data>
+  <data name="SurfaceLineHasNoPoints" xml:space="preserve">
+    <value>Surfaceline '{0}' has no points</value>
+  </data>
+  <data name="SurfaceLineInvalidName" xml:space="preserve">
+    <value>Surfaceline has an invalid name {0}</value>
+  </data>
+</root>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IFeatureRepository.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IFeatureRepository.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IFeatureRepository.cs	(revision 3305)
@@ -0,0 +1,65 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+
+using GeoAPI.Geometries;
+
+namespace Deltares.Maps
+{
+    public interface IFeatureRepository : IFeatureCollection
+    {
+        IGeometry GetGeometryById(Guid id);
+
+        IEnumerable<KeyValuePair<string, object>> GetAttributes(IGeometry geom);
+
+        IEnumerable<Guid> FeatureIds { get; }
+        IEnumerable<IFeature> Features { get; }
+
+        IEnumerable<string> SupportedAttributes { get; }
+
+        /// <summary>
+        ///     Returns a list of features which may lie in the given search envelope
+        /// </summary>
+        /// <param name="feature"></param>
+        /// <returns></returns>
+        IEnumerable<IFeature> Query(IFeature feature);
+
+        /// <summary>
+        ///     Returns a list of features which may lie in the given search envelope
+        /// </summary>
+        /// <param name="feature"></param>
+        /// <returns></returns>
+        IEnumerable<IFeature> Query(IGeometry feature);
+
+        /// <summary>
+        ///     Returns a list of features which may lie in the given search envelope
+        /// </summary>
+        /// <param name="feature"></param>
+        /// <returns></returns>
+        IEnumerable<IFeature> Query(Envelope feature);
+
+        void Add(Feature feature, Func<IFeature, bool> predicate);
+
+        void Remove(Func<IFeature, bool> predicate);
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Properties/AssemblyInfo.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Properties/AssemblyInfo.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Properties/AssemblyInfo.cs	(revision 3305)
@@ -0,0 +1,31 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Deltares.Dam.Data")]
+[assembly: ComVisible(false)]
+[assembly: Guid("a6184ba6-b126-4783-b437-e987b511e09b")]
+
+[assembly: InternalsVisibleTo("Deltares.Dam.Tests")]
+[assembly: InternalsVisibleTo("Deltares.Dam.IntegrationTests")]
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/VersionInfo.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/VersionInfo.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/VersionInfo.cs	(revision 3305)
@@ -0,0 +1,87 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Reflection;
+using System.Xml.Serialization;
+using Deltares.Standard.Attributes;
+
+namespace Deltares.Dam.Data.IO
+{
+    [XmlNoKey]
+    public class VersionInfo
+    {
+        public const int CurrentFileVersion = 1;
+        /// <summary>Current File Version.</summary>
+        /// <value>The file version.</value>
+        ///
+        /// 
+        public int FileVersion { get; set; } // Default is 0 and indicates the situation that FileVersion was not introduced yet
+
+        /// <summary>Gets or sets the assembly name with which the input file is being created.</summary>
+        /// <value>The program version.</value>
+        /// 
+        public string AssemblyName { get; set; }
+
+        /// <summary>Gets or sets the assembly version with which the input file is being created.</summary>
+        /// <value>The program version.</value>
+        /// 
+        public string AssemblyVersion { get; set; }
+
+        /// <summary>Gets or sets the version as read.</summary>
+        /// <value>The file version as read.</value>
+        ///
+        /// 
+        [XmlIgnore]
+        public int FileVersionAsRead { get; set; }
+        /// <summary>Gets or sets the assembly name with which the input file has been created.</summary>
+        /// <value>The assembly version as read.</value>
+        [XmlIgnore]
+        public string AssemblyNameAsRead { get; set; }
+
+        /// <summary>Gets or sets the assembly version with which the input file has been created.</summary>
+        /// <value>The assembly version as read.</value>
+        [XmlIgnore]
+        public string AssemblyVersionAsRead { get; set; }
+
+        /// <summary>Initializes the version information to the current program version.</summary>
+        public void InitVersionInfo()
+        {
+            FileVersion = VersionInfo.CurrentFileVersion;
+            var hostAssembly = Assembly.GetEntryAssembly();
+            if (hostAssembly == null)
+            {
+                hostAssembly = Assembly.GetExecutingAssembly();
+            }
+            AssemblyName = hostAssembly.GetName().Name;
+            AssemblyVersion = hostAssembly.GetName().Version.ToString();
+        }
+
+        /// <summary>After the read the current version info should be transferred to the ..AsRead fields
+        /// and after that current version info can be initialized.</summary>
+        public void InitVersionInfoAfterRead()
+        {
+            FileVersionAsRead = FileVersion;
+            AssemblyNameAsRead = AssemblyName;
+            AssemblyVersionAsRead = AssemblyVersion;
+            InitVersionInfo();
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilProfileDataSet.xsd
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilProfileDataSet.xsd	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilProfileDataSet.xsd	(revision 3305)
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) Stichting Deltares 2019. All rights reserved.
+
+This file is part of the DAM - Clients Library.
+
+The DAM - UI is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+<xs:schema id="SoilProfileDataSet" targetNamespace="http://tempuri.org/DataSet1.xsd" xmlns:mstns="http://tempuri.org/DataSet1.xsd" xmlns="http://tempuri.org/DataSet1.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" xmlns:msprop="urn:schemas-microsoft-com:xml-msprop" attributeFormDefault="qualified" elementFormDefault="qualified">
+  <xs:annotation>
+    <xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource">
+      <DataSource DefaultConnectionIndex="0" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+        <Connections>
+          <Connection AppSettingsObjectName="Web.config" AppSettingsPropertyName="ConnectionString" IsAppSettingsProperty="true" Modifier="Assembly" Name="ConnectionString (Web.config)" PropertyReference="AppConfig.System.Configuration.ConfigurationManager.0.ConnectionStrings.ConnectionString.ConnectionString" Provider="System.Data.Odbc" />
+        </Connections>
+        <Tables>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="ODGEOMETRIESTableAdapter" GeneratorDataComponentClassName="ODGEOMETRIESTableAdapter" Name="ODGEOMETRIES" UserDataComponentName="ODGEOMETRIESTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="ConnectionString (Web.config)" DbObjectName="[D:\bka\Voorbeeld MGeobase\Vb].ODGEOMETRIES" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="GetData">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT OD_NR, OD_NAME, OD_DESCR, OD_RDX, OD_RDY, OD_CPTNR, OD_BORINGNR, OD_GEOL_ZONE, OD_CHANCE_OCCUR FROM ODGEOMETRIES</CommandText>
+                    <Parameters />
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="OD_NR" DataSetColumn="OD_NR" />
+              <Mapping SourceColumn="OD_NAME" DataSetColumn="OD_NAME" />
+              <Mapping SourceColumn="OD_DESCR" DataSetColumn="OD_DESCR" />
+              <Mapping SourceColumn="OD_RDX" DataSetColumn="OD_RDX" />
+              <Mapping SourceColumn="OD_RDY" DataSetColumn="OD_RDY" />
+              <Mapping SourceColumn="OD_CPTNR" DataSetColumn="OD_CPTNR" />
+              <Mapping SourceColumn="OD_BORINGNR" DataSetColumn="OD_BORINGNR" />
+              <Mapping SourceColumn="OD_GEOL_ZONE" DataSetColumn="OD_GEOL_ZONE" />
+              <Mapping SourceColumn="OD_CHANCE_OCCUR" DataSetColumn="OD_CHANCE_OCCUR" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="ODGEOLAYERSTableAdapter" GeneratorDataComponentClassName="ODGEOLAYERSTableAdapter" Name="ODGEOLAYERS" UserDataComponentName="ODGEOLAYERSTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="ConnectionString (Web.config)" DbObjectName="[D:\bka\Voorbeeld MGeobase\Vb].ODGEOLAYERS" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="GetData">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT OL_NR, OD_NR, MA_NR, OL_LAYERNR, OL_LEVEL, OL_PLATTOP, OL_PLATBOTTOM, OL_TOPEXCESSPP, OL_BOTEXCESSPP, OL_OCR FROM ODGEOLAYERS</CommandText>
+                    <Parameters />
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="OL_NR" DataSetColumn="OL_NR" />
+              <Mapping SourceColumn="OD_NR" DataSetColumn="OD_NR" />
+              <Mapping SourceColumn="MA_NR" DataSetColumn="MA_NR" />
+              <Mapping SourceColumn="OL_LAYERNR" DataSetColumn="OL_LAYERNR" />
+              <Mapping SourceColumn="OL_LEVEL" DataSetColumn="OL_LEVEL" />
+              <Mapping SourceColumn="OL_PLATTOP" DataSetColumn="OL_PLATTOP" />
+              <Mapping SourceColumn="OL_PLATBOTTOM" DataSetColumn="OL_PLATBOTTOM" />
+              <Mapping SourceColumn="OL_TOPEXCESSPP" DataSetColumn="OL_TOPEXCESSPP" />
+              <Mapping SourceColumn="OL_BOTEXCESSPP" DataSetColumn="OL_BOTEXCESSPP" />
+              <Mapping SourceColumn="OL_OCR" DataSetColumn="OL_OCR" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="MATERIALSTableAdapter" GeneratorDataComponentClassName="MATERIALSTableAdapter" Name="MATERIALS" UserDataComponentName="MATERIALSTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="ConnectionString (Web.config)" DbObjectName="[D:\bka\Voorbeeld MGeobase\Vb].MATERIALS" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="GetData">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT MA_NR, MA_NAME, MA_DESCR, MA_INDEX FROM MATERIALS</CommandText>
+                    <Parameters />
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="MA_NR" DataSetColumn="MA_NR" />
+              <Mapping SourceColumn="MA_NAME" DataSetColumn="MA_NAME" />
+              <Mapping SourceColumn="MA_DESCR" DataSetColumn="MA_DESCR" />
+              <Mapping SourceColumn="MA_INDEX" DataSetColumn="MA_INDEX" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="PARAMETERNAMESTableAdapter" GeneratorDataComponentClassName="PARAMETERNAMESTableAdapter" Name="PARAMETERNAMES" UserDataComponentName="PARAMETERNAMESTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="ConnectionString (Web.config)" DbObjectName="[D:\bka\Voorbeeld MGeobase\Vb].PARAMETERNAMES" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="GetData">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT PN_NR, PN_NAME FROM PARAMETERNAMES</CommandText>
+                    <Parameters />
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="PN_NR" DataSetColumn="PN_NR" />
+              <Mapping SourceColumn="PN_NAME" DataSetColumn="PN_NAME" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="PARAMETERVALUESTableAdapter" GeneratorDataComponentClassName="PARAMETERVALUESTableAdapter" Name="PARAMETERVALUES" UserDataComponentName="PARAMETERVALUESTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="ConnectionString (Web.config)" DbObjectName="[D:\bka\Voorbeeld MGeobase\Vb].PARAMETERVALUES" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="GetData">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT PV_NR, MA_NR, PN_NR, PV_VALUE FROM PARAMETERVALUES</CommandText>
+                    <Parameters />
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="PV_NR" DataSetColumn="PV_NR" />
+              <Mapping SourceColumn="MA_NR" DataSetColumn="MA_NR" />
+              <Mapping SourceColumn="PN_NR" DataSetColumn="PN_NR" />
+              <Mapping SourceColumn="PV_VALUE" DataSetColumn="PV_VALUE" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
+        </Tables>
+        <Sources />
+      </DataSource>
+    </xs:appinfo>
+  </xs:annotation>
+  <xs:element name="SoilProfileDataSet" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:Generator_UserDSName="SoilProfileDataSet" msprop:Generator_DataSetName="SoilProfileDataSet" msprop:EnableTableAdapterManager="true">
+    <xs:complexType>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element name="ODGEOMETRIES" msprop:Generator_UserTableName="ODGEOMETRIES" msprop:Generator_RowDeletedName="ODGEOMETRIESRowDeleted" msprop:Generator_RowChangedName="ODGEOMETRIESRowChanged" msprop:Generator_RowClassName="ODGEOMETRIESRow" msprop:Generator_RowChangingName="ODGEOMETRIESRowChanging" msprop:Generator_RowEvArgName="ODGEOMETRIESRowChangeEvent" msprop:Generator_RowEvHandlerName="ODGEOMETRIESRowChangeEventHandler" msprop:Generator_TableClassName="ODGEOMETRIESDataTable" msprop:Generator_TableVarName="tableODGEOMETRIES" msprop:Generator_RowDeletingName="ODGEOMETRIESRowDeleting" msprop:Generator_TablePropName="ODGEOMETRIES">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="OD_NR" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="OD_NR" msprop:Generator_ColumnVarNameInTable="columnOD_NR" msprop:Generator_ColumnPropNameInRow="OD_NR" msprop:Generator_ColumnPropNameInTable="OD_NRColumn" type="xs:int" />
+              <xs:element name="OD_NAME" msprop:Generator_UserColumnName="OD_NAME" msprop:Generator_ColumnVarNameInTable="columnOD_NAME" msprop:Generator_ColumnPropNameInRow="OD_NAME" msprop:Generator_ColumnPropNameInTable="OD_NAMEColumn" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="64" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="OD_DESCR" msprop:Generator_UserColumnName="OD_DESCR" msprop:Generator_ColumnVarNameInTable="columnOD_DESCR" msprop:Generator_ColumnPropNameInRow="OD_DESCR" msprop:Generator_ColumnPropNameInTable="OD_DESCRColumn" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="240" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="OD_RDX" msprop:Generator_UserColumnName="OD_RDX" msprop:Generator_ColumnVarNameInTable="columnOD_RDX" msprop:Generator_ColumnPropNameInRow="OD_RDX" msprop:Generator_ColumnPropNameInTable="OD_RDXColumn" type="xs:double" minOccurs="0" />
+              <xs:element name="OD_RDY" msprop:Generator_UserColumnName="OD_RDY" msprop:Generator_ColumnVarNameInTable="columnOD_RDY" msprop:Generator_ColumnPropNameInRow="OD_RDY" msprop:Generator_ColumnPropNameInTable="OD_RDYColumn" type="xs:double" minOccurs="0" />
+              <xs:element name="OD_CPTNR" msprop:Generator_UserColumnName="OD_CPTNR" msprop:Generator_ColumnVarNameInTable="columnOD_CPTNR" msprop:Generator_ColumnPropNameInRow="OD_CPTNR" msprop:Generator_ColumnPropNameInTable="OD_CPTNRColumn" type="xs:int" minOccurs="0" />
+              <xs:element name="OD_BORINGNR" msprop:Generator_UserColumnName="OD_BORINGNR" msprop:Generator_ColumnVarNameInTable="columnOD_BORINGNR" msprop:Generator_ColumnPropNameInRow="OD_BORINGNR" msprop:Generator_ColumnPropNameInTable="OD_BORINGNRColumn" type="xs:int" minOccurs="0" />
+              <xs:element name="OD_GEOL_ZONE" msprop:Generator_UserColumnName="OD_GEOL_ZONE" msprop:Generator_ColumnVarNameInTable="columnOD_GEOL_ZONE" msprop:Generator_ColumnPropNameInRow="OD_GEOL_ZONE" msprop:Generator_ColumnPropNameInTable="OD_GEOL_ZONEColumn" type="xs:int" minOccurs="0" />
+              <xs:element name="OD_CHANCE_OCCUR" msprop:Generator_UserColumnName="OD_CHANCE_OCCUR" msprop:Generator_ColumnVarNameInTable="columnOD_CHANCE_OCCUR" msprop:Generator_ColumnPropNameInRow="OD_CHANCE_OCCUR" msprop:Generator_ColumnPropNameInTable="OD_CHANCE_OCCURColumn" type="xs:double" minOccurs="0" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="ODGEOLAYERS" msprop:Generator_UserTableName="ODGEOLAYERS" msprop:Generator_RowDeletedName="ODGEOLAYERSRowDeleted" msprop:Generator_RowChangedName="ODGEOLAYERSRowChanged" msprop:Generator_RowClassName="ODGEOLAYERSRow" msprop:Generator_RowChangingName="ODGEOLAYERSRowChanging" msprop:Generator_RowEvArgName="ODGEOLAYERSRowChangeEvent" msprop:Generator_RowEvHandlerName="ODGEOLAYERSRowChangeEventHandler" msprop:Generator_TableClassName="ODGEOLAYERSDataTable" msprop:Generator_TableVarName="tableODGEOLAYERS" msprop:Generator_RowDeletingName="ODGEOLAYERSRowDeleting" msprop:Generator_TablePropName="ODGEOLAYERS">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="OL_NR" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="OL_NR" msprop:Generator_ColumnVarNameInTable="columnOL_NR" msprop:Generator_ColumnPropNameInRow="OL_NR" msprop:Generator_ColumnPropNameInTable="OL_NRColumn" type="xs:int" />
+              <xs:element name="OD_NR" msprop:Generator_UserColumnName="OD_NR" msprop:Generator_ColumnVarNameInTable="columnOD_NR" msprop:Generator_ColumnPropNameInRow="OD_NR" msprop:Generator_ColumnPropNameInTable="OD_NRColumn" type="xs:int" minOccurs="0" />
+              <xs:element name="MA_NR" msprop:Generator_UserColumnName="MA_NR" msprop:Generator_ColumnVarNameInTable="columnMA_NR" msprop:Generator_ColumnPropNameInRow="MA_NR" msprop:Generator_ColumnPropNameInTable="MA_NRColumn" type="xs:int" minOccurs="0" />
+              <xs:element name="OL_LAYERNR" msprop:Generator_UserColumnName="OL_LAYERNR" msprop:Generator_ColumnVarNameInTable="columnOL_LAYERNR" msprop:Generator_ColumnPropNameInRow="OL_LAYERNR" msprop:Generator_ColumnPropNameInTable="OL_LAYERNRColumn" type="xs:int" minOccurs="0" />
+              <xs:element name="OL_LEVEL" msprop:Generator_UserColumnName="OL_LEVEL" msprop:Generator_ColumnVarNameInTable="columnOL_LEVEL" msprop:Generator_ColumnPropNameInRow="OL_LEVEL" msprop:Generator_ColumnPropNameInTable="OL_LEVELColumn" type="xs:double" minOccurs="0" />
+              <xs:element name="OL_PLATTOP" msprop:Generator_UserColumnName="OL_PLATTOP" msprop:Generator_ColumnVarNameInTable="columnOL_PLATTOP" msprop:Generator_ColumnPropNameInRow="OL_PLATTOP" msprop:Generator_ColumnPropNameInTable="OL_PLATTOPColumn" type="xs:int" minOccurs="0" />
+              <xs:element name="OL_PLATBOTTOM" msprop:Generator_UserColumnName="OL_PLATBOTTOM" msprop:Generator_ColumnVarNameInTable="columnOL_PLATBOTTOM" msprop:Generator_ColumnPropNameInRow="OL_PLATBOTTOM" msprop:Generator_ColumnPropNameInTable="OL_PLATBOTTOMColumn" type="xs:int" minOccurs="0" />
+              <xs:element name="OL_TOPEXCESSPP" msprop:Generator_UserColumnName="OL_TOPEXCESSPP" msprop:Generator_ColumnVarNameInTable="columnOL_TOPEXCESSPP" msprop:Generator_ColumnPropNameInRow="OL_TOPEXCESSPP" msprop:Generator_ColumnPropNameInTable="OL_TOPEXCESSPPColumn" type="xs:double" minOccurs="0" />
+              <xs:element name="OL_BOTEXCESSPP" msprop:Generator_UserColumnName="OL_BOTEXCESSPP" msprop:Generator_ColumnVarNameInTable="columnOL_BOTEXCESSPP" msprop:Generator_ColumnPropNameInRow="OL_BOTEXCESSPP" msprop:Generator_ColumnPropNameInTable="OL_BOTEXCESSPPColumn" type="xs:double" minOccurs="0" />
+              <xs:element name="OL_OCR" msprop:Generator_UserColumnName="OL_OCR" msprop:Generator_ColumnVarNameInTable="columnOL_OCR" msprop:Generator_ColumnPropNameInRow="OL_OCR" msprop:Generator_ColumnPropNameInTable="OL_OCRColumn" type="xs:double" minOccurs="0" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="MATERIALS" msprop:Generator_UserTableName="MATERIALS" msprop:Generator_RowDeletedName="MATERIALSRowDeleted" msprop:Generator_RowChangedName="MATERIALSRowChanged" msprop:Generator_RowClassName="MATERIALSRow" msprop:Generator_RowChangingName="MATERIALSRowChanging" msprop:Generator_RowEvArgName="MATERIALSRowChangeEvent" msprop:Generator_RowEvHandlerName="MATERIALSRowChangeEventHandler" msprop:Generator_TableClassName="MATERIALSDataTable" msprop:Generator_TableVarName="tableMATERIALS" msprop:Generator_RowDeletingName="MATERIALSRowDeleting" msprop:Generator_TablePropName="MATERIALS">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="MA_NR" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="MA_NR" msprop:Generator_ColumnVarNameInTable="columnMA_NR" msprop:Generator_ColumnPropNameInRow="MA_NR" msprop:Generator_ColumnPropNameInTable="MA_NRColumn" type="xs:int" />
+              <xs:element name="MA_NAME" msprop:Generator_UserColumnName="MA_NAME" msprop:Generator_ColumnVarNameInTable="columnMA_NAME" msprop:Generator_ColumnPropNameInRow="MA_NAME" msprop:Generator_ColumnPropNameInTable="MA_NAMEColumn" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="128" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="MA_DESCR" msprop:Generator_UserColumnName="MA_DESCR" msprop:Generator_ColumnVarNameInTable="columnMA_DESCR" msprop:Generator_ColumnPropNameInRow="MA_DESCR" msprop:Generator_ColumnPropNameInTable="MA_DESCRColumn" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="240" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="MA_INDEX" msprop:Generator_UserColumnName="MA_INDEX" msprop:Generator_ColumnVarNameInTable="columnMA_INDEX" msprop:Generator_ColumnPropNameInRow="MA_INDEX" msprop:Generator_ColumnPropNameInTable="MA_INDEXColumn" type="xs:int" minOccurs="0" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="PARAMETERNAMES" msprop:Generator_UserTableName="PARAMETERNAMES" msprop:Generator_RowDeletedName="PARAMETERNAMESRowDeleted" msprop:Generator_RowChangedName="PARAMETERNAMESRowChanged" msprop:Generator_RowClassName="PARAMETERNAMESRow" msprop:Generator_RowChangingName="PARAMETERNAMESRowChanging" msprop:Generator_RowEvArgName="PARAMETERNAMESRowChangeEvent" msprop:Generator_RowEvHandlerName="PARAMETERNAMESRowChangeEventHandler" msprop:Generator_TableClassName="PARAMETERNAMESDataTable" msprop:Generator_TableVarName="tablePARAMETERNAMES" msprop:Generator_RowDeletingName="PARAMETERNAMESRowDeleting" msprop:Generator_TablePropName="PARAMETERNAMES">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="PN_NR" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="PN_NR" msprop:Generator_ColumnVarNameInTable="columnPN_NR" msprop:Generator_ColumnPropNameInRow="PN_NR" msprop:Generator_ColumnPropNameInTable="PN_NRColumn" type="xs:int" />
+              <xs:element name="PN_NAME" msprop:Generator_UserColumnName="PN_NAME" msprop:Generator_ColumnVarNameInTable="columnPN_NAME" msprop:Generator_ColumnPropNameInRow="PN_NAME" msprop:Generator_ColumnPropNameInTable="PN_NAMEColumn" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="64" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="PARAMETERVALUES" msprop:Generator_UserTableName="PARAMETERVALUES" msprop:Generator_RowDeletedName="PARAMETERVALUESRowDeleted" msprop:Generator_RowChangedName="PARAMETERVALUESRowChanged" msprop:Generator_RowClassName="PARAMETERVALUESRow" msprop:Generator_RowChangingName="PARAMETERVALUESRowChanging" msprop:Generator_RowEvArgName="PARAMETERVALUESRowChangeEvent" msprop:Generator_RowEvHandlerName="PARAMETERVALUESRowChangeEventHandler" msprop:Generator_TableClassName="PARAMETERVALUESDataTable" msprop:Generator_TableVarName="tablePARAMETERVALUES" msprop:Generator_RowDeletingName="PARAMETERVALUESRowDeleting" msprop:Generator_TablePropName="PARAMETERVALUES">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="PV_NR" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="PV_NR" msprop:Generator_ColumnVarNameInTable="columnPV_NR" msprop:Generator_ColumnPropNameInRow="PV_NR" msprop:Generator_ColumnPropNameInTable="PV_NRColumn" type="xs:int" />
+              <xs:element name="MA_NR" msprop:Generator_UserColumnName="MA_NR" msprop:Generator_ColumnVarNameInTable="columnMA_NR" msprop:Generator_ColumnPropNameInRow="MA_NR" msprop:Generator_ColumnPropNameInTable="MA_NRColumn" type="xs:int" minOccurs="0" />
+              <xs:element name="PN_NR" msprop:Generator_UserColumnName="PN_NR" msprop:Generator_ColumnVarNameInTable="columnPN_NR" msprop:Generator_ColumnPropNameInRow="PN_NR" msprop:Generator_ColumnPropNameInTable="PN_NRColumn" type="xs:int" minOccurs="0" />
+              <xs:element name="PV_VALUE" msprop:Generator_UserColumnName="PV_VALUE" msprop:Generator_ColumnVarNameInTable="columnPV_VALUE" msprop:Generator_ColumnPropNameInRow="PV_VALUE" msprop:Generator_ColumnPropNameInTable="PV_VALUEColumn" type="xs:double" minOccurs="0" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:choice>
+    </xs:complexType>
+    <xs:unique name="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:ODGEOMETRIES" />
+      <xs:field xpath="mstns:OD_NR" />
+    </xs:unique>
+    <xs:unique name="ODGEOLAYERS_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:ODGEOLAYERS" />
+      <xs:field xpath="mstns:OL_NR" />
+    </xs:unique>
+    <xs:unique name="MATERIALS_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:MATERIALS" />
+      <xs:field xpath="mstns:MA_NR" />
+    </xs:unique>
+    <xs:unique name="PARAMETERNAMES_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:PARAMETERNAMES" />
+      <xs:field xpath="mstns:PN_NR" />
+    </xs:unique>
+    <xs:unique name="PARAMETERVALUES_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:PARAMETERVALUES" />
+      <xs:field xpath="mstns:PV_NR" />
+    </xs:unique>
+  </xs:element>
+  <xs:annotation>
+    <xs:appinfo>
+      <msdata:Relationship name="ODGEOMETRIES_ODGEOLAYERS" msdata:parent="ODGEOMETRIES" msdata:child="ODGEOLAYERS" msdata:parentkey="OD_NR" msdata:childkey="OD_NR" msprop:Generator_UserRelationName="ODGEOMETRIES_ODGEOLAYERS" msprop:Generator_RelationVarName="relationODGEOMETRIES_ODGEOLAYERS" msprop:Generator_UserChildTable="ODGEOLAYERS" msprop:Generator_UserParentTable="ODGEOMETRIES" msprop:Generator_ParentPropName="ODGEOMETRIESRow" msprop:Generator_ChildPropName="GetODGEOLAYERSRows" />
+      <msdata:Relationship name="ODGEOLAYERS_MATERIALS" msdata:parent="MATERIALS" msdata:child="ODGEOLAYERS" msdata:parentkey="MA_NR" msdata:childkey="MA_NR" msprop:Generator_UserRelationName="ODGEOLAYERS_MATERIALS" msprop:Generator_RelationVarName="relationODGEOLAYERS_MATERIALS" msprop:Generator_UserChildTable="ODGEOLAYERS" msprop:Generator_UserParentTable="MATERIALS" msprop:Generator_ParentPropName="MATERIALSRow" msprop:Generator_ChildPropName="GetODGEOLAYERSRows" />
+      <msdata:Relationship name="PARAMETERVALUES_MATERIALS" msdata:parent="MATERIALS" msdata:child="PARAMETERVALUES" msdata:parentkey="MA_NR" msdata:childkey="MA_NR" msprop:Generator_UserRelationName="PARAMETERVALUES_MATERIALS" msprop:Generator_RelationVarName="relationPARAMETERVALUES_MATERIALS" msprop:Generator_UserChildTable="PARAMETERVALUES" msprop:Generator_UserParentTable="MATERIALS" msprop:Generator_ParentPropName="MATERIALSRow" msprop:Generator_ChildPropName="GetPARAMETERVALUESRows" />
+      <msdata:Relationship name="PARAMETERNAMES_PARAMETERVALUES" msdata:parent="PARAMETERNAMES" msdata:child="PARAMETERVALUES" msdata:parentkey="PN_NR" msdata:childkey="PN_NR" msprop:Generator_UserRelationName="PARAMETERNAMES_PARAMETERVALUES" msprop:Generator_RelationVarName="relationPARAMETERNAMES_PARAMETERVALUES" msprop:Generator_UserChildTable="PARAMETERVALUES" msprop:Generator_UserParentTable="PARAMETERNAMES" msprop:Generator_ParentPropName="PARAMETERNAMESRow" msprop:Generator_ChildPropName="GetPARAMETERVALUESRows" />
+    </xs:appinfo>
+  </xs:annotation>
+</xs:schema>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Services/ShapeFileCreatorTest.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Services/ShapeFileCreatorTest.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Services/ShapeFileCreatorTest.cs	(revision 3305)
@@ -0,0 +1,231 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of the application DAM - UI.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading;
+
+using NUnit.Framework;
+
+namespace Deltares.Maps.Tests.Services
+{
+    [TestFixture]
+    public class ShapeFileCreatorTest
+    {
+        const string OutputFolder = "ShapeFileTestFiles";
+
+        private FeatureRepository repository;
+        private string fileName;
+        private string shpFile;
+        private string dbfFile;
+        private string shxFile;
+        private string shpFilePath;
+        private string shxFilePath;
+        private string dbfFilePath;
+
+        #region Setup
+
+        [TestFixtureSetUp]
+        public void FixtureSetup()
+        {
+            if (Directory.Exists(OutputFolder))
+            {
+                //Directory.Delete(OutputFolder, true);  // TODO: Disabled to prevent files from being deleted in test data dir (although copied there for other tests)
+            }
+
+            Directory.CreateDirectory(OutputFolder);
+        }
+
+        [TestFixtureTearDown]
+        public void FixtureTearDown()
+        {
+        }
+
+        [SetUp]
+        public void TestSetup()
+        {
+            fileName = "TestFile_" + Guid.NewGuid().ToString().Replace("-", "_");
+            shpFile = fileName + ".shp";
+            dbfFile = fileName + ".dbf";
+            shxFile = fileName + ".shx";
+
+            shpFilePath = Path.Combine(OutputFolder, shpFile);
+            shxFilePath = Path.Combine(OutputFolder, shxFile);
+            dbfFilePath = Path.Combine(OutputFolder, dbfFile);
+
+            if (File.Exists(shpFilePath))
+            {
+                File.Delete(shpFilePath);
+            }
+            if (File.Exists(shxFilePath))
+            {
+                File.Delete(shxFilePath);
+            }
+            if (File.Exists(dbfFilePath))
+            {
+                File.Delete(dbfFilePath);
+            }
+
+            repository = new FeatureRepository();
+        }
+
+        [TearDown]
+        public void TestTearDown()
+        {
+            if (File.Exists(shpFilePath))
+            {
+                File.Delete(shpFilePath);
+            }
+            if (File.Exists(shxFilePath))
+            {
+                File.Delete(shxFilePath);
+            }
+            if (File.Exists(dbfFilePath))
+            {
+                // disposing the dbf file could take longer
+                for (int i = 0; i < 3; i++)
+                {
+                    try
+                    {
+                        File.Delete(dbfFilePath);
+                    }
+                    catch (IOException)
+                    {
+                        Thread.Sleep(200);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void CreateFile_ValidPathAndNoFeatures_Throws()
+        {
+            ShapeFileCreator.Create(@"", fileName, repository);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void CreateFile_InvalidName_Throws()
+        {
+            ShapeFileCreator.Create(@"", "", repository);
+        }
+
+        [Test]
+        [Ignore("Need to fix shape file writing")]
+        [ExpectedException(typeof(NotSupportedException),
+            ExpectedMessage = "The repository contains geometry types which are currently not supported")]
+        public void CreateFile_RepositoryContainsNotSupportedFeature_Throws()
+        {
+            repository.Add(Feature.Create("POLYGON (( 10 10, 10 20, 20 20, 20 15, 10 10))"));
+            ShapeFileCreator.Create(@"", fileName, repository);
+        }
+
+        [Test]
+        [Ignore("Need to fix shape file writing")]
+        [ExpectedException(typeof(NotSupportedException),
+            ExpectedMessage =
+                "The repository contains different geometry types. Currently only one type per repository is supported ")]
+        public void CreateFile_RepositoryContainsDifferentGeometryTypes_Throws()
+        {
+            repository.Add(Feature.Create("LINESTRING EMPTY"));
+            repository.Add(Feature.Create("POINT(0 0)"));
+            ShapeFileCreator.Create(@"", fileName, repository);
+        }
+
+        [Test]
+        [Ignore("Need to fix shape file writing")]
+        public void CreateFile_ValidPathAndRepositoryContainsOneLineString_ShapeFileIsCreated()
+        {
+            repository.Add(Feature.Create("LINESTRING (10 10, 10 20)"));
+            ShapeFileCreator.Create(OutputFolder, fileName, repository);
+
+            AssertThatMandatoryFilesExist();
+
+            var shapeFile = new ShapeFileLocation(shpFilePath);
+            IFeatureRepository retrievedRepository = FeatureRepository.CreateFromShapeFile(shapeFile);
+            Assert.IsNotNull(retrievedRepository);
+            Assert.IsTrue(retrievedRepository.Count == 1);
+            Assert.AreEqual("LineString", repository.Features.ElementAt(0).Geometry.GeometryType);
+        }
+
+        [Test]
+        [Ignore("Need to fix shape file writing")]
+        public void CreateFile_ValidPathAndRepositoryContainsOneLineStringAndOneMultiLineString_ShapeFileIsCreated()
+        {
+            repository.Add(Feature.Create("LINESTRING (10 10, 10 20)"));
+            repository.Add(Feature.Create("MULTILINESTRING ((10 10, 20 20, 10 40),(40 40, 30 30, 40 20, 30 10))"));
+            ShapeFileCreator.Create(OutputFolder, fileName, repository);
+
+            AssertThatMandatoryFilesExist();
+
+            var shapeFile = new ShapeFileLocation(shpFilePath);
+            IFeatureRepository retrievedRepository = FeatureRepository.CreateFromShapeFile(shapeFile);
+            Assert.IsNotNull(retrievedRepository);
+            Assert.IsTrue(retrievedRepository.Count == 2);
+            Assert.IsTrue(repository.Features.Any(f => f.Geometry.GeometryType == "LineString"));
+            Assert.IsTrue(repository.Features.Any(f => f.Geometry.GeometryType == "MultiLineString"));
+        }
+
+        [Test]
+        [Ignore("Need to fix shape file writing")]
+        public void CreateFile_ValidPathAndRepositoryContainsOnePoint_ShapeFileIsCreated()
+        {
+            repository.Add(Feature.Create("POINT(0 0)"));
+            ShapeFileCreator.Create(OutputFolder, fileName, repository);
+
+            AssertThatMandatoryFilesExist();
+
+            var shapeFile = new ShapeFileLocation(shpFilePath);
+            IFeatureRepository retrievedRepository = FeatureRepository.CreateFromShapeFile(shapeFile);
+            Assert.IsNotNull(retrievedRepository);
+            Assert.IsTrue(retrievedRepository.Count == 1);
+            Assert.AreEqual("GeometryPoint", repository.Features.ElementAt(0).Geometry.GeometryType);
+        }
+
+        /*    [Test]
+        public void CreateFile_ValidPathAndRepositoryContainsMultyPoint_ShapeFileIsCreated()
+        {
+            //repository.Add(Feature.Create("POINT(0 0)"));
+            repository.Add(Feature.Create("MULTIPOINT (10 40, 40 30, 20 20, 30 10)"));
+            ShapeFileCreator.Create(OutputFolder, fileName, repository);
+
+            AssertThatMandatoryFilesExist();
+
+            var shapeFile = new ShapeFile(this.shpFilePath);
+            var retrievedRepository = FeatureRepository.CreateFromShapeFile(shapeFile);
+            Assert.IsNotNull(retrievedRepository);
+            Assert.IsTrue(retrievedRepository.Count == 2);
+            Assert.IsTrue(repository.Features.Any(f => f.Geometry.GeometryType == GeometryType2.MultiPoint));
+            Assert.IsTrue(repository.Features.Any(f => f.Geometry.GeometryType == GeometryType2.GeometryPoint));
+        }*/
+
+        private void AssertThatMandatoryFilesExist()
+        {
+            Assert.IsTrue(File.Exists(shpFilePath), string.Format("{0} does not exist", shpFile));
+            Assert.IsTrue(File.Exists(dbfFilePath), string.Format("{0} does not exist", dbfFile));
+            Assert.IsTrue(File.Exists(shxFilePath), string.Format("{0} does not exist", shxFile));
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/ProfileDefinition.xsd
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/ProfileDefinition.xsd	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/ProfileDefinition.xsd	(revision 3305)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) Stichting Deltares 2019. All rights reserved.
+
+This file is part of the DAM - Clients Library.
+
+The DAM - UI is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+
+<!-- Created with Liquid XML Studio 1.0.8.0 (http://www.liquid-technologies.com) -->
+<xsd:schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://deltares.nl/2008/ProfileDefinition">
+  <xs:complexType name="Profile">
+    <xs:sequence>
+      <xs:element minOccurs="0" name="Layers">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="Layer">
+              <xs:complexType>
+                <xs:attribute name="ID" type="xs:ID" use="required" />
+                <xs:attribute name="SoilID" type="xs:string" use="required" />
+                <xs:attribute name="TopLevel" type="xs:double" use="required" />
+                <xs:attribute default="0" name="ExcessPorePressureAtTop" type="xs:double" use="optional" />
+                <xs:attribute default="0" name="ExcessPorePressureAtBottom" type="xs:double" use="optional" />
+                <xs:attribute default="1" name="OCRValue" type="xs:double" use="optional" />
+                <xs:attribute name="PlAtTop" type="xs:integer" />
+                <xs:attribute name="PlAtBottom" type="xs:integer" />
+              </xs:complexType>
+            </xs:element>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+    <xs:attribute name="Name" type="xs:string" use="required" />
+    <xs:attribute name="InBetweenSandLayerID" type="xs:string" use="optional" />
+    <xs:attribute name="InfiltrationLayerID" type="xs:string" use="optional" />
+    <xs:attribute name="BottomSandLayerID" type="xs:string" use="optional" />
+    <xs:attribute name="XCoordinate" type="xs:double" use="optional" />
+    <xs:attribute name="YCoordinate" type="xs:double" use="optional" />
+    <xs:attribute name="PhreaticLevel" type="xs:double" use="optional" />
+    <xs:attribute name="HasPhreaticLevel" type="xs:boolean" />
+    <xs:attribute name="BottomLevel" type="xs:double" />
+  </xs:complexType>
+</xsd:schema>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs	(revision 3305)
@@ -0,0 +1,385 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Dam.Data.Importers
+{
+    /// <summary>
+    /// Defines column name definitions used for importing csv data
+    /// </summary>
+    /// <remarks>
+    /// Some of the definitions are used (referenced) in the LocationPropertyImporter. 
+    /// Changing the definitions will affect the location importers using shapefiles as well!!
+    /// </remarks>
+    public static class CsvColumnNames
+    {
+        /// <summary>
+        /// location_id
+        /// </summary>
+        public const string LocationColumnName = "location_id";
+
+        /// <summary>
+        /// location_scenario_id
+        /// </summary>
+        public const string LocationScenarioColumnName = "location_scenario_id";
+
+        /// <summary>
+        /// dikering_id
+        /// </summary>
+        public const string DikeRingColumnName = "dikering_id";
+
+        /// <summary>
+        /// surfaceline_id
+        /// </summary>
+        public const string SurfaceLineColumnName = "surfaceline_id";
+
+        /// <summary>
+        /// geo_x
+        /// </summary>
+        public const string XValueColumnName = "geo_x";
+
+        /// <summary>
+        /// geo_y
+        /// </summary>
+        public const string YValueColumnName = "geo_y";
+
+        /// <summary>
+        /// segment_id
+        /// </summary>
+        public const string SegmentColumnName = "segment_id";
+
+        /// <summary>
+        /// polderlevel
+        /// </summary>
+        public const string PolderLevelColumnName = "polderlevel";
+
+        /// <summary>
+        /// head_pl2
+        /// </summary>
+        public const string HeadPl2ColumnName = "head_pl2";
+
+        /// <summary>
+        /// head_pl3
+        /// </summary>
+        public const string HeadPl3ColumnName = "head_pl3";
+
+        /// <summary>
+        /// head_pl4
+        /// </summary>
+        public const string HeadPl4ColumnName = "head_pl4";
+
+        /// <summary>
+        /// head_pl3
+        /// </summary>
+        public const string HeadPl3OldFormatColumnName = "HeadPl3";
+
+        /// <summary>
+        /// head_pl4
+        /// </summary>
+        public const string HeadPl4OldFormatColumnName = "HeadPl4";
+
+        /// <summary>
+        /// x_soilgeometry2D_origin
+        /// </summary>
+        public const string XSoilGeometry2DOriginColumnName = "x_soilgeometry2D_origin";
+            
+        /// <summary>
+        /// ophoogmateriaaldijk
+        /// </summary>
+        public const string DikeEmbankmentMaterialColumnName = "ophoogmateriaaldijk";
+
+        /// <summary>
+        /// ophoogmateriaalberm
+        /// </summary>
+        public const string ShoulderEmbankmentMaterialColumnName = "ophoogmateriaalberm";
+
+        /// <summary>
+        /// dempingsfactor_pl3
+        /// </summary>
+        public const string DampingFactorPl3ColumnName = "dempingsfactor_pl3";
+
+        /// <summary>
+        /// dempingsfactor_pl4
+        /// </summary>
+        public const string DampingFactorPl4ColumnName = "dempingsfactor_pl4";
+
+        /// <summary>
+        /// PenetrationLength
+        /// </summary>
+        public const string PenetrationLengthColumnName = "PenetrationLength";
+
+        /// <summary>
+        /// TrafficLoad
+        /// </summary>
+        public const string TrafficLoadColumnName = "TrafficLoad";
+
+        /// <summary>
+        /// TL_DegreeOfConsolidation
+        /// </summary>
+        public const string TlDegreeOfConsolidationColumnName = "TL_DegreeOfConsolidation";
+
+        /// <summary>
+        /// PLLineCreationMethod
+        /// </summary>
+        public const string PlLineCreationMethodColumnName = "PLLineCreationMethod";
+
+        /// <summary>
+        /// PlLineOffsetBelowDikeTopAtRiver
+        /// </summary>
+        public const string PlLineOffsetBelowDikeTopAtRiverColumnName = "PlLineOffsetBelowDikeTopAtRiver";
+
+        /// <summary>
+        /// PlLineOffsetBelowDikeTopAtPolder
+        /// </summary>
+        public const string PlLineOffsetBelowDikeTopAtPolderColumnName = "PlLineOffsetBelowDikeTopAtPolder";
+
+        /// <summary>
+        /// PlLineOffsetBelowShoulderBaseInside
+        /// </summary>
+        public const string PlLineOffsetBelowShoulderBaseInsideColumnName = "PlLineOffsetBelowShoulderBaseInside";
+
+        /// <summary>
+        /// PlLineOffsetBelowDikeToeAtPolder
+        /// </summary>
+        public const string PlLineOffsetBelowDikeToeAtPolderColumnName = "PlLineOffsetBelowDikeToeAtPolder";
+
+        /// <summary>
+        /// The pl line offset below dike crest middle
+        /// </summary>
+        public const string PlLineOffsetBelowDikeCrestMiddleColumnName = "PLLineOffsetBelowDikeCrestMiddle";
+
+        /// <summary>
+        /// The pl line offset factor below shoulder crest
+        /// </summary>
+        public const string PlLineOffsetFactorBelowShoulderCrestColumnName = "PLLineOffsetFactorBelowShoulderCrest";
+
+        /// <summary>
+        /// Use the pl line offset below dike crest middle
+        /// </summary>
+        public const string UsePlLineOffsetBelowDikeCrestMiddleColumnName = "UsePLLineOffsetBelowDikeCrestMiddle";
+
+        /// <summary>
+        /// Use the pl line offset factor below shoulder crest
+        /// </summary>
+        public const string UsePlLineOffsetFactorBelowShoulderCrestColumnName = "UsePLLineOffsetFactorBelowShoulderCrest";
+
+        /// <summary>
+        /// The intrusion vertical water pressure
+        /// </summary>
+        public const string IntrusionVerticalWaterPressureColumnName = "IntrusionVerticalWaterPressure";
+
+        /// <summary>
+        /// StabilityShoulderGrowSlope
+        /// </summary>
+        public const string StabilityShoulderGrowSlopeColumnName = "StabilityShoulderGrowSlope";
+
+        /// <summary>
+        /// StabilityShoulderGrowDeltaX
+        /// </summary>
+        public const string StabilityShoulderGrowDeltaXColumnName = "StabilityShoulderGrowDeltaX";
+
+        /// <summary>
+        /// StabilitySlopeAdaptionDeltaX
+        /// </summary>
+        public const string StabilitySlopeAdaptionDeltaXColumnName = "StabilitySlopeAdaptionDeltaX";
+
+        /// <summary>
+        /// minimal_circle_depth
+        /// </summary>
+        public const string MinimalCircleDepthColumnName = "minimal_circle_depth";
+
+        /// <summary>
+        /// distance_to_entry_point
+        /// </summary>
+        public const string DistanceToEntryPointColumnName = "distance_to_entry_point";
+
+        /// <summary>
+        /// Stability Design Method
+        /// </summary>
+        public const string StabilityDesignMethodColumnName = "StabilityDesignMethod";
+
+        /// <summary>
+        /// Start value (cotangent) for slope adaption by angle
+        /// </summary>
+        public const string SlopeAdaptionStartCotangentColumnName = "SlopeAdaptionStartCotangent";
+
+        /// <summary>
+        /// End value (cotangent) for slope adaption by angle
+        /// </summary>
+        public const string SlopeAdaptionEndCotangentColumnName = "SlopeAdaptionEndCotangent";
+
+        /// <summary>
+        /// Step size (cotangent) for slope adaption by angle
+        /// </summary>
+        public const string SlopeAdaptionStepCotangentColumnName = "SlopeAdaptionStepCotangent";
+
+        /// <summary>
+        /// Slope damping piezometric height polderside
+        /// </summary>
+        public const string SlopeDampingPiezometricHeightPolderSideColumnName = "SlopeDampingPiezometricHeightPolderSide";
+
+        /// <summary>
+        /// safety_factor_stability_inner_slope
+        /// </summary>
+        public const string RequiredSafetyFactorStabilityInnerSlopeColumnName = ModelFactorCsvIdentifiers.SafetyFactorStabilityInnerslope;
+
+        /// <summary>
+        /// safety_factor_stability_outer_slope
+        /// </summary>
+        public const string RequiredSafetyFactorStabilityOuterSlopeColumnName = ModelFactorCsvIdentifiers.SafetyFactorStabilityOuterslope;
+
+        /// <summary>
+        /// safety_factor_piping
+        /// </summary>
+        public const string RequiredSafetyFactorPipingColumnName = ModelFactorCsvIdentifiers.SafetyFactorPiping;
+
+        /// <summary>
+        /// uplift_criterion_piping
+        /// </summary>
+        public const string UpliftCriterionPipingColumnName = ModelFactorCsvIdentifiers.UpliftCriterionPiping;
+
+        /// <summary>
+        /// uplift_criterion_stability
+        /// </summary>
+        public const string UpliftCriterionStabilityColumnName  = ModelFactorCsvIdentifiers.UpliftCriterionStability;
+
+
+        /// <summary>
+        /// Zone type 
+        /// </summary>
+        public const string ZoneTypeColumnName = "ZoneType";
+
+        /// <summary>
+        /// ForbiddenZoneFactor 
+        /// </summary>
+        public const string ForbiddenZoneFactorColumnName = "ForbiddenZoneFactor";
+
+        /// <summary>
+        /// ZoneAreaRestSlopeCrestWidth 
+        /// </summary>
+        public const string ZoneAreaRestSlopeCrestWidthColumnName = "ZoneAreaRestSlopeCrestWidth";
+
+        /// <summary>
+        /// NewDikeTopWidth
+        /// </summary>
+        public const string NewDikeTopWidthColumnName = "NewDikeTopWidth";
+
+        /// <summary>
+        /// UseNewDikeTopWidth
+        /// </summary>
+        public const string UseNewDikeTopWidthColumnName = "UseNewDikeTopWidth";
+
+        /// <summary>
+        /// NewDikeSlopeInside
+        /// </summary>
+        public const string NewDikeSlopeInsideColumnName = "NewDikeSlopeInside";
+
+        /// <summary>
+        /// UseNewDikeSlopeInside
+        /// </summary>
+        public const string UseNewDikeSlopeInsideColumnName = "UseNewDikeSlopeInside";
+
+        /// <summary>
+        /// NewDikeSlopeOutside
+        /// </summary>
+        public const string NewDikeSlopeOutsideColumnName = "NewDikeSlopeOutside";
+
+        /// <summary>
+        /// UseNewDikeSlopeOutside 
+        /// </summary>
+        public const string UseNewDikeSlopeOutsideColumnName = "UseNewDikeSlopeOutside";
+
+        /// <summary>
+        /// NewShoulderTopSlope
+        /// </summary>
+        public const string NewShoulderTopSlopeColumnName = "NewShoulderTopSlope";
+
+        /// <summary>
+        /// UseNewShoulderTopSlope 
+        /// </summary>
+        public const string UseNewShoulderTopSlopeColumnName = "UseNewShoulderTopSlope";
+
+        /// <summary>
+        /// NewShoulderBaseSlope
+        /// </summary>
+        public const string NewShoulderBaseSlopeColumnName = "NewShoulderBaseSlope";
+
+        /// <summary>
+        /// UseNewShoulderBaseSlope
+        /// </summary>
+        public const string UseNewShoulderBaseSlopeColumnName = "UseNewShoulderBaseSlope";
+
+        /// <summary>
+        /// NewMaxHeightShoulderAsFraction
+        /// </summary>
+        public const string NewMaxHeightShoulderAsFractionColumnName = "NewMaxHeightShoulderAsFraction";
+
+        /// <summary>
+        /// UseNewMaxHeightShoulderAsFraction
+        /// </summary>
+        public const string UseNewMaxHeightShoulderAsFractionColumnName = "UseNewMaxHeightShoulderAsFraction";
+
+        /// <summary>
+        /// NewMinDistanceDikeToeStartDitch
+        /// </summary>
+        public const string NewMinDistanceDikeToeStartDitchColumnName = "NewMinDistanceDikeToeStartDitch";
+
+        /// <summary>
+        /// UseNewMinDistanceDikeToeStartDitch
+        /// </summary>
+        public const string UseNewMinDistanceDikeToeStartDitchColumnName = "UseNewMinDistanceDikeToeStartDitch";
+
+        /// <summary>
+        /// UseNewDitchDefinition 
+        /// </summary>
+        public const string UseNewDitchDefinitionColumnName = "UseNewDitchDefinition";
+
+        /// <summary>
+        /// NewWidthDitchBottom
+        /// </summary>
+        public const string NewWidthDitchBottomColumnName = "NewWidthDitchBottom";
+
+        /// <summary>
+        /// newSlopeAngleDitch
+        /// </summary>
+        public const string NewSlopeAngleDitchColumnName = "newSlopeAngleDitch";
+
+        /// <summary>
+        /// NewDepthDitch
+        /// </summary>
+        public const string NewDepthDitchColumnName = "NewDepthDitch";
+
+        /// <summary>
+        /// DikeTableHeight
+        /// </summary>
+        public const string DikeTableHeightColumnName = "dike_table_height";
+
+        /// <summary>
+        /// water_height
+        /// </summary>
+        public const string RiverLevelColumnName = "water_height";
+
+        /// <summary>
+        /// water_height_low
+        /// </summary>
+        public const string RiverLevelLowColumnName = "water_height_low";        
+
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamGlobalConstants.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamGlobalConstants.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamGlobalConstants.cs	(revision 3305)
@@ -0,0 +1,30 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Dam.Data
+{
+    public static class DamGlobalConstants
+    {
+        public const double NoRunValue = 99;
+        public const double PlLineOffsetFactorBelowShoulderCrestMinValue = 0.0;
+        public const double PlLineOffsetFactorBelowShoulderCrestMaxValue = 1.0;
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IFeature.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IFeature.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IFeature.cs	(revision 3305)
@@ -0,0 +1,37 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+
+using GeoAPI.Geometries;
+
+using NetTopologySuite.Features;
+
+namespace Deltares.Maps
+{
+    public interface IFeature
+    {
+        Guid Id { get; }
+        string WktFormat { get; }
+        IGeometry Geometry { get; }
+        IAttributesTable Attributes { get; }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/PredicateSpecification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/PredicateSpecification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/PredicateSpecification.cs	(revision 3305)
@@ -0,0 +1,55 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Deltares.Dam.Data;
+
+namespace Deltares.Standard.Specifications
+{
+    public class PredicateSpecification<T> : CompositeSpecification<T>
+    {
+        private readonly Predicate<T> predicate;
+
+        public PredicateSpecification(Predicate<T> predicate)
+        {
+            if (predicate == default(Predicate<T>))
+                throw new ArgumentNullException("predicate");
+
+            this.predicate = predicate;
+        }
+
+        #region ISpecification<T> Members
+
+        /// <summary>
+        /// Determines whether the candidate satisfies the specification.
+        /// </summary>
+        /// <param name="candidate">The candidate.</param>
+        /// <returns>
+        ///   <c>true</c> if the candidate satisfies the specification otherwise, <c>false</c>.
+        /// </returns>
+        public override bool IsSatisfiedBy(T candidate)
+        {
+            return this.predicate(candidate);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardJob.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardJob.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardJob.cs	(revision 3305)
@@ -0,0 +1,46 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Dam.Data
+{
+    public class WaterBoardJob : CompositeJob
+    {
+        public WaterBoardJob()
+        {
+        }
+        public WaterBoardJob(object subject): base(subject)
+        {
+        }
+
+        public bool AreAllDikeLocationsWaterLevelTimeSeriesAssigned()
+        {
+            bool areAssigned = true;
+            foreach (DamJob damJob in Jobs)
+            {
+                if (damJob.GetType() == typeof(DikeJob))
+                {
+                    areAssigned = areAssigned && (((DikeJob)damJob).AreAllLocationWaterLevelTimeSeriesAssigned());
+                }
+            }
+            return areAssigned;
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Assemblers/DamMStabAssembler.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Assemblers/DamMStabAssembler.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Assemblers/DamMStabAssembler.cs	(revision 3305)
@@ -0,0 +1,684 @@
+//-----------------------------------------------------------------------
+// <copyright file="DamMStabAssembler.cs" company="Deltares">
+//  Copyright (c) 2010 Deltares. All rights reserved.
+// </copyright>
+// <author>B.S.T.I.M. The</author>
+// <email>tom.the@deltares.nl</email>
+// <date>18-05-2010</date>
+// <summary>xml file creator for DGSMStabDam.dll</summary>
+//-----------------------------------------------------------------------
+using Deltares.Geometry;
+using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.SurfaceLines;
+using Deltares.Standard.IO.DtoAssembler;
+
+namespace Deltares.Dam.Data.Assemblers
+{
+    using System;
+    using System.IO;
+    using System.Linq;
+    using System.Reflection;
+    using System.Xml;
+    using System.Xml.Linq;
+    using System.Xml.Schema;
+    using Deltares.Soilbase;
+    using Deltares.Standard;
+    using Deltares.Geotechnics;
+    using Standard.Extensions;
+
+    /// <summary>
+    /// 
+    /// </summary>    
+    public class DamMStabAssembler :
+        DtoDocumentAssembler<FailureMechanismeParamatersMStab, FailureMechanismeParamatersMStab>
+    {
+        #region Constant declarations
+
+        /// <summary>
+        /// Holds the common part of the path to the embedded resource
+        /// </summary>
+        private const string EmbeddedResourcePath = "Deltares.Dam.Data.Xsd";
+
+        public const string XmlAttributeBottomLevel = "BottomLevel";
+        public const string XmlAttributeBoundaryLayer = "BoundaryLayer";
+        public const string XmlAttributeHasPhreaticLevel = "HasPhreaticLevel";
+        public const string XmlAttributeID = "ID";
+        public const string XmlAttributeIsPhreatic = "IsPhreatic";
+
+        public const string XmlAttributeMStabFileName = "MStabFileName";
+        public const string XmlAttributeName = "Name";
+        public const string XmlAttributePhreaticLevel = "PhreaticLevel";
+        public const string XmlAttributeSoilDBName = "SoilDBName";
+        public const string XmlAttributeSoilID = "SoilID";
+        public const string XmlAttributeTopLevel = "TopLevel";
+        public const string XmlAttributeXCoord = "XCoord";
+        public const string XmlAttributeXCoordinate = "XCoordinate";
+        public const string XmlAttributeYCoord = "YCoord";
+        public const string XmlAttributeYCoordinate = "YCoordinate";
+        public const string XmlAttributeCharacteristicPointType = "CharacteristicPointType";
+        public const string XmlElementExternalPLLines = "ExternalPLLines";
+        public const string XmlElementLayer = "Layer";
+        public const string XmlElementLayers = "Layers";
+        public const string XmlAttributeSoilType = "SoilType";
+        public const string XmlAttributeInBetweenSandLayerID = "InBetweenSandLayerID";
+        public const string XmlAttributeBottomSandLayerID = "BottomSandLayerID";
+        public const string XmlAttributeInfiltrationLayerID = "InfiltrationLayerID";
+
+        /// <summary>
+        /// Holds the xml element name
+        /// </summary>
+        public const string XmlElementName = "DamMStabDoc";
+
+        public const string XmlElementNameInput = "DamMStabInput";
+
+        /// <summary>
+        /// Holds the xml namespace
+        /// </summary>
+        public const string XmlElementNamespace = "http://deltares.nl/2008/" + XmlSchemaName;
+
+        public const string XmlElementNamespaceInput = "http://deltares.nl/2008/" + XmlSchemaNameInput;
+        public const string XmlElementPLLine = "PLLine";
+        public const string XmlElementPLPoint = "PLPoint";
+        public const string XmlElementProfile = "Profile";
+        public const string XmlElementSurfaceLine = "SurfaceLine";
+        public const string XmlElementSurfacePoint = "SurfacePoint";
+        public const string XmlElementCharacteristicPoints = "CharacteristicPoints";
+        public const string XmlElementCharacteristicPoint = "CharacteristicPoint";
+        public const string XmlElementZoneAreas = "ZoneAreas";
+        public const string XmlElementForbiddenZone = "ForbiddenZone";
+        public const string XmlElementSheetPiling = "SheetPiling";
+        public const string XmlElementHorizontalBalanceArea = "HorizontalBalanceArea";
+        public const string XmlElementSlipCircleDefinition = "SlipCircleDefinition";
+
+        /// <summary>
+        /// Holds the model xml element and attribute names
+        /// </summary>
+        public const string XmlElementModel = "Model";
+
+        public const string XmlAttributeCalculationModel = "CalculationModel";
+        public const string XmlAttributeShearStrength = "ShearStrength";
+        public const string XmlAttributeProbabilistic = "Probabilistic";
+        public const string XmlAttributeSearchMethod = "SearchMethod";
+        public const string XmlAttributeGridPosition = "GridPosition";
+
+        /// <summary>
+        /// Holds the TrafficLoad xml element and attribute names
+        /// </summary>
+        public const string XmlElementTrafficLoad = "TrafficLoad";
+
+        public const string XmlAttributeXCoordinateAtRiver = "XCoordinateAtRiver";
+        public const string XmlAttributeXCoordinateAtPolder = "XCoordinateAtPolder";
+        public const string XmlAttributeLoad = "Load";
+
+        /// <summary>
+        /// Holds the CalculationOptions xml element and attribute names
+        /// </summary>
+        public const string XmlElementCalculationOptions = "CalculationOptions";
+
+        public const string XmlAttributeMinimalCircleDepth = "MinimalCircleDepth";
+        public const string XmlAttributeZonesType = "ZonesType";
+
+        /// <summary>
+        /// Holds the GeometryCreationOptions xml element and attribute names
+        /// </summary>
+        public const string XmlElementGeometryCreationOptions = "GeometryCreationOptions";
+
+        public const string XmlAttributeSoilGeometryType = "SoilGeometryType";
+        public const string XmlAttributeSoilGeometry2DFilename = "SoilGeometry2DFilename";
+        public const string XmlAttributeXOffsetSoilGeometry2DOrigin = "XOffsetSoilGeometry2DOrigin";
+        public const string XmlAttributeMaterialForDike = "MaterialForDike";
+        public const string XmlAttributeMaterialForShoulder = "MaterialForShoulder";
+        public const string XmlAttributeIsUseOriginalPLLineAssignments = "IsUseOriginalPLLineAssignments";
+        public const string XmlAttributeIsUseOriginalCalculationOptions = "IsUseOriginalCalculationOptions";
+        public const string XmlAttributeIsDrySituation = "IsDrySituation";
+        public const string XmlAttributePLLineAssignment = "PLLineAssignment";
+        public const string XmlAttributeIntrusionVerticalWaterPressure = "IntrusionVerticalWaterPressure";
+        public const string XmlAttributePenetrationLength = "PenetrationLength";
+        public const string XmlAttributeIsDesign = "IsDesign";
+
+        public const string XmlElementDesign = "Design";
+        public const string XmlAttributeEmbankmentMaterialName = "EmbankmentMaterialName";
+        public const string XmlAttributePreviousGeometry2DFilename = "PreviousGeometry2DFilename";
+        /// <summary>
+        /// Holds the name of the xml schema
+        /// </summary>
+        private const string XmlSchemaName = "DamMStabDocDefinition";
+
+        private const string XmlSchemaNameInput = "DamMStabInputDefinition";
+
+        /// <summary>
+        /// Holds the xsd resource path 
+        /// </summary>
+        public const string XsdEmbeddedResourcePath = EmbeddedResourcePath + "." + XmlSchemaName + ".xsd";
+
+        private const string XsdEmbeddedResourcePathInput = EmbeddedResourcePath + "." + XmlSchemaNameInput + ".xsd";
+
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public DamMStabAssembler() :
+            base(XmlElementName, XmlElementNamespace, XsdEmbeddedResourcePath)
+        {
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="failureMechanismeParamatersMStab"></param>
+        /// <returns></returns>
+        public override XDocument CreateDataTransferObject(FailureMechanismeParamatersMStab failureMechanismeParamatersMStab)
+        {
+            XDocument doc = base.CreateDataTransferObject(failureMechanismeParamatersMStab);
+
+            XNamespace tns = ElementNamespace;
+
+            Location location = failureMechanismeParamatersMStab.Location;
+            // Todo: Sheetpiling should be done correctly (SheetpilePointLevel vs SheetpileLength)
+            // For now: disable this
+            //if (location.SheetPileLength > 0.0)
+            //{
+            //    SheetPiling sheetPiling = new SheetPiling();
+            //    sheetPiling.Length = location.SheetPileLength;
+            //    sheetPiling.XCoordinate = location.SheetPilePoint.X;
+            //    sheetPiling.YCoordinate = location.SheetPilePoint.Y;
+            //    sheetPiling.ZCoordinate = location.SheetPilePoint.Z;
+            //    damFailureMechanismeCalculation.FailureMechanismeParamatersMStab.MStabParameters.SheetPiling =
+            //        sheetPiling;
+            //}
+
+            // DAMMStabInput
+            var inputElement = new XElement(tns + XmlElementNameInput);
+            doc.Root.Add(inputElement);
+
+            XNamespace tnsb = XmlElementNamespaceInput;
+            doc.Root.Add(new XAttribute(XNamespace.Xmlns + "tnsb", tnsb.NamespaceName));
+
+            // Soil database
+            inputElement.Add(new XAttribute(XmlAttributeMStabFileName,failureMechanismeParamatersMStab.MStabParameters.ProjectFileName));
+            inputElement.Add(new XAttribute(XmlAttributeSoilDBName, failureMechanismeParamatersMStab.MStabParameters.SoilDatabaseName));
+
+            // Surface line
+            XElement surfaceLineElement = GetSurfaceLineElement(failureMechanismeParamatersMStab, tnsb);
+            inputElement.Add(surfaceLineElement);
+
+            // Surface line
+            XElement characteristicPointsElement = GetCharacteristicPointsElement(failureMechanismeParamatersMStab, tnsb);
+            inputElement.Add(characteristicPointsElement);
+
+            // External PL lines
+            XElement externalPLLinesElement = GetExternalPlLinesElement(failureMechanismeParamatersMStab, tnsb);
+            inputElement.Add(externalPLLinesElement);
+
+            // Model
+            XElement modelElement = GetModelElement(failureMechanismeParamatersMStab, tnsb);
+            inputElement.Add(modelElement);
+
+            // Zone Area
+            if (failureMechanismeParamatersMStab.MStabParameters.ZoneAreas != null)
+            {
+                XElement zoneAreasElement = GetZoneAreasElement(failureMechanismeParamatersMStab.MStabParameters.ZoneAreas, tnsb);
+                inputElement.Add(zoneAreasElement);
+            }
+
+            // Forbidden zone
+            if (failureMechanismeParamatersMStab.MStabParameters.ForbiddenZone != null)
+            {
+                XElement forbiddenZoneElement =
+                    GetForbiddenZoneElement(failureMechanismeParamatersMStab.MStabParameters.ForbiddenZone, tnsb);
+                inputElement.Add(forbiddenZoneElement);
+            }
+
+            // Traffic load
+            if (
+                failureMechanismeParamatersMStab.SurfaceLine.HasAnnotation(CharacteristicPointType.TrafficLoadInside) &&
+                failureMechanismeParamatersMStab.SurfaceLine.HasAnnotation(CharacteristicPointType.TrafficLoadOutside))
+            {
+                XElement trafficLoadElement = GetTrafficLoadElement(failureMechanismeParamatersMStab, tnsb);
+                inputElement.Add(trafficLoadElement);
+            }
+
+            // Calculation Options
+            if (failureMechanismeParamatersMStab.MStabParameters.CalculationOptions !=
+                null)
+            {
+                XElement calculationOptionsElement = GetCalculationOptionsElement(failureMechanismeParamatersMStab, tnsb);
+                inputElement.Add(calculationOptionsElement);
+            }
+
+            // GeometryCreationOptions Options
+            if (failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions != null)
+            {
+                XElement geometryCreationOptionsElement = GetGeometryCreationOptionsElement(failureMechanismeParamatersMStab, tnsb);
+                inputElement.Add(geometryCreationOptionsElement);
+            }
+
+            // SheetPiling
+            if (failureMechanismeParamatersMStab.MStabParameters.SheetPiling != null)
+            {
+                XElement sheetPilingElement = GetSheetPilingElement(failureMechanismeParamatersMStab.MStabParameters.SheetPiling, tnsb);
+                inputElement.Add(sheetPilingElement);
+            }
+
+            // Horizontal Balance Area
+            if (failureMechanismeParamatersMStab.MStabParameters.HorizontalBalanceArea != null)
+            {
+                XElement horizontalBalanceAreaElement =
+                    GetHorizontalBalanceAreaElement(failureMechanismeParamatersMStab.MStabParameters.HorizontalBalanceArea, tnsb);
+                inputElement.Add(horizontalBalanceAreaElement);
+            }
+
+            // Slip Circle Definition
+            if (failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition != null)
+            {
+                XElement slipCircleDefinitionElement = GetSlipCircleDefinitionElement(
+                    failureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition, tnsb);
+                inputElement.Add(slipCircleDefinitionElement);
+            }
+
+            // Design data
+            if (failureMechanismeParamatersMStab.Design != null)
+            {
+                XElement designElement = GetDesignElement(failureMechanismeParamatersMStab, tnsb);
+                inputElement.Add(designElement);
+            }
+
+            // Profile
+            SoilProfile1D profile = failureMechanismeParamatersMStab.SoilProfile;
+            if (profile != null)
+            {
+                var soilProfileAssembler = new SoilProfileAssembler<SoilLayer1D, Soil>();
+                XNamespace tnsa = soilProfileAssembler.ElementNamespace;
+                doc.Root.Add(new XAttribute(XNamespace.Xmlns + "tnsa", tnsa.NamespaceName));
+
+
+                //TODO: Remove duplicate code. The method GetProfileElement should call the SoilProfileAssembler already defined in another namespace
+                XElement profileElement = GetProfileElement(profile, tns, tnsa);
+                //                XElement profileElement = soilProfileAssembler.CreateDataTransferObject(profile); //GetProfileElement(profile, tns, tnsa);
+                //                profileElement.Name = tns.GetName(profileElement.Name.LocalName);// .SetNamespace(DamMStabAssembler.XmlElementProfile, tns.NamespaceName);
+                doc.Root.Add(profileElement);
+            }
+
+            return doc;
+        }
+
+        private static XElement GetZoneAreasElement(MStabZoneAreas zoneAreas, XNamespace tns)
+        {
+            if (zoneAreas == null)
+                throw new ArgumentNullException("zoneAreas");
+
+            return zoneAreas.ToXElement(XmlElementZoneAreas, tns);
+        }
+
+        private static XElement GetForbiddenZoneElement(MStabForbiddenZone forbiddenZone, XNamespace tns)
+        {
+            if (forbiddenZone == null)
+                throw new ArgumentNullException("forbiddenZone");
+
+            return forbiddenZone.ToXElement(XmlElementForbiddenZone, tns);
+        }
+
+        private static XElement GetSheetPilingElement(Deltares.Dam.Data.SheetPiling sheetPiling, XNamespace tns)
+        {
+            if (sheetPiling == null)
+                throw new ArgumentNullException("sheetPiling");
+
+            return sheetPiling.ToXElement(XmlElementSheetPiling, tns);
+        }
+
+        private static XElement GetHorizontalBalanceAreaElement(HorizontalBalanceArea horizontalBalanceArea,
+                                                                XNamespace tns)
+        {
+            if (horizontalBalanceArea == null)
+                throw new ArgumentNullException("horizontalBalanceArea");
+
+            return horizontalBalanceArea.ToXElement(XmlElementHorizontalBalanceArea, tns);
+        }
+
+        /// <summary>
+        /// Gets the slip circle definition element.
+        /// </summary>
+        /// <param name="slipCircleDefinition">The slip circle definition.</param>
+        /// <param name="tns">The namespace</param>
+        /// <returns></returns>
+        private static XElement GetSlipCircleDefinitionElement(SlipCircleDefinition slipCircleDefinition, XNamespace tns)
+        {
+            if (slipCircleDefinition == null)
+                throw new ArgumentNullException("slipCircleDefinition");
+
+            return slipCircleDefinition.ToXElement(XmlElementSlipCircleDefinition, tns);
+        }
+
+        #region Private Assembler Methods
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="profile"></param>
+        /// <param name="tns"></param>
+        /// <param name="tnsa"></param>
+        /// <returns></returns>
+        private static XElement GetProfileElement(SoilProfile1D profile, XNamespace tns,
+                                                  XNamespace tnsa)
+        {
+            var profileElement = new XElement(tns + XmlElementProfile);
+            profileElement.Add(new XAttribute(XmlAttributeName, profile.Name));
+            profileElement.Add(new XAttribute(XmlAttributeXCoordinate, profile.X));
+            profileElement.Add(new XAttribute(XmlAttributeYCoordinate, profile.Y));
+            profileElement.Add(new XAttribute(XmlAttributePhreaticLevel, profile.PhreaticLevel));
+            profileElement.Add(new XAttribute(XmlAttributeHasPhreaticLevel, profile.HasPhreaticLevel));
+            profileElement.Add(new XAttribute(XmlAttributeBottomLevel, profile.BottomLevel));
+
+            if (profile.Layers.Count > 0)
+            {
+                var layersElement = new XElement(tnsa + XmlElementLayers);
+                GetProfileLayersElement(profile, tnsa, layersElement);
+                profileElement.Add(layersElement);
+            }
+
+            // Bottom sand layer
+            if (profile.BottomAquiferLayer != null)
+                profileElement.Add(new XAttribute(XmlAttributeBottomSandLayerID, profile.BottomAquiferLayer.Id));
+            // In-between sand layer
+            if (profile.InBetweenAquiferLayer != null)
+                profileElement.Add(new XAttribute(XmlAttributeInBetweenSandLayerID, profile.InBetweenAquiferLayer.Id));
+            // Infiltration layer
+            if (profile.InfiltrationLayer != null)
+                profileElement.Add(new XAttribute(XmlAttributeInfiltrationLayerID, profile.InfiltrationLayer.Id));
+            return profileElement;
+        }
+
+        // Assembles the layer elements for the profile
+        private static void GetProfileLayersElement(SoilProfile1D profile, XNamespace tnsa,
+                                                    XElement layersElement)
+        {
+            profile.EnsureUniqueLayerIds();
+            foreach (SoilLayer1D layer in profile.Layers)
+            {
+                var layerElement = new XElement(tnsa + XmlElementLayer);
+                layersElement.Add(layerElement);
+                layerElement.Add(new XAttribute(XmlAttributeID, String.Format("{0}", layer.Id)));
+                layerElement.Add(new XAttribute(XmlAttributeSoilID, layer.Soil.Name));
+                layerElement.Add(new XAttribute(XmlAttributeTopLevel, layer.TopLevel));
+            }
+        }
+
+        /// <summary>
+        /// Assembles the pl lines
+        /// </summary>
+        /// <param name="failureMechanismeParamatersMStab"></param>
+        /// <param name="tnsb"></param>
+        /// <returns></returns>
+        private static XElement GetExternalPlLinesElement(
+            FailureMechanismeParamatersMStab failureMechanismeParamatersMStab, XNamespace tnsb)
+        {
+            XElement externalPLLinesElement = null;
+            if (failureMechanismeParamatersMStab.PLLines != null)
+            {
+                externalPLLinesElement = new XElement(tnsb + XmlElementExternalPLLines);
+                foreach (PLLineType plLineType in Enum.GetValues(typeof(PLLineType)))
+                {
+                    PLLine line = failureMechanismeParamatersMStab.PLLines.Lines[plLineType];
+                    var PLLineElement = new XElement(tnsb + XmlElementPLLine);
+                    externalPLLinesElement.Add(PLLineElement);
+                    PLLineElement.Add(new XAttribute(XmlAttributeIsPhreatic, line.IsPhreatic));
+                    PLLineElement.Add(new XAttribute(XmlAttributeBoundaryLayer, line.BoundaryLayer));
+                    foreach (PLLinePoint point in line.Points)
+                    {
+                        var PLPointElement = new XElement(tnsb + XmlElementPLPoint);
+                        PLPointElement.Add(new XAttribute(XmlAttributeXCoord, point.X));
+                        PLPointElement.Add(new XAttribute(XmlAttributeYCoord, point.Z));
+                        PLLineElement.Add(PLPointElement);
+                    }
+                }
+            }
+            if (failureMechanismeParamatersMStab.DupuitPLLines != null)
+            {
+                externalPLLinesElement = new XElement(tnsb + XmlElementExternalPLLines);
+                for (int plLineIndex = 0;
+                     plLineIndex <
+                     failureMechanismeParamatersMStab.DupuitPLLines.PLLines.Count;
+                     plLineIndex++)
+                {
+                    PLLine line = failureMechanismeParamatersMStab.DupuitPLLines.PLLines[plLineIndex];
+                    line.IsPhreatic = (plLineIndex == failureMechanismeParamatersMStab.DupuitPLLines.PLLines.Count - 1);
+                    line.BoundaryLayer = plLineIndex;
+                    var PLLineElement = new XElement(tnsb + XmlElementPLLine);
+                    externalPLLinesElement.Add(PLLineElement);
+                    PLLineElement.Add(new XAttribute(XmlAttributeIsPhreatic, line.IsPhreatic));
+                    PLLineElement.Add(new XAttribute(XmlAttributeBoundaryLayer, line.BoundaryLayer));
+                    for (int pointIndex = 1; pointIndex < line.Points.Count - 1; pointIndex++)
+                    {
+                        GeometryPoint point = line.Points[pointIndex];
+                        var PLPointElement = new XElement(tnsb + XmlElementPLPoint);
+                        PLPointElement.Add(new XAttribute(XmlAttributeXCoord, point.X));
+                        PLPointElement.Add(new XAttribute(XmlAttributeYCoord, point.Z));
+                        PLLineElement.Add(PLPointElement);
+                    }
+                }
+            }
+            return externalPLLinesElement;
+        }
+
+        /// <summary>
+        /// Assembles the surface line element
+        /// </summary>
+        /// <param name="failureMechanismeParamatersMStab"></param>
+        /// <param name="tnsb"></param>
+        /// <returns></returns>
+        private static XElement GetSurfaceLineElement(
+            FailureMechanismeParamatersMStab failureMechanismeParamatersMStab, XNamespace tnsb)
+        {
+            var surfaceLineElement = new XElement(tnsb + XmlElementSurfaceLine);
+            foreach (GeometryPoint point in failureMechanismeParamatersMStab.SurfaceLine.Geometry.Points)
+            {
+                var surfacePointElement = new XElement(tnsb + XmlElementSurfacePoint);
+                surfacePointElement.Add(new XAttribute(XmlAttributeXCoord, point.X));
+                surfacePointElement.Add(new XAttribute(XmlAttributeYCoord, point.Z));
+                surfaceLineElement.Add(surfacePointElement);
+            }
+            return surfaceLineElement;
+        }
+
+        /// <summary>
+        /// Assembles the characteristic points element
+        /// </summary>
+        /// <param name="failureMechanismeParamatersMStab"></param>
+        /// <param name="tnsb"></param>
+        /// <returns></returns>
+        private static XElement GetCharacteristicPointsElement(
+            FailureMechanismeParamatersMStab failureMechanismeParamatersMStab, XNamespace tnsb)
+        {
+            var characteristicPointsElement = new XElement(tnsb + XmlElementCharacteristicPoints);
+            foreach (CharacteristicPointType characteristicPointType in Enum.GetValues(typeof(CharacteristicPointType)))
+            {
+                GeometryPoint point = failureMechanismeParamatersMStab.SurfaceLine.CharacteristicPoints.GetGeometryPoint(characteristicPointType);
+                if (point != null)
+                {
+                    var characteristicPointElement = new XElement(tnsb + XmlElementCharacteristicPoint);
+                    characteristicPointElement.Add(new XAttribute(XmlAttributeXCoord, point.X));
+                    characteristicPointElement.Add(new XAttribute(XmlAttributeYCoord, point.Z));
+                    characteristicPointElement.Add(new XAttribute(XmlAttributeCharacteristicPointType, characteristicPointType.ToString()));
+                    characteristicPointsElement.Add(characteristicPointElement);
+                }
+                
+            }
+            return characteristicPointsElement;
+        }
+
+
+        /// <summary>
+        /// Assembles the model element 
+        /// </summary>
+        /// <param name="failureMechanismeParamatersMStab"></param>
+        /// <param name="tnsb"></param>
+        /// <returns></returns>
+        private static XElement GetModelElement(
+            FailureMechanismeParamatersMStab failureMechanismeParamatersMStab, XNamespace tnsb)
+        {
+            return new XElement(tnsb + XmlElementModel,
+                                new XAttribute(XmlAttributeCalculationModel, failureMechanismeParamatersMStab.MStabParameters.Model),
+                                new XAttribute(XmlAttributeShearStrength, failureMechanismeParamatersMStab.MStabParameters.ShearStrength),
+                                new XAttribute(XmlAttributeProbabilistic, failureMechanismeParamatersMStab.MStabParameters.IsProbabilistic),
+                                new XAttribute(XmlAttributeSearchMethod, failureMechanismeParamatersMStab.MStabParameters.SearchMethod),
+                                new XAttribute(XmlAttributeGridPosition, failureMechanismeParamatersMStab.MStabParameters.GridPosition.ToString().ToLower())
+                );
+        }
+
+        /// <summary>
+        /// Assembles the traffic load element
+        /// </summary>
+        /// <param name="failureMechanismeParamatersMStab"></param>
+        /// <param name="tnsb"></param>
+        /// <returns></returns>
+        private static XElement GetTrafficLoadElement(
+            FailureMechanismeParamatersMStab failureMechanismeParamatersMStab, XNamespace tnsb)
+        {
+            return new XElement(tnsb + XmlElementTrafficLoad,
+                                new XAttribute(XmlAttributeXCoordinateAtRiver, failureMechanismeParamatersMStab.
+                                                   SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).X),
+                                new XAttribute(XmlAttributeXCoordinateAtPolder, failureMechanismeParamatersMStab.
+                                                   SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).X),
+                                new XAttribute(XmlAttributeLoad, failureMechanismeParamatersMStab.TrafficLoad)
+                );
+        }
+
+        /// <summary>
+        /// Assembles the calculation options element
+        /// </summary>
+        /// <param name="failureMechanismeParamatersMStab"></param>
+        /// <param name="tnsb"></param>
+        /// <returns></returns>
+        private static XElement GetCalculationOptionsElement(
+            FailureMechanismeParamatersMStab failureMechanismeParamatersMStab, XNamespace tnsb)
+        {
+            return new XElement(tnsb + XmlElementCalculationOptions,
+                                new XAttribute(XmlAttributeMinimalCircleDepth, failureMechanismeParamatersMStab.
+                                                   MStabParameters.CalculationOptions.MinimalCircleDepth),
+                                new XAttribute(XmlAttributeZonesType, failureMechanismeParamatersMStab.
+                                                   MStabParameters.CalculationOptions.ZonesType.ToString())
+                );
+        }
+
+        /// <summary>
+        /// Assembles the GeometryCreationOptions element 
+        /// </summary>
+        /// <param name="failureMechanismeParamatersMStab"></param>
+        /// <param name="tnsb"></param>
+        /// <returns></returns>
+        private static XElement GetGeometryCreationOptionsElement(
+            FailureMechanismeParamatersMStab failureMechanismeParamatersMStab, XNamespace tnsb)
+        {
+            string soilGeometryName = failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.SoilGeometry2DFilename;
+            soilGeometryName = (soilGeometryName == null ? "" : soilGeometryName);
+            string materialForDike = failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.MaterialForDike;
+            materialForDike = (materialForDike == null ? "" : materialForDike);
+            string materialForShoulder = failureMechanismeParamatersMStab.MStabParameters.GeometryCreationOptions.MaterialForShoulder;
+            materialForShoulder = (materialForShoulder == null ? "" : materialForShoulder);
+            return new XElement(tnsb + XmlElementGeometryCreationOptions,
+                                new XAttribute(XmlAttributeSoilGeometryType, failureMechanismeParamatersMStab.
+                                                   MStabParameters.GeometryCreationOptions.SoilGeometryType),
+                                new XAttribute(XmlAttributeSoilGeometry2DFilename, soilGeometryName),
+                                new XAttribute(XmlAttributeXOffsetSoilGeometry2DOrigin, failureMechanismeParamatersMStab.
+                                                   MStabParameters.GeometryCreationOptions.XOffsetSoilGeometry2DOrigin),
+                                new XAttribute(XmlAttributeMaterialForDike, materialForDike),
+                                new XAttribute(XmlAttributeMaterialForShoulder, materialForShoulder),
+                                new XAttribute(XmlAttributeIsUseOriginalPLLineAssignments, failureMechanismeParamatersMStab.
+                                                   MStabParameters.GeometryCreationOptions.IsUseOriginalPLLineAssignments),
+                                new XAttribute(XmlAttributeIsUseOriginalCalculationOptions, failureMechanismeParamatersMStab.
+                                                   MStabParameters.GeometryCreationOptions.IsUseOriginalCalculationOptions),
+                                new XAttribute(XmlAttributeIsDrySituation, failureMechanismeParamatersMStab.
+                                                   MStabParameters.GeometryCreationOptions.IsDrySituation),
+                                new XAttribute(XmlAttributePLLineAssignment, failureMechanismeParamatersMStab.
+                                                   MStabParameters.GeometryCreationOptions.PLLineAssignment),
+                                new XAttribute(XmlAttributeIntrusionVerticalWaterPressure, failureMechanismeParamatersMStab.
+                                                   MStabParameters.GeometryCreationOptions.IntrusionVerticalWaterPressureType),
+                                new XAttribute(XmlAttributePenetrationLength, failureMechanismeParamatersMStab.
+                                                   MStabParameters.GeometryCreationOptions.PenetrationLength),
+                                new XAttribute(XmlAttributeIsDesign, failureMechanismeParamatersMStab.
+                                                   MStabParameters.GeometryCreationOptions.IsDesign));
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="failureMechanismeParamatersMStab"></param>
+        /// <param name="tnsb"></param>
+        /// <returns></returns>
+        private static XElement GetDesignElement(
+            FailureMechanismeParamatersMStab failureMechanismeParamatersMStab, XNamespace tnsb)
+        {
+            string embankmentMaterialname = failureMechanismeParamatersMStab.Design.EmbankmentMaterialname;
+            embankmentMaterialname = (embankmentMaterialname == null ? "" : embankmentMaterialname);
+            string previousGeometry2DFilename = failureMechanismeParamatersMStab.Design.PreviousGeometry2DFilename;
+            previousGeometry2DFilename = (previousGeometry2DFilename == null ? "" : previousGeometry2DFilename);
+
+            return new XElement(tnsb + XmlElementDesign,
+                                new XAttribute(XmlAttributeEmbankmentMaterialName, embankmentMaterialname),
+                                new XAttribute(XmlAttributePreviousGeometry2DFilename, previousGeometry2DFilename));
+        }
+
+
+
+        #endregion
+
+        #region Schema Validator Method
+
+        public bool ValidateSchema(XDocument doc, out string message)
+        {
+            bool result = true;
+            string errorMessage = String.Empty;
+
+            // DAMMStabDefinition
+            XmlSchemaSet schemas = new XmlSchemaSet();
+
+            Stream xsdStream = Common.GetEmbeddedFile(Assembly.GetExecutingAssembly(), XsdEmbeddedResourcePath);
+            schemas.Add(XmlElementNamespace, XmlReader.Create(xsdStream));
+            xsdStream = Common.GetEmbeddedFile(Assembly.GetExecutingAssembly(), XsdEmbeddedResourcePathInput);
+            schemas.Add(XmlElementNamespaceInput, XmlReader.Create(xsdStream));
+
+            Assembly assembly;
+            string schemaName;
+            string resourceName;
+
+            // FileIdentificationDefinition
+            var fileIdentificationAssembler = new FileIdentificationAssembler();
+            if (!schemas.Contains(fileIdentificationAssembler.ElementNamespace))
+            {
+                assembly = fileIdentificationAssembler.GetType().Assembly;
+                schemaName = Path.GetFileName(fileIdentificationAssembler.ElementNamespace);
+                string schemaFileName = schemaName + ".xsd";
+                resourceName =
+                    (from string name in assembly.GetManifestResourceNames()
+                     where name.EndsWith(schemaFileName)
+                     select name).Single();
+                xsdStream = Common.GetEmbeddedFile(assembly, resourceName);
+                schemas.Add(fileIdentificationAssembler.ElementNamespace, XmlReader.Create(xsdStream));
+            }
+
+            // ProfileDefinition
+            var soilProfileAssembler =
+                new SoilProfileAssembler<SoilLayer1D, Soil>();
+            assembly = soilProfileAssembler.GetType().Assembly;
+            schemaName = Path.GetFileName(soilProfileAssembler.ElementNamespace);
+            resourceName =
+                (from string name in assembly.GetManifestResourceNames()
+                 where name.EndsWith(schemaName + ".xsd")
+                 select name).Single();
+            xsdStream = Common.GetEmbeddedFile(assembly, resourceName);
+            schemas.Add(soilProfileAssembler.ElementNamespace, XmlReader.Create(xsdStream));
+            doc.Validate(schemas, (o, e) =>
+                                      {
+                                          result = false;
+                                          errorMessage = e.Message;
+                                      }, true);
+
+            message = errorMessage;
+
+            return result;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/License/DamLicense.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/License/DamLicense.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/License/DamLicense.cs	(revision 3305)
@@ -0,0 +1,138 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Deltares.Authorization;
+
+namespace Deltares.Dam.Data.License
+{
+    /// <summary>
+    /// License class to chekout and checkin licenses
+    /// </summary>
+    public class DamLicense
+    {
+
+        private static DAuthClient dAuthClient;
+        private static DamLicenseType damLicenseType = DamLicenseType.None;
+        private static string checkedOutFeature;
+
+        /// <summary>
+        /// Gets the type of the dam license.
+        /// </summary>
+        /// <value>
+        /// The type of the dam license.
+        /// </value>
+        public static DamLicenseType DamLicenseType
+        {
+            get
+            {
+                return damLicenseType;
+            }
+        }
+
+        /// <summary>
+        /// Checkouts the license.
+        /// Look up all features starting with the specified string
+        /// See if any of them has the correct license version, according to the version we get from the Application version info
+        /// </summary>
+        /// <param name="feature">The feature.</param>
+        /// <param name="version">The version.</param>
+        public static void CheckoutLicense(string feature, string version)
+        {
+            if (feature == null) throw new ArgumentNullException(nameof(feature));
+            IEnumerable<string> featureNames = GetAllFeaturesStartingWith(feature);
+            if (featureNames == null)
+            {
+                checkedOutFeature = null;
+                damLicenseType = DamLicenseType.None;
+                return;
+            }
+            int majorVersion = GetMajorVersionFromVersionString(version);
+            string versionString = majorVersion.ToString(CultureInfo.InvariantCulture);
+            damLicenseType = DamLicenseType.None;
+            foreach (var featureName in featureNames)
+            {
+                if (DAuthClient.CheckOut(featureName, versionString))
+                {
+                    damLicenseType = DamLicenseType.LFM;
+                    checkedOutFeature = featureName;
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Checks in the license.
+        /// </summary>
+        public static void CheckinLicense()
+        {
+            if (!String.IsNullOrEmpty(checkedOutFeature))
+            {
+                DAuthClient.CheckIn(checkedOutFeature);
+            }
+        }
+
+        /// <summary>
+        /// Gets all features starting with the specified feature string
+        /// </summary>
+        /// <param name="feature">the feature string to look up</param>
+        /// <returns>all the feature names thta start with the specified feature string</returns>
+        public static IEnumerable<string> GetAllFeaturesStartingWith(string feature)
+        {
+            string[] features = null;
+            DAuthClient.GetAvailableFeatures(ref features);
+            if (features == null)
+            {
+                return null;
+            }
+            IEnumerable<string> featureNames = features.Where(s => s.StartsWith(feature));
+            return featureNames;
+        }
+
+        private static DAuthClient DAuthClient
+        {
+            get
+            {
+                if (dAuthClient != null)
+                {
+                    return dAuthClient;
+                }
+                dAuthClient = new DAuthClient(false, true);
+                return dAuthClient;
+            }
+        }
+
+        private static int GetMajorVersionFromVersionString(string version)
+        {
+            var seperator = new[]
+            {
+                '.'
+            };
+            var versionNumbers = version.Split(seperator);
+            int majorVersion;
+            int.TryParse(versionNumbers[0], out majorVersion);
+            return majorVersion;
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/NtsFeature.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/NtsFeature.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/NtsFeature.cs	(revision 3305)
@@ -0,0 +1,46 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+
+namespace Deltares.Maps
+{
+    public class NtsFeature : NetTopologySuite.Features.Feature, IFeature
+    {
+        private readonly Guid id;
+
+        public NtsFeature()
+        {
+            id = Guid.NewGuid();
+            Attributes = new AttributesDictionary();
+        }
+
+        public Guid Id
+        {
+            get { return id; }
+        }
+
+        public string WktFormat
+        {
+            get { return Geometry.AsText(); }
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Stochast.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Stochast.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Stochast.cs	(revision 3305)
@@ -0,0 +1,34 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Dam.Data
+{
+    public class Stochast
+    {
+        public Stochast()
+        {
+        }
+
+        public double Mean { get; set; }
+        public double StandardDeviation { get; set; }
+        public int Distribution { get; set; }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/Serialization.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/Serialization.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/Serialization.cs	(revision 3305)
@@ -0,0 +1,200 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//
+//
+using System;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Xml.Serialization;
+
+namespace Deltares.Standard
+{
+    /// <summary>
+    /// Types that implement this interface has a seperate data object 
+    /// that needs to be serialized instead of the implementer itself
+    /// </summary>
+    /// <remarks>
+    /// The type implementing this interface act as an adapter without subclassing (Decorator pattern). 
+    /// It can have a complete different data contract interface and can delegate calls to the members
+    /// of the object being serialized
+    /// </remarks>
+    /// <typeparam name="T"></typeparam>
+    public interface ISerializableObject<T>
+    {
+        /// <summary>
+        /// Should return the data object to serialize
+        /// </summary>
+        /// <returns></returns>
+        T GetDataObject();
+
+        /// <summary>
+        /// Sets the data object which needs to be serialized later
+        /// Data properties in the implementer should implemenent setters and getters on this object
+        /// </summary>
+        /// <param name="obj"></param>
+        void SetDataObject(T obj);
+    }
+
+    /// <summary>
+    /// A common exception which should be trown when validating the schema and mandatory fields are not set.
+    /// </summary>
+    [Serializable]
+    public class NotSchemaCompliantException : Exception
+    {
+        public NotSchemaCompliantException()
+        {
+        }
+
+        public NotSchemaCompliantException(string message) : base(message)
+        {
+        }
+
+        public NotSchemaCompliantException(string message, Exception inner) : base(message, inner)
+        {
+        }
+
+        protected NotSchemaCompliantException(
+            SerializationInfo info,
+            StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+
+    /// <summary>
+    /// Defines a contract for the Serializer.
+    /// </summary>
+    public interface INamespaceProvider
+    {
+        /// <summary>
+        /// Defines a method which should return the target namespaces
+        /// </summary>
+        /// <returns>The qualified name</returns>
+        XmlSerializerNamespaces GetNamespaces();
+    }
+
+    public static class Serialization
+    {
+        /// <summary>
+        /// Serializes the target to file
+        /// </summary>
+        /// <typeparam name="T">The target type that implements ISchemaSerializer</typeparam>
+        /// <param name="target">The target instance</param>
+        /// <param name="fileName">The name of the file to serialze to</param>
+        public static void SerializeToFile<T>(T target, string fileName)
+        {
+            XmlSerializerNamespaces namespaces = null;
+            var ns = target as INamespaceProvider;
+            if (ns != null)
+                namespaces = ns.GetNamespaces();
+
+            var xml = new System.Xml.Serialization.XmlSerializer(typeof (T));
+            using (var fs = new FileStream(fileName, FileMode.Create))
+            {
+                if (namespaces != null)
+                    xml.Serialize(fs, target, namespaces);
+                else
+                    xml.Serialize(fs, target);
+            }
+        }
+
+        /// <summary>
+        /// Serializes the target to string
+        /// </summary>
+        /// <typeparam name="T">The target type</typeparam>
+        /// <param name="target">The target instance</param>
+        /// <returns>the target serialized as a xml string</returns>
+        public static string SerializeToString<T>(T target)
+        {
+            string result = "";
+            XmlSerializerNamespaces namespaces = null;
+            var ns = target as INamespaceProvider;
+            if (ns != null)
+                namespaces = ns.GetNamespaces();
+
+            var xml = new System.Xml.Serialization.XmlSerializer(typeof (T));
+            using (var sw = new StringWriter())
+            {
+                if (namespaces != null)
+                    xml.Serialize(sw, target, namespaces);
+                else
+                    xml.Serialize(sw, target);
+
+                result = sw.ToString();
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Deserializes the target object class from file
+        /// </summary>
+        /// <typeparam name="T">The target type that implements ISchemaSerializer</typeparam>
+        /// <param name="fileName">The name of the file to deserialize from</param>
+        /// <returns>The target object graph</returns>
+        public static T DeserializeFromFile<T>(string fileName) where T : class
+        {
+            T result = default(T);
+            var xml = new System.Xml.Serialization.XmlSerializer(typeof (T));
+
+            using (var fs = new FileStream(fileName, FileMode.Open))
+            {
+                result = xml.Deserialize(fs) as T;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Deserializes the target object class from file
+        /// </summary>
+        /// <typeparam name="T">The target type that implements ISchemaSerializer</typeparam>
+        /// <param name="fileName">The name of the file to deserialize from</param>
+        /// <returns>The target object graph</returns>
+        public static string DeserializeFromFileToString<T>(string fileName) where T : class
+        {
+            T result = default(T);
+            var xml = new System.Xml.Serialization.XmlSerializer(typeof (T));
+            using (var fs = new FileStream(fileName, FileMode.Open))
+            {
+                result = xml.Deserialize(fs) as T;
+            }
+            return SerializeToString<T>(result);
+        }
+
+        /// <summary>
+        /// Deserializes the target object from string
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="xmlData"></param>
+        /// <returns></returns>
+        public static T DeserializeFromString<T>(string xmlData) where T : class
+        {
+            T result = default(T);
+            var xml = new System.Xml.Serialization.XmlSerializer(typeof (T));
+            using (var sr = new StringReader(xmlData))
+            {
+                result = xml.Deserialize(sr) as T;
+            }
+
+            return result;
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/ValueBoundSpecification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/ValueBoundSpecification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/ValueBoundSpecification.cs	(revision 3305)
@@ -0,0 +1,91 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Standard.Specifications
+{
+    /// <summary>
+    /// With this class a value of an object bound to a property can be tested against the specification.
+    /// This is a variant of the ParameterizedSpecification
+    /// </summary>
+    /// <typeparam name="TCandidate">The candidate type</typeparam>
+    /// <typeparam name="TValue">The candidate property type</typeparam>
+    public abstract class ValueBoundSpecification<TCandidate, TValue> : SpecificationBase<TCandidate>
+    {
+        private readonly string attributeName;
+        private readonly TValue attributeValue;
+        private TValue candidateValue;
+
+        protected ValueBoundSpecification(string attributeName, TValue attributeValue)
+        {
+            this.attributeName = attributeName;
+            this.attributeValue = attributeValue;
+        }
+
+        /// <summary>
+        /// Gets the attribute value.
+        /// </summary>
+        public TValue AttributeValue
+        {
+            get { return attributeValue; }
+        }
+
+        /// <summary>
+        /// Gets the candidate value.
+        /// </summary>
+        public TValue CandidateValue
+        {
+            get { return candidateValue; }
+        }
+
+        /// <summary>
+        /// Gets the candidate string value.
+        /// </summary>
+        /// <param name="candidate">The candidate.</param>
+        /// <returns></returns>
+        protected string GetCandidateStringValue(TCandidate candidate)
+        {
+            return GetCandidateObjectValue(candidate).ToString();
+        }
+
+        /// <summary>
+        /// Gets the candidate T value.
+        /// </summary>
+        /// <param name="candidate">The candidate.</param>
+        /// <returns></returns>
+        protected TValue GetCandidateTValue(TCandidate candidate)
+        {
+            if (candidateValue.Equals(default(TValue)))
+                candidateValue = (TValue) GetCandidateObjectValue(candidate);
+
+            return candidateValue;
+        }
+
+        /// <summary>
+        /// Gets the candidate object value.
+        /// </summary>
+        /// <param name="candidate">The candidate.</param>
+        /// <returns></returns>
+        private object GetCandidateObjectValue(TCandidate candidate)
+        {
+            return candidate.GetType().GetProperty(attributeName).GetValue(candidate, null);
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/OrSpecification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/OrSpecification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/OrSpecification.cs	(revision 3305)
@@ -0,0 +1,57 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Dam.Data;
+
+namespace Deltares.Standard.Specifications
+{
+    public class OrSpecification<TCandidate> : CompositeSpecification<TCandidate>
+    {
+        private readonly ISpecification<TCandidate> one;
+        private readonly ISpecification<TCandidate> other;
+
+        public OrSpecification(ISpecification<TCandidate> one, ISpecification<TCandidate> other)
+        {
+            this.one = one;
+            this.other = other;
+        }
+
+        /// <summary>
+        /// Determines whether the candidate satisfies the specification.
+        /// </summary>
+        /// <param name="candidate">The candidate to test.</param>
+        /// <returns>
+        ///   <c>true</c> if the candidate satisfies the specification otherwise, <c>false</c>.
+        /// </returns>
+        public override bool IsSatisfiedBy(TCandidate candidate)
+        {
+            bool otherIsSatisfiedBy = other.IsSatisfiedBy(candidate);
+            bool thisIsSatisfiedBy = one.IsSatisfiedBy(candidate);
+
+            bool isSatisfied = (thisIsSatisfiedBy || otherIsSatisfiedBy);
+            if (!isSatisfied)
+            {
+                Description = "This " + one.Description + " AND " + other.Description + " are not satisfied";
+            }
+            return isSatisfied;
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Assemblers/CalculationParametersAssembler.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Assemblers/CalculationParametersAssembler.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Assemblers/CalculationParametersAssembler.cs	(revision 3305)
@@ -0,0 +1,241 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.IO;
+using System.Reflection;
+using System.Xml;
+using System.Xml.Linq;
+using System.Xml.Schema;
+using Deltares.Standard;
+
+namespace Deltares.Dam.Data.Assemblers
+{
+    using Standard.Extensions;
+
+    /// <summary>
+    /// 
+    /// </summary>    
+    public class CalculationParametersAssembler : DtoAssembler<CalculationParameters>
+    {
+        #region Constant declarations
+
+        /// <summary>
+        /// Holds the common part of the path to the embedded resource
+        /// </summary>
+        private const string EmbeddedResourcePath = "Deltares.Dam.Data.Xsd";
+
+        public const string XmlCalculationModulesElementName = "CalculationModules";
+        public const string XmlStabilityInsideElementName = "StabilityInside";
+        public const string XmlStabilityOutsideElementName = "StabilityOutside";
+        public const string XmlPipingWtiElementName = "PipingWti";
+        public const string XmlPipingBlighElementName = "PipingBligh";
+        public const string XmlPipingSellmeijerElementName = "PipingSellmeijer";
+        // Obsolete module names
+        public const string XmlObsoletePipingSellmeijerProbabilisticElementName = "PipingSellmeijerProbabilistic";
+        public const string XmlObsoleteStabilityElementName = "Stability";
+        public const string XmlObsoletePipingIJkdijkElementName = "PipingIJkdijk";
+        public const string XmlObsoleteOvertoppingElementName = "Overtopping";
+
+        public const string XmlMStabParametersElementName = "MStabParameters";
+        public const string XmlMStabIsCalculateAllStabilityProjectsAtOnceElementName = "IsCalculateAllStabilityProjectsAtOnce";
+        public const string XmlMStabCalculationModelElementName = "CalculationModel";
+        public const string XmlMStabSearchMethodElementName = "SearchMethod";
+        public const string XmlMStabUseZonesElementName = "UseZones";
+        // Obsolete Mstab parameters
+        public const string XmlObsoleteMStabProbabilisticElementName = "Probabilistic";
+        public const string XmlObsoleteMStabIsOverrulePLLineCreationMethodName = "IsOverrulePLLineCreationMethod";
+        public const string XmlObsoleteMStabPLLineCreationMethodname = "PLLineCreationMethod";
+        public const string XmlObsoleteMStabShearStrengthElementName = "ShearStrength";
+
+        /// <summary>
+        /// Holds the xml element name
+        /// </summary>
+        private const string XmlElementName = "CalculationParameters";
+
+        /// <summary>
+        /// Holds the name of the xml schema
+        /// </summary>
+        private const string XmlSchemaName = "CalculationParametersDefinition";
+
+        /// <summary>
+        /// Holds the xml namespace
+        /// </summary>
+        private const string XmlElementNamespace = "http://deltares.nl/2008/" + XmlSchemaName;
+
+        /// <summary>
+        /// Holds the xsd resource path 
+        /// </summary>
+        private const string XsdEmbeddedResourcePath = EmbeddedResourcePath + "." + XmlSchemaName + ".xsd";
+
+
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public CalculationParametersAssembler()
+            : base(XmlElementName, XmlElementNamespace, Assembly.GetExecutingAssembly().GetEmbeddedFile(XsdEmbeddedResourcePath))
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the file.
+        /// </summary>
+        /// <value>
+        /// The name of the file.
+        /// </value>
+        public string FileName { get; set; }
+
+        public override CalculationParameters CreateDomainObject(XElement dtoObj)
+        {
+
+            CalculationParameters calculationParameters = base.CreateDomainObject(dtoObj);
+
+            // Calculation modules
+            XElement calculationModulesElement = dtoObj.Element(XmlCalculationModulesElementName);
+            if (calculationModulesElement != null)
+            {
+                CalculationModules calculationModules = new CalculationModules();
+                var found = false;
+                XElement element = calculationModulesElement.Element(CalculationParametersAssembler.XmlStabilityInsideElementName);
+                if (element != null)
+                {
+                    calculationModules.StabilityInside = int.Parse(element.Value) != 0;
+                    found = true;
+                }
+                element = calculationModulesElement.Element(CalculationParametersAssembler.XmlObsoleteStabilityElementName);
+                if (element != null && !found)
+                {
+                    calculationModules.StabilityInside = int.Parse(element.Value) != 0;
+                    found = true;
+                }
+                element = calculationModulesElement.Element(CalculationParametersAssembler.XmlStabilityOutsideElementName);
+                if (element != null)
+                {
+                    calculationModules.StabilityOutside = int.Parse(element.Value) != 0;
+                }
+
+                element = calculationModulesElement.Element(CalculationParametersAssembler.XmlPipingWtiElementName);
+                if (element != null)
+                {
+                    calculationModules.PipingWti = int.Parse(element.Value) != 0;
+                }
+
+                element = calculationModulesElement.Element(CalculationParametersAssembler.XmlPipingBlighElementName);
+                if (element != null)
+                {
+                    calculationModules.PipingBligh = int.Parse(element.Value) != 0;
+                }
+
+                element = calculationModulesElement.Element(CalculationParametersAssembler.XmlPipingSellmeijerElementName);
+                if (element != null)
+                {
+                    calculationModules.PipingSellmeijer = int.Parse(element.Value) != 0;
+                }
+
+                // Check for obsolete keys
+                ThrowIfObsoleteKeyNameFound(calculationModulesElement, XmlObsoletePipingSellmeijerProbabilisticElementName, FileName);
+                ThrowIfObsoleteKeyNameFound(calculationModulesElement, XmlObsoletePipingIJkdijkElementName, FileName);
+                ThrowIfObsoleteKeyNameFound(calculationModulesElement, XmlObsoleteOvertoppingElementName, FileName);
+                
+
+                calculationParameters.CalculationModules = calculationModules;
+            }
+
+            // MStab parameters
+            XElement mstabParametersElement = dtoObj.Element(XmlMStabParametersElementName);
+            if (mstabParametersElement != null)
+            {
+                MStabParameters mstabParameters = new MStabParameters();
+
+                XElement element;
+
+                element = mstabParametersElement.Element(CalculationParametersAssembler.XmlMStabIsCalculateAllStabilityProjectsAtOnceElementName);
+                if (element != null)
+                {
+                    mstabParameters.IsCalculateAllStabilityProjectsAtOnce = int.Parse(element.Value) != 0;
+                }
+
+                element = mstabParametersElement.Element(CalculationParametersAssembler.XmlMStabCalculationModelElementName);
+                if (element != null)
+                {
+                    mstabParameters.Model = (MStabModelType)Enum.Parse(typeof(MStabModelType), element.Value, true);
+                }
+
+                element = mstabParametersElement.Element(CalculationParametersAssembler.XmlMStabSearchMethodElementName);
+                if (element != null)
+                {
+                    mstabParameters.SearchMethod = (MStabSearchMethod)Enum.Parse(typeof(MStabSearchMethod), element.Value, true);
+                }
+
+                element = mstabParametersElement.Element(CalculationParametersAssembler.XmlMStabUseZonesElementName);
+                mstabParameters.CalculationOptions = new MStabCalculationOptions();
+                mstabParameters.CalculationOptions.ZonesType = MStabZonesType.NoZones;
+                if (element != null)
+                {
+                    int useZones = int.Parse(element.Value);
+                    mstabParameters.CalculationOptions.ZonesType = (MStabZonesType)useZones;
+                }
+
+                // Check for obsolete keys
+                ThrowIfObsoleteKeyNameFound(mstabParametersElement, XmlObsoleteMStabProbabilisticElementName, FileName);
+                ThrowIfObsoleteKeyNameFound(mstabParametersElement, XmlObsoleteMStabIsOverrulePLLineCreationMethodName, FileName);
+                ThrowIfObsoleteKeyNameFound(mstabParametersElement, XmlObsoleteMStabPLLineCreationMethodname, FileName);
+                ThrowIfObsoleteKeyNameFound(mstabParametersElement, XmlObsoleteMStabShearStrengthElementName, FileName);
+
+                calculationParameters.MStabParameters = mstabParameters;
+            }
+
+            return calculationParameters;
+        }
+
+        private static void ThrowIfObsoleteKeyNameFound(XElement calculationModulesElement, string obsoleteElementKeyName, string fileName)
+        {
+            XElement obsoleteElement = calculationModulesElement.Element(obsoleteElementKeyName);
+            if (obsoleteElement != null)
+            {
+                throw new DtoAssemblerException(String.Format("Your input file {0} is incorrect. The specified parameter '{1}' in your xml is obsolete. Please remove it.", fileName, obsoleteElementKeyName));
+            }
+        }
+
+        #region Schema Validator Method
+
+        public bool ValidateSchema(XDocument doc, out string message)
+        {
+            bool result = true;
+            string errorMessage = String.Empty;
+
+            XmlSchemaSet schemas = new XmlSchemaSet();
+
+            Stream xsdStream = Common.GetEmbeddedFile(Assembly.GetExecutingAssembly(), XsdEmbeddedResourcePath);
+            schemas.Add(XmlElementNamespace, XmlReader.Create(xsdStream));
+
+            doc.Validate(schemas, (o, e) => { result = false; errorMessage = e.Message; }, true);
+
+            message = errorMessage;
+
+            return result;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/PLLines.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/PLLines.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/PLLines.cs	(revision 3305)
@@ -0,0 +1,47 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+
+namespace Deltares.Dam.Data
+{
+
+    public class PLLines  
+    {
+        IDictionary<PLLineType, PLLine> lines;
+        public PLLines()
+        {
+            lines = new Dictionary<PLLineType, PLLine>();
+            foreach (PLLineType plLineType in PLLineType.GetValues(typeof(PLLineType)))
+            {
+                this.Lines[plLineType] = new PLLine();
+            }
+        }
+
+        public IDictionary<PLLineType, PLLine> Lines
+        {
+            get { return this.lines; }
+            private set { this.lines = value; }
+        }
+        public int PLLineCount { get { return PLLineType.GetValues(typeof(PLLineType)).GetLength(0); } }
+
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/InBetweenRangeSpecification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/InBetweenRangeSpecification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/InBetweenRangeSpecification.cs	(revision 3305)
@@ -0,0 +1,54 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Standard.Specifications
+{
+    /// <summary>
+    /// Checks if the candidate is in between the range boundaries. Boundaries are excluded
+    /// </summary>
+    public class InBetweenRangeSpecification : SpecificationBase<double>
+    {
+        private readonly double min;
+        private readonly double max;
+
+        public InBetweenRangeSpecification(double min, double max)
+        {
+            this.min = min;
+            this.max = max;
+
+            Name = "In between range specification";
+            Description = string.Format("The candidate value should have a value between {0} and {1}. Boundaries are excluded", min, max);
+        }
+
+        /// <summary>
+        /// Determines whether the candidate satisfies the specification.
+        /// </summary>
+        /// <param name="candidate">The candidate to test.</param>
+        /// <returns>
+        ///   <c>true</c> if the candidate satisfies the specification otherwise, <c>false</c>.
+        /// </returns>
+        public override bool IsSatisfiedBy(double candidate)
+        {
+            return (min < candidate && max > candidate);
+        }
+    }
+
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/TestData/Gemeenten.shp.xml
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/TestData/Gemeenten.shp.xml	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/TestData/Gemeenten.shp.xml	(revision 3305)
@@ -0,0 +1,1051 @@
+<?xml
+  version="1.0"?>
+<!--
+Copyright (C) Stichting Deltares 2018. All rights reserved.
+
+This file is part of the DAM - UI.
+
+The DAM - UI is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+<metadata xml:lang="en">
+  <Esri>
+    <CreaDate>20060810</CreaDate><CreaTime>14300900</CreaTime><SyncOnce>FALSE</SyncOnce><SyncDate>20090123</SyncDate>
+    <SyncTime>16122700</SyncTime><ModDate>20090123</ModDate><ModTime>16122700</ModTime>
+    <DataProperties>
+      <lineage>
+        <Process ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\CopyFeatures"
+                 Date="20060810" Time="134721">
+          CopyFeatures "O:\Demo_data_opleidingen\Data DVD
+          opleidingen\CBS2005buurtkaartdata\buurt_2005_gen.shp" "O:\Demo_data_opleidingen\Data DVD opleidingen\Opzet
+          voor op DVD\Nederland.mdb\buurt_2005_gen" # 0 0 0
+        </Process>
+        <Process ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\CopyFeatures"
+                 Date="20070308" Time="162449">
+          CopyFeatures "\\arc\opleidingen\Demo_data_opleidingen\Data DVD
+          opleidingen\Opzet voor op DVD\Nederland\Nederland.mdb\WijkEnBuurtkaart\Gemeenten"
+          D:\Opleiding\Nederland\Nederland.gdb\WijkEnBuurtkaart\Gemeenten # 0 0 0
+        </Process>
+        <Process ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\CopyFeatures"
+                 Date="20090123" Time="161228">
+          CopyFeatures
+          F:\esriStuff\GeodataESRI\Data\Nederland\Nederland.gdb\WijkEnBuurtkaart\Gemeenten
+          F:\esriStuff\GeodataESRI\shapes\Gemeenten.shp # 0 0 0
+        </Process>
+      </lineage>
+    </DataProperties>
+    <MetaID>{3764633F-A58A-4AFB-97F3-7B968ECEC015}</MetaID>
+  </Esri>
+  <MD_Metadata xmlns:gml="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xsi="http://www.w3.org/2001/XML-schema-instance" xmlns:gco="http://www.isotc211.org/2005/gco"
+               xmlns="http://www.isotc211.org/2005/gmd">
+    <fileIdentifier>
+      <gco:CharacterString>{1A0F83F5-5E97-4615-B068-AC18883EF221}</gco:CharacterString>
+    </fileIdentifier>
+    <language>
+      <gco:CharacterString>dut</gco:CharacterString>
+    </language>
+    <characterSet>
+      <MD_CharacterSetCode codeList="./resources/codeList.xml#MD_CharacterSetCode" codeListValue="utf8" />
+    </characterSet>
+    <hierarchyLevel>
+      <MD_ScopeCode codeList="./resources/codeList.xml#MD_ScopeCode" codeListValue="dataset" />
+    </hierarchyLevel>
+    <contact>
+      <CI_ResponsibleParty>
+        <individualName>
+          <gco:CharacterString />
+        </individualName>
+        <organisationName>
+          <gco:CharacterString>ESRI Nederland Opleidingen</gco:CharacterString>
+        </organisationName>
+        <positionName>
+          <gco:CharacterString />
+        </positionName>
+        <contactInfo>
+          <CI_Contact>
+            <phone>
+              <CI_Telephone>
+                <voice>
+                  <gco:CharacterString />
+                </voice>
+                <facsimile>
+                  <gco:CharacterString />
+                </facsimile>
+              </CI_Telephone>
+            </phone>
+            <address>
+              <CI_Address>
+                <deliveryPoint>
+                  <gco:CharacterString />
+                </deliveryPoint>
+                <city>
+                  <gco:CharacterString />
+                </city>
+                <administrativeArea>
+                  <gco:CharacterString />
+                </administrativeArea>
+                <postalCode>
+                  <gco:CharacterString />
+                </postalCode>
+                <country>
+                  <gco:CharacterString />
+                </country>
+                <electronicMailAddress>
+                  <gco:CharacterString />
+                </electronicMailAddress>
+              </CI_Address>
+            </address>
+            <onlineResource>
+              <CI_OnlineResource>
+                <linkage>
+                  <URL />
+                </linkage>
+              </CI_OnlineResource>
+            </onlineResource>
+          </CI_Contact>
+        </contactInfo>
+        <role>
+          <CI_RoleCode codeList="./resources/codeList.xml#CI_RoleCode" codeListValue="" />
+        </role>
+      </CI_ResponsibleParty>
+    </contact>
+    <dateStamp>
+      <gco:Date>2006-08-14</gco:Date>
+    </dateStamp>
+    <metadataStandardName>
+      <gco:CharacterString>ISO 19115:2003</gco:CharacterString>
+    </metadataStandardName>
+    <metadataStandardVersion>
+      <gco:CharacterString>Nederlandse metadata standaard voor geografie 1.0</gco:CharacterString>
+    </metadataStandardVersion>
+    <referenceSystemInfo>
+      <MD_ReferenceSystem>
+        <referenceSystemIdentifier>
+          <RS_Identifier>
+            <code>
+              <gco:CharacterString>Rijksdriehoekstelsel_New (28992)</gco:CharacterString>
+            </code>
+            <codeSpace>
+              <gco:CharacterString>EPSG</gco:CharacterString>
+            </codeSpace>
+          </RS_Identifier>
+        </referenceSystemIdentifier>
+      </MD_ReferenceSystem>
+    </referenceSystemInfo>
+    <identificationInfo>
+      <MD_DataIdentification>
+        <citation>
+          <CI_Citation>
+            <title>
+              <gco:CharacterString>Wijk- en buurtkaart</gco:CharacterString>
+            </title>
+            <alternateTitle>
+              <gco:CharacterString />
+            </alternateTitle>
+            <edition>
+              <gco:CharacterString>2005</gco:CharacterString>
+            </edition>
+            <series>
+              <CI_Series>
+                <name>
+                  <gco:CharacterString />
+                </name>
+              </CI_Series>
+            </series>
+          </CI_Citation>
+        </citation>
+        <abstract>
+          <gco:CharacterString>
+            De wijk- en buurtkaart bevat digitale geometrie van de grenzen van de buurten, wijken en gemeenten. De
+            kerncijfers van de buurten en de geaggreggeerde kerncijfers van de wijken en gemeenten zijn aan de kaart
+            toegevoegd.
+          </gco:CharacterString>
+        </abstract>
+        <purpose>
+          <gco:CharacterString />
+        </purpose>
+        <pointOfContact>
+          <CI_ResponsibleParty>
+            <individualName>
+              <gco:CharacterString />
+            </individualName>
+            <organisationName>
+              <gco:CharacterString>Centraal Bureau voor de Statistiek</gco:CharacterString>
+            </organisationName>
+            <positionName>
+              <gco:CharacterString />
+            </positionName>
+            <contactInfo>
+              <CI_Contact>
+                <phone>
+                  <CI_Telephone>
+                    <voice>
+                      <gco:CharacterString />
+                    </voice>
+                    <facsimile>
+                      <gco:CharacterString />
+                    </facsimile>
+                  </CI_Telephone>
+                </phone>
+                <address>
+                  <CI_Address>
+                    <deliveryPoint>
+                      <gco:CharacterString />
+                    </deliveryPoint>
+                    <city>
+                      <gco:CharacterString />
+                    </city>
+                    <administrativeArea>
+                      <gco:CharacterString />
+                    </administrativeArea>
+                    <postalCode>
+                      <gco:CharacterString />
+                    </postalCode>
+                    <country>
+                      <gco:CharacterString />
+                    </country>
+                    <electronicMailAddress>
+                      <gco:CharacterString />
+                    </electronicMailAddress>
+                  </CI_Address>
+                </address>
+                <onlineResource>
+                  <CI_OnlineResource>
+                    <linkage>
+                      <URL>www.cbs.nl</URL>
+                    </linkage>
+                  </CI_OnlineResource>
+                </onlineResource>
+              </CI_Contact>
+            </contactInfo>
+            <role>
+              <CI_RoleCode codeList="./resources/codeList.xml#CI_RoleCode" codeListValue="owner" />
+            </role>
+          </CI_ResponsibleParty>
+        </pointOfContact>
+        <pointOfContact>
+          <CI_ResponsibleParty>
+            <individualName>
+              <gco:CharacterString />
+            </individualName>
+            <organisationName>
+              <gco:CharacterString>Topografische Dienst Kadaster</gco:CharacterString>
+            </organisationName>
+            <positionName>
+              <gco:CharacterString />
+            </positionName>
+            <contactInfo>
+              <CI_Contact>
+                <phone>
+                  <CI_Telephone>
+                    <voice>
+                      <gco:CharacterString />
+                    </voice>
+                    <facsimile>
+                      <gco:CharacterString />
+                    </facsimile>
+                  </CI_Telephone>
+                </phone>
+                <address>
+                  <CI_Address>
+                    <deliveryPoint>
+                      <gco:CharacterString />
+                    </deliveryPoint>
+                    <city>
+                      <gco:CharacterString />
+                    </city>
+                    <administrativeArea>
+                      <gco:CharacterString />
+                    </administrativeArea>
+                    <postalCode>
+                      <gco:CharacterString />
+                    </postalCode>
+                    <country>
+                      <gco:CharacterString />
+                    </country>
+                    <electronicMailAddress>
+                      <gco:CharacterString />
+                    </electronicMailAddress>
+                  </CI_Address>
+                </address>
+                <onlineResource>
+                  <CI_OnlineResource>
+                    <linkage>
+                      <URL>www.kadaster.nl</URL>
+                    </linkage>
+                  </CI_OnlineResource>
+                </onlineResource>
+              </CI_Contact>
+            </contactInfo>
+            <role>
+              <CI_RoleCode codeList="./resources/codeList.xml#CI_RoleCode" codeListValue="owner" />
+            </role>
+          </CI_ResponsibleParty>
+        </pointOfContact>
+        <resourceMaintenance />
+        <descriptiveKeywords>
+          <MD_Keywords />
+        </descriptiveKeywords>
+        <resourceSpecificUsage>
+          <MD_Usage>
+            <specificUsage>
+              <gco:CharacterString />
+            </specificUsage>
+          </MD_Usage>
+        </resourceSpecificUsage>
+        <resourceConstraints>
+          <MD_Constraints>
+            <useLimitation>
+              <gco:CharacterString>
+                Op alle data rust een copyright zoals die door de eigenaars van de data is
+                vastgelegd en bij hen is op te vragen. Gebruik van de data betekent dat u met deze voorwaarde akkoord
+                gaat.
+              </gco:CharacterString>
+            </useLimitation>
+          </MD_Constraints>
+        </resourceConstraints>
+        <spatialRepresentationType>
+          <MD_SpatialRepresentationTypeCode codeList="./resources/codeList.xml#MD_SpatialRepresentationTypeCode"
+                                            codeListValue="vector" />
+        </spatialRepresentationType>
+        <spatialResolution>
+          <MD_Resolution>
+            <equivalentScale>
+              <MD_RepresentativeFraction>
+                <denominator />
+              </MD_RepresentativeFraction>
+            </equivalentScale>
+          </MD_Resolution>
+        </spatialResolution>
+        <language>
+          <gco:CharacterString>dut</gco:CharacterString>
+        </language>
+        <characterSet>
+          <MD_CharacterSetCode codeList="./resources/codeList.xml#MD_CharacterSetCode" codeListValue="utf8" />
+        </characterSet>
+        <extent>
+          <EX_Extent>
+            <geographicElement>
+              <EX_GeographicBoundingBox>
+                <westBoundLongitude>
+                  <gco:Decimal>3.254</gco:Decimal>
+                </westBoundLongitude>
+                <eastBoundLongitude>
+                  <gco:Decimal>7.244</gco:Decimal>
+                </eastBoundLongitude>
+                <southBoundLatitude>
+                  <gco:Decimal>50.735</gco:Decimal>
+                </southBoundLatitude>
+                <northBoundLatitude>
+                  <gco:Decimal>53.561</gco:Decimal>
+                </northBoundLatitude>
+              </EX_GeographicBoundingBox>
+            </geographicElement>
+            <geographicElement>
+              <EX_GeographicDescription>
+                <geographicIdentifier>
+                  <MD_Identifier>
+                    <code>
+                      <gco:CharacterString>Nederland</gco:CharacterString>
+                    </code>
+                  </MD_Identifier>
+                </geographicIdentifier>
+              </EX_GeographicDescription>
+            </geographicElement>
+          </EX_Extent>
+        </extent>
+      </MD_DataIdentification>
+    </identificationInfo>
+    <distributionInfo>
+      <MD_Distribution>
+        <distributionFormat>
+          <MD_Format>
+            <name>
+              <gco:CharacterString>Shapefile</gco:CharacterString>
+            </name>
+            <version>
+              <gco:CharacterString>1.0</gco:CharacterString>
+            </version>
+          </MD_Format>
+        </distributionFormat>
+        <distributor>
+          <MD_Distributor>
+            <distributorContact>
+              <CI_ResponsibleParty>
+                <individualName>
+                  <gco:CharacterString />
+                </individualName>
+                <organisationName>
+                  <gco:CharacterString>Centraal Bureau voor de Statistiek (CBS)</gco:CharacterString>
+                </organisationName>
+                <positionName>
+                  <gco:CharacterString />
+                </positionName>
+                <contactInfo>
+                  <CI_Contact>
+                    <address>
+                      <CI_Address>
+                        <deliveryPoint>
+                          <gco:CharacterString />
+                        </deliveryPoint>
+                        <city>
+                          <gco:CharacterString />
+                        </city>
+                        <administrativeArea>
+                          <gco:CharacterString />
+                        </administrativeArea>
+                        <postalCode>
+                          <gco:CharacterString />
+                        </postalCode>
+                        <country>
+                          <gco:CharacterString />
+                        </country>
+                        <electronicMailAddress>
+                          <gco:CharacterString />
+                        </electronicMailAddress>
+                      </CI_Address>
+                    </address>
+                    <onlineResource>
+                      <CI_OnlineResource>
+                        <linkage>
+                          <URL>www.cbs.nl</URL>
+                        </linkage>
+                      </CI_OnlineResource>
+                    </onlineResource>
+                  </CI_Contact>
+                </contactInfo>
+                <role>
+                  <CI_RoleCode codeList="./resources/codeList.xml#CI_RoleCode" codeListValue="distributor" />
+                </role>
+              </CI_ResponsibleParty>
+            </distributorContact>
+            <distributionOrderProcess>
+              <MD_StandardOrderProcess>
+                <fees>
+                  <gco:CharacterString />
+                </fees>
+                <orderingInstructions>
+                  <gco:CharacterString />
+                </orderingInstructions>
+                <turnaround>
+                  <gco:CharacterString />
+                </turnaround>
+              </MD_StandardOrderProcess>
+            </distributionOrderProcess>
+          </MD_Distributor>
+        </distributor>
+        <transferOptions>
+          <MD_DigitalTransferOptions>
+            <unitsOfDistribution>
+              <gco:CharacterString />
+            </unitsOfDistribution>
+            <onLine>
+              <CI_OnlineResource>
+                <linkage>
+                  <URL>\\arc\opleidingen\Demo_data_opleidingen\Data DVD opleidingen\Opzet voor op DVD\Nederland.mdb</URL>
+                </linkage>
+              </CI_OnlineResource>
+            </onLine>
+            <offLine>
+              <MD_Medium>
+                <name>
+                  <MD_MediumNameCode codeList="./resources/codeList.xml#MD_MediumNameCode" codeListValue="" />
+                </name>
+              </MD_Medium>
+            </offLine>
+          </MD_DigitalTransferOptions>
+        </transferOptions>
+      </MD_Distribution>
+    </distributionInfo>
+    <dataQualityInfo>
+      <DQ_DataQuality>
+        <scope>
+          <DQ_Scope>
+            <level>
+              <MD_ScopeCode codeList="./resources/codeList.xml#MD_ScopeCode" codeListValue="dataset" />
+            </level>
+          </DQ_Scope>
+        </scope>
+        <report>
+          <DQ_AbsoluteExternalPositionalAccuracy>
+            <result>
+              <DQ_QuantitativeResult>
+                <valueUnit>
+                  <gco:CharacterString>text</gco:CharacterString>
+                </valueUnit>
+                <value>
+                  <gco:CharacterString>
+                    De buurtgrenzen zijn gegeneraliseerd.
+                    De begrenzing van de buurten met de volledige (niet-gegeneraliseerde) geometrie is als
+                    verbijzondering toegevoegd aan de volledige digitale geometrie van de gemeentegrenzen van de
+                    Topografische Dienst Kadaster.
+                  </gco:CharacterString>
+                </value>
+              </DQ_QuantitativeResult>
+            </result>
+          </DQ_AbsoluteExternalPositionalAccuracy>
+        </report>
+        <lineage>
+          <LI_Lineage>
+            <statement>
+              <gco:CharacterString>
+                De kaart is samengesteld uit drie bronnen: de gemeentegrenzen op land volgens de
+                kaart van gemeentegrenzen van de Topografische Dienst Kadaster, de buurtgrenzen volgens opgave van de
+                gemeenten en de grens van het land met grotere wateren volgens de meeste recente kaart van het Bestand
+                Bodemgebruik van het CBS.
+              </gco:CharacterString>
+            </statement>
+          </LI_Lineage>
+        </lineage>
+      </DQ_DataQuality>
+    </dataQualityInfo>
+    <applicationSchemaInfo>
+      <MD_ApplicationSchemaInformation>
+        <name>
+          <CI_Citation>
+            <title>
+              <gco:CharacterString />
+            </title>
+          </CI_Citation>
+        </name>
+        <schemaLanguage>
+          <gco:CharacterString />
+        </schemaLanguage>
+        <constraintLanguage>
+          <gco:CharacterString />
+        </constraintLanguage>
+      </MD_ApplicationSchemaInformation>
+    </applicationSchemaInfo>
+  </MD_Metadata>
+  <FC_FeatureCatalogue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                       xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <featureType>
+      <name>Gemeenten</name><definition />
+      <featureAttribute>
+        <name>OBJECTID</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>Shape</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>GM_CODE</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>GM_NAAM</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>POSTCODE</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>DEK_PERC</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>OPP_TOT</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>OPP_LAND</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>OPP_WATER</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>BEV_DICHTH</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>AANT_INW</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>AANT_MAN</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>AANT_VROUW</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>P_0_14_JR</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>P_15_24_JR</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>P_25_44_JR</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>P_45_64_JR</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>P_65_EO_JR</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>P_WEST_AL</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>P_N_W_AL</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>P_MARROK</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>P_ANT_ARU</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>P_SURINAM</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>P_TURKIJE</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>P_OVER_NW</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>AANTAL_HH</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>P_EENP_HH</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>P_HH_Z_K</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>P_HH_M_K</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>GEM_HH_GR</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>AUTO_TOT</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>AUTO_MUT</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>AUTO_HH</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>AUTO_LAND</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>BEDR_AUTO</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>MOTOR_2W</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>Shape_Length</name><definition></definition>
+      </featureAttribute>
+      <featureAttribute>
+        <name>Shape_Area</name><definition></definition>
+      </featureAttribute>
+    </featureType>
+  </FC_FeatureCatalogue>
+  <idinfo>
+    <native Sync="TRUE">Microsoft Windows XP Version 5.1 (Build 2600) Service Pack 2; ESRI ArcCatalog 9.2.0.1324</native>
+    <descript>
+      <langdata Sync="TRUE">nl</langdata><abstract>REQUIRED: A brief narrative summary of the data set.</abstract>
+      <purpose>REQUIRED: A summary of the intentions with which the data set was developed.</purpose>
+    </descript>
+    <citation>
+      <citeinfo>
+        <origin>REQUIRED: The name of an organization or individual that developed the data set.</origin>
+        <pubdate>REQUIRED: The date when the data set is published or otherwise made available for release.</pubdate>
+        <title Sync="TRUE">Gemeenten</title><ftname Sync="TRUE">Gemeenten</ftname>
+        <geoform Sync="TRUE">vector digital data</geoform>
+        <onlink Sync="TRUE">\\wl01982\F$\esriStuff\GeodataESRI\shapes\Gemeenten.shp</onlink>
+      </citeinfo>
+    </citation>
+    <timeperd>
+      <current>REQUIRED: The basis on which the time period of content information is determined.</current>
+      <timeinfo>
+        <sngdate>
+          <caldate>
+            REQUIRED: The year (and optionally month, or month and day) for which the data set corresponds to
+            the ground.
+          </caldate>
+        </sngdate>
+      </timeinfo>
+    </timeperd>
+    <status>
+      <progress>REQUIRED: The state of the data set.</progress>
+      <update>
+        REQUIRED: The frequency with which changes and additions are made to the data set after the initial data
+        set is completed.
+      </update>
+    </status>
+    <spdom>
+      <bounding>
+        <westbc Sync="TRUE">3.253906</westbc><eastbc Sync="TRUE">7.243915</eastbc>
+        <northbc Sync="TRUE">53.561375</northbc><southbc Sync="TRUE">50.734945</southbc>
+      </bounding>
+      <lboundng>
+        <leftbc Sync="TRUE">13573.708052</leftbc><rightbc Sync="TRUE">278026.099972</rightbc>
+        <bottombc Sync="TRUE">306838.822004</bottombc><topbc Sync="TRUE">619352.799996</topbc>
+      </lboundng>
+    </spdom>
+    <keywords>
+      <theme>
+        <themekt>
+          REQUIRED: Reference to a formally registered thesaurus or a similar authoritative source of theme
+          keywords.
+        </themekt>
+        <themekey>REQUIRED: Common-use word or phrase used to describe the subject of the data set.</themekey>
+      </theme>
+    </keywords>
+    <accconst>REQUIRED: Restrictions and legal prerequisites for accessing the data set.</accconst>
+    <useconst>REQUIRED: Restrictions and legal prerequisites for using the data set after access is granted.</useconst>
+    <natvform Sync="TRUE">Shapefile</natvform>
+  </idinfo>
+  <dataIdInfo>
+    <envirDesc Sync="TRUE">Microsoft Windows XP Version 5.1 (Build 2600) Service Pack 2; ESRI ArcCatalog 9.2.0.1324</envirDesc>
+    <dataLang>
+      <languageCode Sync="TRUE" value="nl"></languageCode>
+    </dataLang>
+    <idCitation>
+      <resTitle Sync="TRUE">Gemeenten</resTitle>
+      <presForm>
+        <PresFormCd Sync="TRUE" value="005"></PresFormCd>
+      </presForm>
+    </idCitation>
+    <spatRpType>
+      <SpatRepTypCd Sync="TRUE" value="001"></SpatRepTypCd>
+    </spatRpType>
+    <dataExt>
+      <geoEle>
+        <GeoBndBox esriExtentType="native">
+          <westBL Sync="TRUE">13573.708052</westBL><eastBL Sync="TRUE">278026.099972</eastBL>
+          <northBL Sync="TRUE">619352.799996</northBL><southBL Sync="TRUE">306838.822004</southBL>
+          <exTypeCode Sync="TRUE">1</exTypeCode>
+        </GeoBndBox>
+      </geoEle>
+    </dataExt>
+    <geoBox esriExtentType="decdegrees">
+      <westBL Sync="TRUE">3.253906</westBL><eastBL Sync="TRUE">7.243915</eastBL>
+      <northBL Sync="TRUE">53.561375</northBL><southBL Sync="TRUE">50.734945</southBL>
+      <exTypeCode Sync="TRUE">1</exTypeCode>
+    </geoBox>
+  </dataIdInfo>
+  <metainfo>
+    <langmeta Sync="TRUE">nl</langmeta>
+    <metstdn Sync="TRUE">FGDC Content Standards for Digital Geospatial Metadata</metstdn>
+    <metstdv Sync="TRUE">FGDC-STD-001-1998</metstdv><mettc Sync="TRUE">local time</mettc>
+    <metc>
+      <cntinfo>
+        <cntorgp>
+          <cntper>REQUIRED: The person responsible for the metadata information.</cntper>
+          <cntorg>REQUIRED: The organization responsible for the metadata information.</cntorg>
+        </cntorgp>
+        <cntaddr>
+          <addrtype>REQUIRED: The mailing and/or physical address for the organization or individual.</addrtype>
+          <city>REQUIRED: The city of the address.</city><state>REQUIRED: The state or province of the address.</state>
+          <postal>REQUIRED: The ZIP or other postal code of the address.</postal>
+        </cntaddr>
+        <cntvoice>REQUIRED: The telephone number by which individuals can speak to the organization or individual.</cntvoice>
+      </cntinfo>
+    </metc>
+    <metd Sync="TRUE">20090123</metd>
+    <metextns>
+      <onlink Sync="TRUE">http://www.esri.com/metadata/esriprof80.html</onlink>
+      <metprof Sync="TRUE">ESRI Metadata Profile</metprof>
+    </metextns>
+  </metainfo>
+  <mdLang>
+    <languageCode Sync="TRUE" value="nl"></languageCode>
+  </mdLang>
+  <mdStanName Sync="TRUE">ISO 19115 Geographic Information - Metadata</mdStanName>
+  <mdStanVer Sync="TRUE">DIS_ESRI1.0</mdStanVer>
+  <mdChar>
+    <CharSetCd Sync="TRUE" value="004"></CharSetCd>
+  </mdChar>
+  <mdHrLv>
+    <ScopeCd Sync="TRUE" value="005"></ScopeCd>
+  </mdHrLv>
+  <mdHrLvName Sync="TRUE">dataset</mdHrLvName>
+  <distinfo>
+    <resdesc Sync="TRUE">Downloadable Data</resdesc>
+    <stdorder>
+      <digform>
+        <digtinfo>
+          <transize Sync="TRUE">0,000</transize><dssize Sync="TRUE">0,000</dssize>
+        </digtinfo>
+      </digform>
+    </stdorder>
+  </distinfo>
+  <distInfo>
+    <distributor>
+      <distorTran>
+        <onLineSrc>
+          <orDesc Sync="TRUE">002</orDesc>
+          <linkage Sync="TRUE">file://\\wl01982\F$\esriStuff\GeodataESRI\shapes\Gemeenten.shp</linkage>
+          <protocol Sync="TRUE">Local Area Network</protocol>
+        </onLineSrc>
+        <transSize Sync="TRUE">0,000</transSize>
+      </distorTran>
+      <distorFormat>
+        <formatName Sync="TRUE">Shapefile</formatName>
+      </distorFormat>
+    </distributor>
+  </distInfo>
+  <spdoinfo>
+    <direct Sync="TRUE">Vector</direct>
+    <ptvctinf>
+      <esriterm Name="Gemeenten">
+        <efeatyp Sync="TRUE">Simple</efeatyp><efeageom Sync="TRUE">Polygon</efeageom>
+        <esritopo Sync="TRUE">FALSE</esritopo><efeacnt Sync="TRUE">0</efeacnt><spindex Sync="TRUE">FALSE</spindex>
+        <linrefer Sync="TRUE">FALSE</linrefer>
+      </esriterm>
+      <sdtsterm Name="Gemeenten">
+        <sdtstype Sync="TRUE">G-polygon</sdtstype><ptvctcnt Sync="TRUE">0</ptvctcnt>
+      </sdtsterm>
+    </ptvctinf>
+  </spdoinfo>
+  <spref>
+    <horizsys>
+      <cordsysn>
+        <geogcsn Sync="TRUE">GCS_Amersfoort</geogcsn><projcsn Sync="TRUE">Rijksdriehoekstelsel_New</projcsn>
+      </cordsysn>
+      <planar>
+        <planci>
+          <plance Sync="TRUE">coordinate pair</plance><plandu Sync="TRUE">meters</plandu>
+          <coordrep>
+            <absres Sync="TRUE">0.000000</absres><ordres Sync="TRUE">0.000000</ordres>
+          </coordrep>
+        </planci>
+        <mapproj>
+          <mapprojn Sync="TRUE">Double Stereographic</mapprojn>
+          <mapprojp>
+            <longpc Sync="TRUE">5.387639</longpc><latprjc Sync="TRUE">52.156161</latprjc>
+            <sfprjorg Sync="TRUE">0.999908</sfprjorg><feast Sync="TRUE">155000.000000</feast>
+            <fnorth Sync="TRUE">463000.000000</fnorth>
+          </mapprojp>
+        </mapproj>
+      </planar>
+      <geodetic>
+        <horizdn Sync="TRUE">D_Amersfoort</horizdn><ellips Sync="TRUE">Bessel_1841</ellips>
+        <semiaxis Sync="TRUE">6377397.155000</semiaxis><denflat Sync="TRUE">299.152813</denflat>
+      </geodetic>
+    </horizsys>
+    <vertdef>
+      <altsys>
+        <altenc Sync="TRUE">Explicit elevation coordinate included with horizontal coordinates</altenc>
+        <altres Sync="TRUE">0.000100</altres>
+      </altsys>
+    </vertdef>
+  </spref>
+  <refSysInfo>
+    <RefSystem>
+      <refSysID>
+        <identCode Sync="TRUE">Rijksdriehoekstelsel_New</identCode>
+      </refSysID>
+    </RefSystem>
+  </refSysInfo>
+  <spatRepInfo>
+    <VectSpatRep>
+      <topLvl>
+        <TopoLevCd Sync="TRUE" value="001"></TopoLevCd>
+      </topLvl>
+      <geometObjs Name="Gemeenten">
+        <geoObjTyp>
+          <GeoObjTypCd Sync="TRUE" value="001"></GeoObjTypCd>
+        </geoObjTyp>
+        <geoObjCnt Sync="TRUE">0</geoObjCnt>
+      </geometObjs>
+    </VectSpatRep>
+  </spatRepInfo>
+  <eainfo>
+    <detailed Name="Gemeenten">
+      <attr>
+        <attrlabl Sync="TRUE">MOTOR_2W</attrlabl><attalias Sync="TRUE">MOTOR_2W</attalias>
+        <attrtype Sync="TRUE">Number</attrtype><attwidth Sync="TRUE">11</attwidth>
+      </attr>
+      <enttyp>
+        <enttypl Sync="TRUE">Gemeenten</enttypl><enttypt Sync="TRUE">Feature Class</enttypt>
+        <enttypc Sync="TRUE">0</enttypc>
+      </enttyp>
+      <attr>
+        <attrlabl Sync="TRUE">Shape</attrlabl><attalias Sync="TRUE">Shape</attalias>
+        <attrtype Sync="TRUE">Geometry</attrtype><attwidth Sync="TRUE">0</attwidth><atprecis Sync="TRUE">0</atprecis>
+        <attscale Sync="TRUE">0</attscale><attrdef Sync="TRUE">Feature geometry.</attrdef>
+        <attrdefs Sync="TRUE">ESRI</attrdefs>
+        <attrdomv>
+          <udom Sync="TRUE">Coordinates defining the features.</udom>
+        </attrdomv>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">GM_CODE</attrlabl><attalias Sync="TRUE">GM_CODE</attalias>
+        <attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">16</attwidth>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">GM_NAAM</attrlabl><attalias Sync="TRUE">GM_NAAM</attalias>
+        <attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">30</attwidth>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">POSTCODE</attrlabl><attalias Sync="TRUE">POSTCODE</attalias>
+        <attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">11</attwidth>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">DEK_PERC</attrlabl><attalias Sync="TRUE">DEK_PERC</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">OPP_TOT</attrlabl><attalias Sync="TRUE">OPP_TOT</attalias>
+        <attrtype Sync="TRUE">Number</attrtype><attwidth Sync="TRUE">9</attwidth>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">OPP_LAND</attrlabl><attalias Sync="TRUE">OPP_LAND</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">OPP_WATER</attrlabl><attalias Sync="TRUE">OPP_WATER</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">BEV_DICHTH</attrlabl><attalias Sync="TRUE">BEV_DICHTH</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">AANT_INW</attrlabl><attalias Sync="TRUE">AANT_INW</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">AANT_MAN</attrlabl><attalias Sync="TRUE">AANT_MAN</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">AANT_VROUW</attrlabl><attalias Sync="TRUE">AANT_VROUW</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">P_0_14_JR</attrlabl><attalias Sync="TRUE">P_0_14_JR</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">P_15_24_JR</attrlabl><attalias Sync="TRUE">P_15_24_JR</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">P_25_44_JR</attrlabl><attalias Sync="TRUE">P_25_44_JR</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">P_45_64_JR</attrlabl><attalias Sync="TRUE">P_45_64_JR</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">P_65_EO_JR</attrlabl><attalias Sync="TRUE">P_65_EO_JR</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">P_WEST_AL</attrlabl><attalias Sync="TRUE">P_WEST_AL</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">P_N_W_AL</attrlabl><attalias Sync="TRUE">P_N_W_AL</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">P_MARROK</attrlabl><attalias Sync="TRUE">P_MARROK</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">P_ANT_ARU</attrlabl><attalias Sync="TRUE">P_ANT_ARU</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">P_SURINAM</attrlabl><attalias Sync="TRUE">P_SURINAM</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">P_TURKIJE</attrlabl><attalias Sync="TRUE">P_TURKIJE</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">P_OVER_NW</attrlabl><attalias Sync="TRUE">P_OVER_NW</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">AANTAL_HH</attrlabl><attalias Sync="TRUE">AANTAL_HH</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">P_EENP_HH</attrlabl><attalias Sync="TRUE">P_EENP_HH</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">P_HH_Z_K</attrlabl><attalias Sync="TRUE">P_HH_Z_K</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">P_HH_M_K</attrlabl><attalias Sync="TRUE">P_HH_M_K</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">GEM_HH_GR</attrlabl><attalias Sync="TRUE">GEM_HH_GR</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">AUTO_TOT</attrlabl><attalias Sync="TRUE">AUTO_TOT</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">AUTO_MUT</attrlabl><attalias Sync="TRUE">AUTO_MUT</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">AUTO_HH</attrlabl><attalias Sync="TRUE">AUTO_HH</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">AUTO_LAND</attrlabl><attalias Sync="TRUE">AUTO_LAND</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">Shape_Area</attrlabl><attalias Sync="TRUE">Shape_Area</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth>
+        <attrdef Sync="TRUE">Area of feature in internal units squared.</attrdef><attrdefs Sync="TRUE">ESRI</attrdefs>
+        <attrdomv>
+          <udom Sync="TRUE">Positive real numbers that are automatically generated.</udom>
+        </attrdomv>
+        <atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">BEDR_AUTO</attrlabl><attalias Sync="TRUE">BEDR_AUTO</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">FID</attrlabl><attalias Sync="TRUE">FID</attalias><attrtype Sync="TRUE">Float</attrtype>
+        <attwidth Sync="TRUE">19</attwidth><attrdef Sync="TRUE">Internal feature number.</attrdef>
+        <attrdefs Sync="TRUE">ESRI</attrdefs>
+        <attrdomv>
+          <udom Sync="TRUE">Sequential unique whole numbers that are automatically generated.</udom>
+        </attrdomv>
+        <atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+      <attr>
+        <attrlabl Sync="TRUE">Shape_Leng</attrlabl><attalias Sync="TRUE">Shape_Leng</attalias>
+        <attrtype Sync="TRUE">Float</attrtype><attwidth Sync="TRUE">19</attwidth><atnumdec Sync="TRUE">11</atnumdec>
+      </attr>
+    </detailed>
+  </eainfo>
+  <mdDateSt Sync="TRUE">20090123</mdDateSt>
+  <dataqual>
+    <lineage>
+      <procstep>
+        <procdesc Sync="TRUE">Metadata imported.</procdesc><srcused Sync="TRUE">C:\TEMP\metadata.xml</srcused>
+        <date Sync="TRUE">20060810</date><time Sync="TRUE">14300900</time>
+      </procstep>
+    </lineage>
+  </dataqual>
+</metadata>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/DamMStabDocDefinition.xsd
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/DamMStabDocDefinition.xsd	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/DamMStabDocDefinition.xsd	(revision 3305)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) Stichting Deltares 2019. All rights reserved.
+
+This file is part of the DAM - Clients Library.
+
+The DAM - UI is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+
+<!-- Created with Liquid XML Studio 1.0.8.0 (http://www.liquid-technologies.com) -->
+<xs:schema xmlns:ns4="http://deltares.nl/2008/DamMStabDocDefinition" xmlns:ns5="http://deltares.nl/2008/ImageDefinition" xmlns:ns1="http://deltares.nl/2008/ProfileDefinition" xmlns:ns2="http://deltares.nl/2008/FileIdentificationDefinition" xmlns:ns3="http://deltares.nl/2008/CPTipInterpretationParametersDefinition" xmlns:ns0="http://deltares.nl/2008/DamMStabDocDefinition" elementFormDefault="qualified" targetNamespace="http://deltares.nl/2008/DamMStabDocDefinition" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:import schemaLocation=".\FileIdentificationDefinition.xsd" namespace="http://deltares.nl/2008/FileIdentificationDefinition" />
+  <xs:import schemaLocation=".\DamMStabInputDefinition.xsd" namespace="http://deltares.nl/2008/DamMStabInputDefinition" />
+  <xs:import schemaLocation=".\ProfileDefinition.xsd" namespace="http://deltares.nl/2008/ProfileDefinition" />
+  <xs:element name="DamMStabDoc">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="1" maxOccurs="1" name="FileIdentification" type="ns2:FileIdentification" />
+        <xs:element xmlns:q1="http://deltares.nl/2008/DamMStabInputDefinition" minOccurs="0" maxOccurs="1" name="DamMStabInput" type="q1:DamMStabInput" />
+        <xs:element minOccurs="0" maxOccurs="1" name="Profile" type="ns1:Profile" />
+        <xs:element minOccurs="0" maxOccurs="1" name="Geometry2DSectionInput">
+          <xs:complexType>
+            <xs:attribute name="XCoordinateSection" type="xs:double" use="required" />
+            <xs:attribute name="SoilGeometry2DFilename" type="xs:string" use="required" />
+          </xs:complexType>
+        </xs:element>
+        <xs:element minOccurs="0" maxOccurs="1" name="Geometry2DData">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element minOccurs="0" maxOccurs="unbounded" name="Boundary">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element minOccurs="0" maxOccurs="unbounded" name="SurfacePoint">
+                      <xs:complexType>
+                        <xs:attribute name="XCoord" type="xs:double" use="required" />
+                        <xs:attribute name="YCoord" type="xs:double" use="required" />
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:sequence>
+                  <xs:attribute name="Soilname" type="xs:string" use="required" />
+                  <xs:attribute name="BoundaryIndex" type="xs:integer" />
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Services/ShapeFileReaderTest.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Services/ShapeFileReaderTest.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Services/ShapeFileReaderTest.cs	(revision 3305)
@@ -0,0 +1,121 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of the application DAM - UI.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using NUnit.Framework;
+
+namespace Deltares.Maps.Tests.Services
+{
+    [TestFixture]
+    public class ShapeFileReaderTest
+    {
+        private ShapeFileReader reader;
+        private ShapeFileLocation testFileLocation;
+
+        #region Setup
+
+        [TestFixtureSetUp]
+        public void FixtureSetup()
+        {
+            testFileLocation = new ShapeFileLocation(@"TestData\Gemeenten.shp");
+        }
+
+        [TestFixtureTearDown]
+        public void FixtureTearDown()
+        {
+        }
+
+        [SetUp]
+        public void TestSetup()
+        {
+            reader = new ShapeFileReader(testFileLocation);
+        }
+
+        [TearDown]
+        public void TestTearDown()
+        {
+        }
+
+        #endregion
+
+        [Test]
+        public void ReadShapeFile_ReadAttributeData_MaterializedFeatures()
+        {
+            reader.IgnoreAttributeData = false; // default 
+            IEnumerable<IFeature> geoms = reader.Read();
+
+            Assert.IsNotNull(geoms);
+            Assert.IsTrue(geoms.Count() > 0);
+            foreach (IFeature geom in geoms)
+            {
+                Assert.IsNotNull(geom.Geometry);
+                Assert.IsNotNull(geom.WktFormat);
+                Assert.IsNotNull(geom.Attributes);
+                Assert.IsTrue(geom.Attributes.Count > 0);
+                Assert.IsNotNull(geom.Attributes.GetNames());
+                Assert.IsTrue(geom.Attributes.GetNames().Count() > 0);
+                Assert.IsNotNull(geom.Attributes.GetValues());
+                Assert.IsTrue(geom.Attributes.GetValues().Count() > 0);
+            }
+        }
+
+        [Test]
+        public void ReadShapeFile_IgnoringAttributeData_MaterializedFeatures()
+        {
+            reader.IgnoreAttributeData = true;
+            IEnumerable<IFeature> geoms = reader.Read();
+            Assert.IsNotNull(geoms);
+            Assert.IsTrue(geoms.Count() > 0);
+            foreach (IFeature geom in geoms)
+            {
+                Assert.IsNotNull(geom.Geometry);
+                Assert.IsNotNull(geom.WktFormat);
+                Assert.IsNotNull(geom.Attributes);
+                Assert.AreEqual(0, geom.Attributes.Count);
+            }
+        }
+
+        [Test]
+        public void ReadShapeFile_DutchCulture_MaterializedFeatures()
+        {
+            Action action =
+                () =>
+                {
+                    reader.IgnoreAttributeData = true;
+                    IEnumerable<IFeature> geoms = reader.Read();
+                    Assert.IsNotNull(geoms);
+                    Assert.IsTrue(geoms.Count() > 0);
+                    foreach (IFeature geom in geoms)
+                    {
+                        Assert.IsNotNull(geom.Geometry);
+                        Assert.IsNotNull(geom.WktFormat);
+                        Assert.IsNotNull(geom.Attributes);
+                        Assert.AreEqual(0, geom.Attributes.Count);
+                    }
+                };
+
+            CultureHelper.InvokeWithDutchCulture(action);
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterSegments.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterSegments.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterSegments.cs	(revision 3305)
@@ -0,0 +1,169 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using Deltares.Standard.IO;
+using Deltares.Standard.Language;
+using LumenWorks.Framework.IO.Csv;
+
+namespace Deltares.Dam.Data.CsvImporters
+{
+    public class CsvImporterSegmentsException : ApplicationException
+    {
+        public CsvImporterSegmentsException(string message)
+            : base(message)
+        {
+        }
+    }
+
+    public class CsvImporterSegments
+    {
+        private List<SegmentRecord> segmentRecords = new List<SegmentRecord>();
+        private List<string> errorMessages = new List<string>();
+
+        public class SegmentRecord
+        {
+            public int SegmentRecordId { get; set; }
+            public string SegmentId { get; set; }
+            public string SoilProfileId { get; set; }
+            public double Probability { get; set; }
+            public FailureMechanismSystemType SegmentFailureMechanismType { get; set; }
+            public string SoilGeometry2DName { get; set; }
+        }
+
+        private void CheckColumn(int index, string fileName, string fieldName)
+        {
+            if (index < 0)
+            {
+                var csvHeaderFieldError = LocalizationManager.GetTranslatedText(this.GetType(), "csvHeaderFieldError");
+                throw new CsvImporterSegmentsException(String.Format("{0} : {1} {2}", fileName, csvHeaderFieldError, fieldName));
+            }
+        }
+
+        public CsvImporterSegments(string fileName)
+        {
+            errorMessages.Clear();
+            ThrowHelper.ThrowIfStringArgumentNullOrEmpty(fileName, StringResourceNames.CsvFileNotValid);
+            ThrowHelper.ThrowIfFileNotExist(fileName, StringResourceNames.CsvFileNotFound);
+           
+            var oldcur = Thread.CurrentThread.CurrentCulture;
+            try
+            {
+                Thread.CurrentThread.CurrentCulture = CsvReaderUtilities.DetermineCultureForFile(fileName);
+                using (CsvReader csv = new CsvReader(new StreamReader(fileName), true, ';'))
+                {
+                    string[] headers = CsvImporterHelper.GetFieldHeaders(this, csv);
+                    if (headers.Count() != 4)
+                    {
+                        var csvHeaderError = LocalizationManager.GetTranslatedText(this.GetType(), "csvHeaderError");
+                        throw new CsvImporterSegmentsException(String.Format("{0} : {1}", fileName, csvHeaderError));                        
+                    }
+                    
+                    const string fieldsement_id = "segment_id";
+                    int colIndexSegmentId = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldsement_id);
+                    CheckColumn(colIndexSegmentId, fileName, fieldsement_id);
+                    
+                    const string fieldsoilprofile_id = "soilprofile_id";
+                    int colIndexSoilProfileId = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldsoilprofile_id);
+                    const string fieldsoilgeometry2D_name = "soilgeometry2D_name";
+                    int colIndexGeometry2dName = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldsoilgeometry2D_name);
+                    // soil profile and geometry2D are in bothe optional but at least one has to be there.
+                    if ((colIndexSoilProfileId < 0) && (colIndexGeometry2dName < 0))
+                    {
+                        var csvHeaderFieldError = LocalizationManager.GetTranslatedText(this.GetType(), "csvHeaderFieldError");
+                        throw new CsvImporterSoilProfilesException(String.Format("{0} : {1} {2} / {3}", fileName, csvHeaderFieldError, fieldsoilprofile_id, fieldsoilgeometry2D_name));
+                    }
+                    const string fieldprobability = "probability";
+                    int colIndexProbability = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldprobability);
+                    CheckColumn(colIndexProbability, fileName, fieldprobability);
+                    
+                    const string fieldcalculation_type = "calculation_type";
+                    int colIndexCalculationType = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldcalculation_type);
+                    CheckColumn(colIndexCalculationType, fileName, fieldcalculation_type);
+                    var index = 1;
+                    while (csv.ReadNextRecord())
+                    {
+                        SegmentRecord segment = new SegmentRecord();
+                        int colIndex = -1;  // Keep track of column for error message
+                        try
+                        {
+                            segment.SegmentId = csv[colIndexSegmentId];
+                            segment.SegmentRecordId = index;
+                            index++;
+                            if (colIndexSoilProfileId > -1)
+                            {
+                                colIndex = colIndexSoilProfileId;
+                                segment.SoilProfileId = csv[colIndexSoilProfileId];
+                            }
+                            if (colIndexGeometry2dName > -1)
+                            {
+                                colIndex = colIndexGeometry2dName;
+                                segment.SoilGeometry2DName = csv[colIndexGeometry2dName];
+                            }
+                            segment.Probability = Convert.ToDouble(csv[colIndexProbability]);
+                            var typeAsString = csv[colIndexCalculationType];
+                            if (typeAsString == "Stability")
+                            {
+                                segment.SegmentFailureMechanismType = FailureMechanismSystemType.StabilityInside;
+                            }
+                            else if (typeAsString == "Piping")
+                            {
+                                segment.SegmentFailureMechanismType = FailureMechanismSystemType.Piping;
+                            }
+                            else
+                            {
+                                var csvSegmentCalculationTypeError = LocalizationManager.GetTranslatedText(this.GetType(), "csvSegmentCalculationTypeError");
+                                errorMessages.Add(String.Format("{0} : {1} {2}", fileName, segment.SegmentId, csvSegmentCalculationTypeError));
+                            }
+                            
+                            segmentRecords.Add(segment);
+                        }
+                        catch (Exception e)
+                        {
+                            var csvSegmentError = String.Format(LocalizationManager.GetTranslatedText(this.GetType(), "csvSegmentError"), segment.SegmentId, colIndex + 1);
+                            errorMessages.Add(csvSegmentError + e.Message);
+                        }
+                        
+                    }
+                }
+            }
+            finally
+            {
+                Thread.CurrentThread.CurrentCulture = oldcur;
+            }
+        }
+
+        public List<SegmentRecord> ImportedItems
+        {
+            get { return segmentRecords; }
+        }
+
+        public List<string> ErrorMessages
+        {
+            get { return errorMessages; }
+            set { errorMessages = value; }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/SpecificationBase.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/SpecificationBase.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/SpecificationBase.cs	(revision 3305)
@@ -0,0 +1,72 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Standard.Specifications
+{
+    /// <summary>
+    /// Abstract specification class that implements base properties
+    /// </summary>
+    /// <typeparam name="TCandidate">The type of the candidate.</typeparam>
+    public abstract class SpecificationBase<TCandidate> : ISpecification<TCandidate>
+    {
+        protected SpecificationBase()
+        {
+            Name = this.GetType().Name;
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the specification. (Short description)
+        /// </summary>
+        /// <value>
+        /// The name string value should be a required property for each specification.
+        /// </value>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the description of the specification. (Long description)
+        /// </summary>
+        /// <value>
+        /// The description string value.
+        /// </value>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// Determines whether the candidate satisfies the specification.
+        /// </summary>
+        /// <param name="candidate">The candidate to test.</param>
+        /// <returns>
+        ///   <c>true</c> if the candidate satisfies the specification otherwise, <c>false</c>.
+        /// </returns>
+        bool ISpecification.IsSatisfiedBy(object candidate)
+        {
+            return IsSatisfiedBy((TCandidate)candidate);
+        }
+
+        /// <summary>
+        /// Determines whether the candidate satisfies the specification.
+        /// </summary>
+        /// <param name="candidate">The candidate to test.</param>
+        /// <returns>
+        ///   <c>true</c> if the candidate satisfies the specification otherwise, <c>false</c>.
+        /// </returns>
+        public abstract bool IsSatisfiedBy(TCandidate candidate);
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Geometry2DData.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Geometry2DData.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Geometry2DData.cs	(revision 3305)
@@ -0,0 +1,95 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using System;
+using Deltares.Standard.Extensions;
+
+namespace Deltares.Dam.Data
+{
+
+    public struct Geometry2DLayer
+    {
+        public Geometry2DBoundaryLine boundaryLine;
+        public String soilName;
+        public LayerType layerType;
+    }
+
+    public class Geometry2DDataException : ApplicationException
+    {
+        public Geometry2DDataException(string message): base(message)
+        {
+        }
+    }
+
+    public class Geometry2DData
+    {
+
+        private List<Geometry2DLayer> layers = new List<Geometry2DLayer>();
+        private double tolerance = 0.0000000001;
+
+        public Geometry2DData()
+        {
+
+        }
+
+        public int LayerCount { get { return layers.Count; } }
+
+        public double Tolerance
+        {
+            get { return tolerance; }
+            set { tolerance = value; }
+        }
+
+        public void AddLayer(Geometry2DLayer layer)
+        {
+            layers.Add(layer);
+        }
+
+        public Geometry2DLayer GetLayer(int index)
+        {
+            return layers[index];
+        }
+
+        public void SetLayertype(int layerIndex, LayerType layerType)
+        {
+            Geometry2DLayer layer = layers[layerIndex];
+            layer.layerType = layerType;
+            layers[layerIndex] = layer;
+        }
+        public void Validate()
+        {
+            if (layers.Count > 1)
+            {
+                double limitLeft = layers[0].boundaryLine.Points[0].X;
+                double limitRight = layers[0].boundaryLine.Points[layers[0].boundaryLine.Points.Count - 1].X;
+                foreach (Geometry2DLayer layer in layers)
+                {
+                    if (!layer.boundaryLine.Points[0].X.AlmostEquals(limitLeft, tolerance) ||
+                        !layer.boundaryLine.Points[layer.boundaryLine.Points.Count - 1].X.AlmostEquals(limitRight, tolerance))
+                    {
+                        throw new Geometry2DDataException("Boundary lines are not aligned");
+                    }
+                }
+            }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/FileLocation.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/FileLocation.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/FileLocation.cs	(revision 3305)
@@ -0,0 +1,190 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.IO;
+
+namespace Deltares.Maps
+{
+    public interface IFile
+    {
+        bool IsValid { get; }
+        string NameWithoutExtension { get; }
+        string FileName { get; }
+        string DirectoryName { get; }
+        string FullPath { get; }
+    }
+
+    public abstract class FileLocation : IFile
+    {
+        const string TheGeometryFileIsNotValid = "The file is not valid";
+
+        private readonly string fullPath;
+
+        /// <summary>
+        ///     Create a file location with the current directory
+        /// </summary>
+        /// <param name="fileName"></param>
+        /// <param name="fileExtension"></param>
+        protected FileLocation(string fileName, string fileExtension)
+            : this(string.Empty, fileName, fileExtension)
+        {
+        }
+
+        protected FileLocation(string fileLocation, string fileName, string fileExtension)
+        {
+            if (IsNullOrEmptyOrWhiteSpace(fileName))
+            {
+                return;
+            }
+
+            fullPath = fileName;
+
+            if (IsNullOrEmptyOrWhiteSpace(fileExtension))
+            {
+                return;
+            }
+
+            if (!fileName.EndsWith(fileExtension))
+            {
+                fileName += fileExtension;
+            }
+
+            if (IsNullOrEmptyOrWhiteSpace(fileLocation) || fileLocation == "." || fileLocation == @".\")
+            {
+                fullPath = Path.Combine(Directory.GetCurrentDirectory(), fileName);
+            }
+            else
+            {
+                fullPath = Path.Combine(fileLocation, fileName);
+            }
+        }
+
+        public bool IsValid
+        {
+            get { return HasValidData(FileName, FileExtension); }
+        }
+
+        private static bool HasValidData(string fileName, string fileExtension)
+        {
+            if (IsNullOrEmptyOrWhiteSpace(fileExtension))
+            {
+                return false;
+            }
+
+            return !(IsNullOrEmptyOrWhiteSpace(fileName) || !fileName.EndsWith(fileExtension));
+        }
+
+        private static bool IsNullOrEmptyOrWhiteSpace(string value)
+        {
+            return string.IsNullOrEmpty(value) || value.Trim() == string.Empty;
+        }
+
+        public bool Exists
+        {
+            get { return File.Exists(FullPath); }
+        }
+
+        /// <summary>
+        ///     Gets the name of the directory the file is contained in
+        /// </summary>
+        public string DirectoryName
+        {
+            get { return Path.GetDirectoryName(fullPath); }
+        }
+
+        /// <summary>
+        ///     Gets the file extension
+        /// </summary>
+        public string FileExtension
+        {
+            get { return Path.GetExtension(fullPath); }
+        }
+
+        /// <summary>
+        ///     Gets the name of the file without the path. Includes the extension
+        /// </summary>
+        public string FileName
+        {
+            get { return Path.GetFileName(fullPath); }
+        }
+
+        /// <summary>
+        ///     Gets the full path of the file (including the file name)
+        /// </summary>
+        // ReSharper disable ConvertToAutoPropertyWithPrivateSetter
+        public string FullPath
+            // ReSharper restore ConvertToAutoPropertyWithPrivateSetter
+        {
+            get { return fullPath; }
+        }
+
+        /// <summary>
+        ///     Gets the name of the file without extension and location
+        /// </summary>
+        public string NameWithoutExtension
+        {
+            get { return Path.GetFileNameWithoutExtension(fullPath); }
+        }
+
+        public override string ToString()
+        {
+            return FullPath;
+        }
+    }
+
+    public class ShapeFileLocation : FileLocation
+    {
+        public const string FileExtensionString = ".shp";
+
+        public ShapeFileLocation(string fileName)
+            : base(fileName, FileExtensionString)
+        {
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="fileLocation">The location or folder of the file</param>
+        /// <param name="fileName">The name of the file</param>
+        public ShapeFileLocation(string fileLocation, string fileName)
+            : base(fileLocation, fileName, FileExtensionString)
+        {
+        }
+    }
+
+    public class WktFileLocation : FileLocation
+    {
+        public const string FileExtensionString = ".wkt";
+
+        public WktFileLocation(string fileName)
+            : base(fileName, FileExtensionString)
+        {
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="fileLocation"></param>
+        /// <param name="fileName"></param>
+        public WktFileLocation(string fileLocation, string fileName)
+            : base(fileLocation, fileName, FileExtensionString)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/TestData/Gemeenten.shx
===================================================================
diff -u
Binary files differ
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Properties/AssemblyInfo.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Properties/AssemblyInfo.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Properties/AssemblyInfo.cs	(revision 3305)
@@ -0,0 +1,28 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Deltares.Maps")]
+[assembly: ComVisible(false)]
+[assembly: Guid("12d231d2-d46c-41ca-bc1d-b91e2986c4d5")]
+
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExporter.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExporter.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExporter.cs	(revision 3305)
@@ -0,0 +1,146 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Globalization;
+using System.Reflection;
+
+namespace Deltares.Dam.Data
+{
+
+    public class CsvExporter<T>
+    {
+        private const string NullValue = "NULL";
+        private const string Delimiter = ";";
+        private readonly string fileName;
+
+        private readonly IEnumerable<T> data;
+        private string columnHeader;
+        private bool headerWritten;
+
+        public CsvExporter(string fileName, IEnumerable<T> data)
+        {
+            this.data = data;
+            ThrowHelper.ThrowWhenConditionIsTrue<CsvExporterException>(
+                StringResourceNames.OutputFileNameNotValid,
+                () => string.IsNullOrEmpty(fileName) || fileName.Trim() == "");
+
+            this.fileName = fileName;
+            headerWritten = false;
+            WriteHeaderInFirstLine = true;
+        }
+
+        public bool WriteHeaderInFirstLine { get; set; }
+
+        public void WriteFile()
+        {
+            using (TextWriter writer = new StreamWriter(this.fileName, false))
+            {
+                foreach (T dataItem in data)
+                {
+                    string line = GetDataItemString(dataItem);
+                    if (line.Trim() != "")
+                    {
+                        if (WriteHeaderInFirstLine && !headerWritten)
+                        {
+                            writer.WriteLine(columnHeader);
+                            headerWritten = true;
+                        }
+
+                        writer.WriteLine(line);
+                    }
+                    else
+                    {
+                        writer.WriteLine("No (public) properties are annotated with the column meta data CsvColumnAttribute.");
+                    }
+                }
+            }
+        }
+
+        private string GetDataItemString(T dataItem)
+        {
+            if (dataItem.Equals(default(T)))
+                throw new CsvExporterException("Invalid export data item");
+
+            var header = new Dictionary<int, string>();
+            var table = new Dictionary<int, object>();
+
+            string line = "";
+            foreach (var pInfo in (typeof(T).GetProperties()))
+            {
+                foreach (Attribute attribute in pInfo.GetCustomAttributes(true))
+                {
+                    var attr = attribute as CsvExportColumnAttribute;
+                    if (null != attr)
+                    {
+                        ThrowWhenIndexAlreadyExists(header, attr.Index, pInfo.Name);
+
+                        header.Add(attr.Index, attr.Name);
+                        object value;
+                        try
+                        {
+                            value = pInfo.GetValue(dataItem, null) ?? NullValue;
+                        }
+                        catch (TargetInvocationException)
+                        {
+                            value = NullValue;
+                        }
+                        table.Add(attr.Index, value);
+                    }
+                }
+            }
+
+            // assemble the data line
+            if (table.Count > 0)
+            {
+                // order the keys by column index
+                var keys = table.Keys.OrderBy(k => k);
+                var counter = 0;
+                foreach (var index in keys)
+                {
+                    var val = string.Format(CultureInfo.InvariantCulture, "{0}", table[index]);
+                    line += val + (++counter < table.Count ? Delimiter : "");
+                }
+
+                // assemble the column header
+                if (WriteHeaderInFirstLine && string.IsNullOrEmpty(columnHeader))
+                {
+                    counter = 0;
+                    foreach (var index in keys)
+                        columnHeader += header[index] + (++counter < table.Count ? Delimiter : "");
+                }
+            }
+
+            return line;
+        }
+
+        private static void ThrowWhenIndexAlreadyExists(IDictionary<int, string> dictionary, int index, string propertyName)
+        {
+            string message = string.Format(ThrowHelper.GetResourceString(StringResourceNames.CsvColumnIndexAlreadyExists), index, propertyName);
+            ThrowHelper.ThrowWhenConditionIsTrue<CsvExporterException>(
+                message,
+                () => dictionary.ContainsKey(index));
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/Extensions/SpecificationExtensions.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/Extensions/SpecificationExtensions.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/Extensions/SpecificationExtensions.cs	(revision 3305)
@@ -0,0 +1,143 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Deltares.Standard.Validation;
+using ValidationResult = Deltares.Dam.Data.Specifications.ValidationResult;
+
+namespace Deltares.Standard.Specifications.Extensions
+{
+    public static class SpecificationExtensions
+    {
+        public static IEnumerable<T> GetBySpecification<T>(this IEnumerable<T> collection, ISpecification<T> specification)
+        {
+            return collection.Where(specification.IsSatisfiedBy);
+        }
+
+        public static bool IsSatisfiedBySpecification<T>(this T source, ISpecification<T> specification)
+        {
+            return specification.IsSatisfiedBy(source);
+        }
+
+        public static bool IsNotSatisfiedBySpecification<T>(this T source, ISpecification<T> specification)
+        {
+            return !IsSatisfiedBySpecification(source, specification);
+        }
+
+        public static IEnumerable<ValidationResult> Validate<T>(this T source, string groupName)
+        {
+            throw new NotImplementedException();
+        }
+
+        public static IEnumerable<ValidationResult> Validate<T>(this T source)
+        {
+            var validationResults = new List<ValidationResult>();
+
+            foreach (var attribute in source.GetType().GetCustomAttributes(false))
+            {
+                var specAttr = attribute as SpecificationBaseAttribute;
+                if (specAttr != null)
+                {
+                    if (IsNotSatisfiedBySpecification(source, (ISpecification<T>)specAttr.Specification))
+                        AddValidationResult(source, validationResults, specAttr);
+                }                
+            }
+            
+            foreach (PropertyInfo property in source.GetType().GetProperties())
+            {
+                foreach (object attribute in property.GetCustomAttributes(true))
+                {
+                    var specAttr = attribute as SpecificationBaseAttribute;
+                    if (specAttr != null)
+                    {
+                        object candidateValue = property.GetValue(source, null);
+                        if (!specAttr.Specification.IsSatisfiedBy(candidateValue))
+                            AddValidationResult(property, validationResults, specAttr);
+                    }
+                    else
+                    {
+                        var minAttr = attribute as MinimumAttribute;
+                        if (minAttr != null)
+                        {
+                            var gte =
+                                new GreaterThanOrEqualToSpecification<T, double>(property.Name, minAttr.AttributeValue);
+                            if (!gte.IsSatisfiedBy(source))
+                            {
+                                validationResults.Add(new ValidationResult()
+                                                      {
+                                                          Subject = property,
+                                                          MessageType = ValidationResultType.Error,
+                                                          Error = new ValidationException(string.Format("The property or field {0} has the value {1} which is less then the specification {2}",
+                                                                                                        property.Name, gte.CandidateValue, minAttr.AttributeValue))
+                                                      });
+                            }
+                        }
+                        else
+                        {
+                            var maxAttr = attribute as MaximumAttribute;
+                            if (maxAttr != null)
+                            {
+                                var lte =
+                                    new LessThanOrEqualToSpecification<T, double>(property.Name, maxAttr.AttributeValue);
+                                if (!lte.IsSatisfiedBy(source))
+                                {
+                                    validationResults.Add(new ValidationResult()
+                                                          {
+                                                              Subject = property,
+                                                              MessageType = ValidationResultType.Error,
+                                                              Error = new ValidationException(string.Format("The property or field {0} has the value {1} which is greater then the specification {2}",
+                                                                                                            property.Name, lte.CandidateValue, maxAttr.AttributeValue))
+                                                          });
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            return validationResults;
+        }
+
+        private static void AddValidationResult(object subject, ICollection<ValidationResult> validationResults, SpecificationBaseAttribute specAttr)
+        {
+            string message = specAttr.NotSatisfiedText;
+
+            if (string.IsNullOrWhiteSpace(message))
+                message = specAttr.Specification.Description;
+
+            if (string.IsNullOrWhiteSpace(message))
+                message = specAttr.Specification.Name;
+
+            if (string.IsNullOrWhiteSpace(message))
+                message = specAttr.Specification.ToString();
+
+            validationResults.Add(new ValidationResult()
+                                  {
+                                      Subject = subject,
+                                      MessageType = ValidationResultType.Error,
+                                      Error = new ValidationException(message)
+                                  });
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoDocumentAssembler.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoDocumentAssembler.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoDocumentAssembler.cs	(revision 3305)
@@ -0,0 +1,189 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Linq;
+using System.Reflection;
+using System.Xml.Linq;
+using Deltares.Standard.IO.DtoAssembler;
+
+namespace Deltares.Standard
+{
+    /// <summary>
+    /// Default implementation for the <see cref="IDtoAssembler"/> interface
+    /// </summary>
+    /// <remarks>
+    /// This base class inherits from <see cref="DtoAssembler"/> this class just fixes 
+    /// the dto type to XElement
+    /// </remarks>
+    /// <typeparam name="T">The domain object type</typeparam>
+    public abstract class DtoDocumentAssembler<TDomainInputObject, TDomainOutputObject> : IDtoAssembler<TDomainInputObject, TDomainOutputObject, XDocument>
+        where TDomainInputObject : new()
+        where TDomainOutputObject : new()
+    {
+        /// <summary>
+        /// Initializes a new instance of the DtoDocumentAssembler class
+        /// </summary>
+        /// <param name="elementName">Sets the element name</param>
+        /// <param name="xsdStream">The text reader stream for reading in ther xsd file which is embedded as an resource</param>
+        public DtoDocumentAssembler(string elementName, string elementNamespace, string embeddedXsdPath)
+            : this(elementName, elementNamespace, embeddedXsdPath, null, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the DtoDocumentAssembler class
+        /// </summary>
+        /// <param name="elementName">Sets the element name</param>
+        /// <param name="xsdStream">The text reader stream for reading in ther xsd file which is embedded as an resource</param>
+        public DtoDocumentAssembler(string elementName, string elementNamespace, string embeddedXsdPath,
+                                    DtoAssembler<TDomainInputObject> inputAssembler, DtoAssembler<TDomainOutputObject> outputAssembler)
+        {
+            if (elementName == null)
+                throw new ArgumentNullException("elementName");
+
+            if (elementNamespace == null)
+                throw new ArgumentNullException("elementNamespace");
+
+            this.ElementName = elementName;
+            this.ElementNamespace = elementNamespace;
+            this.OutputAssembler = outputAssembler;
+            this.InputAssembler = inputAssembler;
+            //Stream xsdStream = Common.GetEmbeddedFile(Assembly.GetExecutingAssembly(), embeddedXsdPath);
+            //this.Schema = XDocument.Load(new StreamReader(xsdStream));
+        }
+
+        /// <summary>
+        /// Gets the xml element name
+        /// </summary>
+        public string ElementName { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the namespace value for the element
+        /// </summary>
+        public string ElementNamespace { get; private set; }
+
+        /// <summary>
+        /// Gets the xml schema (if any)
+        /// </summary>
+        public XDocument Schema { get; private set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public DtoAssembler<TDomainInputObject> InputAssembler { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public DtoAssembler<TDomainOutputObject> OutputAssembler { get; set; }
+
+        #region IDtoAssembler<TDomainInputObject,TDomainOutputObject,XDocument> Members
+
+        public virtual TDomainOutputObject CreateOutputObject(XDocument dtoDocument)
+        {
+            if (dtoDocument == null)
+                throw new ArgumentNullException("dtoDocument");
+
+            if (this.OutputAssembler != null)
+            {
+                // the document should contain the element only once!
+                XElement el = (from x in dtoDocument.Descendants()
+                               where x.Name.LocalName == this.OutputAssembler.ElementName
+                               select x).Single();
+
+                return this.OutputAssembler.CreateDomainObject(el);
+            }
+
+            return default(TDomainOutputObject);
+        }
+
+        public virtual TDomainInputObject CreateInputObject(XDocument dtoDocument)
+        {
+            if (dtoDocument == null)
+                throw new ArgumentNullException("dtoDocument");
+
+            if (this.InputAssembler != null)
+            {
+                // the document should contain the element only once!
+                XElement el = (from x in dtoDocument.Descendants()
+                               where x.Name.LocalName == this.InputAssembler.ElementName
+                               select x).Single();
+
+                return this.InputAssembler.CreateDomainObject(el);
+            }
+
+            return default(TDomainInputObject);
+        }
+
+        public virtual XDocument CreateDataTransferObject(TDomainInputObject domainInputObj)
+        {
+            var doc = new XDocument(new XDeclaration("1.0", "utf-8", "yes"));
+
+            // add the file identification to the document
+            var fileId = new FileIdentification(Assembly.GetCallingAssembly());
+            var fileIdAssembler = new FileIdentificationAssembler();
+
+            XNamespace xsi = "http://www.w3.org/2001/XMLSchema-instance";
+
+            XNamespace tns = this.ElementNamespace;
+            XNamespace tns1 = fileIdAssembler.ElementNamespace;
+
+            var root = new XElement(tns + this.ElementName,
+                                    new XAttribute(XNamespace.Xmlns + "xsi", xsi.NamespaceName),
+                                    new XAttribute(XNamespace.Xmlns + "tns", tns.NamespaceName),
+                                    new XAttribute(XNamespace.Xmlns + "tns1", tns1.NamespaceName));
+
+            doc.Add(root);
+            doc.Root.Add(fileId.ToDto(fileIdAssembler, tns));
+
+            if (this.InputAssembler != null)
+            {
+                XNamespace tns2 = this.InputAssembler.ElementNamespace;
+                root.Add(new XAttribute(XNamespace.Xmlns + "tns2", tns2.NamespaceName));
+                doc.Root.Add(domainInputObj.ToDto(this.InputAssembler, tns));
+            }
+
+            return doc;
+        }
+
+        #endregion
+
+        public TDomainOutputObject CreateOutputObject(string fileName)
+        {
+            return this.CreateOutputObject(this.CreateDocument(fileName));
+        }
+
+        public TDomainInputObject CreateInputObject(string fileName)
+        {
+            return this.CreateInputObject(this.CreateDocument(fileName));
+        }
+
+        private XDocument CreateDocument(string fileName)
+        {
+            if (!fileName.HasValidStringValue())
+                throw new ArgumentNullException("fileName");
+
+            XDocument doc = XDocument.Load(fileName);
+            return doc;
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardPostProcessRelativeProfiles.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardPostProcessRelativeProfiles.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardPostProcessRelativeProfiles.cs	(revision 3305)
@@ -0,0 +1,112 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.SurfaceLines;
+using Deltares.Standard.Logging;
+
+namespace Deltares.Dam.Data
+{
+    public class WaterBoardPostProcessRelativeProfilesException : Exception
+    {
+        public WaterBoardPostProcessRelativeProfilesException(string message)
+            : base(message)
+        {
+        }
+    }
+
+    public static class WaterBoardPostProcessRelativeProfiles
+    {
+        /// <summary>
+        /// Creates the absolute profiles based on the original profiles.
+        /// The original profiles are considered to be relative to the specified characteristic point
+        /// 1) Create a copy of the assigned segment for each location
+        /// 2) In the copy the toplevel of the soilprofile will be moved to the z-coordinate of the specified characteristic point
+        /// </summary>
+        /// <param name="waterBoard">The water board.</param>
+        /// <param name="characteristicPointType">The characteristic point to which the soilprofile toplevel should be moved </param>
+        public static void CreateAbsoluteProfiles(WaterBoard waterBoard, CharacteristicPointType characteristicPointType)
+        {
+            foreach (Dike dike in waterBoard.Dikes)
+            {
+                foreach (Location location in dike.Locations)
+                {
+                    var orgSegment = location.Segment;
+                    if (orgSegment != null)
+                    {
+                        var newSegment = new Segment();
+                        newSegment.Name = String.Format("Segment {0}", location.Name);
+                        foreach (SoilGeometryProbability orgSoilGeometryProbability in orgSegment.SoilProfileProbabilities)
+                        {
+                            try
+                            {
+                                var characteristicGeometryPoint = location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(characteristicPointType);
+                                if (characteristicGeometryPoint == null)
+                                {
+                                    throw new WaterBoardPostProcessRelativeProfilesException(String.Format("Characteristic point {0} is not defined", characteristicPointType));
+                                }
+                                if (orgSoilGeometryProbability.SoilProfileType.Equals(SoilProfileType.SoilGeometryStiFile))
+                                {
+                                    throw new WaterBoardPostProcessRelativeProfilesException("Cannnot apply releative profiles for 2d soilprofiles");
+                                }
+
+                                // Create a copy of the original SoilGeometryProbability
+                                SoilGeometryProbability newSoilGeometryProbability = new SoilGeometryProbability();
+                                newSoilGeometryProbability.Assign(orgSoilGeometryProbability);
+
+                                // Move all layer boundaries so toplevel of the soilprofile1D will be at level of specified characteristic point
+                                // Dependent if deltaZ is positive or negative, the bottomLevel should be adjusted before or after adjusting the layers
+                                // This is necessary, because the bottomlevel is adjusted automatically during adjustment of layers
+                                var soilProfile1D = newSoilGeometryProbability.SoilProfile;
+                                double deltaZ = characteristicGeometryPoint.Z - soilProfile1D.TopLevel;
+                                if (deltaZ < 0)
+                                {
+                                    soilProfile1D.BottomLevel += deltaZ;
+                                }
+                                foreach (SoilLayer1D soilLayer1D in soilProfile1D.Layers)
+                                {
+                                    soilLayer1D.TopLevel += deltaZ;
+                                }
+                                if (deltaZ > 0)
+                                {
+                                    soilProfile1D.BottomLevel += deltaZ;
+                                }
+
+                                // Add new SoilGeometryProbability to new segment and assign new segment to location
+                                newSegment.SoilProfileProbabilities.Add(newSoilGeometryProbability);
+                                location.Segment = newSegment;
+                                waterBoard.Segments.Add(newSegment);
+                            }
+                            catch (Exception e)
+                            {
+                                LogManager.Messages.Add(new LogMessage(LogMessageType.Error, location,
+                                    String.Format("Error in location '{0}' applying relative height for soilprofile '{1}': {2} ",
+                                    location.Name, orgSoilGeometryProbability.SoilGeometryName, e.Message)));
+                            }
+                        }
+                    }
+                }
+            }
+
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilProfileDataSet1.Designer.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilProfileDataSet1.Designer.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilProfileDataSet1.Designer.cs	(revision 3305)
@@ -0,0 +1,4349 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+#pragma warning disable 1591
+
+namespace Deltares.Dam.Data.Xsd {
+    
+    
+    /// <summary>
+    ///Represents a strongly typed in-memory cache of data.
+    ///</summary>
+    [global::System.Serializable()]
+    [global::System.ComponentModel.DesignerCategoryAttribute("code")]
+    [global::System.ComponentModel.ToolboxItem(true)]
+    [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedDataSetSchema")]
+    [global::System.Xml.Serialization.XmlRootAttribute("SoilProfileDataSet")]
+    [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.DataSet")]
+    public partial class SoilProfileDataSet : global::System.Data.DataSet {
+        
+        private ODGEOMETRIESDataTable tableODGEOMETRIES;
+        
+        private ODGEOLAYERSDataTable tableODGEOLAYERS;
+        
+        private MATERIALSDataTable tableMATERIALS;
+        
+        private PARAMETERNAMESDataTable tablePARAMETERNAMES;
+        
+        private PARAMETERVALUESDataTable tablePARAMETERVALUES;
+        
+        private global::System.Data.DataRelation relationODGEOMETRIES_ODGEOLAYERS;
+        
+        private global::System.Data.DataRelation relationODGEOLAYERS_MATERIALS;
+        
+        private global::System.Data.DataRelation relationPARAMETERVALUES_MATERIALS;
+        
+        private global::System.Data.DataRelation relationPARAMETERNAMES_PARAMETERVALUES;
+        
+        private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema;
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public SoilProfileDataSet() {
+            this.BeginInit();
+            this.InitClass();
+            global::System.ComponentModel.CollectionChangeEventHandler schemaChangedHandler = new global::System.ComponentModel.CollectionChangeEventHandler(this.SchemaChanged);
+            base.Tables.CollectionChanged += schemaChangedHandler;
+            base.Relations.CollectionChanged += schemaChangedHandler;
+            this.EndInit();
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        protected SoilProfileDataSet(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
+                base(info, context, false) {
+            if ((this.IsBinarySerialized(info, context) == true)) {
+                this.InitVars(false);
+                global::System.ComponentModel.CollectionChangeEventHandler schemaChangedHandler1 = new global::System.ComponentModel.CollectionChangeEventHandler(this.SchemaChanged);
+                this.Tables.CollectionChanged += schemaChangedHandler1;
+                this.Relations.CollectionChanged += schemaChangedHandler1;
+                return;
+            }
+            string strSchema = ((string)(info.GetValue("XmlSchema", typeof(string))));
+            if ((this.DetermineSchemaSerializationMode(info, context) == global::System.Data.SchemaSerializationMode.IncludeSchema)) {
+                global::System.Data.DataSet ds = new global::System.Data.DataSet();
+                ds.ReadXmlSchema(new global::System.Xml.XmlTextReader(new global::System.IO.StringReader(strSchema)));
+                if ((ds.Tables["ODGEOMETRIES"] != null)) {
+                    base.Tables.Add(new ODGEOMETRIESDataTable(ds.Tables["ODGEOMETRIES"]));
+                }
+                if ((ds.Tables["ODGEOLAYERS"] != null)) {
+                    base.Tables.Add(new ODGEOLAYERSDataTable(ds.Tables["ODGEOLAYERS"]));
+                }
+                if ((ds.Tables["MATERIALS"] != null)) {
+                    base.Tables.Add(new MATERIALSDataTable(ds.Tables["MATERIALS"]));
+                }
+                if ((ds.Tables["PARAMETERNAMES"] != null)) {
+                    base.Tables.Add(new PARAMETERNAMESDataTable(ds.Tables["PARAMETERNAMES"]));
+                }
+                if ((ds.Tables["PARAMETERVALUES"] != null)) {
+                    base.Tables.Add(new PARAMETERVALUESDataTable(ds.Tables["PARAMETERVALUES"]));
+                }
+                this.DataSetName = ds.DataSetName;
+                this.Prefix = ds.Prefix;
+                this.Namespace = ds.Namespace;
+                this.Locale = ds.Locale;
+                this.CaseSensitive = ds.CaseSensitive;
+                this.EnforceConstraints = ds.EnforceConstraints;
+                this.Merge(ds, false, global::System.Data.MissingSchemaAction.Add);
+                this.InitVars();
+            }
+            else {
+                this.ReadXmlSchema(new global::System.Xml.XmlTextReader(new global::System.IO.StringReader(strSchema)));
+            }
+            this.GetSerializationData(info, context);
+            global::System.ComponentModel.CollectionChangeEventHandler schemaChangedHandler = new global::System.ComponentModel.CollectionChangeEventHandler(this.SchemaChanged);
+            base.Tables.CollectionChanged += schemaChangedHandler;
+            this.Relations.CollectionChanged += schemaChangedHandler;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        [global::System.ComponentModel.Browsable(false)]
+        [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)]
+        public ODGEOMETRIESDataTable ODGEOMETRIES {
+            get {
+                return this.tableODGEOMETRIES;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        [global::System.ComponentModel.Browsable(false)]
+        [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)]
+        public ODGEOLAYERSDataTable ODGEOLAYERS {
+            get {
+                return this.tableODGEOLAYERS;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        [global::System.ComponentModel.Browsable(false)]
+        [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)]
+        public MATERIALSDataTable MATERIALS {
+            get {
+                return this.tableMATERIALS;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        [global::System.ComponentModel.Browsable(false)]
+        [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)]
+        public PARAMETERNAMESDataTable PARAMETERNAMES {
+            get {
+                return this.tablePARAMETERNAMES;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        [global::System.ComponentModel.Browsable(false)]
+        [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)]
+        public PARAMETERVALUESDataTable PARAMETERVALUES {
+            get {
+                return this.tablePARAMETERVALUES;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        [global::System.ComponentModel.BrowsableAttribute(true)]
+        [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Visible)]
+        public override global::System.Data.SchemaSerializationMode SchemaSerializationMode {
+            get {
+                return this._schemaSerializationMode;
+            }
+            set {
+                this._schemaSerializationMode = value;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public new global::System.Data.DataTableCollection Tables {
+            get {
+                return base.Tables;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public new global::System.Data.DataRelationCollection Relations {
+            get {
+                return base.Relations;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        protected override void InitializeDerivedDataSet() {
+            this.BeginInit();
+            this.InitClass();
+            this.EndInit();
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public override global::System.Data.DataSet Clone() {
+            SoilProfileDataSet cln = ((SoilProfileDataSet)(base.Clone()));
+            cln.InitVars();
+            cln.SchemaSerializationMode = this.SchemaSerializationMode;
+            return cln;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        protected override bool ShouldSerializeTables() {
+            return false;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        protected override bool ShouldSerializeRelations() {
+            return false;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        protected override void ReadXmlSerializable(global::System.Xml.XmlReader reader) {
+            if ((this.DetermineSchemaSerializationMode(reader) == global::System.Data.SchemaSerializationMode.IncludeSchema)) {
+                this.Reset();
+                global::System.Data.DataSet ds = new global::System.Data.DataSet();
+                ds.ReadXml(reader);
+                if ((ds.Tables["ODGEOMETRIES"] != null)) {
+                    base.Tables.Add(new ODGEOMETRIESDataTable(ds.Tables["ODGEOMETRIES"]));
+                }
+                if ((ds.Tables["ODGEOLAYERS"] != null)) {
+                    base.Tables.Add(new ODGEOLAYERSDataTable(ds.Tables["ODGEOLAYERS"]));
+                }
+                if ((ds.Tables["MATERIALS"] != null)) {
+                    base.Tables.Add(new MATERIALSDataTable(ds.Tables["MATERIALS"]));
+                }
+                if ((ds.Tables["PARAMETERNAMES"] != null)) {
+                    base.Tables.Add(new PARAMETERNAMESDataTable(ds.Tables["PARAMETERNAMES"]));
+                }
+                if ((ds.Tables["PARAMETERVALUES"] != null)) {
+                    base.Tables.Add(new PARAMETERVALUESDataTable(ds.Tables["PARAMETERVALUES"]));
+                }
+                this.DataSetName = ds.DataSetName;
+                this.Prefix = ds.Prefix;
+                this.Namespace = ds.Namespace;
+                this.Locale = ds.Locale;
+                this.CaseSensitive = ds.CaseSensitive;
+                this.EnforceConstraints = ds.EnforceConstraints;
+                this.Merge(ds, false, global::System.Data.MissingSchemaAction.Add);
+                this.InitVars();
+            }
+            else {
+                this.ReadXml(reader);
+                this.InitVars();
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        protected override global::System.Xml.Schema.XmlSchema GetSchemaSerializable() {
+            global::System.IO.MemoryStream stream = new global::System.IO.MemoryStream();
+            this.WriteXmlSchema(new global::System.Xml.XmlTextWriter(stream, null));
+            stream.Position = 0;
+            return global::System.Xml.Schema.XmlSchema.Read(new global::System.Xml.XmlTextReader(stream), null);
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        internal void InitVars() {
+            this.InitVars(true);
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        internal void InitVars(bool initTable) {
+            this.tableODGEOMETRIES = ((ODGEOMETRIESDataTable)(base.Tables["ODGEOMETRIES"]));
+            if ((initTable == true)) {
+                if ((this.tableODGEOMETRIES != null)) {
+                    this.tableODGEOMETRIES.InitVars();
+                }
+            }
+            this.tableODGEOLAYERS = ((ODGEOLAYERSDataTable)(base.Tables["ODGEOLAYERS"]));
+            if ((initTable == true)) {
+                if ((this.tableODGEOLAYERS != null)) {
+                    this.tableODGEOLAYERS.InitVars();
+                }
+            }
+            this.tableMATERIALS = ((MATERIALSDataTable)(base.Tables["MATERIALS"]));
+            if ((initTable == true)) {
+                if ((this.tableMATERIALS != null)) {
+                    this.tableMATERIALS.InitVars();
+                }
+            }
+            this.tablePARAMETERNAMES = ((PARAMETERNAMESDataTable)(base.Tables["PARAMETERNAMES"]));
+            if ((initTable == true)) {
+                if ((this.tablePARAMETERNAMES != null)) {
+                    this.tablePARAMETERNAMES.InitVars();
+                }
+            }
+            this.tablePARAMETERVALUES = ((PARAMETERVALUESDataTable)(base.Tables["PARAMETERVALUES"]));
+            if ((initTable == true)) {
+                if ((this.tablePARAMETERVALUES != null)) {
+                    this.tablePARAMETERVALUES.InitVars();
+                }
+            }
+            this.relationODGEOMETRIES_ODGEOLAYERS = this.Relations["ODGEOMETRIES_ODGEOLAYERS"];
+            this.relationODGEOLAYERS_MATERIALS = this.Relations["ODGEOLAYERS_MATERIALS"];
+            this.relationPARAMETERVALUES_MATERIALS = this.Relations["PARAMETERVALUES_MATERIALS"];
+            this.relationPARAMETERNAMES_PARAMETERVALUES = this.Relations["PARAMETERNAMES_PARAMETERVALUES"];
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private void InitClass() {
+            this.DataSetName = "SoilProfileDataSet";
+            this.Prefix = "";
+            this.Namespace = "http://tempuri.org/DataSet1.xsd";
+            this.EnforceConstraints = true;
+            this.SchemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema;
+            this.tableODGEOMETRIES = new ODGEOMETRIESDataTable();
+            base.Tables.Add(this.tableODGEOMETRIES);
+            this.tableODGEOLAYERS = new ODGEOLAYERSDataTable();
+            base.Tables.Add(this.tableODGEOLAYERS);
+            this.tableMATERIALS = new MATERIALSDataTable();
+            base.Tables.Add(this.tableMATERIALS);
+            this.tablePARAMETERNAMES = new PARAMETERNAMESDataTable();
+            base.Tables.Add(this.tablePARAMETERNAMES);
+            this.tablePARAMETERVALUES = new PARAMETERVALUESDataTable();
+            base.Tables.Add(this.tablePARAMETERVALUES);
+            this.relationODGEOMETRIES_ODGEOLAYERS = new global::System.Data.DataRelation("ODGEOMETRIES_ODGEOLAYERS", new global::System.Data.DataColumn[] {
+                        this.tableODGEOMETRIES.OD_NRColumn}, new global::System.Data.DataColumn[] {
+                        this.tableODGEOLAYERS.OD_NRColumn}, false);
+            this.Relations.Add(this.relationODGEOMETRIES_ODGEOLAYERS);
+            this.relationODGEOLAYERS_MATERIALS = new global::System.Data.DataRelation("ODGEOLAYERS_MATERIALS", new global::System.Data.DataColumn[] {
+                        this.tableMATERIALS.MA_NRColumn}, new global::System.Data.DataColumn[] {
+                        this.tableODGEOLAYERS.MA_NRColumn}, false);
+            this.Relations.Add(this.relationODGEOLAYERS_MATERIALS);
+            this.relationPARAMETERVALUES_MATERIALS = new global::System.Data.DataRelation("PARAMETERVALUES_MATERIALS", new global::System.Data.DataColumn[] {
+                        this.tableMATERIALS.MA_NRColumn}, new global::System.Data.DataColumn[] {
+                        this.tablePARAMETERVALUES.MA_NRColumn}, false);
+            this.Relations.Add(this.relationPARAMETERVALUES_MATERIALS);
+            this.relationPARAMETERNAMES_PARAMETERVALUES = new global::System.Data.DataRelation("PARAMETERNAMES_PARAMETERVALUES", new global::System.Data.DataColumn[] {
+                        this.tablePARAMETERNAMES.PN_NRColumn}, new global::System.Data.DataColumn[] {
+                        this.tablePARAMETERVALUES.PN_NRColumn}, false);
+            this.Relations.Add(this.relationPARAMETERNAMES_PARAMETERVALUES);
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private bool ShouldSerializeODGEOMETRIES() {
+            return false;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private bool ShouldSerializeODGEOLAYERS() {
+            return false;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private bool ShouldSerializeMATERIALS() {
+            return false;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private bool ShouldSerializePARAMETERNAMES() {
+            return false;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private bool ShouldSerializePARAMETERVALUES() {
+            return false;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) {
+            if ((e.Action == global::System.ComponentModel.CollectionChangeAction.Remove)) {
+                this.InitVars();
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedDataSetSchema(global::System.Xml.Schema.XmlSchemaSet xs) {
+            SoilProfileDataSet ds = new SoilProfileDataSet();
+            global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();
+            global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();
+            global::System.Xml.Schema.XmlSchemaAny any = new global::System.Xml.Schema.XmlSchemaAny();
+            any.Namespace = ds.Namespace;
+            sequence.Items.Add(any);
+            type.Particle = sequence;
+            global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();
+            if (xs.Contains(dsSchema.TargetNamespace)) {
+                global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream();
+                global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream();
+                try {
+                    global::System.Xml.Schema.XmlSchema schema = null;
+                    dsSchema.Write(s1);
+                    for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) {
+                        schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current));
+                        s2.SetLength(0);
+                        schema.Write(s2);
+                        if ((s1.Length == s2.Length)) {
+                            s1.Position = 0;
+                            s2.Position = 0;
+                            for (; ((s1.Position != s1.Length) 
+                                        && (s1.ReadByte() == s2.ReadByte())); ) {
+                                ;
+                            }
+                            if ((s1.Position == s1.Length)) {
+                                return type;
+                            }
+                        }
+                    }
+                }
+                finally {
+                    if ((s1 != null)) {
+                        s1.Close();
+                    }
+                    if ((s2 != null)) {
+                        s2.Close();
+                    }
+                }
+            }
+            xs.Add(dsSchema);
+            return type;
+        }
+        
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public delegate void ODGEOMETRIESRowChangeEventHandler(object sender, ODGEOMETRIESRowChangeEvent e);
+        
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public delegate void ODGEOLAYERSRowChangeEventHandler(object sender, ODGEOLAYERSRowChangeEvent e);
+        
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public delegate void MATERIALSRowChangeEventHandler(object sender, MATERIALSRowChangeEvent e);
+        
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public delegate void PARAMETERNAMESRowChangeEventHandler(object sender, PARAMETERNAMESRowChangeEvent e);
+        
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public delegate void PARAMETERVALUESRowChangeEventHandler(object sender, PARAMETERVALUESRowChangeEvent e);
+        
+        /// <summary>
+        ///Represents the strongly named DataTable class.
+        ///</summary>
+        [global::System.Serializable()]
+        [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
+        public partial class ODGEOMETRIESDataTable : global::System.Data.TypedTableBase<ODGEOMETRIESRow> {
+            
+            private global::System.Data.DataColumn columnOD_NR;
+            
+            private global::System.Data.DataColumn columnOD_NAME;
+            
+            private global::System.Data.DataColumn columnOD_DESCR;
+            
+            private global::System.Data.DataColumn columnOD_RDX;
+            
+            private global::System.Data.DataColumn columnOD_RDY;
+            
+            private global::System.Data.DataColumn columnOD_CPTNR;
+            
+            private global::System.Data.DataColumn columnOD_BORINGNR;
+            
+            private global::System.Data.DataColumn columnOD_GEOL_ZONE;
+            
+            private global::System.Data.DataColumn columnOD_CHANCE_OCCUR;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public ODGEOMETRIESDataTable() {
+                this.TableName = "ODGEOMETRIES";
+                this.BeginInit();
+                this.InitClass();
+                this.EndInit();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            internal ODGEOMETRIESDataTable(global::System.Data.DataTable table) {
+                this.TableName = table.TableName;
+                if ((table.CaseSensitive != table.DataSet.CaseSensitive)) {
+                    this.CaseSensitive = table.CaseSensitive;
+                }
+                if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) {
+                    this.Locale = table.Locale;
+                }
+                if ((table.Namespace != table.DataSet.Namespace)) {
+                    this.Namespace = table.Namespace;
+                }
+                this.Prefix = table.Prefix;
+                this.MinimumCapacity = table.MinimumCapacity;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected ODGEOMETRIESDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
+                    base(info, context) {
+                this.InitVars();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn OD_NRColumn {
+                get {
+                    return this.columnOD_NR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn OD_NAMEColumn {
+                get {
+                    return this.columnOD_NAME;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn OD_DESCRColumn {
+                get {
+                    return this.columnOD_DESCR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn OD_RDXColumn {
+                get {
+                    return this.columnOD_RDX;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn OD_RDYColumn {
+                get {
+                    return this.columnOD_RDY;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn OD_CPTNRColumn {
+                get {
+                    return this.columnOD_CPTNR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn OD_BORINGNRColumn {
+                get {
+                    return this.columnOD_BORINGNR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn OD_GEOL_ZONEColumn {
+                get {
+                    return this.columnOD_GEOL_ZONE;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn OD_CHANCE_OCCURColumn {
+                get {
+                    return this.columnOD_CHANCE_OCCUR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            [global::System.ComponentModel.Browsable(false)]
+            public int Count {
+                get {
+                    return this.Rows.Count;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public ODGEOMETRIESRow this[int index] {
+                get {
+                    return ((ODGEOMETRIESRow)(this.Rows[index]));
+                }
+            }
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public event ODGEOMETRIESRowChangeEventHandler ODGEOMETRIESRowChanging;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public event ODGEOMETRIESRowChangeEventHandler ODGEOMETRIESRowChanged;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public event ODGEOMETRIESRowChangeEventHandler ODGEOMETRIESRowDeleting;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public event ODGEOMETRIESRowChangeEventHandler ODGEOMETRIESRowDeleted;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void AddODGEOMETRIESRow(ODGEOMETRIESRow row) {
+                this.Rows.Add(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public ODGEOMETRIESRow AddODGEOMETRIESRow(string OD_NAME, string OD_DESCR, double OD_RDX, double OD_RDY, int OD_CPTNR, int OD_BORINGNR, int OD_GEOL_ZONE, double OD_CHANCE_OCCUR) {
+                ODGEOMETRIESRow rowODGEOMETRIESRow = ((ODGEOMETRIESRow)(this.NewRow()));
+                object[] columnValuesArray = new object[] {
+                        null,
+                        OD_NAME,
+                        OD_DESCR,
+                        OD_RDX,
+                        OD_RDY,
+                        OD_CPTNR,
+                        OD_BORINGNR,
+                        OD_GEOL_ZONE,
+                        OD_CHANCE_OCCUR};
+                rowODGEOMETRIESRow.ItemArray = columnValuesArray;
+                this.Rows.Add(rowODGEOMETRIESRow);
+                return rowODGEOMETRIESRow;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public ODGEOMETRIESRow FindByOD_NR(int OD_NR) {
+                return ((ODGEOMETRIESRow)(this.Rows.Find(new object[] {
+                            OD_NR})));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public override global::System.Data.DataTable Clone() {
+                ODGEOMETRIESDataTable cln = ((ODGEOMETRIESDataTable)(base.Clone()));
+                cln.InitVars();
+                return cln;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override global::System.Data.DataTable CreateInstance() {
+                return new ODGEOMETRIESDataTable();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            internal void InitVars() {
+                this.columnOD_NR = base.Columns["OD_NR"];
+                this.columnOD_NAME = base.Columns["OD_NAME"];
+                this.columnOD_DESCR = base.Columns["OD_DESCR"];
+                this.columnOD_RDX = base.Columns["OD_RDX"];
+                this.columnOD_RDY = base.Columns["OD_RDY"];
+                this.columnOD_CPTNR = base.Columns["OD_CPTNR"];
+                this.columnOD_BORINGNR = base.Columns["OD_BORINGNR"];
+                this.columnOD_GEOL_ZONE = base.Columns["OD_GEOL_ZONE"];
+                this.columnOD_CHANCE_OCCUR = base.Columns["OD_CHANCE_OCCUR"];
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            private void InitClass() {
+                this.columnOD_NR = new global::System.Data.DataColumn("OD_NR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOD_NR);
+                this.columnOD_NAME = new global::System.Data.DataColumn("OD_NAME", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOD_NAME);
+                this.columnOD_DESCR = new global::System.Data.DataColumn("OD_DESCR", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOD_DESCR);
+                this.columnOD_RDX = new global::System.Data.DataColumn("OD_RDX", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOD_RDX);
+                this.columnOD_RDY = new global::System.Data.DataColumn("OD_RDY", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOD_RDY);
+                this.columnOD_CPTNR = new global::System.Data.DataColumn("OD_CPTNR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOD_CPTNR);
+                this.columnOD_BORINGNR = new global::System.Data.DataColumn("OD_BORINGNR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOD_BORINGNR);
+                this.columnOD_GEOL_ZONE = new global::System.Data.DataColumn("OD_GEOL_ZONE", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOD_GEOL_ZONE);
+                this.columnOD_CHANCE_OCCUR = new global::System.Data.DataColumn("OD_CHANCE_OCCUR", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOD_CHANCE_OCCUR);
+                this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
+                                this.columnOD_NR}, true));
+                this.columnOD_NR.AutoIncrement = true;
+                this.columnOD_NR.AutoIncrementSeed = -1;
+                this.columnOD_NR.AutoIncrementStep = -1;
+                this.columnOD_NR.AllowDBNull = false;
+                this.columnOD_NR.ReadOnly = true;
+                this.columnOD_NR.Unique = true;
+                this.columnOD_NAME.MaxLength = 64;
+                this.columnOD_DESCR.MaxLength = 240;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public ODGEOMETRIESRow NewODGEOMETRIESRow() {
+                return ((ODGEOMETRIESRow)(this.NewRow()));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) {
+                return new ODGEOMETRIESRow(builder);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override global::System.Type GetRowType() {
+                return typeof(ODGEOMETRIESRow);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanged(e);
+                if ((this.ODGEOMETRIESRowChanged != null)) {
+                    this.ODGEOMETRIESRowChanged(this, new ODGEOMETRIESRowChangeEvent(((ODGEOMETRIESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanging(e);
+                if ((this.ODGEOMETRIESRowChanging != null)) {
+                    this.ODGEOMETRIESRowChanging(this, new ODGEOMETRIESRowChangeEvent(((ODGEOMETRIESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleted(e);
+                if ((this.ODGEOMETRIESRowDeleted != null)) {
+                    this.ODGEOMETRIESRowDeleted(this, new ODGEOMETRIESRowChangeEvent(((ODGEOMETRIESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleting(e);
+                if ((this.ODGEOMETRIESRowDeleting != null)) {
+                    this.ODGEOMETRIESRowDeleting(this, new ODGEOMETRIESRowChangeEvent(((ODGEOMETRIESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void RemoveODGEOMETRIESRow(ODGEOMETRIESRow row) {
+                this.Rows.Remove(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) {
+                global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();
+                global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();
+                SoilProfileDataSet ds = new SoilProfileDataSet();
+                global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny();
+                any1.Namespace = "http://www.w3.org/2001/XMLSchema";
+                any1.MinOccurs = new decimal(0);
+                any1.MaxOccurs = decimal.MaxValue;
+                any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any1);
+                global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny();
+                any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1";
+                any2.MinOccurs = new decimal(1);
+                any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any2);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute1.Name = "namespace";
+                attribute1.FixedValue = ds.Namespace;
+                type.Attributes.Add(attribute1);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute2.Name = "tableTypeName";
+                attribute2.FixedValue = "ODGEOMETRIESDataTable";
+                type.Attributes.Add(attribute2);
+                type.Particle = sequence;
+                global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();
+                if (xs.Contains(dsSchema.TargetNamespace)) {
+                    global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream();
+                    global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream();
+                    try {
+                        global::System.Xml.Schema.XmlSchema schema = null;
+                        dsSchema.Write(s1);
+                        for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) {
+                            schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current));
+                            s2.SetLength(0);
+                            schema.Write(s2);
+                            if ((s1.Length == s2.Length)) {
+                                s1.Position = 0;
+                                s2.Position = 0;
+                                for (; ((s1.Position != s1.Length) 
+                                            && (s1.ReadByte() == s2.ReadByte())); ) {
+                                    ;
+                                }
+                                if ((s1.Position == s1.Length)) {
+                                    return type;
+                                }
+                            }
+                        }
+                    }
+                    finally {
+                        if ((s1 != null)) {
+                            s1.Close();
+                        }
+                        if ((s2 != null)) {
+                            s2.Close();
+                        }
+                    }
+                }
+                xs.Add(dsSchema);
+                return type;
+            }
+        }
+        
+        /// <summary>
+        ///Represents the strongly named DataTable class.
+        ///</summary>
+        [global::System.Serializable()]
+        [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
+        public partial class ODGEOLAYERSDataTable : global::System.Data.TypedTableBase<ODGEOLAYERSRow> {
+            
+            private global::System.Data.DataColumn columnOL_NR;
+            
+            private global::System.Data.DataColumn columnOD_NR;
+            
+            private global::System.Data.DataColumn columnMA_NR;
+            
+            private global::System.Data.DataColumn columnOL_LAYERNR;
+            
+            private global::System.Data.DataColumn columnOL_LEVEL;
+            
+            private global::System.Data.DataColumn columnOL_PLATTOP;
+            
+            private global::System.Data.DataColumn columnOL_PLATBOTTOM;
+            
+            private global::System.Data.DataColumn columnOL_TOPEXCESSPP;
+            
+            private global::System.Data.DataColumn columnOL_BOTEXCESSPP;
+            
+            private global::System.Data.DataColumn columnOL_OCR;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public ODGEOLAYERSDataTable() {
+                this.TableName = "ODGEOLAYERS";
+                this.BeginInit();
+                this.InitClass();
+                this.EndInit();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            internal ODGEOLAYERSDataTable(global::System.Data.DataTable table) {
+                this.TableName = table.TableName;
+                if ((table.CaseSensitive != table.DataSet.CaseSensitive)) {
+                    this.CaseSensitive = table.CaseSensitive;
+                }
+                if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) {
+                    this.Locale = table.Locale;
+                }
+                if ((table.Namespace != table.DataSet.Namespace)) {
+                    this.Namespace = table.Namespace;
+                }
+                this.Prefix = table.Prefix;
+                this.MinimumCapacity = table.MinimumCapacity;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected ODGEOLAYERSDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
+                    base(info, context) {
+                this.InitVars();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn OL_NRColumn {
+                get {
+                    return this.columnOL_NR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn OD_NRColumn {
+                get {
+                    return this.columnOD_NR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn MA_NRColumn {
+                get {
+                    return this.columnMA_NR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn OL_LAYERNRColumn {
+                get {
+                    return this.columnOL_LAYERNR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn OL_LEVELColumn {
+                get {
+                    return this.columnOL_LEVEL;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn OL_PLATTOPColumn {
+                get {
+                    return this.columnOL_PLATTOP;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn OL_PLATBOTTOMColumn {
+                get {
+                    return this.columnOL_PLATBOTTOM;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn OL_TOPEXCESSPPColumn {
+                get {
+                    return this.columnOL_TOPEXCESSPP;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn OL_BOTEXCESSPPColumn {
+                get {
+                    return this.columnOL_BOTEXCESSPP;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn OL_OCRColumn {
+                get {
+                    return this.columnOL_OCR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            [global::System.ComponentModel.Browsable(false)]
+            public int Count {
+                get {
+                    return this.Rows.Count;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public ODGEOLAYERSRow this[int index] {
+                get {
+                    return ((ODGEOLAYERSRow)(this.Rows[index]));
+                }
+            }
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public event ODGEOLAYERSRowChangeEventHandler ODGEOLAYERSRowChanging;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public event ODGEOLAYERSRowChangeEventHandler ODGEOLAYERSRowChanged;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public event ODGEOLAYERSRowChangeEventHandler ODGEOLAYERSRowDeleting;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public event ODGEOLAYERSRowChangeEventHandler ODGEOLAYERSRowDeleted;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void AddODGEOLAYERSRow(ODGEOLAYERSRow row) {
+                this.Rows.Add(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public ODGEOLAYERSRow AddODGEOLAYERSRow(ODGEOMETRIESRow parentODGEOMETRIESRowByODGEOMETRIES_ODGEOLAYERS, MATERIALSRow parentMATERIALSRowByODGEOLAYERS_MATERIALS, int OL_LAYERNR, double OL_LEVEL, int OL_PLATTOP, int OL_PLATBOTTOM, double OL_TOPEXCESSPP, double OL_BOTEXCESSPP, double OL_OCR) {
+                ODGEOLAYERSRow rowODGEOLAYERSRow = ((ODGEOLAYERSRow)(this.NewRow()));
+                object[] columnValuesArray = new object[] {
+                        null,
+                        null,
+                        null,
+                        OL_LAYERNR,
+                        OL_LEVEL,
+                        OL_PLATTOP,
+                        OL_PLATBOTTOM,
+                        OL_TOPEXCESSPP,
+                        OL_BOTEXCESSPP,
+                        OL_OCR};
+                if ((parentODGEOMETRIESRowByODGEOMETRIES_ODGEOLAYERS != null)) {
+                    columnValuesArray[1] = parentODGEOMETRIESRowByODGEOMETRIES_ODGEOLAYERS[0];
+                }
+                if ((parentMATERIALSRowByODGEOLAYERS_MATERIALS != null)) {
+                    columnValuesArray[2] = parentMATERIALSRowByODGEOLAYERS_MATERIALS[0];
+                }
+                rowODGEOLAYERSRow.ItemArray = columnValuesArray;
+                this.Rows.Add(rowODGEOLAYERSRow);
+                return rowODGEOLAYERSRow;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public ODGEOLAYERSRow FindByOL_NR(int OL_NR) {
+                return ((ODGEOLAYERSRow)(this.Rows.Find(new object[] {
+                            OL_NR})));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public override global::System.Data.DataTable Clone() {
+                ODGEOLAYERSDataTable cln = ((ODGEOLAYERSDataTable)(base.Clone()));
+                cln.InitVars();
+                return cln;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override global::System.Data.DataTable CreateInstance() {
+                return new ODGEOLAYERSDataTable();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            internal void InitVars() {
+                this.columnOL_NR = base.Columns["OL_NR"];
+                this.columnOD_NR = base.Columns["OD_NR"];
+                this.columnMA_NR = base.Columns["MA_NR"];
+                this.columnOL_LAYERNR = base.Columns["OL_LAYERNR"];
+                this.columnOL_LEVEL = base.Columns["OL_LEVEL"];
+                this.columnOL_PLATTOP = base.Columns["OL_PLATTOP"];
+                this.columnOL_PLATBOTTOM = base.Columns["OL_PLATBOTTOM"];
+                this.columnOL_TOPEXCESSPP = base.Columns["OL_TOPEXCESSPP"];
+                this.columnOL_BOTEXCESSPP = base.Columns["OL_BOTEXCESSPP"];
+                this.columnOL_OCR = base.Columns["OL_OCR"];
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            private void InitClass() {
+                this.columnOL_NR = new global::System.Data.DataColumn("OL_NR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOL_NR);
+                this.columnOD_NR = new global::System.Data.DataColumn("OD_NR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOD_NR);
+                this.columnMA_NR = new global::System.Data.DataColumn("MA_NR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnMA_NR);
+                this.columnOL_LAYERNR = new global::System.Data.DataColumn("OL_LAYERNR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOL_LAYERNR);
+                this.columnOL_LEVEL = new global::System.Data.DataColumn("OL_LEVEL", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOL_LEVEL);
+                this.columnOL_PLATTOP = new global::System.Data.DataColumn("OL_PLATTOP", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOL_PLATTOP);
+                this.columnOL_PLATBOTTOM = new global::System.Data.DataColumn("OL_PLATBOTTOM", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOL_PLATBOTTOM);
+                this.columnOL_TOPEXCESSPP = new global::System.Data.DataColumn("OL_TOPEXCESSPP", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOL_TOPEXCESSPP);
+                this.columnOL_BOTEXCESSPP = new global::System.Data.DataColumn("OL_BOTEXCESSPP", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOL_BOTEXCESSPP);
+                this.columnOL_OCR = new global::System.Data.DataColumn("OL_OCR", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOL_OCR);
+                this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
+                                this.columnOL_NR}, true));
+                this.columnOL_NR.AutoIncrement = true;
+                this.columnOL_NR.AutoIncrementSeed = -1;
+                this.columnOL_NR.AutoIncrementStep = -1;
+                this.columnOL_NR.AllowDBNull = false;
+                this.columnOL_NR.ReadOnly = true;
+                this.columnOL_NR.Unique = true;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public ODGEOLAYERSRow NewODGEOLAYERSRow() {
+                return ((ODGEOLAYERSRow)(this.NewRow()));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) {
+                return new ODGEOLAYERSRow(builder);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override global::System.Type GetRowType() {
+                return typeof(ODGEOLAYERSRow);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanged(e);
+                if ((this.ODGEOLAYERSRowChanged != null)) {
+                    this.ODGEOLAYERSRowChanged(this, new ODGEOLAYERSRowChangeEvent(((ODGEOLAYERSRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanging(e);
+                if ((this.ODGEOLAYERSRowChanging != null)) {
+                    this.ODGEOLAYERSRowChanging(this, new ODGEOLAYERSRowChangeEvent(((ODGEOLAYERSRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleted(e);
+                if ((this.ODGEOLAYERSRowDeleted != null)) {
+                    this.ODGEOLAYERSRowDeleted(this, new ODGEOLAYERSRowChangeEvent(((ODGEOLAYERSRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleting(e);
+                if ((this.ODGEOLAYERSRowDeleting != null)) {
+                    this.ODGEOLAYERSRowDeleting(this, new ODGEOLAYERSRowChangeEvent(((ODGEOLAYERSRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void RemoveODGEOLAYERSRow(ODGEOLAYERSRow row) {
+                this.Rows.Remove(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) {
+                global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();
+                global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();
+                SoilProfileDataSet ds = new SoilProfileDataSet();
+                global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny();
+                any1.Namespace = "http://www.w3.org/2001/XMLSchema";
+                any1.MinOccurs = new decimal(0);
+                any1.MaxOccurs = decimal.MaxValue;
+                any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any1);
+                global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny();
+                any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1";
+                any2.MinOccurs = new decimal(1);
+                any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any2);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute1.Name = "namespace";
+                attribute1.FixedValue = ds.Namespace;
+                type.Attributes.Add(attribute1);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute2.Name = "tableTypeName";
+                attribute2.FixedValue = "ODGEOLAYERSDataTable";
+                type.Attributes.Add(attribute2);
+                type.Particle = sequence;
+                global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();
+                if (xs.Contains(dsSchema.TargetNamespace)) {
+                    global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream();
+                    global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream();
+                    try {
+                        global::System.Xml.Schema.XmlSchema schema = null;
+                        dsSchema.Write(s1);
+                        for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) {
+                            schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current));
+                            s2.SetLength(0);
+                            schema.Write(s2);
+                            if ((s1.Length == s2.Length)) {
+                                s1.Position = 0;
+                                s2.Position = 0;
+                                for (; ((s1.Position != s1.Length) 
+                                            && (s1.ReadByte() == s2.ReadByte())); ) {
+                                    ;
+                                }
+                                if ((s1.Position == s1.Length)) {
+                                    return type;
+                                }
+                            }
+                        }
+                    }
+                    finally {
+                        if ((s1 != null)) {
+                            s1.Close();
+                        }
+                        if ((s2 != null)) {
+                            s2.Close();
+                        }
+                    }
+                }
+                xs.Add(dsSchema);
+                return type;
+            }
+        }
+        
+        /// <summary>
+        ///Represents the strongly named DataTable class.
+        ///</summary>
+        [global::System.Serializable()]
+        [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
+        public partial class MATERIALSDataTable : global::System.Data.TypedTableBase<MATERIALSRow> {
+            
+            private global::System.Data.DataColumn columnMA_NR;
+            
+            private global::System.Data.DataColumn columnMA_NAME;
+            
+            private global::System.Data.DataColumn columnMA_DESCR;
+            
+            private global::System.Data.DataColumn columnMA_INDEX;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public MATERIALSDataTable() {
+                this.TableName = "MATERIALS";
+                this.BeginInit();
+                this.InitClass();
+                this.EndInit();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            internal MATERIALSDataTable(global::System.Data.DataTable table) {
+                this.TableName = table.TableName;
+                if ((table.CaseSensitive != table.DataSet.CaseSensitive)) {
+                    this.CaseSensitive = table.CaseSensitive;
+                }
+                if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) {
+                    this.Locale = table.Locale;
+                }
+                if ((table.Namespace != table.DataSet.Namespace)) {
+                    this.Namespace = table.Namespace;
+                }
+                this.Prefix = table.Prefix;
+                this.MinimumCapacity = table.MinimumCapacity;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected MATERIALSDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
+                    base(info, context) {
+                this.InitVars();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn MA_NRColumn {
+                get {
+                    return this.columnMA_NR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn MA_NAMEColumn {
+                get {
+                    return this.columnMA_NAME;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn MA_DESCRColumn {
+                get {
+                    return this.columnMA_DESCR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn MA_INDEXColumn {
+                get {
+                    return this.columnMA_INDEX;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            [global::System.ComponentModel.Browsable(false)]
+            public int Count {
+                get {
+                    return this.Rows.Count;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public MATERIALSRow this[int index] {
+                get {
+                    return ((MATERIALSRow)(this.Rows[index]));
+                }
+            }
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public event MATERIALSRowChangeEventHandler MATERIALSRowChanging;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public event MATERIALSRowChangeEventHandler MATERIALSRowChanged;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public event MATERIALSRowChangeEventHandler MATERIALSRowDeleting;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public event MATERIALSRowChangeEventHandler MATERIALSRowDeleted;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void AddMATERIALSRow(MATERIALSRow row) {
+                this.Rows.Add(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public MATERIALSRow AddMATERIALSRow(string MA_NAME, string MA_DESCR, int MA_INDEX) {
+                MATERIALSRow rowMATERIALSRow = ((MATERIALSRow)(this.NewRow()));
+                object[] columnValuesArray = new object[] {
+                        null,
+                        MA_NAME,
+                        MA_DESCR,
+                        MA_INDEX};
+                rowMATERIALSRow.ItemArray = columnValuesArray;
+                this.Rows.Add(rowMATERIALSRow);
+                return rowMATERIALSRow;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public MATERIALSRow FindByMA_NR(int MA_NR) {
+                return ((MATERIALSRow)(this.Rows.Find(new object[] {
+                            MA_NR})));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public override global::System.Data.DataTable Clone() {
+                MATERIALSDataTable cln = ((MATERIALSDataTable)(base.Clone()));
+                cln.InitVars();
+                return cln;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override global::System.Data.DataTable CreateInstance() {
+                return new MATERIALSDataTable();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            internal void InitVars() {
+                this.columnMA_NR = base.Columns["MA_NR"];
+                this.columnMA_NAME = base.Columns["MA_NAME"];
+                this.columnMA_DESCR = base.Columns["MA_DESCR"];
+                this.columnMA_INDEX = base.Columns["MA_INDEX"];
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            private void InitClass() {
+                this.columnMA_NR = new global::System.Data.DataColumn("MA_NR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnMA_NR);
+                this.columnMA_NAME = new global::System.Data.DataColumn("MA_NAME", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnMA_NAME);
+                this.columnMA_DESCR = new global::System.Data.DataColumn("MA_DESCR", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnMA_DESCR);
+                this.columnMA_INDEX = new global::System.Data.DataColumn("MA_INDEX", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnMA_INDEX);
+                this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
+                                this.columnMA_NR}, true));
+                this.columnMA_NR.AutoIncrement = true;
+                this.columnMA_NR.AutoIncrementSeed = -1;
+                this.columnMA_NR.AutoIncrementStep = -1;
+                this.columnMA_NR.AllowDBNull = false;
+                this.columnMA_NR.ReadOnly = true;
+                this.columnMA_NR.Unique = true;
+                this.columnMA_NAME.MaxLength = 128;
+                this.columnMA_DESCR.MaxLength = 240;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public MATERIALSRow NewMATERIALSRow() {
+                return ((MATERIALSRow)(this.NewRow()));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) {
+                return new MATERIALSRow(builder);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override global::System.Type GetRowType() {
+                return typeof(MATERIALSRow);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanged(e);
+                if ((this.MATERIALSRowChanged != null)) {
+                    this.MATERIALSRowChanged(this, new MATERIALSRowChangeEvent(((MATERIALSRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanging(e);
+                if ((this.MATERIALSRowChanging != null)) {
+                    this.MATERIALSRowChanging(this, new MATERIALSRowChangeEvent(((MATERIALSRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleted(e);
+                if ((this.MATERIALSRowDeleted != null)) {
+                    this.MATERIALSRowDeleted(this, new MATERIALSRowChangeEvent(((MATERIALSRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleting(e);
+                if ((this.MATERIALSRowDeleting != null)) {
+                    this.MATERIALSRowDeleting(this, new MATERIALSRowChangeEvent(((MATERIALSRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void RemoveMATERIALSRow(MATERIALSRow row) {
+                this.Rows.Remove(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) {
+                global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();
+                global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();
+                SoilProfileDataSet ds = new SoilProfileDataSet();
+                global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny();
+                any1.Namespace = "http://www.w3.org/2001/XMLSchema";
+                any1.MinOccurs = new decimal(0);
+                any1.MaxOccurs = decimal.MaxValue;
+                any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any1);
+                global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny();
+                any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1";
+                any2.MinOccurs = new decimal(1);
+                any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any2);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute1.Name = "namespace";
+                attribute1.FixedValue = ds.Namespace;
+                type.Attributes.Add(attribute1);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute2.Name = "tableTypeName";
+                attribute2.FixedValue = "MATERIALSDataTable";
+                type.Attributes.Add(attribute2);
+                type.Particle = sequence;
+                global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();
+                if (xs.Contains(dsSchema.TargetNamespace)) {
+                    global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream();
+                    global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream();
+                    try {
+                        global::System.Xml.Schema.XmlSchema schema = null;
+                        dsSchema.Write(s1);
+                        for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) {
+                            schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current));
+                            s2.SetLength(0);
+                            schema.Write(s2);
+                            if ((s1.Length == s2.Length)) {
+                                s1.Position = 0;
+                                s2.Position = 0;
+                                for (; ((s1.Position != s1.Length) 
+                                            && (s1.ReadByte() == s2.ReadByte())); ) {
+                                    ;
+                                }
+                                if ((s1.Position == s1.Length)) {
+                                    return type;
+                                }
+                            }
+                        }
+                    }
+                    finally {
+                        if ((s1 != null)) {
+                            s1.Close();
+                        }
+                        if ((s2 != null)) {
+                            s2.Close();
+                        }
+                    }
+                }
+                xs.Add(dsSchema);
+                return type;
+            }
+        }
+        
+        /// <summary>
+        ///Represents the strongly named DataTable class.
+        ///</summary>
+        [global::System.Serializable()]
+        [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
+        public partial class PARAMETERNAMESDataTable : global::System.Data.TypedTableBase<PARAMETERNAMESRow> {
+            
+            private global::System.Data.DataColumn columnPN_NR;
+            
+            private global::System.Data.DataColumn columnPN_NAME;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public PARAMETERNAMESDataTable() {
+                this.TableName = "PARAMETERNAMES";
+                this.BeginInit();
+                this.InitClass();
+                this.EndInit();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            internal PARAMETERNAMESDataTable(global::System.Data.DataTable table) {
+                this.TableName = table.TableName;
+                if ((table.CaseSensitive != table.DataSet.CaseSensitive)) {
+                    this.CaseSensitive = table.CaseSensitive;
+                }
+                if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) {
+                    this.Locale = table.Locale;
+                }
+                if ((table.Namespace != table.DataSet.Namespace)) {
+                    this.Namespace = table.Namespace;
+                }
+                this.Prefix = table.Prefix;
+                this.MinimumCapacity = table.MinimumCapacity;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected PARAMETERNAMESDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
+                    base(info, context) {
+                this.InitVars();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn PN_NRColumn {
+                get {
+                    return this.columnPN_NR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn PN_NAMEColumn {
+                get {
+                    return this.columnPN_NAME;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            [global::System.ComponentModel.Browsable(false)]
+            public int Count {
+                get {
+                    return this.Rows.Count;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public PARAMETERNAMESRow this[int index] {
+                get {
+                    return ((PARAMETERNAMESRow)(this.Rows[index]));
+                }
+            }
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public event PARAMETERNAMESRowChangeEventHandler PARAMETERNAMESRowChanging;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public event PARAMETERNAMESRowChangeEventHandler PARAMETERNAMESRowChanged;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public event PARAMETERNAMESRowChangeEventHandler PARAMETERNAMESRowDeleting;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public event PARAMETERNAMESRowChangeEventHandler PARAMETERNAMESRowDeleted;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void AddPARAMETERNAMESRow(PARAMETERNAMESRow row) {
+                this.Rows.Add(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public PARAMETERNAMESRow AddPARAMETERNAMESRow(string PN_NAME) {
+                PARAMETERNAMESRow rowPARAMETERNAMESRow = ((PARAMETERNAMESRow)(this.NewRow()));
+                object[] columnValuesArray = new object[] {
+                        null,
+                        PN_NAME};
+                rowPARAMETERNAMESRow.ItemArray = columnValuesArray;
+                this.Rows.Add(rowPARAMETERNAMESRow);
+                return rowPARAMETERNAMESRow;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public PARAMETERNAMESRow FindByPN_NR(int PN_NR) {
+                return ((PARAMETERNAMESRow)(this.Rows.Find(new object[] {
+                            PN_NR})));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public override global::System.Data.DataTable Clone() {
+                PARAMETERNAMESDataTable cln = ((PARAMETERNAMESDataTable)(base.Clone()));
+                cln.InitVars();
+                return cln;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override global::System.Data.DataTable CreateInstance() {
+                return new PARAMETERNAMESDataTable();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            internal void InitVars() {
+                this.columnPN_NR = base.Columns["PN_NR"];
+                this.columnPN_NAME = base.Columns["PN_NAME"];
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            private void InitClass() {
+                this.columnPN_NR = new global::System.Data.DataColumn("PN_NR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnPN_NR);
+                this.columnPN_NAME = new global::System.Data.DataColumn("PN_NAME", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnPN_NAME);
+                this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
+                                this.columnPN_NR}, true));
+                this.columnPN_NR.AutoIncrement = true;
+                this.columnPN_NR.AutoIncrementSeed = -1;
+                this.columnPN_NR.AutoIncrementStep = -1;
+                this.columnPN_NR.AllowDBNull = false;
+                this.columnPN_NR.ReadOnly = true;
+                this.columnPN_NR.Unique = true;
+                this.columnPN_NAME.MaxLength = 64;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public PARAMETERNAMESRow NewPARAMETERNAMESRow() {
+                return ((PARAMETERNAMESRow)(this.NewRow()));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) {
+                return new PARAMETERNAMESRow(builder);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override global::System.Type GetRowType() {
+                return typeof(PARAMETERNAMESRow);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanged(e);
+                if ((this.PARAMETERNAMESRowChanged != null)) {
+                    this.PARAMETERNAMESRowChanged(this, new PARAMETERNAMESRowChangeEvent(((PARAMETERNAMESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanging(e);
+                if ((this.PARAMETERNAMESRowChanging != null)) {
+                    this.PARAMETERNAMESRowChanging(this, new PARAMETERNAMESRowChangeEvent(((PARAMETERNAMESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleted(e);
+                if ((this.PARAMETERNAMESRowDeleted != null)) {
+                    this.PARAMETERNAMESRowDeleted(this, new PARAMETERNAMESRowChangeEvent(((PARAMETERNAMESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleting(e);
+                if ((this.PARAMETERNAMESRowDeleting != null)) {
+                    this.PARAMETERNAMESRowDeleting(this, new PARAMETERNAMESRowChangeEvent(((PARAMETERNAMESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void RemovePARAMETERNAMESRow(PARAMETERNAMESRow row) {
+                this.Rows.Remove(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) {
+                global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();
+                global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();
+                SoilProfileDataSet ds = new SoilProfileDataSet();
+                global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny();
+                any1.Namespace = "http://www.w3.org/2001/XMLSchema";
+                any1.MinOccurs = new decimal(0);
+                any1.MaxOccurs = decimal.MaxValue;
+                any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any1);
+                global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny();
+                any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1";
+                any2.MinOccurs = new decimal(1);
+                any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any2);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute1.Name = "namespace";
+                attribute1.FixedValue = ds.Namespace;
+                type.Attributes.Add(attribute1);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute2.Name = "tableTypeName";
+                attribute2.FixedValue = "PARAMETERNAMESDataTable";
+                type.Attributes.Add(attribute2);
+                type.Particle = sequence;
+                global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();
+                if (xs.Contains(dsSchema.TargetNamespace)) {
+                    global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream();
+                    global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream();
+                    try {
+                        global::System.Xml.Schema.XmlSchema schema = null;
+                        dsSchema.Write(s1);
+                        for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) {
+                            schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current));
+                            s2.SetLength(0);
+                            schema.Write(s2);
+                            if ((s1.Length == s2.Length)) {
+                                s1.Position = 0;
+                                s2.Position = 0;
+                                for (; ((s1.Position != s1.Length) 
+                                            && (s1.ReadByte() == s2.ReadByte())); ) {
+                                    ;
+                                }
+                                if ((s1.Position == s1.Length)) {
+                                    return type;
+                                }
+                            }
+                        }
+                    }
+                    finally {
+                        if ((s1 != null)) {
+                            s1.Close();
+                        }
+                        if ((s2 != null)) {
+                            s2.Close();
+                        }
+                    }
+                }
+                xs.Add(dsSchema);
+                return type;
+            }
+        }
+        
+        /// <summary>
+        ///Represents the strongly named DataTable class.
+        ///</summary>
+        [global::System.Serializable()]
+        [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
+        public partial class PARAMETERVALUESDataTable : global::System.Data.TypedTableBase<PARAMETERVALUESRow> {
+            
+            private global::System.Data.DataColumn columnPV_NR;
+            
+            private global::System.Data.DataColumn columnMA_NR;
+            
+            private global::System.Data.DataColumn columnPN_NR;
+            
+            private global::System.Data.DataColumn columnPV_VALUE;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public PARAMETERVALUESDataTable() {
+                this.TableName = "PARAMETERVALUES";
+                this.BeginInit();
+                this.InitClass();
+                this.EndInit();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            internal PARAMETERVALUESDataTable(global::System.Data.DataTable table) {
+                this.TableName = table.TableName;
+                if ((table.CaseSensitive != table.DataSet.CaseSensitive)) {
+                    this.CaseSensitive = table.CaseSensitive;
+                }
+                if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) {
+                    this.Locale = table.Locale;
+                }
+                if ((table.Namespace != table.DataSet.Namespace)) {
+                    this.Namespace = table.Namespace;
+                }
+                this.Prefix = table.Prefix;
+                this.MinimumCapacity = table.MinimumCapacity;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected PARAMETERVALUESDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
+                    base(info, context) {
+                this.InitVars();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn PV_NRColumn {
+                get {
+                    return this.columnPV_NR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn MA_NRColumn {
+                get {
+                    return this.columnMA_NR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn PN_NRColumn {
+                get {
+                    return this.columnPN_NR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataColumn PV_VALUEColumn {
+                get {
+                    return this.columnPV_VALUE;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            [global::System.ComponentModel.Browsable(false)]
+            public int Count {
+                get {
+                    return this.Rows.Count;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public PARAMETERVALUESRow this[int index] {
+                get {
+                    return ((PARAMETERVALUESRow)(this.Rows[index]));
+                }
+            }
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public event PARAMETERVALUESRowChangeEventHandler PARAMETERVALUESRowChanging;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public event PARAMETERVALUESRowChangeEventHandler PARAMETERVALUESRowChanged;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public event PARAMETERVALUESRowChangeEventHandler PARAMETERVALUESRowDeleting;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public event PARAMETERVALUESRowChangeEventHandler PARAMETERVALUESRowDeleted;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void AddPARAMETERVALUESRow(PARAMETERVALUESRow row) {
+                this.Rows.Add(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public PARAMETERVALUESRow AddPARAMETERVALUESRow(MATERIALSRow parentMATERIALSRowByPARAMETERVALUES_MATERIALS, PARAMETERNAMESRow parentPARAMETERNAMESRowByPARAMETERNAMES_PARAMETERVALUES, double PV_VALUE) {
+                PARAMETERVALUESRow rowPARAMETERVALUESRow = ((PARAMETERVALUESRow)(this.NewRow()));
+                object[] columnValuesArray = new object[] {
+                        null,
+                        null,
+                        null,
+                        PV_VALUE};
+                if ((parentMATERIALSRowByPARAMETERVALUES_MATERIALS != null)) {
+                    columnValuesArray[1] = parentMATERIALSRowByPARAMETERVALUES_MATERIALS[0];
+                }
+                if ((parentPARAMETERNAMESRowByPARAMETERNAMES_PARAMETERVALUES != null)) {
+                    columnValuesArray[2] = parentPARAMETERNAMESRowByPARAMETERNAMES_PARAMETERVALUES[0];
+                }
+                rowPARAMETERVALUESRow.ItemArray = columnValuesArray;
+                this.Rows.Add(rowPARAMETERVALUESRow);
+                return rowPARAMETERVALUESRow;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public PARAMETERVALUESRow FindByPV_NR(int PV_NR) {
+                return ((PARAMETERVALUESRow)(this.Rows.Find(new object[] {
+                            PV_NR})));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public override global::System.Data.DataTable Clone() {
+                PARAMETERVALUESDataTable cln = ((PARAMETERVALUESDataTable)(base.Clone()));
+                cln.InitVars();
+                return cln;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override global::System.Data.DataTable CreateInstance() {
+                return new PARAMETERVALUESDataTable();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            internal void InitVars() {
+                this.columnPV_NR = base.Columns["PV_NR"];
+                this.columnMA_NR = base.Columns["MA_NR"];
+                this.columnPN_NR = base.Columns["PN_NR"];
+                this.columnPV_VALUE = base.Columns["PV_VALUE"];
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            private void InitClass() {
+                this.columnPV_NR = new global::System.Data.DataColumn("PV_NR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnPV_NR);
+                this.columnMA_NR = new global::System.Data.DataColumn("MA_NR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnMA_NR);
+                this.columnPN_NR = new global::System.Data.DataColumn("PN_NR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnPN_NR);
+                this.columnPV_VALUE = new global::System.Data.DataColumn("PV_VALUE", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnPV_VALUE);
+                this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
+                                this.columnPV_NR}, true));
+                this.columnPV_NR.AutoIncrement = true;
+                this.columnPV_NR.AutoIncrementSeed = -1;
+                this.columnPV_NR.AutoIncrementStep = -1;
+                this.columnPV_NR.AllowDBNull = false;
+                this.columnPV_NR.ReadOnly = true;
+                this.columnPV_NR.Unique = true;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public PARAMETERVALUESRow NewPARAMETERVALUESRow() {
+                return ((PARAMETERVALUESRow)(this.NewRow()));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) {
+                return new PARAMETERVALUESRow(builder);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override global::System.Type GetRowType() {
+                return typeof(PARAMETERVALUESRow);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanged(e);
+                if ((this.PARAMETERVALUESRowChanged != null)) {
+                    this.PARAMETERVALUESRowChanged(this, new PARAMETERVALUESRowChangeEvent(((PARAMETERVALUESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanging(e);
+                if ((this.PARAMETERVALUESRowChanging != null)) {
+                    this.PARAMETERVALUESRowChanging(this, new PARAMETERVALUESRowChangeEvent(((PARAMETERVALUESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleted(e);
+                if ((this.PARAMETERVALUESRowDeleted != null)) {
+                    this.PARAMETERVALUESRowDeleted(this, new PARAMETERVALUESRowChangeEvent(((PARAMETERVALUESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleting(e);
+                if ((this.PARAMETERVALUESRowDeleting != null)) {
+                    this.PARAMETERVALUESRowDeleting(this, new PARAMETERVALUESRowChangeEvent(((PARAMETERVALUESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void RemovePARAMETERVALUESRow(PARAMETERVALUESRow row) {
+                this.Rows.Remove(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) {
+                global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();
+                global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();
+                SoilProfileDataSet ds = new SoilProfileDataSet();
+                global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny();
+                any1.Namespace = "http://www.w3.org/2001/XMLSchema";
+                any1.MinOccurs = new decimal(0);
+                any1.MaxOccurs = decimal.MaxValue;
+                any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any1);
+                global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny();
+                any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1";
+                any2.MinOccurs = new decimal(1);
+                any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any2);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute1.Name = "namespace";
+                attribute1.FixedValue = ds.Namespace;
+                type.Attributes.Add(attribute1);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute2.Name = "tableTypeName";
+                attribute2.FixedValue = "PARAMETERVALUESDataTable";
+                type.Attributes.Add(attribute2);
+                type.Particle = sequence;
+                global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();
+                if (xs.Contains(dsSchema.TargetNamespace)) {
+                    global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream();
+                    global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream();
+                    try {
+                        global::System.Xml.Schema.XmlSchema schema = null;
+                        dsSchema.Write(s1);
+                        for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) {
+                            schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current));
+                            s2.SetLength(0);
+                            schema.Write(s2);
+                            if ((s1.Length == s2.Length)) {
+                                s1.Position = 0;
+                                s2.Position = 0;
+                                for (; ((s1.Position != s1.Length) 
+                                            && (s1.ReadByte() == s2.ReadByte())); ) {
+                                    ;
+                                }
+                                if ((s1.Position == s1.Length)) {
+                                    return type;
+                                }
+                            }
+                        }
+                    }
+                    finally {
+                        if ((s1 != null)) {
+                            s1.Close();
+                        }
+                        if ((s2 != null)) {
+                            s2.Close();
+                        }
+                    }
+                }
+                xs.Add(dsSchema);
+                return type;
+            }
+        }
+        
+        /// <summary>
+        ///Represents strongly named DataRow class.
+        ///</summary>
+        public partial class ODGEOMETRIESRow : global::System.Data.DataRow {
+            
+            private ODGEOMETRIESDataTable tableODGEOMETRIES;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            internal ODGEOMETRIESRow(global::System.Data.DataRowBuilder rb) : 
+                    base(rb) {
+                this.tableODGEOMETRIES = ((ODGEOMETRIESDataTable)(this.Table));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public int OD_NR {
+                get {
+                    return ((int)(this[this.tableODGEOMETRIES.OD_NRColumn]));
+                }
+                set {
+                    this[this.tableODGEOMETRIES.OD_NRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public string OD_NAME {
+                get {
+                    try {
+                        return ((string)(this[this.tableODGEOMETRIES.OD_NAMEColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OD_NAME\' in table \'ODGEOMETRIES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOMETRIES.OD_NAMEColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public string OD_DESCR {
+                get {
+                    try {
+                        return ((string)(this[this.tableODGEOMETRIES.OD_DESCRColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OD_DESCR\' in table \'ODGEOMETRIES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOMETRIES.OD_DESCRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public double OD_RDX {
+                get {
+                    try {
+                        return ((double)(this[this.tableODGEOMETRIES.OD_RDXColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OD_RDX\' in table \'ODGEOMETRIES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOMETRIES.OD_RDXColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public double OD_RDY {
+                get {
+                    try {
+                        return ((double)(this[this.tableODGEOMETRIES.OD_RDYColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OD_RDY\' in table \'ODGEOMETRIES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOMETRIES.OD_RDYColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public int OD_CPTNR {
+                get {
+                    try {
+                        return ((int)(this[this.tableODGEOMETRIES.OD_CPTNRColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OD_CPTNR\' in table \'ODGEOMETRIES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOMETRIES.OD_CPTNRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public int OD_BORINGNR {
+                get {
+                    try {
+                        return ((int)(this[this.tableODGEOMETRIES.OD_BORINGNRColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OD_BORINGNR\' in table \'ODGEOMETRIES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOMETRIES.OD_BORINGNRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public int OD_GEOL_ZONE {
+                get {
+                    try {
+                        return ((int)(this[this.tableODGEOMETRIES.OD_GEOL_ZONEColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OD_GEOL_ZONE\' in table \'ODGEOMETRIES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOMETRIES.OD_GEOL_ZONEColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public double OD_CHANCE_OCCUR {
+                get {
+                    try {
+                        return ((double)(this[this.tableODGEOMETRIES.OD_CHANCE_OCCURColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OD_CHANCE_OCCUR\' in table \'ODGEOMETRIES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOMETRIES.OD_CHANCE_OCCURColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsOD_NAMENull() {
+                return this.IsNull(this.tableODGEOMETRIES.OD_NAMEColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetOD_NAMENull() {
+                this[this.tableODGEOMETRIES.OD_NAMEColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsOD_DESCRNull() {
+                return this.IsNull(this.tableODGEOMETRIES.OD_DESCRColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetOD_DESCRNull() {
+                this[this.tableODGEOMETRIES.OD_DESCRColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsOD_RDXNull() {
+                return this.IsNull(this.tableODGEOMETRIES.OD_RDXColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetOD_RDXNull() {
+                this[this.tableODGEOMETRIES.OD_RDXColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsOD_RDYNull() {
+                return this.IsNull(this.tableODGEOMETRIES.OD_RDYColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetOD_RDYNull() {
+                this[this.tableODGEOMETRIES.OD_RDYColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsOD_CPTNRNull() {
+                return this.IsNull(this.tableODGEOMETRIES.OD_CPTNRColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetOD_CPTNRNull() {
+                this[this.tableODGEOMETRIES.OD_CPTNRColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsOD_BORINGNRNull() {
+                return this.IsNull(this.tableODGEOMETRIES.OD_BORINGNRColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetOD_BORINGNRNull() {
+                this[this.tableODGEOMETRIES.OD_BORINGNRColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsOD_GEOL_ZONENull() {
+                return this.IsNull(this.tableODGEOMETRIES.OD_GEOL_ZONEColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetOD_GEOL_ZONENull() {
+                this[this.tableODGEOMETRIES.OD_GEOL_ZONEColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsOD_CHANCE_OCCURNull() {
+                return this.IsNull(this.tableODGEOMETRIES.OD_CHANCE_OCCURColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetOD_CHANCE_OCCURNull() {
+                this[this.tableODGEOMETRIES.OD_CHANCE_OCCURColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public ODGEOLAYERSRow[] GetODGEOLAYERSRows() {
+                if ((this.Table.ChildRelations["ODGEOMETRIES_ODGEOLAYERS"] == null)) {
+                    return new ODGEOLAYERSRow[0];
+                }
+                else {
+                    return ((ODGEOLAYERSRow[])(base.GetChildRows(this.Table.ChildRelations["ODGEOMETRIES_ODGEOLAYERS"])));
+                }
+            }
+        }
+        
+        /// <summary>
+        ///Represents strongly named DataRow class.
+        ///</summary>
+        public partial class ODGEOLAYERSRow : global::System.Data.DataRow {
+            
+            private ODGEOLAYERSDataTable tableODGEOLAYERS;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            internal ODGEOLAYERSRow(global::System.Data.DataRowBuilder rb) : 
+                    base(rb) {
+                this.tableODGEOLAYERS = ((ODGEOLAYERSDataTable)(this.Table));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public int OL_NR {
+                get {
+                    return ((int)(this[this.tableODGEOLAYERS.OL_NRColumn]));
+                }
+                set {
+                    this[this.tableODGEOLAYERS.OL_NRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public int OD_NR {
+                get {
+                    try {
+                        return ((int)(this[this.tableODGEOLAYERS.OD_NRColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OD_NR\' in table \'ODGEOLAYERS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOLAYERS.OD_NRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public int MA_NR {
+                get {
+                    try {
+                        return ((int)(this[this.tableODGEOLAYERS.MA_NRColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'MA_NR\' in table \'ODGEOLAYERS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOLAYERS.MA_NRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public int OL_LAYERNR {
+                get {
+                    try {
+                        return ((int)(this[this.tableODGEOLAYERS.OL_LAYERNRColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OL_LAYERNR\' in table \'ODGEOLAYERS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOLAYERS.OL_LAYERNRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public double OL_LEVEL {
+                get {
+                    try {
+                        return ((double)(this[this.tableODGEOLAYERS.OL_LEVELColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OL_LEVEL\' in table \'ODGEOLAYERS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOLAYERS.OL_LEVELColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public int OL_PLATTOP {
+                get {
+                    try {
+                        return ((int)(this[this.tableODGEOLAYERS.OL_PLATTOPColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OL_PLATTOP\' in table \'ODGEOLAYERS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOLAYERS.OL_PLATTOPColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public int OL_PLATBOTTOM {
+                get {
+                    try {
+                        return ((int)(this[this.tableODGEOLAYERS.OL_PLATBOTTOMColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OL_PLATBOTTOM\' in table \'ODGEOLAYERS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOLAYERS.OL_PLATBOTTOMColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public double OL_TOPEXCESSPP {
+                get {
+                    try {
+                        return ((double)(this[this.tableODGEOLAYERS.OL_TOPEXCESSPPColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OL_TOPEXCESSPP\' in table \'ODGEOLAYERS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOLAYERS.OL_TOPEXCESSPPColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public double OL_BOTEXCESSPP {
+                get {
+                    try {
+                        return ((double)(this[this.tableODGEOLAYERS.OL_BOTEXCESSPPColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OL_BOTEXCESSPP\' in table \'ODGEOLAYERS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOLAYERS.OL_BOTEXCESSPPColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public double OL_OCR {
+                get {
+                    try {
+                        return ((double)(this[this.tableODGEOLAYERS.OL_OCRColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OL_OCR\' in table \'ODGEOLAYERS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOLAYERS.OL_OCRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public ODGEOMETRIESRow ODGEOMETRIESRow {
+                get {
+                    return ((ODGEOMETRIESRow)(this.GetParentRow(this.Table.ParentRelations["ODGEOMETRIES_ODGEOLAYERS"])));
+                }
+                set {
+                    this.SetParentRow(value, this.Table.ParentRelations["ODGEOMETRIES_ODGEOLAYERS"]);
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public MATERIALSRow MATERIALSRow {
+                get {
+                    return ((MATERIALSRow)(this.GetParentRow(this.Table.ParentRelations["ODGEOLAYERS_MATERIALS"])));
+                }
+                set {
+                    this.SetParentRow(value, this.Table.ParentRelations["ODGEOLAYERS_MATERIALS"]);
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsOD_NRNull() {
+                return this.IsNull(this.tableODGEOLAYERS.OD_NRColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetOD_NRNull() {
+                this[this.tableODGEOLAYERS.OD_NRColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsMA_NRNull() {
+                return this.IsNull(this.tableODGEOLAYERS.MA_NRColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetMA_NRNull() {
+                this[this.tableODGEOLAYERS.MA_NRColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsOL_LAYERNRNull() {
+                return this.IsNull(this.tableODGEOLAYERS.OL_LAYERNRColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetOL_LAYERNRNull() {
+                this[this.tableODGEOLAYERS.OL_LAYERNRColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsOL_LEVELNull() {
+                return this.IsNull(this.tableODGEOLAYERS.OL_LEVELColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetOL_LEVELNull() {
+                this[this.tableODGEOLAYERS.OL_LEVELColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsOL_PLATTOPNull() {
+                return this.IsNull(this.tableODGEOLAYERS.OL_PLATTOPColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetOL_PLATTOPNull() {
+                this[this.tableODGEOLAYERS.OL_PLATTOPColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsOL_PLATBOTTOMNull() {
+                return this.IsNull(this.tableODGEOLAYERS.OL_PLATBOTTOMColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetOL_PLATBOTTOMNull() {
+                this[this.tableODGEOLAYERS.OL_PLATBOTTOMColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsOL_TOPEXCESSPPNull() {
+                return this.IsNull(this.tableODGEOLAYERS.OL_TOPEXCESSPPColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetOL_TOPEXCESSPPNull() {
+                this[this.tableODGEOLAYERS.OL_TOPEXCESSPPColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsOL_BOTEXCESSPPNull() {
+                return this.IsNull(this.tableODGEOLAYERS.OL_BOTEXCESSPPColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetOL_BOTEXCESSPPNull() {
+                this[this.tableODGEOLAYERS.OL_BOTEXCESSPPColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsOL_OCRNull() {
+                return this.IsNull(this.tableODGEOLAYERS.OL_OCRColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetOL_OCRNull() {
+                this[this.tableODGEOLAYERS.OL_OCRColumn] = global::System.Convert.DBNull;
+            }
+        }
+        
+        /// <summary>
+        ///Represents strongly named DataRow class.
+        ///</summary>
+        public partial class MATERIALSRow : global::System.Data.DataRow {
+            
+            private MATERIALSDataTable tableMATERIALS;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            internal MATERIALSRow(global::System.Data.DataRowBuilder rb) : 
+                    base(rb) {
+                this.tableMATERIALS = ((MATERIALSDataTable)(this.Table));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public int MA_NR {
+                get {
+                    return ((int)(this[this.tableMATERIALS.MA_NRColumn]));
+                }
+                set {
+                    this[this.tableMATERIALS.MA_NRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public string MA_NAME {
+                get {
+                    try {
+                        return ((string)(this[this.tableMATERIALS.MA_NAMEColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'MA_NAME\' in table \'MATERIALS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableMATERIALS.MA_NAMEColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public string MA_DESCR {
+                get {
+                    try {
+                        return ((string)(this[this.tableMATERIALS.MA_DESCRColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'MA_DESCR\' in table \'MATERIALS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableMATERIALS.MA_DESCRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public int MA_INDEX {
+                get {
+                    try {
+                        return ((int)(this[this.tableMATERIALS.MA_INDEXColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'MA_INDEX\' in table \'MATERIALS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableMATERIALS.MA_INDEXColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsMA_NAMENull() {
+                return this.IsNull(this.tableMATERIALS.MA_NAMEColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetMA_NAMENull() {
+                this[this.tableMATERIALS.MA_NAMEColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsMA_DESCRNull() {
+                return this.IsNull(this.tableMATERIALS.MA_DESCRColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetMA_DESCRNull() {
+                this[this.tableMATERIALS.MA_DESCRColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsMA_INDEXNull() {
+                return this.IsNull(this.tableMATERIALS.MA_INDEXColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetMA_INDEXNull() {
+                this[this.tableMATERIALS.MA_INDEXColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public ODGEOLAYERSRow[] GetODGEOLAYERSRows() {
+                if ((this.Table.ChildRelations["ODGEOLAYERS_MATERIALS"] == null)) {
+                    return new ODGEOLAYERSRow[0];
+                }
+                else {
+                    return ((ODGEOLAYERSRow[])(base.GetChildRows(this.Table.ChildRelations["ODGEOLAYERS_MATERIALS"])));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public PARAMETERVALUESRow[] GetPARAMETERVALUESRows() {
+                if ((this.Table.ChildRelations["PARAMETERVALUES_MATERIALS"] == null)) {
+                    return new PARAMETERVALUESRow[0];
+                }
+                else {
+                    return ((PARAMETERVALUESRow[])(base.GetChildRows(this.Table.ChildRelations["PARAMETERVALUES_MATERIALS"])));
+                }
+            }
+        }
+        
+        /// <summary>
+        ///Represents strongly named DataRow class.
+        ///</summary>
+        public partial class PARAMETERNAMESRow : global::System.Data.DataRow {
+            
+            private PARAMETERNAMESDataTable tablePARAMETERNAMES;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            internal PARAMETERNAMESRow(global::System.Data.DataRowBuilder rb) : 
+                    base(rb) {
+                this.tablePARAMETERNAMES = ((PARAMETERNAMESDataTable)(this.Table));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public int PN_NR {
+                get {
+                    return ((int)(this[this.tablePARAMETERNAMES.PN_NRColumn]));
+                }
+                set {
+                    this[this.tablePARAMETERNAMES.PN_NRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public string PN_NAME {
+                get {
+                    try {
+                        return ((string)(this[this.tablePARAMETERNAMES.PN_NAMEColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'PN_NAME\' in table \'PARAMETERNAMES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tablePARAMETERNAMES.PN_NAMEColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsPN_NAMENull() {
+                return this.IsNull(this.tablePARAMETERNAMES.PN_NAMEColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetPN_NAMENull() {
+                this[this.tablePARAMETERNAMES.PN_NAMEColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public PARAMETERVALUESRow[] GetPARAMETERVALUESRows() {
+                if ((this.Table.ChildRelations["PARAMETERNAMES_PARAMETERVALUES"] == null)) {
+                    return new PARAMETERVALUESRow[0];
+                }
+                else {
+                    return ((PARAMETERVALUESRow[])(base.GetChildRows(this.Table.ChildRelations["PARAMETERNAMES_PARAMETERVALUES"])));
+                }
+            }
+        }
+        
+        /// <summary>
+        ///Represents strongly named DataRow class.
+        ///</summary>
+        public partial class PARAMETERVALUESRow : global::System.Data.DataRow {
+            
+            private PARAMETERVALUESDataTable tablePARAMETERVALUES;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            internal PARAMETERVALUESRow(global::System.Data.DataRowBuilder rb) : 
+                    base(rb) {
+                this.tablePARAMETERVALUES = ((PARAMETERVALUESDataTable)(this.Table));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public int PV_NR {
+                get {
+                    return ((int)(this[this.tablePARAMETERVALUES.PV_NRColumn]));
+                }
+                set {
+                    this[this.tablePARAMETERVALUES.PV_NRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public int MA_NR {
+                get {
+                    try {
+                        return ((int)(this[this.tablePARAMETERVALUES.MA_NRColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'MA_NR\' in table \'PARAMETERVALUES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tablePARAMETERVALUES.MA_NRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public int PN_NR {
+                get {
+                    try {
+                        return ((int)(this[this.tablePARAMETERVALUES.PN_NRColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'PN_NR\' in table \'PARAMETERVALUES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tablePARAMETERVALUES.PN_NRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public double PV_VALUE {
+                get {
+                    try {
+                        return ((double)(this[this.tablePARAMETERVALUES.PV_VALUEColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'PV_VALUE\' in table \'PARAMETERVALUES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tablePARAMETERVALUES.PV_VALUEColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public MATERIALSRow MATERIALSRow {
+                get {
+                    return ((MATERIALSRow)(this.GetParentRow(this.Table.ParentRelations["PARAMETERVALUES_MATERIALS"])));
+                }
+                set {
+                    this.SetParentRow(value, this.Table.ParentRelations["PARAMETERVALUES_MATERIALS"]);
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public PARAMETERNAMESRow PARAMETERNAMESRow {
+                get {
+                    return ((PARAMETERNAMESRow)(this.GetParentRow(this.Table.ParentRelations["PARAMETERNAMES_PARAMETERVALUES"])));
+                }
+                set {
+                    this.SetParentRow(value, this.Table.ParentRelations["PARAMETERNAMES_PARAMETERVALUES"]);
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsMA_NRNull() {
+                return this.IsNull(this.tablePARAMETERVALUES.MA_NRColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetMA_NRNull() {
+                this[this.tablePARAMETERVALUES.MA_NRColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsPN_NRNull() {
+                return this.IsNull(this.tablePARAMETERVALUES.PN_NRColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetPN_NRNull() {
+                this[this.tablePARAMETERVALUES.PN_NRColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public bool IsPV_VALUENull() {
+                return this.IsNull(this.tablePARAMETERVALUES.PV_VALUEColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public void SetPV_VALUENull() {
+                this[this.tablePARAMETERVALUES.PV_VALUEColumn] = global::System.Convert.DBNull;
+            }
+        }
+        
+        /// <summary>
+        ///Row event argument class
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public class ODGEOMETRIESRowChangeEvent : global::System.EventArgs {
+            
+            private ODGEOMETRIESRow eventRow;
+            
+            private global::System.Data.DataRowAction eventAction;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public ODGEOMETRIESRowChangeEvent(ODGEOMETRIESRow row, global::System.Data.DataRowAction action) {
+                this.eventRow = row;
+                this.eventAction = action;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public ODGEOMETRIESRow Row {
+                get {
+                    return this.eventRow;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataRowAction Action {
+                get {
+                    return this.eventAction;
+                }
+            }
+        }
+        
+        /// <summary>
+        ///Row event argument class
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public class ODGEOLAYERSRowChangeEvent : global::System.EventArgs {
+            
+            private ODGEOLAYERSRow eventRow;
+            
+            private global::System.Data.DataRowAction eventAction;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public ODGEOLAYERSRowChangeEvent(ODGEOLAYERSRow row, global::System.Data.DataRowAction action) {
+                this.eventRow = row;
+                this.eventAction = action;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public ODGEOLAYERSRow Row {
+                get {
+                    return this.eventRow;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataRowAction Action {
+                get {
+                    return this.eventAction;
+                }
+            }
+        }
+        
+        /// <summary>
+        ///Row event argument class
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public class MATERIALSRowChangeEvent : global::System.EventArgs {
+            
+            private MATERIALSRow eventRow;
+            
+            private global::System.Data.DataRowAction eventAction;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public MATERIALSRowChangeEvent(MATERIALSRow row, global::System.Data.DataRowAction action) {
+                this.eventRow = row;
+                this.eventAction = action;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public MATERIALSRow Row {
+                get {
+                    return this.eventRow;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataRowAction Action {
+                get {
+                    return this.eventAction;
+                }
+            }
+        }
+        
+        /// <summary>
+        ///Row event argument class
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public class PARAMETERNAMESRowChangeEvent : global::System.EventArgs {
+            
+            private PARAMETERNAMESRow eventRow;
+            
+            private global::System.Data.DataRowAction eventAction;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public PARAMETERNAMESRowChangeEvent(PARAMETERNAMESRow row, global::System.Data.DataRowAction action) {
+                this.eventRow = row;
+                this.eventAction = action;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public PARAMETERNAMESRow Row {
+                get {
+                    return this.eventRow;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataRowAction Action {
+                get {
+                    return this.eventAction;
+                }
+            }
+        }
+        
+        /// <summary>
+        ///Row event argument class
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public class PARAMETERVALUESRowChangeEvent : global::System.EventArgs {
+            
+            private PARAMETERVALUESRow eventRow;
+            
+            private global::System.Data.DataRowAction eventAction;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public PARAMETERVALUESRowChangeEvent(PARAMETERVALUESRow row, global::System.Data.DataRowAction action) {
+                this.eventRow = row;
+                this.eventAction = action;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public PARAMETERVALUESRow Row {
+                get {
+                    return this.eventRow;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public global::System.Data.DataRowAction Action {
+                get {
+                    return this.eventAction;
+                }
+            }
+        }
+    }
+}
+namespace Deltares.Dam.Data.Xsd.SoilProfileDataSetTableAdapters {
+    
+    
+    /// <summary>
+    ///Represents the connection and commands used to retrieve and save data.
+    ///</summary>
+    [global::System.ComponentModel.DesignerCategoryAttribute("code")]
+    [global::System.ComponentModel.ToolboxItem(true)]
+    [global::System.ComponentModel.DataObjectAttribute(true)]
+    [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" +
+        ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+    [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+    public partial class ODGEOMETRIESTableAdapter : global::System.ComponentModel.Component {
+        
+        private global::System.Data.Odbc.OdbcDataAdapter _adapter;
+        
+        private global::System.Data.Odbc.OdbcConnection _connection;
+        
+        private global::System.Data.Odbc.OdbcTransaction _transaction;
+        
+        private global::System.Data.Odbc.OdbcCommand[] _commandCollection;
+        
+        private bool _clearBeforeFill;
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public ODGEOMETRIESTableAdapter() {
+            this.ClearBeforeFill = true;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        protected internal global::System.Data.Odbc.OdbcDataAdapter Adapter {
+            get {
+                if ((this._adapter == null)) {
+                    this.InitAdapter();
+                }
+                return this._adapter;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        internal global::System.Data.Odbc.OdbcConnection Connection {
+            get {
+                if ((this._connection == null)) {
+                    this.InitConnection();
+                }
+                return this._connection;
+            }
+            set {
+                this._connection = value;
+                if ((this.Adapter.InsertCommand != null)) {
+                    this.Adapter.InsertCommand.Connection = value;
+                }
+                if ((this.Adapter.DeleteCommand != null)) {
+                    this.Adapter.DeleteCommand.Connection = value;
+                }
+                if ((this.Adapter.UpdateCommand != null)) {
+                    this.Adapter.UpdateCommand.Connection = value;
+                }
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    if ((this.CommandCollection[i] != null)) {
+                        ((global::System.Data.Odbc.OdbcCommand)(this.CommandCollection[i])).Connection = value;
+                    }
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        internal global::System.Data.Odbc.OdbcTransaction Transaction {
+            get {
+                return this._transaction;
+            }
+            set {
+                this._transaction = value;
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    this.CommandCollection[i].Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.DeleteCommand != null))) {
+                    this.Adapter.DeleteCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.InsertCommand != null))) {
+                    this.Adapter.InsertCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.UpdateCommand != null))) {
+                    this.Adapter.UpdateCommand.Transaction = this._transaction;
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        protected global::System.Data.Odbc.OdbcCommand[] CommandCollection {
+            get {
+                if ((this._commandCollection == null)) {
+                    this.InitCommandCollection();
+                }
+                return this._commandCollection;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public bool ClearBeforeFill {
+            get {
+                return this._clearBeforeFill;
+            }
+            set {
+                this._clearBeforeFill = value;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private void InitAdapter() {
+            this._adapter = new global::System.Data.Odbc.OdbcDataAdapter();
+            global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping();
+            tableMapping.SourceTable = "Table";
+            tableMapping.DataSetTable = "ODGEOMETRIES";
+            tableMapping.ColumnMappings.Add("OD_NR", "OD_NR");
+            tableMapping.ColumnMappings.Add("OD_NAME", "OD_NAME");
+            tableMapping.ColumnMappings.Add("OD_DESCR", "OD_DESCR");
+            tableMapping.ColumnMappings.Add("OD_RDX", "OD_RDX");
+            tableMapping.ColumnMappings.Add("OD_RDY", "OD_RDY");
+            tableMapping.ColumnMappings.Add("OD_CPTNR", "OD_CPTNR");
+            tableMapping.ColumnMappings.Add("OD_BORINGNR", "OD_BORINGNR");
+            tableMapping.ColumnMappings.Add("OD_GEOL_ZONE", "OD_GEOL_ZONE");
+            tableMapping.ColumnMappings.Add("OD_CHANCE_OCCUR", "OD_CHANCE_OCCUR");
+            this._adapter.TableMappings.Add(tableMapping);
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private void InitConnection() {
+            this._connection = new global::System.Data.Odbc.OdbcConnection();
+            this._connection.ConnectionString = System.Configuration.ConfigurationManager.ConnectionStrings["ConnectionString"].ConnectionString;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private void InitCommandCollection() {
+            this._commandCollection = new global::System.Data.Odbc.OdbcCommand[1];
+            this._commandCollection[0] = new global::System.Data.Odbc.OdbcCommand();
+            this._commandCollection[0].Connection = this.Connection;
+            this._commandCollection[0].CommandText = "SELECT OD_NR, OD_NAME, OD_DESCR, OD_RDX, OD_RDY, OD_CPTNR, OD_BORINGNR, OD_GEOL_Z" +
+                "ONE, OD_CHANCE_OCCUR FROM ODGEOMETRIES";
+            this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
+        public virtual SoilProfileDataSet.ODGEOMETRIESDataTable GetData() {
+            this.Adapter.SelectCommand = this.CommandCollection[0];
+            SoilProfileDataSet.ODGEOMETRIESDataTable dataTable = new SoilProfileDataSet.ODGEOMETRIESDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+    }
+    
+    /// <summary>
+    ///Represents the connection and commands used to retrieve and save data.
+    ///</summary>
+    [global::System.ComponentModel.DesignerCategoryAttribute("code")]
+    [global::System.ComponentModel.ToolboxItem(true)]
+    [global::System.ComponentModel.DataObjectAttribute(true)]
+    [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" +
+        ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+    [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+    public partial class ODGEOLAYERSTableAdapter : global::System.ComponentModel.Component {
+        
+        private global::System.Data.Odbc.OdbcDataAdapter _adapter;
+        
+        private global::System.Data.Odbc.OdbcConnection _connection;
+        
+        private global::System.Data.Odbc.OdbcTransaction _transaction;
+        
+        private global::System.Data.Odbc.OdbcCommand[] _commandCollection;
+        
+        private bool _clearBeforeFill;
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public ODGEOLAYERSTableAdapter() {
+            this.ClearBeforeFill = true;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        protected internal global::System.Data.Odbc.OdbcDataAdapter Adapter {
+            get {
+                if ((this._adapter == null)) {
+                    this.InitAdapter();
+                }
+                return this._adapter;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        internal global::System.Data.Odbc.OdbcConnection Connection {
+            get {
+                if ((this._connection == null)) {
+                    this.InitConnection();
+                }
+                return this._connection;
+            }
+            set {
+                this._connection = value;
+                if ((this.Adapter.InsertCommand != null)) {
+                    this.Adapter.InsertCommand.Connection = value;
+                }
+                if ((this.Adapter.DeleteCommand != null)) {
+                    this.Adapter.DeleteCommand.Connection = value;
+                }
+                if ((this.Adapter.UpdateCommand != null)) {
+                    this.Adapter.UpdateCommand.Connection = value;
+                }
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    if ((this.CommandCollection[i] != null)) {
+                        ((global::System.Data.Odbc.OdbcCommand)(this.CommandCollection[i])).Connection = value;
+                    }
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        internal global::System.Data.Odbc.OdbcTransaction Transaction {
+            get {
+                return this._transaction;
+            }
+            set {
+                this._transaction = value;
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    this.CommandCollection[i].Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.DeleteCommand != null))) {
+                    this.Adapter.DeleteCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.InsertCommand != null))) {
+                    this.Adapter.InsertCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.UpdateCommand != null))) {
+                    this.Adapter.UpdateCommand.Transaction = this._transaction;
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        protected global::System.Data.Odbc.OdbcCommand[] CommandCollection {
+            get {
+                if ((this._commandCollection == null)) {
+                    this.InitCommandCollection();
+                }
+                return this._commandCollection;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public bool ClearBeforeFill {
+            get {
+                return this._clearBeforeFill;
+            }
+            set {
+                this._clearBeforeFill = value;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private void InitAdapter() {
+            this._adapter = new global::System.Data.Odbc.OdbcDataAdapter();
+            global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping();
+            tableMapping.SourceTable = "Table";
+            tableMapping.DataSetTable = "ODGEOLAYERS";
+            tableMapping.ColumnMappings.Add("OL_NR", "OL_NR");
+            tableMapping.ColumnMappings.Add("OD_NR", "OD_NR");
+            tableMapping.ColumnMappings.Add("MA_NR", "MA_NR");
+            tableMapping.ColumnMappings.Add("OL_LAYERNR", "OL_LAYERNR");
+            tableMapping.ColumnMappings.Add("OL_LEVEL", "OL_LEVEL");
+            tableMapping.ColumnMappings.Add("OL_PLATTOP", "OL_PLATTOP");
+            tableMapping.ColumnMappings.Add("OL_PLATBOTTOM", "OL_PLATBOTTOM");
+            tableMapping.ColumnMappings.Add("OL_TOPEXCESSPP", "OL_TOPEXCESSPP");
+            tableMapping.ColumnMappings.Add("OL_BOTEXCESSPP", "OL_BOTEXCESSPP");
+            tableMapping.ColumnMappings.Add("OL_OCR", "OL_OCR");
+            this._adapter.TableMappings.Add(tableMapping);
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private void InitConnection() {
+            this._connection = new global::System.Data.Odbc.OdbcConnection();
+            this._connection.ConnectionString = System.Configuration.ConfigurationManager.ConnectionStrings["ConnectionString"].ConnectionString;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private void InitCommandCollection() {
+            this._commandCollection = new global::System.Data.Odbc.OdbcCommand[1];
+            this._commandCollection[0] = new global::System.Data.Odbc.OdbcCommand();
+            this._commandCollection[0].Connection = this.Connection;
+            this._commandCollection[0].CommandText = "SELECT OL_NR, OD_NR, MA_NR, OL_LAYERNR, OL_LEVEL, OL_PLATTOP, OL_PLATBOTTOM, OL_T" +
+                "OPEXCESSPP, OL_BOTEXCESSPP, OL_OCR FROM ODGEOLAYERS";
+            this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
+        public virtual SoilProfileDataSet.ODGEOLAYERSDataTable GetData() {
+            this.Adapter.SelectCommand = this.CommandCollection[0];
+            SoilProfileDataSet.ODGEOLAYERSDataTable dataTable = new SoilProfileDataSet.ODGEOLAYERSDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+    }
+    
+    /// <summary>
+    ///Represents the connection and commands used to retrieve and save data.
+    ///</summary>
+    [global::System.ComponentModel.DesignerCategoryAttribute("code")]
+    [global::System.ComponentModel.ToolboxItem(true)]
+    [global::System.ComponentModel.DataObjectAttribute(true)]
+    [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" +
+        ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+    [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+    public partial class MATERIALSTableAdapter : global::System.ComponentModel.Component {
+        
+        private global::System.Data.Odbc.OdbcDataAdapter _adapter;
+        
+        private global::System.Data.Odbc.OdbcConnection _connection;
+        
+        private global::System.Data.Odbc.OdbcTransaction _transaction;
+        
+        private global::System.Data.Odbc.OdbcCommand[] _commandCollection;
+        
+        private bool _clearBeforeFill;
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public MATERIALSTableAdapter() {
+            this.ClearBeforeFill = true;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        protected internal global::System.Data.Odbc.OdbcDataAdapter Adapter {
+            get {
+                if ((this._adapter == null)) {
+                    this.InitAdapter();
+                }
+                return this._adapter;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        internal global::System.Data.Odbc.OdbcConnection Connection {
+            get {
+                if ((this._connection == null)) {
+                    this.InitConnection();
+                }
+                return this._connection;
+            }
+            set {
+                this._connection = value;
+                if ((this.Adapter.InsertCommand != null)) {
+                    this.Adapter.InsertCommand.Connection = value;
+                }
+                if ((this.Adapter.DeleteCommand != null)) {
+                    this.Adapter.DeleteCommand.Connection = value;
+                }
+                if ((this.Adapter.UpdateCommand != null)) {
+                    this.Adapter.UpdateCommand.Connection = value;
+                }
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    if ((this.CommandCollection[i] != null)) {
+                        ((global::System.Data.Odbc.OdbcCommand)(this.CommandCollection[i])).Connection = value;
+                    }
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        internal global::System.Data.Odbc.OdbcTransaction Transaction {
+            get {
+                return this._transaction;
+            }
+            set {
+                this._transaction = value;
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    this.CommandCollection[i].Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.DeleteCommand != null))) {
+                    this.Adapter.DeleteCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.InsertCommand != null))) {
+                    this.Adapter.InsertCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.UpdateCommand != null))) {
+                    this.Adapter.UpdateCommand.Transaction = this._transaction;
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        protected global::System.Data.Odbc.OdbcCommand[] CommandCollection {
+            get {
+                if ((this._commandCollection == null)) {
+                    this.InitCommandCollection();
+                }
+                return this._commandCollection;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public bool ClearBeforeFill {
+            get {
+                return this._clearBeforeFill;
+            }
+            set {
+                this._clearBeforeFill = value;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private void InitAdapter() {
+            this._adapter = new global::System.Data.Odbc.OdbcDataAdapter();
+            global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping();
+            tableMapping.SourceTable = "Table";
+            tableMapping.DataSetTable = "MATERIALS";
+            tableMapping.ColumnMappings.Add("MA_NR", "MA_NR");
+            tableMapping.ColumnMappings.Add("MA_NAME", "MA_NAME");
+            tableMapping.ColumnMappings.Add("MA_DESCR", "MA_DESCR");
+            tableMapping.ColumnMappings.Add("MA_INDEX", "MA_INDEX");
+            this._adapter.TableMappings.Add(tableMapping);
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private void InitConnection() {
+            this._connection = new global::System.Data.Odbc.OdbcConnection();
+            this._connection.ConnectionString = System.Configuration.ConfigurationManager.ConnectionStrings["ConnectionString"].ConnectionString;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private void InitCommandCollection() {
+            this._commandCollection = new global::System.Data.Odbc.OdbcCommand[1];
+            this._commandCollection[0] = new global::System.Data.Odbc.OdbcCommand();
+            this._commandCollection[0].Connection = this.Connection;
+            this._commandCollection[0].CommandText = "SELECT MA_NR, MA_NAME, MA_DESCR, MA_INDEX FROM MATERIALS";
+            this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
+        public virtual SoilProfileDataSet.MATERIALSDataTable GetData() {
+            this.Adapter.SelectCommand = this.CommandCollection[0];
+            SoilProfileDataSet.MATERIALSDataTable dataTable = new SoilProfileDataSet.MATERIALSDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+    }
+    
+    /// <summary>
+    ///Represents the connection and commands used to retrieve and save data.
+    ///</summary>
+    [global::System.ComponentModel.DesignerCategoryAttribute("code")]
+    [global::System.ComponentModel.ToolboxItem(true)]
+    [global::System.ComponentModel.DataObjectAttribute(true)]
+    [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" +
+        ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+    [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+    public partial class PARAMETERNAMESTableAdapter : global::System.ComponentModel.Component {
+        
+        private global::System.Data.Odbc.OdbcDataAdapter _adapter;
+        
+        private global::System.Data.Odbc.OdbcConnection _connection;
+        
+        private global::System.Data.Odbc.OdbcTransaction _transaction;
+        
+        private global::System.Data.Odbc.OdbcCommand[] _commandCollection;
+        
+        private bool _clearBeforeFill;
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public PARAMETERNAMESTableAdapter() {
+            this.ClearBeforeFill = true;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        protected internal global::System.Data.Odbc.OdbcDataAdapter Adapter {
+            get {
+                if ((this._adapter == null)) {
+                    this.InitAdapter();
+                }
+                return this._adapter;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        internal global::System.Data.Odbc.OdbcConnection Connection {
+            get {
+                if ((this._connection == null)) {
+                    this.InitConnection();
+                }
+                return this._connection;
+            }
+            set {
+                this._connection = value;
+                if ((this.Adapter.InsertCommand != null)) {
+                    this.Adapter.InsertCommand.Connection = value;
+                }
+                if ((this.Adapter.DeleteCommand != null)) {
+                    this.Adapter.DeleteCommand.Connection = value;
+                }
+                if ((this.Adapter.UpdateCommand != null)) {
+                    this.Adapter.UpdateCommand.Connection = value;
+                }
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    if ((this.CommandCollection[i] != null)) {
+                        ((global::System.Data.Odbc.OdbcCommand)(this.CommandCollection[i])).Connection = value;
+                    }
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        internal global::System.Data.Odbc.OdbcTransaction Transaction {
+            get {
+                return this._transaction;
+            }
+            set {
+                this._transaction = value;
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    this.CommandCollection[i].Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.DeleteCommand != null))) {
+                    this.Adapter.DeleteCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.InsertCommand != null))) {
+                    this.Adapter.InsertCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.UpdateCommand != null))) {
+                    this.Adapter.UpdateCommand.Transaction = this._transaction;
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        protected global::System.Data.Odbc.OdbcCommand[] CommandCollection {
+            get {
+                if ((this._commandCollection == null)) {
+                    this.InitCommandCollection();
+                }
+                return this._commandCollection;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public bool ClearBeforeFill {
+            get {
+                return this._clearBeforeFill;
+            }
+            set {
+                this._clearBeforeFill = value;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private void InitAdapter() {
+            this._adapter = new global::System.Data.Odbc.OdbcDataAdapter();
+            global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping();
+            tableMapping.SourceTable = "Table";
+            tableMapping.DataSetTable = "PARAMETERNAMES";
+            tableMapping.ColumnMappings.Add("PN_NR", "PN_NR");
+            tableMapping.ColumnMappings.Add("PN_NAME", "PN_NAME");
+            this._adapter.TableMappings.Add(tableMapping);
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private void InitConnection() {
+            this._connection = new global::System.Data.Odbc.OdbcConnection();
+            this._connection.ConnectionString = System.Configuration.ConfigurationManager.ConnectionStrings["ConnectionString"].ConnectionString;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private void InitCommandCollection() {
+            this._commandCollection = new global::System.Data.Odbc.OdbcCommand[1];
+            this._commandCollection[0] = new global::System.Data.Odbc.OdbcCommand();
+            this._commandCollection[0].Connection = this.Connection;
+            this._commandCollection[0].CommandText = "SELECT PN_NR, PN_NAME FROM PARAMETERNAMES";
+            this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
+        public virtual SoilProfileDataSet.PARAMETERNAMESDataTable GetData() {
+            this.Adapter.SelectCommand = this.CommandCollection[0];
+            SoilProfileDataSet.PARAMETERNAMESDataTable dataTable = new SoilProfileDataSet.PARAMETERNAMESDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+    }
+    
+    /// <summary>
+    ///Represents the connection and commands used to retrieve and save data.
+    ///</summary>
+    [global::System.ComponentModel.DesignerCategoryAttribute("code")]
+    [global::System.ComponentModel.ToolboxItem(true)]
+    [global::System.ComponentModel.DataObjectAttribute(true)]
+    [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" +
+        ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+    [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+    public partial class PARAMETERVALUESTableAdapter : global::System.ComponentModel.Component {
+        
+        private global::System.Data.Odbc.OdbcDataAdapter _adapter;
+        
+        private global::System.Data.Odbc.OdbcConnection _connection;
+        
+        private global::System.Data.Odbc.OdbcTransaction _transaction;
+        
+        private global::System.Data.Odbc.OdbcCommand[] _commandCollection;
+        
+        private bool _clearBeforeFill;
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public PARAMETERVALUESTableAdapter() {
+            this.ClearBeforeFill = true;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        protected internal global::System.Data.Odbc.OdbcDataAdapter Adapter {
+            get {
+                if ((this._adapter == null)) {
+                    this.InitAdapter();
+                }
+                return this._adapter;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        internal global::System.Data.Odbc.OdbcConnection Connection {
+            get {
+                if ((this._connection == null)) {
+                    this.InitConnection();
+                }
+                return this._connection;
+            }
+            set {
+                this._connection = value;
+                if ((this.Adapter.InsertCommand != null)) {
+                    this.Adapter.InsertCommand.Connection = value;
+                }
+                if ((this.Adapter.DeleteCommand != null)) {
+                    this.Adapter.DeleteCommand.Connection = value;
+                }
+                if ((this.Adapter.UpdateCommand != null)) {
+                    this.Adapter.UpdateCommand.Connection = value;
+                }
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    if ((this.CommandCollection[i] != null)) {
+                        ((global::System.Data.Odbc.OdbcCommand)(this.CommandCollection[i])).Connection = value;
+                    }
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        internal global::System.Data.Odbc.OdbcTransaction Transaction {
+            get {
+                return this._transaction;
+            }
+            set {
+                this._transaction = value;
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    this.CommandCollection[i].Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.DeleteCommand != null))) {
+                    this.Adapter.DeleteCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.InsertCommand != null))) {
+                    this.Adapter.InsertCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.UpdateCommand != null))) {
+                    this.Adapter.UpdateCommand.Transaction = this._transaction;
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        protected global::System.Data.Odbc.OdbcCommand[] CommandCollection {
+            get {
+                if ((this._commandCollection == null)) {
+                    this.InitCommandCollection();
+                }
+                return this._commandCollection;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public bool ClearBeforeFill {
+            get {
+                return this._clearBeforeFill;
+            }
+            set {
+                this._clearBeforeFill = value;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private void InitAdapter() {
+            this._adapter = new global::System.Data.Odbc.OdbcDataAdapter();
+            global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping();
+            tableMapping.SourceTable = "Table";
+            tableMapping.DataSetTable = "PARAMETERVALUES";
+            tableMapping.ColumnMappings.Add("PV_NR", "PV_NR");
+            tableMapping.ColumnMappings.Add("MA_NR", "MA_NR");
+            tableMapping.ColumnMappings.Add("PN_NR", "PN_NR");
+            tableMapping.ColumnMappings.Add("PV_VALUE", "PV_VALUE");
+            this._adapter.TableMappings.Add(tableMapping);
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private void InitConnection() {
+            this._connection = new global::System.Data.Odbc.OdbcConnection();
+            this._connection.ConnectionString = System.Configuration.ConfigurationManager.ConnectionStrings["ConnectionString"].ConnectionString;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private void InitCommandCollection() {
+            this._commandCollection = new global::System.Data.Odbc.OdbcCommand[1];
+            this._commandCollection[0] = new global::System.Data.Odbc.OdbcCommand();
+            this._commandCollection[0].Connection = this.Connection;
+            this._commandCollection[0].CommandText = "SELECT PV_NR, MA_NR, PN_NR, PV_VALUE FROM PARAMETERVALUES";
+            this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
+        public virtual SoilProfileDataSet.PARAMETERVALUESDataTable GetData() {
+            this.Adapter.SelectCommand = this.CommandCollection[0];
+            SoilProfileDataSet.PARAMETERVALUESDataTable dataTable = new SoilProfileDataSet.PARAMETERVALUESDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+    }
+    
+    /// <summary>
+    ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios
+    ///</summary>
+    [global::System.ComponentModel.DesignerCategoryAttribute("code")]
+    [global::System.ComponentModel.ToolboxItem(true)]
+    [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerDesigner, Microsoft.VSD" +
+        "esigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+    [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapterManager")]
+    public partial class TableAdapterManager : global::System.ComponentModel.Component {
+        
+        private UpdateOrderOption _updateOrder;
+        
+        private bool _backupDataSetBeforeUpdate;
+        
+        private global::System.Data.IDbConnection _connection;
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public UpdateOrderOption UpdateOrder {
+            get {
+                return this._updateOrder;
+            }
+            set {
+                this._updateOrder = value;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public bool BackupDataSetBeforeUpdate {
+            get {
+                return this._backupDataSetBeforeUpdate;
+            }
+            set {
+                this._backupDataSetBeforeUpdate = value;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        [global::System.ComponentModel.Browsable(false)]
+        public global::System.Data.IDbConnection Connection {
+            get {
+                if ((this._connection != null)) {
+                    return this._connection;
+                }
+                return null;
+            }
+            set {
+                this._connection = value;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        [global::System.ComponentModel.Browsable(false)]
+        public int TableAdapterInstanceCount {
+            get {
+                int count = 0;
+                return count;
+            }
+        }
+        
+        /// <summary>
+        ///Update rows in top-down order.
+        ///</summary>
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private int UpdateUpdatedRows(SoilProfileDataSet dataSet, global::System.Collections.Generic.List<global::System.Data.DataRow> allChangedRows, global::System.Collections.Generic.List<global::System.Data.DataRow> allAddedRows) {
+            int result = 0;
+            return result;
+        }
+        
+        /// <summary>
+        ///Insert rows in top-down order.
+        ///</summary>
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private int UpdateInsertedRows(SoilProfileDataSet dataSet, global::System.Collections.Generic.List<global::System.Data.DataRow> allAddedRows) {
+            int result = 0;
+            return result;
+        }
+        
+        /// <summary>
+        ///Delete rows in bottom-up order.
+        ///</summary>
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private int UpdateDeletedRows(SoilProfileDataSet dataSet, global::System.Collections.Generic.List<global::System.Data.DataRow> allChangedRows) {
+            int result = 0;
+            return result;
+        }
+        
+        /// <summary>
+        ///Remove inserted rows that become updated rows after calling TableAdapter.Update(inserted rows) first
+        ///</summary>
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private global::System.Data.DataRow[] GetRealUpdatedRows(global::System.Data.DataRow[] updatedRows, global::System.Collections.Generic.List<global::System.Data.DataRow> allAddedRows) {
+            if (((updatedRows == null) 
+                        || (updatedRows.Length < 1))) {
+                return updatedRows;
+            }
+            if (((allAddedRows == null) 
+                        || (allAddedRows.Count < 1))) {
+                return updatedRows;
+            }
+            global::System.Collections.Generic.List<global::System.Data.DataRow> realUpdatedRows = new global::System.Collections.Generic.List<global::System.Data.DataRow>();
+            for (int i = 0; (i < updatedRows.Length); i = (i + 1)) {
+                global::System.Data.DataRow row = updatedRows[i];
+                if ((allAddedRows.Contains(row) == false)) {
+                    realUpdatedRows.Add(row);
+                }
+            }
+            return realUpdatedRows.ToArray();
+        }
+        
+        /// <summary>
+        ///Update all changes to the dataset.
+        ///</summary>
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public virtual int UpdateAll(SoilProfileDataSet dataSet) {
+            if ((dataSet == null)) {
+                throw new global::System.ArgumentNullException("dataSet");
+            }
+            if ((dataSet.HasChanges() == false)) {
+                return 0;
+            }
+            global::System.Data.IDbConnection workConnection = this.Connection;
+            if ((workConnection == null)) {
+                throw new global::System.ApplicationException("TableAdapterManager contains no connection information. Set each TableAdapterMana" +
+                        "ger TableAdapter property to a valid TableAdapter instance.");
+            }
+            bool workConnOpened = false;
+            if (((workConnection.State & global::System.Data.ConnectionState.Broken) 
+                        == global::System.Data.ConnectionState.Broken)) {
+                workConnection.Close();
+            }
+            if ((workConnection.State == global::System.Data.ConnectionState.Closed)) {
+                workConnection.Open();
+                workConnOpened = true;
+            }
+            global::System.Data.IDbTransaction workTransaction = workConnection.BeginTransaction();
+            if ((workTransaction == null)) {
+                throw new global::System.ApplicationException("The transaction cannot begin. The current data connection does not support transa" +
+                        "ctions or the current state is not allowing the transaction to begin.");
+            }
+            global::System.Collections.Generic.List<global::System.Data.DataRow> allChangedRows = new global::System.Collections.Generic.List<global::System.Data.DataRow>();
+            global::System.Collections.Generic.List<global::System.Data.DataRow> allAddedRows = new global::System.Collections.Generic.List<global::System.Data.DataRow>();
+            global::System.Collections.Generic.List<global::System.Data.Common.DataAdapter> adaptersWithAcceptChangesDuringUpdate = new global::System.Collections.Generic.List<global::System.Data.Common.DataAdapter>();
+            global::System.Collections.Generic.Dictionary<object, global::System.Data.IDbConnection> revertConnections = new global::System.Collections.Generic.Dictionary<object, global::System.Data.IDbConnection>();
+            int result = 0;
+            global::System.Data.DataSet backupDataSet = null;
+            if (this.BackupDataSetBeforeUpdate) {
+                backupDataSet = new global::System.Data.DataSet();
+                backupDataSet.Merge(dataSet);
+            }
+            try {
+                // ---- Prepare for update -----------
+                //
+                // 
+                //---- Perform updates -----------
+                //
+                if ((this.UpdateOrder == UpdateOrderOption.UpdateInsertDelete)) {
+                    result = (result + this.UpdateUpdatedRows(dataSet, allChangedRows, allAddedRows));
+                    result = (result + this.UpdateInsertedRows(dataSet, allAddedRows));
+                }
+                else {
+                    result = (result + this.UpdateInsertedRows(dataSet, allAddedRows));
+                    result = (result + this.UpdateUpdatedRows(dataSet, allChangedRows, allAddedRows));
+                }
+                result = (result + this.UpdateDeletedRows(dataSet, allChangedRows));
+                // 
+                //---- Commit updates -----------
+                //
+                workTransaction.Commit();
+                if ((0 < allAddedRows.Count)) {
+                    global::System.Data.DataRow[] rows = new System.Data.DataRow[allAddedRows.Count];
+                    allAddedRows.CopyTo(rows);
+                    for (int i = 0; (i < rows.Length); i = (i + 1)) {
+                        global::System.Data.DataRow row = rows[i];
+                        row.AcceptChanges();
+                    }
+                }
+                if ((0 < allChangedRows.Count)) {
+                    global::System.Data.DataRow[] rows = new System.Data.DataRow[allChangedRows.Count];
+                    allChangedRows.CopyTo(rows);
+                    for (int i = 0; (i < rows.Length); i = (i + 1)) {
+                        global::System.Data.DataRow row = rows[i];
+                        row.AcceptChanges();
+                    }
+                }
+            }
+            catch (global::System.Exception ex) {
+                workTransaction.Rollback();
+                // ---- Restore the dataset -----------
+                if (this.BackupDataSetBeforeUpdate) {
+                    global::System.Diagnostics.Debug.Assert((backupDataSet != null));
+                    dataSet.Clear();
+                    dataSet.Merge(backupDataSet);
+                }
+                else {
+                    if ((0 < allAddedRows.Count)) {
+                        global::System.Data.DataRow[] rows = new System.Data.DataRow[allAddedRows.Count];
+                        allAddedRows.CopyTo(rows);
+                        for (int i = 0; (i < rows.Length); i = (i + 1)) {
+                            global::System.Data.DataRow row = rows[i];
+                            row.AcceptChanges();
+                            row.SetAdded();
+                        }
+                    }
+                }
+                throw ex;
+            }
+            finally {
+                if (workConnOpened) {
+                    workConnection.Close();
+                }
+                if ((0 < adaptersWithAcceptChangesDuringUpdate.Count)) {
+                    global::System.Data.Common.DataAdapter[] adapters = new System.Data.Common.DataAdapter[adaptersWithAcceptChangesDuringUpdate.Count];
+                    adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters);
+                    for (int i = 0; (i < adapters.Length); i = (i + 1)) {
+                        global::System.Data.Common.DataAdapter adapter = adapters[i];
+                        adapter.AcceptChangesDuringUpdate = true;
+                    }
+                }
+            }
+            return result;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        protected virtual void SortSelfReferenceRows(global::System.Data.DataRow[] rows, global::System.Data.DataRelation relation, bool childFirst) {
+            global::System.Array.Sort<global::System.Data.DataRow>(rows, new SelfReferenceComparer(relation, childFirst));
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        protected virtual bool MatchTableAdapterConnection(global::System.Data.IDbConnection inputConnection) {
+            if ((this._connection != null)) {
+                return true;
+            }
+            if (((this.Connection == null) 
+                        || (inputConnection == null))) {
+                return true;
+            }
+            if (string.Equals(this.Connection.ConnectionString, inputConnection.ConnectionString, global::System.StringComparison.Ordinal)) {
+                return true;
+            }
+            return false;
+        }
+        
+        /// <summary>
+        ///Update Order Option
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        public enum UpdateOrderOption {
+            
+            InsertUpdateDelete = 0,
+            
+            UpdateInsertDelete = 1,
+        }
+        
+        /// <summary>
+        ///Used to sort self-referenced table's rows
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+        private class SelfReferenceComparer : object, global::System.Collections.Generic.IComparer<global::System.Data.DataRow> {
+            
+            private global::System.Data.DataRelation _relation;
+            
+            private int _childFirst;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            internal SelfReferenceComparer(global::System.Data.DataRelation relation, bool childFirst) {
+                this._relation = relation;
+                if (childFirst) {
+                    this._childFirst = -1;
+                }
+                else {
+                    this._childFirst = 1;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            private global::System.Data.DataRow GetRoot(global::System.Data.DataRow row, out int distance) {
+                global::System.Diagnostics.Debug.Assert((row != null));
+                global::System.Data.DataRow root = row;
+                distance = 0;
+
+                global::System.Collections.Generic.IDictionary<global::System.Data.DataRow, global::System.Data.DataRow> traversedRows = new global::System.Collections.Generic.Dictionary<global::System.Data.DataRow, global::System.Data.DataRow>();
+                traversedRows[row] = row;
+
+                global::System.Data.DataRow parent = row.GetParentRow(this._relation, global::System.Data.DataRowVersion.Default);
+                for (
+                ; ((parent != null) 
+                            && (traversedRows.ContainsKey(parent) == false)); 
+                ) {
+                    distance = (distance + 1);
+                    root = parent;
+                    traversedRows[parent] = parent;
+                    parent = parent.GetParentRow(this._relation, global::System.Data.DataRowVersion.Default);
+                }
+
+                if ((distance == 0)) {
+                    traversedRows.Clear();
+                    traversedRows[row] = row;
+                    parent = row.GetParentRow(this._relation, global::System.Data.DataRowVersion.Original);
+                    for (
+                    ; ((parent != null) 
+                                && (traversedRows.ContainsKey(parent) == false)); 
+                    ) {
+                        distance = (distance + 1);
+                        root = parent;
+                        traversedRows[parent] = parent;
+                        parent = parent.GetParentRow(this._relation, global::System.Data.DataRowVersion.Original);
+                    }
+                }
+
+                return root;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+            public int Compare(global::System.Data.DataRow row1, global::System.Data.DataRow row2) {
+                if (object.ReferenceEquals(row1, row2)) {
+                    return 0;
+                }
+                if ((row1 == null)) {
+                    return -1;
+                }
+                if ((row2 == null)) {
+                    return 1;
+                }
+
+                int distance1 = 0;
+                global::System.Data.DataRow root1 = this.GetRoot(row1, out distance1);
+
+                int distance2 = 0;
+                global::System.Data.DataRow root2 = this.GetRoot(row2, out distance2);
+
+                if (object.ReferenceEquals(root1, root2)) {
+                    return (this._childFirst * distance1.CompareTo(distance2));
+                }
+                else {
+                    global::System.Diagnostics.Debug.Assert(((root1.Table != null) 
+                                    && (root2.Table != null)));
+                    if ((root1.Table.Rows.IndexOf(root1) < root2.Table.Rows.IndexOf(root2))) {
+                        return -1;
+                    }
+                    else {
+                        return 1;
+                    }
+                }
+            }
+        }
+    }
+}
+
+#pragma warning restore 1591
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/GenericLine.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/GenericLine.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/GenericLine.cs	(revision 3305)
@@ -0,0 +1,42 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Deltares.Geometry;
+
+namespace Deltares.Dam.Data
+{
+    public class GenericLineException : Exception
+    {
+        public GenericLineException(string message) : base(message)
+        {
+        }
+    }
+
+    public class GenericLine : PolyLine<GeometryPoint>
+    {
+        public GenericLine()
+            : base()
+        {
+        }
+    }
+
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/IPLLineCreator.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/IPLLineCreator.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/IPLLineCreator.cs	(revision 3305)
@@ -0,0 +1,28 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Dam.Data.Sensors
+{
+    public interface IPLLineCreator
+    {
+        PLLine CreatePLLine();
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlHelper.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlHelper.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlHelper.cs	(revision 3305)
@@ -0,0 +1,61 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Deltares.Geometry;
+using Deltares.Geotechnics.GeotechnicalGeometry;
+using Deltares.Geotechnics.SurfaceLines;
+using SurfaceLine = Deltares.DamEngine.Io.XmlInput.SurfaceLine;
+
+namespace Deltares.Dam.Data.DamEngineIo
+{
+    public class FillDamUiFromXmlHelper
+    {
+        public static SurfaceLine2 ConvertXmlSurfaceLineToSurfaceLine2(SurfaceLine inputSurfaceLine)
+        {
+            var surfaceLine = new SurfaceLine2();
+            surfaceLine.Name = inputSurfaceLine.Name;
+            surfaceLine.CharacteristicPoints.Geometry = surfaceLine.Geometry;
+            AddPointsToSurfaceLine(inputSurfaceLine, surfaceLine);
+            return surfaceLine;
+        }
+
+        private static void AddPointsToSurfaceLine(SurfaceLine inputSurfaceLine, SurfaceLine2 surfaceLine)
+        {
+            surfaceLine.Geometry = new LocalizedGeometryPointString();
+            for (int j = 0; j < inputSurfaceLine.Points.Length; j++)
+            {
+                var inputPoint = inputSurfaceLine.Points[j];
+                var geometryPoint = new GeometryPoint()
+                {
+                    X = inputPoint.X,
+                    Y = 0.0,
+                    Z = inputPoint.Z
+                };
+                surfaceLine.AddCharacteristicPoint(geometryPoint, ConversionHelper.ConvertToDamPointType(inputPoint.PointType));
+            }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/RdLatLngConverter.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/RdLatLngConverter.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/RdLatLngConverter.cs	(revision 3305)
@@ -0,0 +1,156 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Geometry;
+
+namespace Deltares.Dam.Data
+{
+    using System;
+
+    public class RdLatLngConverter
+    {
+        private const double A01 = 3236.0331637;
+        private const double A02 = -0.2472814;
+        private const double A03 = -0.0655238;
+        private const double A04 = 0.0000371;
+        private const double A20 = -32.5915821;
+        private const double A21 = -0.8501341;
+        private const double A22 = -0.0171137;
+        private const double A23 = -0.0003859;
+        private const double A24 = -0.0000090;
+        private const double A40 = 0.0052771;
+        private const double A41 = 0.0003314;
+        private const double A42 = 0.0000143;
+
+        private const double B10 = 5261.3028966;
+        private const double B11 = 105.9780241;
+        private const double B12 = 2.4576469;
+        private const double B13 = 0.0560089;
+        private const double B14 = 0.0012770;
+        private const double B15 = 0.0000291;
+        private const double B30 = -0.8192156;
+        private const double B31 = -0.0560092;
+        private const double B32 = -0.0025614;
+        private const double B33 = -0.0000973;
+        private const double B50 = 0.0002574;
+        private const double B51 = 0.0000293;
+
+        private const double C01 = 190066.98903;
+        private const double C03 = -32.38360;
+        private const double C05 = -0.00661;
+        private const double C11 = -11830.85831;
+        private const double C13 = -0.60639;
+        private const double C21 = -114.19754;
+        private const double C23 = 0.15774;
+        private const double C31 = -2.34078;
+        private const double C41 = -0.04158;
+        private const double D02 = 3638.36193;
+        private const double D04 = 0.09351;
+        private const double D10 = 309020.31810;
+        private const double D12 = -157.95222;
+        private const double D14 = -0.05419;
+        private const double D20 = 72.97141;
+        private const double D22 = -6.43481;
+        private const double D30 = 59.79734;
+        private const double D32 = -0.07379;
+        private const double D40 = -0.03444;
+        private const double Lam0 = 5.387638889;
+        private const double Phi0 = 52.156160556;
+
+        private const double X0 = 155000.00;
+        private const double Y0 = 463000.00;
+
+        public static GeometryPoint RdToLatLng(double xRd, double yRd)
+        {
+            var phi = GetPhi(xRd, yRd);
+            var lam = GetLam(xRd, yRd);
+            var lat = GetLat(lam, phi);
+            var lng = GetLng(lam, phi);
+
+            return new GeometryPoint() {X = lat, Y = lng};
+        }
+
+        public static GeometryPoint LatLngToRd(double latitude, double longitude)
+        {
+            var x = GetX(latitude, longitude);
+            var y = GetY(latitude, longitude);
+            
+            return new GeometryPoint() {X = x, Y = y};
+        }
+
+
+        private static double GetLng(double lam, double phi)
+        {
+            return lam + (-37.902 + 0.329*(phi - 52) - 14.667*(lam - 5))/100000;
+        }
+
+        private static double GetLat(double lam, double phi)
+        {
+            return phi + (-96.862 - 11.714*(phi - 52) - 0.125*(lam - 5))/100000;
+        }
+
+        private static double GetPhi(double x, double y)
+        {
+            var dX = (x - X0)*Math.Pow(10, -5);
+            var dY = (y - Y0)*Math.Pow(10, -5);
+            var dPhi = A01*dY + A20*Math.Pow(dX, 2) + A02*Math.Pow(dY, 2) + A21*Math.Pow(dX, 2)*dY +
+                          A03*Math.Pow(dY, 3) + A40*Math.Pow(dX, 4) +
+                          A22*Math.Pow(dX, 2)*Math.Pow(dY, 2) + A04*Math.Pow(dY, 4) + A41*Math.Pow(dX, 4)*dY +
+                          A23*Math.Pow(dX, 2)*Math.Pow(dY, 3) +
+                          A42*Math.Pow(dX, 4)*Math.Pow(dY, 2) + A24*Math.Pow(dX, 2)*Math.Pow(dY, 4);
+            return Phi0 + (dPhi/3600.00);
+        }
+
+        private static double GetLam(double x, double y)
+        {
+            var dX = (x - X0)*Math.Pow(10, -5);
+            var dY = (y - Y0)*Math.Pow(10, -5);
+            var dLam = B10*dX + B11*dX*dY + B30*Math.Pow(dX, 3) + B12*dX*Math.Pow(dY, 2) + B31*Math.Pow(dX, 3)*dY +
+                          B13*dX*Math.Pow(dY, 3) +
+                          B50*Math.Pow(dX, 5) + B32*Math.Pow(dX, 3)*Math.Pow(dY, 2) + B14*dX*Math.Pow(dY, 4) +
+                          B51*Math.Pow(dX, 5)*dY +
+                          B33*Math.Pow(dX, 3)*Math.Pow(dY, 3) + B15*dX*Math.Pow(dY, 5);
+            return Lam0 + (dLam/3600.00);
+        }
+
+        private static double GetX(double lat, double lng)
+        {
+            var dPhi = (lat - Phi0)*0.36;
+            var dLam = (lng - Lam0)*0.36;
+            var dX = C01*dLam + C11*dPhi*dLam + C21*Math.Pow(dPhi, 2)*dLam + C03*Math.Pow(dLam, 3) +
+                        C31*Math.Pow(dPhi, 3)*dLam + C13*dPhi*Math.Pow(dLam, 3) +
+                        C23*Math.Pow(dPhi, 2)*Math.Pow(dLam, 3) +
+                        C41*Math.Pow(dPhi, 4)*dLam + C05*Math.Pow(dLam, 5);
+            return X0 + dX;
+        }
+
+        private static double GetY(double lat, double lng)
+        {
+            var dPhi = (lat - Phi0)*0.36;
+            var dLam = (lng - Lam0)*0.36;
+            var dY = D10*dPhi + D20*Math.Pow(dPhi, 2) + D02*Math.Pow(dLam, 2) + D12*dPhi*Math.Pow(dLam, 2) +
+                        D30*Math.Pow(dPhi, 3) + D22*Math.Pow(dPhi, 2)*Math.Pow(dLam, 2) + D40*Math.Pow(dPhi, 4) +
+                        D04*Math.Pow(dLam, 4) +
+                        D32*Math.Pow(dPhi, 3)*Math.Pow(dLam, 2) + D14*dPhi*Math.Pow(dLam, 4);
+            return Y0 + dY;
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/PointNotExistsException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/PointNotExistsException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/PointNotExistsException.cs	(revision 3305)
@@ -0,0 +1,59 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+using Deltares.Geometry;
+using Deltares.Geotechnics.SurfaceLines;
+
+namespace Deltares.Dam.Data
+{
+
+    [Serializable]
+    public class PointNotExistsException : Exception
+    {
+        public PointNotExistsException()
+        {
+        }
+
+        public PointNotExistsException(string surfaceLineId, CharacteristicPointType pointType, GeometryPoint point, string messageFormat)
+            : base(string.Format(messageFormat, pointType, point, surfaceLineId))
+        {
+        }
+
+        public PointNotExistsException(string message)
+            : base(message)
+        {
+        }
+
+        public PointNotExistsException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+
+        protected PointNotExistsException(
+            SerializationInfo info,
+            StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Copying.GPL.licenseheader
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Copying.GPL.licenseheader	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Copying.GPL.licenseheader	(revision 3305)
@@ -0,0 +1,45 @@
+extensions: .cs
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+extensions:  .xml .config .xsd .wxs
+<!--
+Copyright (C) Stichting Deltares 2019. All rights reserved.
+
+This file is part of the DAM - Clients Library.
+
+The DAM - UI is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IAttributeImporter.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IAttributeImporter.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IAttributeImporter.cs	(revision 3305)
@@ -0,0 +1,69 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+
+namespace Deltares.Maps
+{
+    public interface IAttributeImporter<T>
+    {
+        /// <summary>
+        ///     Gets or sets the target object lookup table
+        /// </summary>
+        IEnumerable<T> Targets { set; }
+
+        /// <summary>
+        /// </summary>
+        IFeatureRepository AttributeRepository { set; }
+
+        /// <summary>
+        /// </summary>
+        IEnumerable<Exception> Errors { get; }
+
+        string FileName { set; }
+
+        void AddError(Exception exception);
+
+        /// <summary>
+        ///     Sets the attribute mappings
+        /// </summary>
+        IEnumerable<AttributeMapping<T>> AttributeMappings { set; }
+
+        /// <summary>
+        /// </summary>
+        /// <remarks>
+        ///     Preconditions:
+        ///     - A valid data folder needs to given
+        ///     - A set of "targets" with their characteristic points table and initialized id's available from the waterboard
+        ///     - The required files need to be in the data folder (one for the characteristics points,
+        ///     - A set of (characteristic) lines wich have to be retrieved from the files
+        ///     Postconditions:
+        ///     - Some targets (the result of a join from the Location shape file and the existing location list from the
+        ///     Waterboard) have new characteristic point values
+        /// </remarks>
+        /// <exception cref="FileNotFoundException" />
+        /// <exception cref="ArgumentNullException" />
+        /// <exception cref="ArgumentException" />
+        /// <exception cref="IOException" />
+        void Import();
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs	(revision 3305)
@@ -0,0 +1,769 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Deltares.Dam.Data.DataPlugins.Configuration;
+using Deltares.Soilbase;
+using Deltares.Standard.EventPublisher;
+using Deltares.Standard.IO.DtoAssembler;
+using Deltares.Standard.Reflection;
+using System.IO;
+using System.Xml;
+using Deltares.Dam.Data.IO;
+using Deltares.Geotechnics.Soils;
+using Deltares.Standard;
+using Deltares.Standard.IO;
+using Deltares.Standard.IO.Xml;
+using Deltares.Standard.Logging;
+
+namespace Deltares.Dam.Data
+{
+    public class DamProjectException : ApplicationException
+    {
+        public DamProjectException(string message)
+            : base(message)
+        {
+        }
+    }
+
+    public class DamProject : IDisposable
+    {
+        private string projectFileName;
+        private static string testProgramVersion;
+        private DamProjectData damProjectData;
+
+        public static ProjectPathLocation ProjectWorkingPathLocation = ProjectPathLocation.InApplicationMap;
+        public static string UserWorkingPath = DamProject.GetNewTempDirectory();
+        public static string ProjectMapWorkingPath = DamProject.GetNewTempDirectory();
+
+        public DamProject()
+        {
+            this.damProjectData = new DamProjectData();
+        }
+
+        public static string GetNewTempDirectory()
+        {
+            int counter = 1;
+
+            while (true)
+            {
+                string dir = Path.GetTempPath() + Path.DirectorySeparatorChar + "DAM" + counter.ToString();
+
+                if (!Directory.Exists(dir) && !File.Exists(dir))
+                {
+                    return dir;
+                }
+                else
+                {
+                    counter++;
+                }
+            }
+        }
+
+        //[XmlIgnore]
+        public static string ProjectMap { get; set; }
+
+        //[XmlIgnore]
+        public static string CalculationMap { get; set; }
+
+        public string ProjectFileName
+        {
+            get { return this.projectFileName; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "ProjectFileName");
+                this.projectFileName = value;
+                ProjectMap = Path.GetDirectoryName(Path.GetFullPath(value));
+                CalculationMap = Path.GetFileName(Path.ChangeExtension(value, "Calc"));
+                ProjectMapWorkingPath = Path.Combine(Path.GetDirectoryName(Path.GetFullPath(value)), CalculationMap);
+                //damProjectFolder = Path.GetDirectoryName(value);
+                DataEventPublisher.AfterChange(this, "ProjectFileName");
+            }
+        }
+
+        //[XmlIgnore]
+        public DamProjectData DamProjectData
+        {
+            get { return damProjectData; }
+            set
+            {
+                var propertyName = this.GetMemberName(x => x.DamProjectData);
+                DataEventPublisher.BeforeChange(this, propertyName);
+                damProjectData = value;
+                DataEventPublisher.AfterChange(this, propertyName);
+            }
+        }
+
+        public object ImportWithDefinitionFile(string fileName, DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress)
+        {
+            var dataSourceContainer = DataSourceContainer.Deserialize(fileName);
+            ProjectFileName = fileName;
+            var definitionFileProjectFolder = Path.GetDirectoryName(fileName);
+
+            List<LogMessage> logMessages;
+
+            // import
+            var waterBoard = WaterBoardImporter.ImportAllData(
+                definitionFileProjectFolder, dataSourceContainer, damProjectType,
+                progress, out logMessages);
+            //var importer = new WaterBoardImporter();
+            //var waterBoard = importer.ImportAllData(
+            //    definitionFileProjectFolder, dataSourceContainer, progress);
+            //logMessages = importer.importLogMessages.ToList();
+
+            // create data
+            DamProjectData = new DamProjectData { WaterBoard = waterBoard };
+
+            // handle log messages
+            if (logMessages.Count > 0)
+            {
+                LogManager.Messages.AddRange(logMessages);
+            }
+
+            // Add stability as standard mechanism when not yet available.
+            if (damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications.Count == 0)
+            {
+                damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications
+                    .Add(new DamFailureMechanismeCalculationSpecification());
+            }
+            return DamProjectData;
+        }
+
+        /// <summary>
+        /// Imports all the data
+        /// </summary>
+        /// <param name="dataFolder">The data folder.</param>
+        /// <param name="dataSourceContainer">The data source container.</param>
+        /// <param name="dikeRingIds">The dike ring ids.</param>
+        /// <param name="damProjectType">Type of the dam project.</param>
+        /// <param name="progress">The progress.</param>
+        /// <returns></returns>
+        public object Import(string dataFolder, DataSourceContainer dataSourceContainer,
+            IEnumerable<string> dikeRingIds, DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress)
+        {
+            var damProjectFolder = Path.GetDirectoryName(projectFileName);
+
+            DataSourceManager.DataSources = DamProjectData.DataSources;
+            List<LogMessage> logMessages;
+
+            // import
+            var waterBoard = WaterBoardImporter.ImportDataForDikeRings(
+                damProjectFolder, dataFolder, dataSourceContainer,
+                dikeRingIds, damProjectType, progress, out logMessages);
+
+            // create data
+            DamProjectData = new DamProjectData { WaterBoard = waterBoard, DataSourceEsriProjection = dataSourceContainer.DataSourceEsriProjection };
+
+            // Make sure Soil properties are same as in database, also build IsAquifer dictionary
+            UpdateSoilPropertiesToSoilDatabase();
+
+            // handle logs
+            if (logMessages.Any())
+            {
+                LogManager.Messages.Clear();
+                LogManager.Messages.AddRange(logMessages);
+            }
+            // Add stability as standard mechanism when not yet available.
+            if (damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications.Count == 0)
+            {
+                this.damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications.
+                    Add(new DamFailureMechanismeCalculationSpecification());
+            }
+            return this.DamProjectData;
+        }
+
+        /// <summary>
+        /// Loads DAM project data from the given .damx file.
+        /// </summary>
+        /// <param name="fileName">Name of the file.</param>
+        /// <returns>The project data</returns>
+        /// <exception cref="ArgumentException" />
+        /// <exception cref="FileNotFoundException" />
+        public static DamProjectData LoadData(string fileName)
+        {
+            if (string.IsNullOrWhiteSpace(fileName)) throw new ArgumentException("fileName");
+            if (!File.Exists(fileName)) throw new FileNotFoundException(fileName);
+            if (!fileName.EndsWith("damx")) throw new ArgumentException("No damx file", "fileName");
+            using (var damProject = new DamProject())
+            {
+                return damProject.OpenXMLProject(fileName) as DamProjectData;
+            }
+        }
+
+
+        /// <summary>
+        /// Saves DAM project data to the given .damx file.
+        /// </summary>
+        /// <remarks>If the file already exists it will be overriden</remarks>
+        /// <param name="fileName">Name of the file.</param>
+        /// <param name="data">The DAM project data to be saved.</param>
+        public static void SaveData(string fileName, DamProjectData data)
+        {
+            if (string.IsNullOrWhiteSpace(fileName)) throw new ArgumentException("fileName");
+            var project = new DamProject() { DamProjectData = data };
+
+            project.SaveXMLProject(fileName, null);
+        }
+
+        /// <summary>
+        /// Gets the main version (first two numbers of full version).
+        /// </summary>
+        /// <param name="fullVersion">The full version.</param>
+        /// <returns></returns>
+        private string GetMainVersion(string fullVersion)
+        {
+            if (fullVersion.Contains("."))
+            {
+                string[] currentVer = fullVersion.Split(".".ToCharArray());
+                var main = currentVer[0];
+                var sec = currentVer[1];
+                return main + "." + sec;
+            }
+            return fullVersion;
+        }
+
+        /// <summary>
+        /// Sets the test program version.
+        /// Note: To be used by unit tests only.
+        /// </summary>
+        /// <param name="testVersion">The test version.</param>
+        public static void SetTestProgramVersion(string testVersion)
+        {
+            testProgramVersion = testVersion;
+        }
+
+        /// <summary>
+        /// Opens the XML project.
+        /// </summary>
+        /// <param name="fileName">Name of the file.</param>
+        /// <returns></returns>
+        public object OpenXMLProject(string fileName)
+        {
+            // To retrieve file version from xml, add handler.
+            var damProjectVersionXmlHandler = new DamProjectVersionXmlHandler();
+            XmlHandler.RegisterObjectHandler(damProjectVersionXmlHandler);
+
+            ClearProject();
+            this.ProjectFileName = fileName;
+            DataEventPublisher.InvokeWithoutPublishingEvents(() =>
+            {
+                string damProjectFolder = Path.GetDirectoryName(fileName);
+                var xmlSerializer = new XmlDeserializer();
+                object project = xmlSerializer.XmlDeserialize(fileName, typeof(DamProjectData), new DefaultClassFactory());
+
+                this.damProjectData = (DamProjectData)project;
+                if (damProjectData != null)
+                {
+                    damProjectData.VersionInfo.InitVersionInfoAfterRead();
+                }
+                if (damProjectData.DamProjectType == DamProjectType.AssessOld)
+                {
+                    ClearProject();
+                    damProjectData.DamProjectType = DamProjectType.AssessOld;
+                }
+                else
+                {
+                    var damProjectVersion = damProjectVersionXmlHandler.GetDamProjectVersion();
+                    damProjectVersion = GetMainVersion(damProjectVersion);
+                    if (damProjectVersion != null)
+                    {
+                        var currentProgramVersion = About.Version;
+                        if (currentProgramVersion == null)
+                        {
+                            currentProgramVersion = testProgramVersion;
+                        }
+                        currentProgramVersion = GetMainVersion(currentProgramVersion);
+                        if (!currentProgramVersion.Equals(damProjectVersion))
+                        {
+                            damProjectData.ClearResults();
+                        }
+                    }
+                }
+                // Project still needs a reference to soilmaterials database; to be resolved later.
+                // This will become obsolete as soon as Delphi DGeoStability version is no longer used.
+                ResolveBackwardCompatibility();
+                UpdateSoilDatabaseReferences(damProjectFolder);
+                UpdateSoilPropertiesToSoilDatabase();
+            });
+
+            // Add stability as standard mechanism when not yet available.
+            if ((damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications.Count == 0) && (damProjectData.DamProjectType != DamProjectType.AssessOld))
+            {
+                damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications.Add(new DamFailureMechanismeCalculationSpecification());
+                UpdateForOlderProjects();
+            }
+            return damProjectData;
+        }
+
+        private void ResolveBackwardCompatibility()
+        {
+            if (DamProjectData.VersionInfo.FileVersionAsRead == 0)
+            {
+                XmlDocument xmlDocument = new XmlDocument();
+                xmlDocument.Load(this.ProjectFileName);
+            }
+        }
+
+        /// <summary>
+        /// Updates older projects for missing data or changed data model.
+        /// </summary>
+        private void UpdateForOlderProjects()
+        {
+            UpdateMStabParametersSlipCircleDefinition();
+        }
+
+        /// <summary>
+        /// Updates the soil properties to the values in the soil database, to avoid discrepancies.
+        /// If the use of the soil database is not necessary anymore (and the soil parameters can be edited in the UI) 
+        /// then this method is not needed anymore.
+        /// Also all references of soil in the layers are forced to point to a soil in the SoilList.
+        /// 
+        /// After this method every soil has only 1 instance, and is present in the soillist
+        /// </summary>
+        private void UpdateSoilPropertiesToSoilDatabase()
+        {
+            foreach (Dike dike in DamProjectData.WaterBoard.Dikes)
+            {
+                UpdateSoilListFromDatabase(dike);
+
+                Dictionary<Soil, bool> aquiferDictionary = dike.SoilList.AquiferDictionary;
+                foreach (Location location in dike.Locations)
+                {
+
+                    location.SoilList = dike.SoilList;
+                    if (location.Segment != null)
+                    {
+                        foreach (SoilGeometryProbability soilGeometryProbability in location.Segment.SoilProfileProbabilities)
+                        {
+                            if (soilGeometryProbability.SoilProfileType == SoilProfileType.SoilProfile1D)
+                            {
+                                foreach (SoilLayer1D layer in soilGeometryProbability.SoilProfile.Layers)
+                                {
+                                    bool isAquifer;
+                                    // Assign correct soil to layer
+                                    Soil newSoil;
+                                    var index = dike.SoilList.GetSoilIndexByName(layer.Soil.Name);
+                                    if (index < 0)
+                                    {
+                                        Soil databaseSoil = dike.SoilBaseDB.GetSoil(layer.Soil.Name, out isAquifer);
+                                        newSoil = databaseSoil;
+                                        dike.SoilList.Soils.Add(newSoil);
+                                    }
+                                    else
+                                    {
+                                        newSoil = dike.SoilList.Soils[index];
+                                        isAquifer = aquiferDictionary[newSoil];
+                                    }
+                                    // Set correct IsAquifer property in layer
+                                    layer.IsAquifer = isAquifer;
+                                    layer.Soil = newSoil;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Update all soil parameters to the data read from database
+        /// </summary>
+        /// <param name="dike"></param>
+        private static void UpdateSoilListFromDatabase(Dike dike)
+        {
+            using (var geoDatabase = new GeoDatabase(dike.SoilDatabaseName))
+            {
+                geoDatabase.ReUseSoils = true;
+                // read list from old DB and put them in a dictonary by name
+                var soilList = geoDatabase.ReadSoils(dike.SoilList.Soils);
+                Dictionary<string, Soil> soils = soilList.Soils.ToDictionary(s => s.Name);
+                CleanDikeAquiferDictionary(dike);
+                foreach (Soil soil in dike.SoilList.Soils)
+                {
+                    var newSoil = soils[soil.Name];
+                    // if the current soil was found in the db list, update the params for the current soil
+                    if (newSoil != null)
+                    {
+                        soil.Assign(newSoil);
+                    }
+                    // update aquifer dictionary too
+                    if (soilList.AquiferDictionary.ContainsKey(newSoil))
+                    {
+                        if (dike.SoilList.AquiferDictionary.ContainsKey(soil))
+                        {
+                            dike.SoilList.AquiferDictionary[soil] = soilList.AquiferDictionary[newSoil];
+                        }
+                        else
+                        {
+                            dike.SoilList.AquiferDictionary.Add(soil, soilList.AquiferDictionary[newSoil]);
+                        }
+                    }
+                }
+            }
+        }
+
+        private static void CleanDikeAquiferDictionary(Dike dike)
+        {
+            var newDict = new Dictionary<Soil, bool>();
+            foreach (var soil in dike.SoilList.Soils)
+            {
+                if (dike.SoilList.AquiferDictionary.ContainsKey(soil))
+                {
+                    newDict[soil] = dike.SoilList.AquiferDictionary[soil];
+                }
+            }
+            dike.SoilList.AquiferDictionary.Clear();
+            dike.SoilList.AquiferDictionary = newDict;
+        }
+
+        /// <summary>
+        /// Update soil database references:
+        /// Soildatabase should always be in the project path 
+        /// Make sure the file reference is adjusted to this
+        /// </summary>
+        /// <param name="damProjectFolder"></param>
+        private void UpdateSoilDatabaseReferences(string damProjectFolder)
+        {
+            if (!string.IsNullOrWhiteSpace(damProjectFolder))
+            {
+                foreach (Dike dike in damProjectData.WaterBoard.Dikes)
+                {
+                    if (!string.IsNullOrWhiteSpace(dike.SoilDatabaseName))
+                    {
+                        dike.SoilDatabaseName = Path.Combine(damProjectFolder, Path.GetFileName(dike.SoilDatabaseName));
+                    }
+
+                    foreach (Location location in dike.Locations)
+                    {
+                        location.SoildatabaseName = dike.SoilDatabaseName;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Updates the MStab parameters slip circle definition.
+        /// For older projects, when slip circle definition was not yet defined we have to provide the default values
+        /// </summary>
+        private void UpdateMStabParametersSlipCircleDefinition()
+        {
+            foreach (DamFailureMechanismeCalculationSpecification damCalculationSpecification in this.damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications)
+            {
+                if (damCalculationSpecification.FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside)
+                {
+                    if (damCalculationSpecification.IsSlipCircleDefinitionUndefined())
+                    {
+                        damCalculationSpecification.ReadUserSettingsSlipCircleDefinition();
+                    }
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// Assigns the specified 2D-geometry mapname for all dikes where it is not assigned.
+        /// </summary>
+        /// <param name="mapName">Name of the map.</param>
+        public void AssignGeometry2DMapnameIfNotAssigned(string mapName)
+        {
+            foreach (var dike in damProjectData.WaterBoard.Dikes)
+            {
+                if (String.IsNullOrEmpty(dike.MapForSoilGeometries2D))
+                {
+                    dike.MapForSoilGeometries2D = mapName;
+                    foreach (Location location in dike.Locations)
+                    {
+                        location.MapForSoilGeometries2D = mapName;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Create a destination filename for new location of soilmaterials database
+        /// </summary>
+        /// <param name="projectFilename"></param>
+        /// <param name="orgMapName"></param>
+        /// <param name="dikeIndex"> </param>
+        /// <returns></returns>
+        public static string CreateNewGeometry2DMapname(string projectFilename, string orgMapName, int dikeIndex)
+        {
+            string destMapname = Path.GetFileNameWithoutExtension(projectFilename) + ".geometries2D." + dikeIndex.ToString(CultureInfo.InvariantCulture) + @"\";
+            return destMapname;
+        }
+
+        /// <summary>
+        /// Copies the 2D-geometries.
+        /// </summary>
+        /// <param name="orgMapname">The original mapname.</param>
+        /// <param name="destMapname">The destination mapname.</param>
+        private void CopyGeometries(string orgMapname, string destMapname)
+        {
+            if (Directory.Exists(orgMapname))
+            {
+                if (!Directory.Exists(destMapname))
+                {
+                    Directory.CreateDirectory(destMapname);
+                }
+                foreach (var file in Directory.GetFiles(orgMapname))
+                {
+                    string fileName = Path.GetFileName(file);
+                    if (fileName != null)
+                    {
+                        var destFile = Path.Combine(destMapname, fileName);
+                        if (File.Exists(destFile))
+                        {
+                            File.Delete(destFile);
+                        }
+                        File.Copy(file, destFile);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Make sure the map with 2d_geometries is copied besides the project file
+        /// and reference to the map is set to it
+        /// </summary>
+        /// <param name="fileName">the filename of the project</param>
+        /// <param name="projectDirectory">The org project map in case of file save as.</param>
+        /// <param name="dataSourceDirectory">The directory in which the .defx file resides.</param>
+        private void EnsureGeometries2DMapWithProject(string fileName, string projectDirectory, string dataSourceDirectory)
+        {
+            for (int dikeIndex = 0; dikeIndex < damProjectData.WaterBoard.Dikes.Count; dikeIndex++)
+            {
+                if (!String.IsNullOrEmpty(damProjectData.WaterBoard.Dikes[dikeIndex].MapForSoilGeometries2D))
+                {
+                    string mapForSoilGeometries = damProjectData.WaterBoard.Dikes[dikeIndex].MapForSoilGeometries2D;
+                    string sourceMapName = DetermineGeometriesSource(mapForSoilGeometries, projectDirectory, dataSourceDirectory);
+
+                    // Only copy files if map of geometries is assigned and exists
+                    if (!String.IsNullOrEmpty(sourceMapName) && Directory.Exists(sourceMapName))
+                    {
+                        string destMapname = CreateNewGeometry2DMapname(fileName, sourceMapName, dikeIndex);
+                        string fullFilename = Path.GetFullPath(fileName);
+                        string destFullMapname = Path.Combine(Path.GetDirectoryName(fullFilename), destMapname);
+                        string orgFullMapname = Path.GetFullPath(sourceMapName);
+                        if (!orgFullMapname.Equals(destFullMapname))
+                        {
+                            CopyGeometries(orgFullMapname, destFullMapname);
+                        }
+                        // Store the relative path to the 2d-geometries
+                        damProjectData.WaterBoard.Dikes[dikeIndex].MapForSoilGeometries2D = destMapname;
+                        foreach (Location location in damProjectData.WaterBoard.Dikes[dikeIndex].Locations)
+                        {
+                            location.MapForSoilGeometries2D = destMapname;
+                        }
+                    }
+                }
+            }
+        }
+        
+        /// <summary>
+        /// Determines from which folder the soil geometry definitions should be retrieved from.
+        /// </summary>
+        /// <param name="soilGeometryDirectory">The directory of the soil geometries as specified by the .defx file</param>
+        /// <param name="projectDirectory">The directory of the .damx project file.</param>
+        /// <param name="dataSourceDirectory">The directory of the .defx file.</param>
+        /// <returns>The directory of where the soil geometries reside.</returns>
+        private static string DetermineGeometriesSource(string soilGeometryDirectory, string projectDirectory, string dataSourceDirectory)
+        {
+            if (Directory.Exists(soilGeometryDirectory))
+            {
+                return soilGeometryDirectory;
+            }
+
+            var directory = Path.Combine(projectDirectory, soilGeometryDirectory);
+            return Directory.Exists(directory) ? directory : Path.Combine(dataSourceDirectory, soilGeometryDirectory);
+        }
+
+        /// <summary>
+        /// Create a destination filename for new location of soilmaterials database
+        /// </summary>
+        /// <param name="projectFilename"></param>
+        /// <param name="soilmaterialsFilename"></param>
+        /// <returns></returns>
+        public static string CreateNewSoilMaterialsFilename(string projectFilename, string soilmaterialsFilename, int dikeIndex)
+        {
+            string destsoilmaterialsFilename = Path.GetFileNameWithoutExtension(projectFilename) + dikeIndex.ToString(CultureInfo.InvariantCulture) + ".soilmaterials.mdb";
+            return destsoilmaterialsFilename;
+        }
+
+        /// <summary>
+        /// Make sure soilamterials file is copied besides the project file
+        /// and reference to the file is set to it
+        /// </summary>
+        /// <param name="fileName">the filename of the project</param>
+        private void EnsureSoilmaterialsFileWithProject(string fileName)
+        {
+            for (int dikeIndex = 0; dikeIndex < damProjectData.WaterBoard.Dikes.Count; dikeIndex++)
+            {
+                string path = Path.GetFullPath(damProjectData.WaterBoard.Dikes[dikeIndex].SoilDatabaseName);
+                // ThrowIfMoreThanOneDikeInProject();
+                Dike dike = this.DamProjectData.WaterBoard.Dikes[dikeIndex];
+                string sourceSoilmaterialsFilename = damProjectData.WaterBoard.Dikes[dikeIndex].SoilDatabaseName;
+                string destSoilmaterialsFilename = CreateNewSoilMaterialsFilename(fileName, sourceSoilmaterialsFilename, dikeIndex);
+                string fullFilename = Path.GetFullPath(fileName);
+                string destSoilmaterialsFullFilename = Path.Combine(Path.GetDirectoryName(fullFilename), destSoilmaterialsFilename);
+                string orgSoilmaterialsFullFilename = Path.GetFullPath(sourceSoilmaterialsFilename);
+                if (!orgSoilmaterialsFullFilename.Equals(destSoilmaterialsFullFilename))
+                {
+                    if (File.Exists(destSoilmaterialsFullFilename))
+                    {
+                        File.Delete(destSoilmaterialsFullFilename);
+                    }
+
+                    if (File.Exists(orgSoilmaterialsFullFilename))
+                    {
+                        File.Copy(orgSoilmaterialsFullFilename, destSoilmaterialsFullFilename);
+                    }
+                }
+                damProjectData.WaterBoard.Dikes[dikeIndex].SoilDatabaseName = destSoilmaterialsFullFilename;
+                foreach (var location in damProjectData.WaterBoard.Dikes[dikeIndex].Locations)
+                {
+                    location.SoildatabaseName = destSoilmaterialsFullFilename;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Save the project in XML format
+        /// </summary>
+        /// <param name="fileName"></param>
+        /// <param name="project"></param>
+        public void SaveXMLProject(string fileName, object project)
+        {
+            // Try to retrieve the data source folder from this object.
+            string dataSourceFolder = null;
+            if (DamProjectData != null)
+            {
+                string damDataSourceFilePath = DamProjectData.DamDataSourceFileName;
+                dataSourceFolder = string.IsNullOrEmpty(damDataSourceFilePath)
+                    ? damDataSourceFilePath
+                    : Path.GetDirectoryName(damDataSourceFilePath);
+            }
+
+            // If the data source is not available, try to retrieve it from
+            // the argument. The data source folder must be set in order to
+            // create the geometries 2D.0 folder 
+            var damProject = project as DamProject;
+            if (damProject != null && dataSourceFolder == null)
+            {
+                dataSourceFolder = Path.GetDirectoryName(damProject.DamProjectData.DamDataSourceFileName);
+            }
+
+            fileName = Path.ChangeExtension(fileName, "damx");
+            string savedProjectMap = ProjectMap;
+            ProjectFileName = fileName;
+            if (savedProjectMap == null)
+            {
+                savedProjectMap = ProjectMap;
+            }
+
+            damProjectData.VersionInfo.InitVersionInfo();
+
+            DataEventPublisher.InvokeWithoutPublishingEvents(() =>
+            {
+                EnsureSoilmaterialsFileWithProject(fileName);
+                EnsureGeometries2DMapWithProject(fileName, savedProjectMap, dataSourceFolder);
+
+                var xmlSerializer = new XmlSerializer();
+                xmlSerializer.Serialize(damProjectData, fileName);
+            });
+        }
+
+        public void ImportWaterLevelTimeSeries()
+        {
+
+            if (DamProjectData.DamProjectCalculationSpecification == null) return;
+            var file = DamProjectData.WaterBoard.WaterLevelTimeSeriesFileName;
+
+            // check if file exists
+            if (!file.HasValidStringValue()) return;
+            if (!File.Exists(file)) return;
+
+            // load file
+            var fewsInputTimeSerieCollection = TimeSerieCollection.LoadFromFile(file);
+            var waterBoardJob = DamProjectData.WaterBoardJob as WaterBoardJob;
+            WaterBoardJobImporter.ImportWaterlevels(waterBoardJob, fewsInputTimeSerieCollection);
+        }
+
+        public static string ProjectWorkingPath
+        {
+            get
+            {
+                switch (ProjectWorkingPathLocation)
+                {
+                    case ProjectPathLocation.InUserMap:
+                        return UserWorkingPath;
+                    case ProjectPathLocation.InProjectMap:
+                        return ProjectMapWorkingPath;
+                    default:
+                        return Path.GetDirectoryName(typeof(DamProject).Assembly.Location) + @"\DamCalculation";
+                }
+            }
+        }
+
+        private void DeleteResultData()
+        {
+            damProjectData.DeleteResults();
+        }
+
+        public void DeleteResults()
+        {
+            DeleteResultData();
+            RemoveCalculationFolder();
+        }
+
+        public void ClearProject()
+        {
+            // DeleteResultData();
+            damProjectData = null;
+            DamProject.CalculationMap = "";
+            DamProject.ProjectMap = "";
+            damProjectData = new DamProjectData();
+            
+            LogManager.Clear();
+        }
+
+        private static void RemoveCalculationFolder()
+        {
+            if (!Directory.Exists(ProjectWorkingPath)) return;
+
+            try
+            {
+                Directory.Delete(ProjectWorkingPath, true);
+            }
+            catch (IOException e)
+            {
+                throw new DamProjectException(e.Message);
+            }
+        }
+
+        public void Dispose()
+        {
+            DamProjectData.Dispose();
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorData.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorData.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorData.cs	(revision 3305)
@@ -0,0 +1,172 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using Deltares.Standard.EventPublisher;
+
+namespace Deltares.Dam.Data.Sensors
+{
+    /// <summary>
+    /// Class to hold the collected sensor data
+    /// </summary>
+    public class SensorData : IDisposable
+    {
+        private List<Sensor> sensors = new List<Sensor>();
+        private List<Group> sensorGroups = new List<Group>();
+        private List<SensorLocation> sensorLocations = new List<SensorLocation>();
+
+        public SensorData()
+        {
+            DataEventPublisher.OnAfterChange += DataEventPublisher_OnAfterChange;
+            DataEventPublisher.OnDataListModified += DataEventPublisher_OnDataListModified;
+        }
+
+        private void DataEventPublisher_OnDataListModified(object sender, PublishEventArgs e)
+        {
+            if (sender is List<Sensor>)
+            {
+                var dma = (DataListModifiedArgs)e;
+                if (dma.Action == ListModifyAction.Delete)
+                {
+                    UpdatePickSensorsForGroups();
+                    foreach (var sensorGroup in sensorGroups)
+                    {
+                        sensorGroup.Remove((Sensor)e.Objects[0]);
+                        // Next lines just to force an update of the group table content 
+                        var ms = sensorGroup.SelectionAsString;
+                        sensorGroup.SelectionAsString = ms;
+                    }
+                }
+            }
+            if (sender is List<Group>)
+            {
+                var dma = (DataListModifiedArgs)e;
+                if (dma.Action == ListModifyAction.Delete)
+                {
+                    var delList = new List<SensorLocation>();
+                    foreach (var sensorLocation in sensorLocations)
+                    {
+                        if (sensorLocation.Group == (Group) e.Objects[0])
+                        {
+                            delList.Add(sensorLocation);
+                        }                                                
+                    }
+                    foreach (var delLocation in delList)
+                    {
+                        sensorLocations.Remove(delLocation);
+                    }
+                    DataEventPublisher.DataListModified(sensorLocations,null);
+                }
+            }
+        }
+
+        private void DataEventPublisher_OnAfterChange(object sender, PublishEventArgs e)
+        {
+            if (sender is Sensor || sender is Group)
+            {
+                UpdatePickSensorsForGroups();
+            }
+        }
+
+        /// <summary>
+        /// Updates the pick sensors for groups.
+        /// </summary>
+        public void UpdatePickSensorsForGroups()
+        {
+            foreach (var sensorGroup in sensorGroups)
+            {
+                sensorGroup.PickSensors = sensors;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the sensors.
+        /// </summary>
+        /// <value>
+        /// The sensors.
+        /// </value>        
+        public List<Sensor> Sensors
+        {
+            get { return sensors; }
+            set { sensors = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the sensor groups.
+        /// </summary>
+        /// <value>
+        /// The sensor groups.
+        /// </value>        
+        public List<Group> SensorGroups
+        {
+            get { return sensorGroups; }
+            set { sensorGroups = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the sensor locations.
+        /// </summary>
+        /// <value>
+        /// The sensor locations.
+        /// </value>  
+        [Browsable(false)]
+        [ReadOnly(true)]      
+        public List<SensorLocation> SensorLocations
+        {
+            get { return sensorLocations; }
+        }
+
+        public Sensor GetSensorById(int id)
+        {
+            return sensors.FirstOrDefault(sensor => sensor.ID == id);
+        }
+
+        public Group GetGroupById(int id)
+        {
+            return sensorGroups.FirstOrDefault(sensorGroup => sensorGroup.ID == id);
+        }
+
+        public SensorLocation GetSensorLocationByLocationName(string name)
+        {
+            return sensorLocations.FirstOrDefault(sensorLocation => sensorLocation.LocationName == name);
+        }
+
+        /// <summary>
+        /// Gets the groups for use in selection lists in de UI.
+        /// </summary>
+        /// <param name="sensorLocation">The sensoLocation.</param>
+        /// <returns></returns>
+        public IEnumerable<Group> GetGroups(SensorLocation sensorLocation)
+        {
+            var list = new List<Group>();
+            list.AddRange(sensorGroups);
+            return list;
+        }
+
+        public void Dispose()
+        {
+            DataEventPublisher.OnAfterChange -= DataEventPublisher_OnAfterChange;
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilProfileDataSet.Designer.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilProfileDataSet.Designer.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilProfileDataSet.Designer.cs	(revision 3305)
@@ -0,0 +1,3991 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.3607
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+#pragma warning disable 1591
+
+namespace WebApplication1 {
+    
+    
+    /// <summary>
+    ///Represents a strongly typed in-memory cache of data.
+    ///</summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+    [global::System.Serializable()]
+    [global::System.ComponentModel.DesignerCategoryAttribute("code")]
+    [global::System.ComponentModel.ToolboxItem(true)]
+    [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedDataSetSchema")]
+    [global::System.Xml.Serialization.XmlRootAttribute("SoilProfileDataSet")]
+    [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.DataSet")]
+    public partial class SoilProfileDataSet : global::System.Data.DataSet {
+        
+        private ODGEOMETRIESDataTable tableODGEOMETRIES;
+        
+        private ODGEOLAYERSDataTable tableODGEOLAYERS;
+        
+        private MATERIALSDataTable tableMATERIALS;
+        
+        private PARAMETERNAMESDataTable tablePARAMETERNAMES;
+        
+        private PARAMETERVALUESDataTable tablePARAMETERVALUES;
+        
+        private global::System.Data.DataRelation relationODGEOMETRIES_ODGEOLAYERS;
+        
+        private global::System.Data.DataRelation relationODGEOLAYERS_MATERIALS;
+        
+        private global::System.Data.DataRelation relationPARAMETERVALUES_MATERIALS;
+        
+        private global::System.Data.DataRelation relationPARAMETERNAMES_PARAMETERVALUES;
+        
+        private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema;
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public SoilProfileDataSet() {
+            this.BeginInit();
+            this.InitClass();
+            global::System.ComponentModel.CollectionChangeEventHandler schemaChangedHandler = new global::System.ComponentModel.CollectionChangeEventHandler(this.SchemaChanged);
+            base.Tables.CollectionChanged += schemaChangedHandler;
+            base.Relations.CollectionChanged += schemaChangedHandler;
+            this.EndInit();
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        protected SoilProfileDataSet(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
+                base(info, context, false) {
+            if ((this.IsBinarySerialized(info, context) == true)) {
+                this.InitVars(false);
+                global::System.ComponentModel.CollectionChangeEventHandler schemaChangedHandler1 = new global::System.ComponentModel.CollectionChangeEventHandler(this.SchemaChanged);
+                this.Tables.CollectionChanged += schemaChangedHandler1;
+                this.Relations.CollectionChanged += schemaChangedHandler1;
+                return;
+            }
+            string strSchema = ((string)(info.GetValue("XmlSchema", typeof(string))));
+            if ((this.DetermineSchemaSerializationMode(info, context) == global::System.Data.SchemaSerializationMode.IncludeSchema)) {
+                global::System.Data.DataSet ds = new global::System.Data.DataSet();
+                ds.ReadXmlSchema(new global::System.Xml.XmlTextReader(new global::System.IO.StringReader(strSchema)));
+                if ((ds.Tables["ODGEOMETRIES"] != null)) {
+                    base.Tables.Add(new ODGEOMETRIESDataTable(ds.Tables["ODGEOMETRIES"]));
+                }
+                if ((ds.Tables["ODGEOLAYERS"] != null)) {
+                    base.Tables.Add(new ODGEOLAYERSDataTable(ds.Tables["ODGEOLAYERS"]));
+                }
+                if ((ds.Tables["MATERIALS"] != null)) {
+                    base.Tables.Add(new MATERIALSDataTable(ds.Tables["MATERIALS"]));
+                }
+                if ((ds.Tables["PARAMETERNAMES"] != null)) {
+                    base.Tables.Add(new PARAMETERNAMESDataTable(ds.Tables["PARAMETERNAMES"]));
+                }
+                if ((ds.Tables["PARAMETERVALUES"] != null)) {
+                    base.Tables.Add(new PARAMETERVALUESDataTable(ds.Tables["PARAMETERVALUES"]));
+                }
+                this.DataSetName = ds.DataSetName;
+                this.Prefix = ds.Prefix;
+                this.Namespace = ds.Namespace;
+                this.Locale = ds.Locale;
+                this.CaseSensitive = ds.CaseSensitive;
+                this.EnforceConstraints = ds.EnforceConstraints;
+                this.Merge(ds, false, global::System.Data.MissingSchemaAction.Add);
+                this.InitVars();
+            }
+            else {
+                this.ReadXmlSchema(new global::System.Xml.XmlTextReader(new global::System.IO.StringReader(strSchema)));
+            }
+            this.GetSerializationData(info, context);
+            global::System.ComponentModel.CollectionChangeEventHandler schemaChangedHandler = new global::System.ComponentModel.CollectionChangeEventHandler(this.SchemaChanged);
+            base.Tables.CollectionChanged += schemaChangedHandler;
+            this.Relations.CollectionChanged += schemaChangedHandler;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.ComponentModel.Browsable(false)]
+        [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)]
+        public ODGEOMETRIESDataTable ODGEOMETRIES {
+            get {
+                return this.tableODGEOMETRIES;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.ComponentModel.Browsable(false)]
+        [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)]
+        public ODGEOLAYERSDataTable ODGEOLAYERS {
+            get {
+                return this.tableODGEOLAYERS;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.ComponentModel.Browsable(false)]
+        [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)]
+        public MATERIALSDataTable MATERIALS {
+            get {
+                return this.tableMATERIALS;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.ComponentModel.Browsable(false)]
+        [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)]
+        public PARAMETERNAMESDataTable PARAMETERNAMES {
+            get {
+                return this.tablePARAMETERNAMES;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.ComponentModel.Browsable(false)]
+        [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)]
+        public PARAMETERVALUESDataTable PARAMETERVALUES {
+            get {
+                return this.tablePARAMETERVALUES;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.ComponentModel.BrowsableAttribute(true)]
+        [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Visible)]
+        public override global::System.Data.SchemaSerializationMode SchemaSerializationMode {
+            get {
+                return this._schemaSerializationMode;
+            }
+            set {
+                this._schemaSerializationMode = value;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public new global::System.Data.DataTableCollection Tables {
+            get {
+                return base.Tables;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.ComponentModel.DesignerSerializationVisibilityAttribute(global::System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public new global::System.Data.DataRelationCollection Relations {
+            get {
+                return base.Relations;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        protected override void InitializeDerivedDataSet() {
+            this.BeginInit();
+            this.InitClass();
+            this.EndInit();
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public override global::System.Data.DataSet Clone() {
+            SoilProfileDataSet cln = ((SoilProfileDataSet)(base.Clone()));
+            cln.InitVars();
+            cln.SchemaSerializationMode = this.SchemaSerializationMode;
+            return cln;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        protected override bool ShouldSerializeTables() {
+            return false;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        protected override bool ShouldSerializeRelations() {
+            return false;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        protected override void ReadXmlSerializable(global::System.Xml.XmlReader reader) {
+            if ((this.DetermineSchemaSerializationMode(reader) == global::System.Data.SchemaSerializationMode.IncludeSchema)) {
+                this.Reset();
+                global::System.Data.DataSet ds = new global::System.Data.DataSet();
+                ds.ReadXml(reader);
+                if ((ds.Tables["ODGEOMETRIES"] != null)) {
+                    base.Tables.Add(new ODGEOMETRIESDataTable(ds.Tables["ODGEOMETRIES"]));
+                }
+                if ((ds.Tables["ODGEOLAYERS"] != null)) {
+                    base.Tables.Add(new ODGEOLAYERSDataTable(ds.Tables["ODGEOLAYERS"]));
+                }
+                if ((ds.Tables["MATERIALS"] != null)) {
+                    base.Tables.Add(new MATERIALSDataTable(ds.Tables["MATERIALS"]));
+                }
+                if ((ds.Tables["PARAMETERNAMES"] != null)) {
+                    base.Tables.Add(new PARAMETERNAMESDataTable(ds.Tables["PARAMETERNAMES"]));
+                }
+                if ((ds.Tables["PARAMETERVALUES"] != null)) {
+                    base.Tables.Add(new PARAMETERVALUESDataTable(ds.Tables["PARAMETERVALUES"]));
+                }
+                this.DataSetName = ds.DataSetName;
+                this.Prefix = ds.Prefix;
+                this.Namespace = ds.Namespace;
+                this.Locale = ds.Locale;
+                this.CaseSensitive = ds.CaseSensitive;
+                this.EnforceConstraints = ds.EnforceConstraints;
+                this.Merge(ds, false, global::System.Data.MissingSchemaAction.Add);
+                this.InitVars();
+            }
+            else {
+                this.ReadXml(reader);
+                this.InitVars();
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        protected override global::System.Xml.Schema.XmlSchema GetSchemaSerializable() {
+            global::System.IO.MemoryStream stream = new global::System.IO.MemoryStream();
+            this.WriteXmlSchema(new global::System.Xml.XmlTextWriter(stream, null));
+            stream.Position = 0;
+            return global::System.Xml.Schema.XmlSchema.Read(new global::System.Xml.XmlTextReader(stream), null);
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        internal void InitVars() {
+            this.InitVars(true);
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        internal void InitVars(bool initTable) {
+            this.tableODGEOMETRIES = ((ODGEOMETRIESDataTable)(base.Tables["ODGEOMETRIES"]));
+            if ((initTable == true)) {
+                if ((this.tableODGEOMETRIES != null)) {
+                    this.tableODGEOMETRIES.InitVars();
+                }
+            }
+            this.tableODGEOLAYERS = ((ODGEOLAYERSDataTable)(base.Tables["ODGEOLAYERS"]));
+            if ((initTable == true)) {
+                if ((this.tableODGEOLAYERS != null)) {
+                    this.tableODGEOLAYERS.InitVars();
+                }
+            }
+            this.tableMATERIALS = ((MATERIALSDataTable)(base.Tables["MATERIALS"]));
+            if ((initTable == true)) {
+                if ((this.tableMATERIALS != null)) {
+                    this.tableMATERIALS.InitVars();
+                }
+            }
+            this.tablePARAMETERNAMES = ((PARAMETERNAMESDataTable)(base.Tables["PARAMETERNAMES"]));
+            if ((initTable == true)) {
+                if ((this.tablePARAMETERNAMES != null)) {
+                    this.tablePARAMETERNAMES.InitVars();
+                }
+            }
+            this.tablePARAMETERVALUES = ((PARAMETERVALUESDataTable)(base.Tables["PARAMETERVALUES"]));
+            if ((initTable == true)) {
+                if ((this.tablePARAMETERVALUES != null)) {
+                    this.tablePARAMETERVALUES.InitVars();
+                }
+            }
+            this.relationODGEOMETRIES_ODGEOLAYERS = this.Relations["ODGEOMETRIES_ODGEOLAYERS"];
+            this.relationODGEOLAYERS_MATERIALS = this.Relations["ODGEOLAYERS_MATERIALS"];
+            this.relationPARAMETERVALUES_MATERIALS = this.Relations["PARAMETERVALUES_MATERIALS"];
+            this.relationPARAMETERNAMES_PARAMETERVALUES = this.Relations["PARAMETERNAMES_PARAMETERVALUES"];
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private void InitClass() {
+            this.DataSetName = "SoilProfileDataSet";
+            this.Prefix = "";
+            this.Namespace = "http://tempuri.org/DataSet1.xsd";
+            this.EnforceConstraints = true;
+            this.SchemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema;
+            this.tableODGEOMETRIES = new ODGEOMETRIESDataTable();
+            base.Tables.Add(this.tableODGEOMETRIES);
+            this.tableODGEOLAYERS = new ODGEOLAYERSDataTable();
+            base.Tables.Add(this.tableODGEOLAYERS);
+            this.tableMATERIALS = new MATERIALSDataTable();
+            base.Tables.Add(this.tableMATERIALS);
+            this.tablePARAMETERNAMES = new PARAMETERNAMESDataTable();
+            base.Tables.Add(this.tablePARAMETERNAMES);
+            this.tablePARAMETERVALUES = new PARAMETERVALUESDataTable();
+            base.Tables.Add(this.tablePARAMETERVALUES);
+            this.relationODGEOMETRIES_ODGEOLAYERS = new global::System.Data.DataRelation("ODGEOMETRIES_ODGEOLAYERS", new global::System.Data.DataColumn[] {
+                        this.tableODGEOMETRIES.OD_NRColumn}, new global::System.Data.DataColumn[] {
+                        this.tableODGEOLAYERS.OD_NRColumn}, false);
+            this.Relations.Add(this.relationODGEOMETRIES_ODGEOLAYERS);
+            this.relationODGEOLAYERS_MATERIALS = new global::System.Data.DataRelation("ODGEOLAYERS_MATERIALS", new global::System.Data.DataColumn[] {
+                        this.tableMATERIALS.MA_NRColumn}, new global::System.Data.DataColumn[] {
+                        this.tableODGEOLAYERS.MA_NRColumn}, false);
+            this.Relations.Add(this.relationODGEOLAYERS_MATERIALS);
+            this.relationPARAMETERVALUES_MATERIALS = new global::System.Data.DataRelation("PARAMETERVALUES_MATERIALS", new global::System.Data.DataColumn[] {
+                        this.tableMATERIALS.MA_NRColumn}, new global::System.Data.DataColumn[] {
+                        this.tablePARAMETERVALUES.MA_NRColumn}, false);
+            this.Relations.Add(this.relationPARAMETERVALUES_MATERIALS);
+            this.relationPARAMETERNAMES_PARAMETERVALUES = new global::System.Data.DataRelation("PARAMETERNAMES_PARAMETERVALUES", new global::System.Data.DataColumn[] {
+                        this.tablePARAMETERNAMES.PN_NRColumn}, new global::System.Data.DataColumn[] {
+                        this.tablePARAMETERVALUES.PN_NRColumn}, false);
+            this.Relations.Add(this.relationPARAMETERNAMES_PARAMETERVALUES);
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private bool ShouldSerializeODGEOMETRIES() {
+            return false;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private bool ShouldSerializeODGEOLAYERS() {
+            return false;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private bool ShouldSerializeMATERIALS() {
+            return false;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private bool ShouldSerializePARAMETERNAMES() {
+            return false;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private bool ShouldSerializePARAMETERVALUES() {
+            return false;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) {
+            if ((e.Action == global::System.ComponentModel.CollectionChangeAction.Remove)) {
+                this.InitVars();
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedDataSetSchema(global::System.Xml.Schema.XmlSchemaSet xs) {
+            SoilProfileDataSet ds = new SoilProfileDataSet();
+            global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();
+            global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();
+            global::System.Xml.Schema.XmlSchemaAny any = new global::System.Xml.Schema.XmlSchemaAny();
+            any.Namespace = ds.Namespace;
+            sequence.Items.Add(any);
+            type.Particle = sequence;
+            global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();
+            if (xs.Contains(dsSchema.TargetNamespace)) {
+                global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream();
+                global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream();
+                try {
+                    global::System.Xml.Schema.XmlSchema schema = null;
+                    dsSchema.Write(s1);
+                    for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) {
+                        schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current));
+                        s2.SetLength(0);
+                        schema.Write(s2);
+                        if ((s1.Length == s2.Length)) {
+                            s1.Position = 0;
+                            s2.Position = 0;
+                            for (; ((s1.Position != s1.Length) 
+                                        && (s1.ReadByte() == s2.ReadByte())); ) {
+                                ;
+                            }
+                            if ((s1.Position == s1.Length)) {
+                                return type;
+                            }
+                        }
+                    }
+                }
+                finally {
+                    if ((s1 != null)) {
+                        s1.Close();
+                    }
+                    if ((s2 != null)) {
+                        s2.Close();
+                    }
+                }
+            }
+            xs.Add(dsSchema);
+            return type;
+        }
+        
+        public delegate void ODGEOMETRIESRowChangeEventHandler(object sender, ODGEOMETRIESRowChangeEvent e);
+        
+        public delegate void ODGEOLAYERSRowChangeEventHandler(object sender, ODGEOLAYERSRowChangeEvent e);
+        
+        public delegate void MATERIALSRowChangeEventHandler(object sender, MATERIALSRowChangeEvent e);
+        
+        public delegate void PARAMETERNAMESRowChangeEventHandler(object sender, PARAMETERNAMESRowChangeEvent e);
+        
+        public delegate void PARAMETERVALUESRowChangeEventHandler(object sender, PARAMETERVALUESRowChangeEvent e);
+        
+        /// <summary>
+        ///Represents the strongly named DataTable class.
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+        [global::System.Serializable()]
+        [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
+        public partial class ODGEOMETRIESDataTable : global::System.Data.TypedTableBase<ODGEOMETRIESRow> {
+            
+            private global::System.Data.DataColumn columnOD_NR;
+            
+            private global::System.Data.DataColumn columnOD_NAME;
+            
+            private global::System.Data.DataColumn columnOD_DESCR;
+            
+            private global::System.Data.DataColumn columnOD_RDX;
+            
+            private global::System.Data.DataColumn columnOD_RDY;
+            
+            private global::System.Data.DataColumn columnOD_CPTNR;
+            
+            private global::System.Data.DataColumn columnOD_BORINGNR;
+            
+            private global::System.Data.DataColumn columnOD_GEOL_ZONE;
+            
+            private global::System.Data.DataColumn columnOD_CHANCE_OCCUR;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public ODGEOMETRIESDataTable() {
+                this.TableName = "ODGEOMETRIES";
+                this.BeginInit();
+                this.InitClass();
+                this.EndInit();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            internal ODGEOMETRIESDataTable(global::System.Data.DataTable table) {
+                this.TableName = table.TableName;
+                if ((table.CaseSensitive != table.DataSet.CaseSensitive)) {
+                    this.CaseSensitive = table.CaseSensitive;
+                }
+                if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) {
+                    this.Locale = table.Locale;
+                }
+                if ((table.Namespace != table.DataSet.Namespace)) {
+                    this.Namespace = table.Namespace;
+                }
+                this.Prefix = table.Prefix;
+                this.MinimumCapacity = table.MinimumCapacity;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected ODGEOMETRIESDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
+                    base(info, context) {
+                this.InitVars();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn OD_NRColumn {
+                get {
+                    return this.columnOD_NR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn OD_NAMEColumn {
+                get {
+                    return this.columnOD_NAME;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn OD_DESCRColumn {
+                get {
+                    return this.columnOD_DESCR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn OD_RDXColumn {
+                get {
+                    return this.columnOD_RDX;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn OD_RDYColumn {
+                get {
+                    return this.columnOD_RDY;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn OD_CPTNRColumn {
+                get {
+                    return this.columnOD_CPTNR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn OD_BORINGNRColumn {
+                get {
+                    return this.columnOD_BORINGNR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn OD_GEOL_ZONEColumn {
+                get {
+                    return this.columnOD_GEOL_ZONE;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn OD_CHANCE_OCCURColumn {
+                get {
+                    return this.columnOD_CHANCE_OCCUR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.ComponentModel.Browsable(false)]
+            public int Count {
+                get {
+                    return this.Rows.Count;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public ODGEOMETRIESRow this[int index] {
+                get {
+                    return ((ODGEOMETRIESRow)(this.Rows[index]));
+                }
+            }
+            
+            public event ODGEOMETRIESRowChangeEventHandler ODGEOMETRIESRowChanging;
+            
+            public event ODGEOMETRIESRowChangeEventHandler ODGEOMETRIESRowChanged;
+            
+            public event ODGEOMETRIESRowChangeEventHandler ODGEOMETRIESRowDeleting;
+            
+            public event ODGEOMETRIESRowChangeEventHandler ODGEOMETRIESRowDeleted;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void AddODGEOMETRIESRow(ODGEOMETRIESRow row) {
+                this.Rows.Add(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public ODGEOMETRIESRow AddODGEOMETRIESRow(string OD_NAME, string OD_DESCR, double OD_RDX, double OD_RDY, int OD_CPTNR, int OD_BORINGNR, int OD_GEOL_ZONE, double OD_CHANCE_OCCUR) {
+                ODGEOMETRIESRow rowODGEOMETRIESRow = ((ODGEOMETRIESRow)(this.NewRow()));
+                object[] columnValuesArray = new object[] {
+                        null,
+                        OD_NAME,
+                        OD_DESCR,
+                        OD_RDX,
+                        OD_RDY,
+                        OD_CPTNR,
+                        OD_BORINGNR,
+                        OD_GEOL_ZONE,
+                        OD_CHANCE_OCCUR};
+                rowODGEOMETRIESRow.ItemArray = columnValuesArray;
+                this.Rows.Add(rowODGEOMETRIESRow);
+                return rowODGEOMETRIESRow;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public ODGEOMETRIESRow FindByOD_NR(int OD_NR) {
+                return ((ODGEOMETRIESRow)(this.Rows.Find(new object[] {
+                            OD_NR})));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public override global::System.Data.DataTable Clone() {
+                ODGEOMETRIESDataTable cln = ((ODGEOMETRIESDataTable)(base.Clone()));
+                cln.InitVars();
+                return cln;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override global::System.Data.DataTable CreateInstance() {
+                return new ODGEOMETRIESDataTable();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            internal void InitVars() {
+                this.columnOD_NR = base.Columns["OD_NR"];
+                this.columnOD_NAME = base.Columns["OD_NAME"];
+                this.columnOD_DESCR = base.Columns["OD_DESCR"];
+                this.columnOD_RDX = base.Columns["OD_RDX"];
+                this.columnOD_RDY = base.Columns["OD_RDY"];
+                this.columnOD_CPTNR = base.Columns["OD_CPTNR"];
+                this.columnOD_BORINGNR = base.Columns["OD_BORINGNR"];
+                this.columnOD_GEOL_ZONE = base.Columns["OD_GEOL_ZONE"];
+                this.columnOD_CHANCE_OCCUR = base.Columns["OD_CHANCE_OCCUR"];
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            private void InitClass() {
+                this.columnOD_NR = new global::System.Data.DataColumn("OD_NR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOD_NR);
+                this.columnOD_NAME = new global::System.Data.DataColumn("OD_NAME", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOD_NAME);
+                this.columnOD_DESCR = new global::System.Data.DataColumn("OD_DESCR", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOD_DESCR);
+                this.columnOD_RDX = new global::System.Data.DataColumn("OD_RDX", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOD_RDX);
+                this.columnOD_RDY = new global::System.Data.DataColumn("OD_RDY", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOD_RDY);
+                this.columnOD_CPTNR = new global::System.Data.DataColumn("OD_CPTNR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOD_CPTNR);
+                this.columnOD_BORINGNR = new global::System.Data.DataColumn("OD_BORINGNR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOD_BORINGNR);
+                this.columnOD_GEOL_ZONE = new global::System.Data.DataColumn("OD_GEOL_ZONE", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOD_GEOL_ZONE);
+                this.columnOD_CHANCE_OCCUR = new global::System.Data.DataColumn("OD_CHANCE_OCCUR", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOD_CHANCE_OCCUR);
+                this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
+                                this.columnOD_NR}, true));
+                this.columnOD_NR.AutoIncrement = true;
+                this.columnOD_NR.AutoIncrementSeed = -1;
+                this.columnOD_NR.AutoIncrementStep = -1;
+                this.columnOD_NR.AllowDBNull = false;
+                this.columnOD_NR.ReadOnly = true;
+                this.columnOD_NR.Unique = true;
+                this.columnOD_NAME.MaxLength = 64;
+                this.columnOD_DESCR.MaxLength = 240;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public ODGEOMETRIESRow NewODGEOMETRIESRow() {
+                return ((ODGEOMETRIESRow)(this.NewRow()));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) {
+                return new ODGEOMETRIESRow(builder);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override global::System.Type GetRowType() {
+                return typeof(ODGEOMETRIESRow);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanged(e);
+                if ((this.ODGEOMETRIESRowChanged != null)) {
+                    this.ODGEOMETRIESRowChanged(this, new ODGEOMETRIESRowChangeEvent(((ODGEOMETRIESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanging(e);
+                if ((this.ODGEOMETRIESRowChanging != null)) {
+                    this.ODGEOMETRIESRowChanging(this, new ODGEOMETRIESRowChangeEvent(((ODGEOMETRIESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleted(e);
+                if ((this.ODGEOMETRIESRowDeleted != null)) {
+                    this.ODGEOMETRIESRowDeleted(this, new ODGEOMETRIESRowChangeEvent(((ODGEOMETRIESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleting(e);
+                if ((this.ODGEOMETRIESRowDeleting != null)) {
+                    this.ODGEOMETRIESRowDeleting(this, new ODGEOMETRIESRowChangeEvent(((ODGEOMETRIESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void RemoveODGEOMETRIESRow(ODGEOMETRIESRow row) {
+                this.Rows.Remove(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) {
+                global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();
+                global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();
+                SoilProfileDataSet ds = new SoilProfileDataSet();
+                global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny();
+                any1.Namespace = "http://www.w3.org/2001/XMLSchema";
+                any1.MinOccurs = new decimal(0);
+                any1.MaxOccurs = decimal.MaxValue;
+                any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any1);
+                global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny();
+                any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1";
+                any2.MinOccurs = new decimal(1);
+                any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any2);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute1.Name = "namespace";
+                attribute1.FixedValue = ds.Namespace;
+                type.Attributes.Add(attribute1);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute2.Name = "tableTypeName";
+                attribute2.FixedValue = "ODGEOMETRIESDataTable";
+                type.Attributes.Add(attribute2);
+                type.Particle = sequence;
+                global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();
+                if (xs.Contains(dsSchema.TargetNamespace)) {
+                    global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream();
+                    global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream();
+                    try {
+                        global::System.Xml.Schema.XmlSchema schema = null;
+                        dsSchema.Write(s1);
+                        for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) {
+                            schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current));
+                            s2.SetLength(0);
+                            schema.Write(s2);
+                            if ((s1.Length == s2.Length)) {
+                                s1.Position = 0;
+                                s2.Position = 0;
+                                for (; ((s1.Position != s1.Length) 
+                                            && (s1.ReadByte() == s2.ReadByte())); ) {
+                                    ;
+                                }
+                                if ((s1.Position == s1.Length)) {
+                                    return type;
+                                }
+                            }
+                        }
+                    }
+                    finally {
+                        if ((s1 != null)) {
+                            s1.Close();
+                        }
+                        if ((s2 != null)) {
+                            s2.Close();
+                        }
+                    }
+                }
+                xs.Add(dsSchema);
+                return type;
+            }
+        }
+        
+        /// <summary>
+        ///Represents the strongly named DataTable class.
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+        [global::System.Serializable()]
+        [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
+        public partial class ODGEOLAYERSDataTable : global::System.Data.TypedTableBase<ODGEOLAYERSRow> {
+            
+            private global::System.Data.DataColumn columnOL_NR;
+            
+            private global::System.Data.DataColumn columnOD_NR;
+            
+            private global::System.Data.DataColumn columnMA_NR;
+            
+            private global::System.Data.DataColumn columnOL_LAYERNR;
+            
+            private global::System.Data.DataColumn columnOL_LEVEL;
+            
+            private global::System.Data.DataColumn columnOL_PLATTOP;
+            
+            private global::System.Data.DataColumn columnOL_PLATBOTTOM;
+            
+            private global::System.Data.DataColumn columnOL_TOPEXCESSPP;
+            
+            private global::System.Data.DataColumn columnOL_BOTEXCESSPP;
+            
+            private global::System.Data.DataColumn columnOL_OCR;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public ODGEOLAYERSDataTable() {
+                this.TableName = "ODGEOLAYERS";
+                this.BeginInit();
+                this.InitClass();
+                this.EndInit();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            internal ODGEOLAYERSDataTable(global::System.Data.DataTable table) {
+                this.TableName = table.TableName;
+                if ((table.CaseSensitive != table.DataSet.CaseSensitive)) {
+                    this.CaseSensitive = table.CaseSensitive;
+                }
+                if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) {
+                    this.Locale = table.Locale;
+                }
+                if ((table.Namespace != table.DataSet.Namespace)) {
+                    this.Namespace = table.Namespace;
+                }
+                this.Prefix = table.Prefix;
+                this.MinimumCapacity = table.MinimumCapacity;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected ODGEOLAYERSDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
+                    base(info, context) {
+                this.InitVars();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn OL_NRColumn {
+                get {
+                    return this.columnOL_NR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn OD_NRColumn {
+                get {
+                    return this.columnOD_NR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn MA_NRColumn {
+                get {
+                    return this.columnMA_NR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn OL_LAYERNRColumn {
+                get {
+                    return this.columnOL_LAYERNR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn OL_LEVELColumn {
+                get {
+                    return this.columnOL_LEVEL;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn OL_PLATTOPColumn {
+                get {
+                    return this.columnOL_PLATTOP;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn OL_PLATBOTTOMColumn {
+                get {
+                    return this.columnOL_PLATBOTTOM;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn OL_TOPEXCESSPPColumn {
+                get {
+                    return this.columnOL_TOPEXCESSPP;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn OL_BOTEXCESSPPColumn {
+                get {
+                    return this.columnOL_BOTEXCESSPP;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn OL_OCRColumn {
+                get {
+                    return this.columnOL_OCR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.ComponentModel.Browsable(false)]
+            public int Count {
+                get {
+                    return this.Rows.Count;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public ODGEOLAYERSRow this[int index] {
+                get {
+                    return ((ODGEOLAYERSRow)(this.Rows[index]));
+                }
+            }
+            
+            public event ODGEOLAYERSRowChangeEventHandler ODGEOLAYERSRowChanging;
+            
+            public event ODGEOLAYERSRowChangeEventHandler ODGEOLAYERSRowChanged;
+            
+            public event ODGEOLAYERSRowChangeEventHandler ODGEOLAYERSRowDeleting;
+            
+            public event ODGEOLAYERSRowChangeEventHandler ODGEOLAYERSRowDeleted;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void AddODGEOLAYERSRow(ODGEOLAYERSRow row) {
+                this.Rows.Add(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public ODGEOLAYERSRow AddODGEOLAYERSRow(ODGEOMETRIESRow parentODGEOMETRIESRowByODGEOMETRIES_ODGEOLAYERS, MATERIALSRow parentMATERIALSRowByODGEOLAYERS_MATERIALS, int OL_LAYERNR, double OL_LEVEL, int OL_PLATTOP, int OL_PLATBOTTOM, double OL_TOPEXCESSPP, double OL_BOTEXCESSPP, double OL_OCR) {
+                ODGEOLAYERSRow rowODGEOLAYERSRow = ((ODGEOLAYERSRow)(this.NewRow()));
+                object[] columnValuesArray = new object[] {
+                        null,
+                        null,
+                        null,
+                        OL_LAYERNR,
+                        OL_LEVEL,
+                        OL_PLATTOP,
+                        OL_PLATBOTTOM,
+                        OL_TOPEXCESSPP,
+                        OL_BOTEXCESSPP,
+                        OL_OCR};
+                if ((parentODGEOMETRIESRowByODGEOMETRIES_ODGEOLAYERS != null)) {
+                    columnValuesArray[1] = parentODGEOMETRIESRowByODGEOMETRIES_ODGEOLAYERS[0];
+                }
+                if ((parentMATERIALSRowByODGEOLAYERS_MATERIALS != null)) {
+                    columnValuesArray[2] = parentMATERIALSRowByODGEOLAYERS_MATERIALS[0];
+                }
+                rowODGEOLAYERSRow.ItemArray = columnValuesArray;
+                this.Rows.Add(rowODGEOLAYERSRow);
+                return rowODGEOLAYERSRow;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public ODGEOLAYERSRow FindByOL_NR(int OL_NR) {
+                return ((ODGEOLAYERSRow)(this.Rows.Find(new object[] {
+                            OL_NR})));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public override global::System.Data.DataTable Clone() {
+                ODGEOLAYERSDataTable cln = ((ODGEOLAYERSDataTable)(base.Clone()));
+                cln.InitVars();
+                return cln;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override global::System.Data.DataTable CreateInstance() {
+                return new ODGEOLAYERSDataTable();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            internal void InitVars() {
+                this.columnOL_NR = base.Columns["OL_NR"];
+                this.columnOD_NR = base.Columns["OD_NR"];
+                this.columnMA_NR = base.Columns["MA_NR"];
+                this.columnOL_LAYERNR = base.Columns["OL_LAYERNR"];
+                this.columnOL_LEVEL = base.Columns["OL_LEVEL"];
+                this.columnOL_PLATTOP = base.Columns["OL_PLATTOP"];
+                this.columnOL_PLATBOTTOM = base.Columns["OL_PLATBOTTOM"];
+                this.columnOL_TOPEXCESSPP = base.Columns["OL_TOPEXCESSPP"];
+                this.columnOL_BOTEXCESSPP = base.Columns["OL_BOTEXCESSPP"];
+                this.columnOL_OCR = base.Columns["OL_OCR"];
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            private void InitClass() {
+                this.columnOL_NR = new global::System.Data.DataColumn("OL_NR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOL_NR);
+                this.columnOD_NR = new global::System.Data.DataColumn("OD_NR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOD_NR);
+                this.columnMA_NR = new global::System.Data.DataColumn("MA_NR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnMA_NR);
+                this.columnOL_LAYERNR = new global::System.Data.DataColumn("OL_LAYERNR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOL_LAYERNR);
+                this.columnOL_LEVEL = new global::System.Data.DataColumn("OL_LEVEL", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOL_LEVEL);
+                this.columnOL_PLATTOP = new global::System.Data.DataColumn("OL_PLATTOP", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOL_PLATTOP);
+                this.columnOL_PLATBOTTOM = new global::System.Data.DataColumn("OL_PLATBOTTOM", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOL_PLATBOTTOM);
+                this.columnOL_TOPEXCESSPP = new global::System.Data.DataColumn("OL_TOPEXCESSPP", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOL_TOPEXCESSPP);
+                this.columnOL_BOTEXCESSPP = new global::System.Data.DataColumn("OL_BOTEXCESSPP", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOL_BOTEXCESSPP);
+                this.columnOL_OCR = new global::System.Data.DataColumn("OL_OCR", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnOL_OCR);
+                this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
+                                this.columnOL_NR}, true));
+                this.columnOL_NR.AutoIncrement = true;
+                this.columnOL_NR.AutoIncrementSeed = -1;
+                this.columnOL_NR.AutoIncrementStep = -1;
+                this.columnOL_NR.AllowDBNull = false;
+                this.columnOL_NR.ReadOnly = true;
+                this.columnOL_NR.Unique = true;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public ODGEOLAYERSRow NewODGEOLAYERSRow() {
+                return ((ODGEOLAYERSRow)(this.NewRow()));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) {
+                return new ODGEOLAYERSRow(builder);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override global::System.Type GetRowType() {
+                return typeof(ODGEOLAYERSRow);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanged(e);
+                if ((this.ODGEOLAYERSRowChanged != null)) {
+                    this.ODGEOLAYERSRowChanged(this, new ODGEOLAYERSRowChangeEvent(((ODGEOLAYERSRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanging(e);
+                if ((this.ODGEOLAYERSRowChanging != null)) {
+                    this.ODGEOLAYERSRowChanging(this, new ODGEOLAYERSRowChangeEvent(((ODGEOLAYERSRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleted(e);
+                if ((this.ODGEOLAYERSRowDeleted != null)) {
+                    this.ODGEOLAYERSRowDeleted(this, new ODGEOLAYERSRowChangeEvent(((ODGEOLAYERSRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleting(e);
+                if ((this.ODGEOLAYERSRowDeleting != null)) {
+                    this.ODGEOLAYERSRowDeleting(this, new ODGEOLAYERSRowChangeEvent(((ODGEOLAYERSRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void RemoveODGEOLAYERSRow(ODGEOLAYERSRow row) {
+                this.Rows.Remove(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) {
+                global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();
+                global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();
+                SoilProfileDataSet ds = new SoilProfileDataSet();
+                global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny();
+                any1.Namespace = "http://www.w3.org/2001/XMLSchema";
+                any1.MinOccurs = new decimal(0);
+                any1.MaxOccurs = decimal.MaxValue;
+                any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any1);
+                global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny();
+                any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1";
+                any2.MinOccurs = new decimal(1);
+                any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any2);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute1.Name = "namespace";
+                attribute1.FixedValue = ds.Namespace;
+                type.Attributes.Add(attribute1);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute2.Name = "tableTypeName";
+                attribute2.FixedValue = "ODGEOLAYERSDataTable";
+                type.Attributes.Add(attribute2);
+                type.Particle = sequence;
+                global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();
+                if (xs.Contains(dsSchema.TargetNamespace)) {
+                    global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream();
+                    global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream();
+                    try {
+                        global::System.Xml.Schema.XmlSchema schema = null;
+                        dsSchema.Write(s1);
+                        for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) {
+                            schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current));
+                            s2.SetLength(0);
+                            schema.Write(s2);
+                            if ((s1.Length == s2.Length)) {
+                                s1.Position = 0;
+                                s2.Position = 0;
+                                for (; ((s1.Position != s1.Length) 
+                                            && (s1.ReadByte() == s2.ReadByte())); ) {
+                                    ;
+                                }
+                                if ((s1.Position == s1.Length)) {
+                                    return type;
+                                }
+                            }
+                        }
+                    }
+                    finally {
+                        if ((s1 != null)) {
+                            s1.Close();
+                        }
+                        if ((s2 != null)) {
+                            s2.Close();
+                        }
+                    }
+                }
+                xs.Add(dsSchema);
+                return type;
+            }
+        }
+        
+        /// <summary>
+        ///Represents the strongly named DataTable class.
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+        [global::System.Serializable()]
+        [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
+        public partial class MATERIALSDataTable : global::System.Data.TypedTableBase<MATERIALSRow> {
+            
+            private global::System.Data.DataColumn columnMA_NR;
+            
+            private global::System.Data.DataColumn columnMA_NAME;
+            
+            private global::System.Data.DataColumn columnMA_DESCR;
+            
+            private global::System.Data.DataColumn columnMA_INDEX;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public MATERIALSDataTable() {
+                this.TableName = "MATERIALS";
+                this.BeginInit();
+                this.InitClass();
+                this.EndInit();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            internal MATERIALSDataTable(global::System.Data.DataTable table) {
+                this.TableName = table.TableName;
+                if ((table.CaseSensitive != table.DataSet.CaseSensitive)) {
+                    this.CaseSensitive = table.CaseSensitive;
+                }
+                if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) {
+                    this.Locale = table.Locale;
+                }
+                if ((table.Namespace != table.DataSet.Namespace)) {
+                    this.Namespace = table.Namespace;
+                }
+                this.Prefix = table.Prefix;
+                this.MinimumCapacity = table.MinimumCapacity;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected MATERIALSDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
+                    base(info, context) {
+                this.InitVars();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn MA_NRColumn {
+                get {
+                    return this.columnMA_NR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn MA_NAMEColumn {
+                get {
+                    return this.columnMA_NAME;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn MA_DESCRColumn {
+                get {
+                    return this.columnMA_DESCR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn MA_INDEXColumn {
+                get {
+                    return this.columnMA_INDEX;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.ComponentModel.Browsable(false)]
+            public int Count {
+                get {
+                    return this.Rows.Count;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public MATERIALSRow this[int index] {
+                get {
+                    return ((MATERIALSRow)(this.Rows[index]));
+                }
+            }
+            
+            public event MATERIALSRowChangeEventHandler MATERIALSRowChanging;
+            
+            public event MATERIALSRowChangeEventHandler MATERIALSRowChanged;
+            
+            public event MATERIALSRowChangeEventHandler MATERIALSRowDeleting;
+            
+            public event MATERIALSRowChangeEventHandler MATERIALSRowDeleted;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void AddMATERIALSRow(MATERIALSRow row) {
+                this.Rows.Add(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public MATERIALSRow AddMATERIALSRow(string MA_NAME, string MA_DESCR, int MA_INDEX) {
+                MATERIALSRow rowMATERIALSRow = ((MATERIALSRow)(this.NewRow()));
+                object[] columnValuesArray = new object[] {
+                        null,
+                        MA_NAME,
+                        MA_DESCR,
+                        MA_INDEX};
+                rowMATERIALSRow.ItemArray = columnValuesArray;
+                this.Rows.Add(rowMATERIALSRow);
+                return rowMATERIALSRow;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public MATERIALSRow FindByMA_NR(int MA_NR) {
+                return ((MATERIALSRow)(this.Rows.Find(new object[] {
+                            MA_NR})));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public override global::System.Data.DataTable Clone() {
+                MATERIALSDataTable cln = ((MATERIALSDataTable)(base.Clone()));
+                cln.InitVars();
+                return cln;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override global::System.Data.DataTable CreateInstance() {
+                return new MATERIALSDataTable();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            internal void InitVars() {
+                this.columnMA_NR = base.Columns["MA_NR"];
+                this.columnMA_NAME = base.Columns["MA_NAME"];
+                this.columnMA_DESCR = base.Columns["MA_DESCR"];
+                this.columnMA_INDEX = base.Columns["MA_INDEX"];
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            private void InitClass() {
+                this.columnMA_NR = new global::System.Data.DataColumn("MA_NR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnMA_NR);
+                this.columnMA_NAME = new global::System.Data.DataColumn("MA_NAME", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnMA_NAME);
+                this.columnMA_DESCR = new global::System.Data.DataColumn("MA_DESCR", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnMA_DESCR);
+                this.columnMA_INDEX = new global::System.Data.DataColumn("MA_INDEX", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnMA_INDEX);
+                this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
+                                this.columnMA_NR}, true));
+                this.columnMA_NR.AutoIncrement = true;
+                this.columnMA_NR.AutoIncrementSeed = -1;
+                this.columnMA_NR.AutoIncrementStep = -1;
+                this.columnMA_NR.AllowDBNull = false;
+                this.columnMA_NR.ReadOnly = true;
+                this.columnMA_NR.Unique = true;
+                this.columnMA_NAME.MaxLength = 128;
+                this.columnMA_DESCR.MaxLength = 240;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public MATERIALSRow NewMATERIALSRow() {
+                return ((MATERIALSRow)(this.NewRow()));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) {
+                return new MATERIALSRow(builder);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override global::System.Type GetRowType() {
+                return typeof(MATERIALSRow);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanged(e);
+                if ((this.MATERIALSRowChanged != null)) {
+                    this.MATERIALSRowChanged(this, new MATERIALSRowChangeEvent(((MATERIALSRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanging(e);
+                if ((this.MATERIALSRowChanging != null)) {
+                    this.MATERIALSRowChanging(this, new MATERIALSRowChangeEvent(((MATERIALSRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleted(e);
+                if ((this.MATERIALSRowDeleted != null)) {
+                    this.MATERIALSRowDeleted(this, new MATERIALSRowChangeEvent(((MATERIALSRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleting(e);
+                if ((this.MATERIALSRowDeleting != null)) {
+                    this.MATERIALSRowDeleting(this, new MATERIALSRowChangeEvent(((MATERIALSRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void RemoveMATERIALSRow(MATERIALSRow row) {
+                this.Rows.Remove(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) {
+                global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();
+                global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();
+                SoilProfileDataSet ds = new SoilProfileDataSet();
+                global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny();
+                any1.Namespace = "http://www.w3.org/2001/XMLSchema";
+                any1.MinOccurs = new decimal(0);
+                any1.MaxOccurs = decimal.MaxValue;
+                any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any1);
+                global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny();
+                any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1";
+                any2.MinOccurs = new decimal(1);
+                any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any2);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute1.Name = "namespace";
+                attribute1.FixedValue = ds.Namespace;
+                type.Attributes.Add(attribute1);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute2.Name = "tableTypeName";
+                attribute2.FixedValue = "MATERIALSDataTable";
+                type.Attributes.Add(attribute2);
+                type.Particle = sequence;
+                global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();
+                if (xs.Contains(dsSchema.TargetNamespace)) {
+                    global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream();
+                    global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream();
+                    try {
+                        global::System.Xml.Schema.XmlSchema schema = null;
+                        dsSchema.Write(s1);
+                        for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) {
+                            schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current));
+                            s2.SetLength(0);
+                            schema.Write(s2);
+                            if ((s1.Length == s2.Length)) {
+                                s1.Position = 0;
+                                s2.Position = 0;
+                                for (; ((s1.Position != s1.Length) 
+                                            && (s1.ReadByte() == s2.ReadByte())); ) {
+                                    ;
+                                }
+                                if ((s1.Position == s1.Length)) {
+                                    return type;
+                                }
+                            }
+                        }
+                    }
+                    finally {
+                        if ((s1 != null)) {
+                            s1.Close();
+                        }
+                        if ((s2 != null)) {
+                            s2.Close();
+                        }
+                    }
+                }
+                xs.Add(dsSchema);
+                return type;
+            }
+        }
+        
+        /// <summary>
+        ///Represents the strongly named DataTable class.
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+        [global::System.Serializable()]
+        [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
+        public partial class PARAMETERNAMESDataTable : global::System.Data.TypedTableBase<PARAMETERNAMESRow> {
+            
+            private global::System.Data.DataColumn columnPN_NR;
+            
+            private global::System.Data.DataColumn columnPN_NAME;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public PARAMETERNAMESDataTable() {
+                this.TableName = "PARAMETERNAMES";
+                this.BeginInit();
+                this.InitClass();
+                this.EndInit();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            internal PARAMETERNAMESDataTable(global::System.Data.DataTable table) {
+                this.TableName = table.TableName;
+                if ((table.CaseSensitive != table.DataSet.CaseSensitive)) {
+                    this.CaseSensitive = table.CaseSensitive;
+                }
+                if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) {
+                    this.Locale = table.Locale;
+                }
+                if ((table.Namespace != table.DataSet.Namespace)) {
+                    this.Namespace = table.Namespace;
+                }
+                this.Prefix = table.Prefix;
+                this.MinimumCapacity = table.MinimumCapacity;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected PARAMETERNAMESDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
+                    base(info, context) {
+                this.InitVars();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn PN_NRColumn {
+                get {
+                    return this.columnPN_NR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn PN_NAMEColumn {
+                get {
+                    return this.columnPN_NAME;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.ComponentModel.Browsable(false)]
+            public int Count {
+                get {
+                    return this.Rows.Count;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public PARAMETERNAMESRow this[int index] {
+                get {
+                    return ((PARAMETERNAMESRow)(this.Rows[index]));
+                }
+            }
+            
+            public event PARAMETERNAMESRowChangeEventHandler PARAMETERNAMESRowChanging;
+            
+            public event PARAMETERNAMESRowChangeEventHandler PARAMETERNAMESRowChanged;
+            
+            public event PARAMETERNAMESRowChangeEventHandler PARAMETERNAMESRowDeleting;
+            
+            public event PARAMETERNAMESRowChangeEventHandler PARAMETERNAMESRowDeleted;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void AddPARAMETERNAMESRow(PARAMETERNAMESRow row) {
+                this.Rows.Add(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public PARAMETERNAMESRow AddPARAMETERNAMESRow(string PN_NAME) {
+                PARAMETERNAMESRow rowPARAMETERNAMESRow = ((PARAMETERNAMESRow)(this.NewRow()));
+                object[] columnValuesArray = new object[] {
+                        null,
+                        PN_NAME};
+                rowPARAMETERNAMESRow.ItemArray = columnValuesArray;
+                this.Rows.Add(rowPARAMETERNAMESRow);
+                return rowPARAMETERNAMESRow;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public PARAMETERNAMESRow FindByPN_NR(int PN_NR) {
+                return ((PARAMETERNAMESRow)(this.Rows.Find(new object[] {
+                            PN_NR})));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public override global::System.Data.DataTable Clone() {
+                PARAMETERNAMESDataTable cln = ((PARAMETERNAMESDataTable)(base.Clone()));
+                cln.InitVars();
+                return cln;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override global::System.Data.DataTable CreateInstance() {
+                return new PARAMETERNAMESDataTable();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            internal void InitVars() {
+                this.columnPN_NR = base.Columns["PN_NR"];
+                this.columnPN_NAME = base.Columns["PN_NAME"];
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            private void InitClass() {
+                this.columnPN_NR = new global::System.Data.DataColumn("PN_NR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnPN_NR);
+                this.columnPN_NAME = new global::System.Data.DataColumn("PN_NAME", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnPN_NAME);
+                this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
+                                this.columnPN_NR}, true));
+                this.columnPN_NR.AutoIncrement = true;
+                this.columnPN_NR.AutoIncrementSeed = -1;
+                this.columnPN_NR.AutoIncrementStep = -1;
+                this.columnPN_NR.AllowDBNull = false;
+                this.columnPN_NR.ReadOnly = true;
+                this.columnPN_NR.Unique = true;
+                this.columnPN_NAME.MaxLength = 64;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public PARAMETERNAMESRow NewPARAMETERNAMESRow() {
+                return ((PARAMETERNAMESRow)(this.NewRow()));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) {
+                return new PARAMETERNAMESRow(builder);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override global::System.Type GetRowType() {
+                return typeof(PARAMETERNAMESRow);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanged(e);
+                if ((this.PARAMETERNAMESRowChanged != null)) {
+                    this.PARAMETERNAMESRowChanged(this, new PARAMETERNAMESRowChangeEvent(((PARAMETERNAMESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanging(e);
+                if ((this.PARAMETERNAMESRowChanging != null)) {
+                    this.PARAMETERNAMESRowChanging(this, new PARAMETERNAMESRowChangeEvent(((PARAMETERNAMESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleted(e);
+                if ((this.PARAMETERNAMESRowDeleted != null)) {
+                    this.PARAMETERNAMESRowDeleted(this, new PARAMETERNAMESRowChangeEvent(((PARAMETERNAMESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleting(e);
+                if ((this.PARAMETERNAMESRowDeleting != null)) {
+                    this.PARAMETERNAMESRowDeleting(this, new PARAMETERNAMESRowChangeEvent(((PARAMETERNAMESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void RemovePARAMETERNAMESRow(PARAMETERNAMESRow row) {
+                this.Rows.Remove(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) {
+                global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();
+                global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();
+                SoilProfileDataSet ds = new SoilProfileDataSet();
+                global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny();
+                any1.Namespace = "http://www.w3.org/2001/XMLSchema";
+                any1.MinOccurs = new decimal(0);
+                any1.MaxOccurs = decimal.MaxValue;
+                any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any1);
+                global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny();
+                any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1";
+                any2.MinOccurs = new decimal(1);
+                any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any2);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute1.Name = "namespace";
+                attribute1.FixedValue = ds.Namespace;
+                type.Attributes.Add(attribute1);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute2.Name = "tableTypeName";
+                attribute2.FixedValue = "PARAMETERNAMESDataTable";
+                type.Attributes.Add(attribute2);
+                type.Particle = sequence;
+                global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();
+                if (xs.Contains(dsSchema.TargetNamespace)) {
+                    global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream();
+                    global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream();
+                    try {
+                        global::System.Xml.Schema.XmlSchema schema = null;
+                        dsSchema.Write(s1);
+                        for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) {
+                            schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current));
+                            s2.SetLength(0);
+                            schema.Write(s2);
+                            if ((s1.Length == s2.Length)) {
+                                s1.Position = 0;
+                                s2.Position = 0;
+                                for (; ((s1.Position != s1.Length) 
+                                            && (s1.ReadByte() == s2.ReadByte())); ) {
+                                    ;
+                                }
+                                if ((s1.Position == s1.Length)) {
+                                    return type;
+                                }
+                            }
+                        }
+                    }
+                    finally {
+                        if ((s1 != null)) {
+                            s1.Close();
+                        }
+                        if ((s2 != null)) {
+                            s2.Close();
+                        }
+                    }
+                }
+                xs.Add(dsSchema);
+                return type;
+            }
+        }
+        
+        /// <summary>
+        ///Represents the strongly named DataTable class.
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+        [global::System.Serializable()]
+        [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
+        public partial class PARAMETERVALUESDataTable : global::System.Data.TypedTableBase<PARAMETERVALUESRow> {
+            
+            private global::System.Data.DataColumn columnPV_NR;
+            
+            private global::System.Data.DataColumn columnMA_NR;
+            
+            private global::System.Data.DataColumn columnPN_NR;
+            
+            private global::System.Data.DataColumn columnPV_VALUE;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public PARAMETERVALUESDataTable() {
+                this.TableName = "PARAMETERVALUES";
+                this.BeginInit();
+                this.InitClass();
+                this.EndInit();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            internal PARAMETERVALUESDataTable(global::System.Data.DataTable table) {
+                this.TableName = table.TableName;
+                if ((table.CaseSensitive != table.DataSet.CaseSensitive)) {
+                    this.CaseSensitive = table.CaseSensitive;
+                }
+                if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) {
+                    this.Locale = table.Locale;
+                }
+                if ((table.Namespace != table.DataSet.Namespace)) {
+                    this.Namespace = table.Namespace;
+                }
+                this.Prefix = table.Prefix;
+                this.MinimumCapacity = table.MinimumCapacity;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected PARAMETERVALUESDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
+                    base(info, context) {
+                this.InitVars();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn PV_NRColumn {
+                get {
+                    return this.columnPV_NR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn MA_NRColumn {
+                get {
+                    return this.columnMA_NR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn PN_NRColumn {
+                get {
+                    return this.columnPN_NR;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataColumn PV_VALUEColumn {
+                get {
+                    return this.columnPV_VALUE;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.ComponentModel.Browsable(false)]
+            public int Count {
+                get {
+                    return this.Rows.Count;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public PARAMETERVALUESRow this[int index] {
+                get {
+                    return ((PARAMETERVALUESRow)(this.Rows[index]));
+                }
+            }
+            
+            public event PARAMETERVALUESRowChangeEventHandler PARAMETERVALUESRowChanging;
+            
+            public event PARAMETERVALUESRowChangeEventHandler PARAMETERVALUESRowChanged;
+            
+            public event PARAMETERVALUESRowChangeEventHandler PARAMETERVALUESRowDeleting;
+            
+            public event PARAMETERVALUESRowChangeEventHandler PARAMETERVALUESRowDeleted;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void AddPARAMETERVALUESRow(PARAMETERVALUESRow row) {
+                this.Rows.Add(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public PARAMETERVALUESRow AddPARAMETERVALUESRow(MATERIALSRow parentMATERIALSRowByPARAMETERVALUES_MATERIALS, PARAMETERNAMESRow parentPARAMETERNAMESRowByPARAMETERNAMES_PARAMETERVALUES, double PV_VALUE) {
+                PARAMETERVALUESRow rowPARAMETERVALUESRow = ((PARAMETERVALUESRow)(this.NewRow()));
+                object[] columnValuesArray = new object[] {
+                        null,
+                        null,
+                        null,
+                        PV_VALUE};
+                if ((parentMATERIALSRowByPARAMETERVALUES_MATERIALS != null)) {
+                    columnValuesArray[1] = parentMATERIALSRowByPARAMETERVALUES_MATERIALS[0];
+                }
+                if ((parentPARAMETERNAMESRowByPARAMETERNAMES_PARAMETERVALUES != null)) {
+                    columnValuesArray[2] = parentPARAMETERNAMESRowByPARAMETERNAMES_PARAMETERVALUES[0];
+                }
+                rowPARAMETERVALUESRow.ItemArray = columnValuesArray;
+                this.Rows.Add(rowPARAMETERVALUESRow);
+                return rowPARAMETERVALUESRow;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public PARAMETERVALUESRow FindByPV_NR(int PV_NR) {
+                return ((PARAMETERVALUESRow)(this.Rows.Find(new object[] {
+                            PV_NR})));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public override global::System.Data.DataTable Clone() {
+                PARAMETERVALUESDataTable cln = ((PARAMETERVALUESDataTable)(base.Clone()));
+                cln.InitVars();
+                return cln;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override global::System.Data.DataTable CreateInstance() {
+                return new PARAMETERVALUESDataTable();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            internal void InitVars() {
+                this.columnPV_NR = base.Columns["PV_NR"];
+                this.columnMA_NR = base.Columns["MA_NR"];
+                this.columnPN_NR = base.Columns["PN_NR"];
+                this.columnPV_VALUE = base.Columns["PV_VALUE"];
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            private void InitClass() {
+                this.columnPV_NR = new global::System.Data.DataColumn("PV_NR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnPV_NR);
+                this.columnMA_NR = new global::System.Data.DataColumn("MA_NR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnMA_NR);
+                this.columnPN_NR = new global::System.Data.DataColumn("PN_NR", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnPN_NR);
+                this.columnPV_VALUE = new global::System.Data.DataColumn("PV_VALUE", typeof(double), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnPV_VALUE);
+                this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
+                                this.columnPV_NR}, true));
+                this.columnPV_NR.AutoIncrement = true;
+                this.columnPV_NR.AutoIncrementSeed = -1;
+                this.columnPV_NR.AutoIncrementStep = -1;
+                this.columnPV_NR.AllowDBNull = false;
+                this.columnPV_NR.ReadOnly = true;
+                this.columnPV_NR.Unique = true;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public PARAMETERVALUESRow NewPARAMETERVALUESRow() {
+                return ((PARAMETERVALUESRow)(this.NewRow()));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) {
+                return new PARAMETERVALUESRow(builder);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override global::System.Type GetRowType() {
+                return typeof(PARAMETERVALUESRow);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanged(e);
+                if ((this.PARAMETERVALUESRowChanged != null)) {
+                    this.PARAMETERVALUESRowChanged(this, new PARAMETERVALUESRowChangeEvent(((PARAMETERVALUESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanging(e);
+                if ((this.PARAMETERVALUESRowChanging != null)) {
+                    this.PARAMETERVALUESRowChanging(this, new PARAMETERVALUESRowChangeEvent(((PARAMETERVALUESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleted(e);
+                if ((this.PARAMETERVALUESRowDeleted != null)) {
+                    this.PARAMETERVALUESRowDeleted(this, new PARAMETERVALUESRowChangeEvent(((PARAMETERVALUESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleting(e);
+                if ((this.PARAMETERVALUESRowDeleting != null)) {
+                    this.PARAMETERVALUESRowDeleting(this, new PARAMETERVALUESRowChangeEvent(((PARAMETERVALUESRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void RemovePARAMETERVALUESRow(PARAMETERVALUESRow row) {
+                this.Rows.Remove(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) {
+                global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();
+                global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();
+                SoilProfileDataSet ds = new SoilProfileDataSet();
+                global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny();
+                any1.Namespace = "http://www.w3.org/2001/XMLSchema";
+                any1.MinOccurs = new decimal(0);
+                any1.MaxOccurs = decimal.MaxValue;
+                any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any1);
+                global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny();
+                any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1";
+                any2.MinOccurs = new decimal(1);
+                any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any2);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute1.Name = "namespace";
+                attribute1.FixedValue = ds.Namespace;
+                type.Attributes.Add(attribute1);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute2.Name = "tableTypeName";
+                attribute2.FixedValue = "PARAMETERVALUESDataTable";
+                type.Attributes.Add(attribute2);
+                type.Particle = sequence;
+                global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();
+                if (xs.Contains(dsSchema.TargetNamespace)) {
+                    global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream();
+                    global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream();
+                    try {
+                        global::System.Xml.Schema.XmlSchema schema = null;
+                        dsSchema.Write(s1);
+                        for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) {
+                            schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current));
+                            s2.SetLength(0);
+                            schema.Write(s2);
+                            if ((s1.Length == s2.Length)) {
+                                s1.Position = 0;
+                                s2.Position = 0;
+                                for (; ((s1.Position != s1.Length) 
+                                            && (s1.ReadByte() == s2.ReadByte())); ) {
+                                    ;
+                                }
+                                if ((s1.Position == s1.Length)) {
+                                    return type;
+                                }
+                            }
+                        }
+                    }
+                    finally {
+                        if ((s1 != null)) {
+                            s1.Close();
+                        }
+                        if ((s2 != null)) {
+                            s2.Close();
+                        }
+                    }
+                }
+                xs.Add(dsSchema);
+                return type;
+            }
+        }
+        
+        /// <summary>
+        ///Represents strongly named DataRow class.
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+        public partial class ODGEOMETRIESRow : global::System.Data.DataRow {
+            
+            private ODGEOMETRIESDataTable tableODGEOMETRIES;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            internal ODGEOMETRIESRow(global::System.Data.DataRowBuilder rb) : 
+                    base(rb) {
+                this.tableODGEOMETRIES = ((ODGEOMETRIESDataTable)(this.Table));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public int OD_NR {
+                get {
+                    return ((int)(this[this.tableODGEOMETRIES.OD_NRColumn]));
+                }
+                set {
+                    this[this.tableODGEOMETRIES.OD_NRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public string OD_NAME {
+                get {
+                    try {
+                        return ((string)(this[this.tableODGEOMETRIES.OD_NAMEColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OD_NAME\' in table \'ODGEOMETRIES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOMETRIES.OD_NAMEColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public string OD_DESCR {
+                get {
+                    try {
+                        return ((string)(this[this.tableODGEOMETRIES.OD_DESCRColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OD_DESCR\' in table \'ODGEOMETRIES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOMETRIES.OD_DESCRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public double OD_RDX {
+                get {
+                    try {
+                        return ((double)(this[this.tableODGEOMETRIES.OD_RDXColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OD_RDX\' in table \'ODGEOMETRIES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOMETRIES.OD_RDXColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public double OD_RDY {
+                get {
+                    try {
+                        return ((double)(this[this.tableODGEOMETRIES.OD_RDYColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OD_RDY\' in table \'ODGEOMETRIES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOMETRIES.OD_RDYColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public int OD_CPTNR {
+                get {
+                    try {
+                        return ((int)(this[this.tableODGEOMETRIES.OD_CPTNRColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OD_CPTNR\' in table \'ODGEOMETRIES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOMETRIES.OD_CPTNRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public int OD_BORINGNR {
+                get {
+                    try {
+                        return ((int)(this[this.tableODGEOMETRIES.OD_BORINGNRColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OD_BORINGNR\' in table \'ODGEOMETRIES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOMETRIES.OD_BORINGNRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public int OD_GEOL_ZONE {
+                get {
+                    try {
+                        return ((int)(this[this.tableODGEOMETRIES.OD_GEOL_ZONEColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OD_GEOL_ZONE\' in table \'ODGEOMETRIES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOMETRIES.OD_GEOL_ZONEColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public double OD_CHANCE_OCCUR {
+                get {
+                    try {
+                        return ((double)(this[this.tableODGEOMETRIES.OD_CHANCE_OCCURColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OD_CHANCE_OCCUR\' in table \'ODGEOMETRIES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOMETRIES.OD_CHANCE_OCCURColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsOD_NAMENull() {
+                return this.IsNull(this.tableODGEOMETRIES.OD_NAMEColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetOD_NAMENull() {
+                this[this.tableODGEOMETRIES.OD_NAMEColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsOD_DESCRNull() {
+                return this.IsNull(this.tableODGEOMETRIES.OD_DESCRColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetOD_DESCRNull() {
+                this[this.tableODGEOMETRIES.OD_DESCRColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsOD_RDXNull() {
+                return this.IsNull(this.tableODGEOMETRIES.OD_RDXColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetOD_RDXNull() {
+                this[this.tableODGEOMETRIES.OD_RDXColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsOD_RDYNull() {
+                return this.IsNull(this.tableODGEOMETRIES.OD_RDYColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetOD_RDYNull() {
+                this[this.tableODGEOMETRIES.OD_RDYColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsOD_CPTNRNull() {
+                return this.IsNull(this.tableODGEOMETRIES.OD_CPTNRColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetOD_CPTNRNull() {
+                this[this.tableODGEOMETRIES.OD_CPTNRColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsOD_BORINGNRNull() {
+                return this.IsNull(this.tableODGEOMETRIES.OD_BORINGNRColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetOD_BORINGNRNull() {
+                this[this.tableODGEOMETRIES.OD_BORINGNRColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsOD_GEOL_ZONENull() {
+                return this.IsNull(this.tableODGEOMETRIES.OD_GEOL_ZONEColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetOD_GEOL_ZONENull() {
+                this[this.tableODGEOMETRIES.OD_GEOL_ZONEColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsOD_CHANCE_OCCURNull() {
+                return this.IsNull(this.tableODGEOMETRIES.OD_CHANCE_OCCURColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetOD_CHANCE_OCCURNull() {
+                this[this.tableODGEOMETRIES.OD_CHANCE_OCCURColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public ODGEOLAYERSRow[] GetODGEOLAYERSRows() {
+                if ((this.Table.ChildRelations["ODGEOMETRIES_ODGEOLAYERS"] == null)) {
+                    return new ODGEOLAYERSRow[0];
+                }
+                else {
+                    return ((ODGEOLAYERSRow[])(base.GetChildRows(this.Table.ChildRelations["ODGEOMETRIES_ODGEOLAYERS"])));
+                }
+            }
+        }
+        
+        /// <summary>
+        ///Represents strongly named DataRow class.
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+        public partial class ODGEOLAYERSRow : global::System.Data.DataRow {
+            
+            private ODGEOLAYERSDataTable tableODGEOLAYERS;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            internal ODGEOLAYERSRow(global::System.Data.DataRowBuilder rb) : 
+                    base(rb) {
+                this.tableODGEOLAYERS = ((ODGEOLAYERSDataTable)(this.Table));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public int OL_NR {
+                get {
+                    return ((int)(this[this.tableODGEOLAYERS.OL_NRColumn]));
+                }
+                set {
+                    this[this.tableODGEOLAYERS.OL_NRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public int OD_NR {
+                get {
+                    try {
+                        return ((int)(this[this.tableODGEOLAYERS.OD_NRColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OD_NR\' in table \'ODGEOLAYERS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOLAYERS.OD_NRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public int MA_NR {
+                get {
+                    try {
+                        return ((int)(this[this.tableODGEOLAYERS.MA_NRColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'MA_NR\' in table \'ODGEOLAYERS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOLAYERS.MA_NRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public int OL_LAYERNR {
+                get {
+                    try {
+                        return ((int)(this[this.tableODGEOLAYERS.OL_LAYERNRColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OL_LAYERNR\' in table \'ODGEOLAYERS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOLAYERS.OL_LAYERNRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public double OL_LEVEL {
+                get {
+                    try {
+                        return ((double)(this[this.tableODGEOLAYERS.OL_LEVELColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OL_LEVEL\' in table \'ODGEOLAYERS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOLAYERS.OL_LEVELColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public int OL_PLATTOP {
+                get {
+                    try {
+                        return ((int)(this[this.tableODGEOLAYERS.OL_PLATTOPColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OL_PLATTOP\' in table \'ODGEOLAYERS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOLAYERS.OL_PLATTOPColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public int OL_PLATBOTTOM {
+                get {
+                    try {
+                        return ((int)(this[this.tableODGEOLAYERS.OL_PLATBOTTOMColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OL_PLATBOTTOM\' in table \'ODGEOLAYERS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOLAYERS.OL_PLATBOTTOMColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public double OL_TOPEXCESSPP {
+                get {
+                    try {
+                        return ((double)(this[this.tableODGEOLAYERS.OL_TOPEXCESSPPColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OL_TOPEXCESSPP\' in table \'ODGEOLAYERS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOLAYERS.OL_TOPEXCESSPPColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public double OL_BOTEXCESSPP {
+                get {
+                    try {
+                        return ((double)(this[this.tableODGEOLAYERS.OL_BOTEXCESSPPColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OL_BOTEXCESSPP\' in table \'ODGEOLAYERS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOLAYERS.OL_BOTEXCESSPPColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public double OL_OCR {
+                get {
+                    try {
+                        return ((double)(this[this.tableODGEOLAYERS.OL_OCRColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'OL_OCR\' in table \'ODGEOLAYERS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableODGEOLAYERS.OL_OCRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public ODGEOMETRIESRow ODGEOMETRIESRow {
+                get {
+                    return ((ODGEOMETRIESRow)(this.GetParentRow(this.Table.ParentRelations["ODGEOMETRIES_ODGEOLAYERS"])));
+                }
+                set {
+                    this.SetParentRow(value, this.Table.ParentRelations["ODGEOMETRIES_ODGEOLAYERS"]);
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public MATERIALSRow MATERIALSRow {
+                get {
+                    return ((MATERIALSRow)(this.GetParentRow(this.Table.ParentRelations["ODGEOLAYERS_MATERIALS"])));
+                }
+                set {
+                    this.SetParentRow(value, this.Table.ParentRelations["ODGEOLAYERS_MATERIALS"]);
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsOD_NRNull() {
+                return this.IsNull(this.tableODGEOLAYERS.OD_NRColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetOD_NRNull() {
+                this[this.tableODGEOLAYERS.OD_NRColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsMA_NRNull() {
+                return this.IsNull(this.tableODGEOLAYERS.MA_NRColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetMA_NRNull() {
+                this[this.tableODGEOLAYERS.MA_NRColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsOL_LAYERNRNull() {
+                return this.IsNull(this.tableODGEOLAYERS.OL_LAYERNRColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetOL_LAYERNRNull() {
+                this[this.tableODGEOLAYERS.OL_LAYERNRColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsOL_LEVELNull() {
+                return this.IsNull(this.tableODGEOLAYERS.OL_LEVELColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetOL_LEVELNull() {
+                this[this.tableODGEOLAYERS.OL_LEVELColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsOL_PLATTOPNull() {
+                return this.IsNull(this.tableODGEOLAYERS.OL_PLATTOPColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetOL_PLATTOPNull() {
+                this[this.tableODGEOLAYERS.OL_PLATTOPColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsOL_PLATBOTTOMNull() {
+                return this.IsNull(this.tableODGEOLAYERS.OL_PLATBOTTOMColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetOL_PLATBOTTOMNull() {
+                this[this.tableODGEOLAYERS.OL_PLATBOTTOMColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsOL_TOPEXCESSPPNull() {
+                return this.IsNull(this.tableODGEOLAYERS.OL_TOPEXCESSPPColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetOL_TOPEXCESSPPNull() {
+                this[this.tableODGEOLAYERS.OL_TOPEXCESSPPColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsOL_BOTEXCESSPPNull() {
+                return this.IsNull(this.tableODGEOLAYERS.OL_BOTEXCESSPPColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetOL_BOTEXCESSPPNull() {
+                this[this.tableODGEOLAYERS.OL_BOTEXCESSPPColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsOL_OCRNull() {
+                return this.IsNull(this.tableODGEOLAYERS.OL_OCRColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetOL_OCRNull() {
+                this[this.tableODGEOLAYERS.OL_OCRColumn] = global::System.Convert.DBNull;
+            }
+        }
+        
+        /// <summary>
+        ///Represents strongly named DataRow class.
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+        public partial class MATERIALSRow : global::System.Data.DataRow {
+            
+            private MATERIALSDataTable tableMATERIALS;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            internal MATERIALSRow(global::System.Data.DataRowBuilder rb) : 
+                    base(rb) {
+                this.tableMATERIALS = ((MATERIALSDataTable)(this.Table));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public int MA_NR {
+                get {
+                    return ((int)(this[this.tableMATERIALS.MA_NRColumn]));
+                }
+                set {
+                    this[this.tableMATERIALS.MA_NRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public string MA_NAME {
+                get {
+                    try {
+                        return ((string)(this[this.tableMATERIALS.MA_NAMEColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'MA_NAME\' in table \'MATERIALS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableMATERIALS.MA_NAMEColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public string MA_DESCR {
+                get {
+                    try {
+                        return ((string)(this[this.tableMATERIALS.MA_DESCRColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'MA_DESCR\' in table \'MATERIALS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableMATERIALS.MA_DESCRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public int MA_INDEX {
+                get {
+                    try {
+                        return ((int)(this[this.tableMATERIALS.MA_INDEXColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'MA_INDEX\' in table \'MATERIALS\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableMATERIALS.MA_INDEXColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsMA_NAMENull() {
+                return this.IsNull(this.tableMATERIALS.MA_NAMEColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetMA_NAMENull() {
+                this[this.tableMATERIALS.MA_NAMEColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsMA_DESCRNull() {
+                return this.IsNull(this.tableMATERIALS.MA_DESCRColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetMA_DESCRNull() {
+                this[this.tableMATERIALS.MA_DESCRColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsMA_INDEXNull() {
+                return this.IsNull(this.tableMATERIALS.MA_INDEXColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetMA_INDEXNull() {
+                this[this.tableMATERIALS.MA_INDEXColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public ODGEOLAYERSRow[] GetODGEOLAYERSRows() {
+                if ((this.Table.ChildRelations["ODGEOLAYERS_MATERIALS"] == null)) {
+                    return new ODGEOLAYERSRow[0];
+                }
+                else {
+                    return ((ODGEOLAYERSRow[])(base.GetChildRows(this.Table.ChildRelations["ODGEOLAYERS_MATERIALS"])));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public PARAMETERVALUESRow[] GetPARAMETERVALUESRows() {
+                if ((this.Table.ChildRelations["PARAMETERVALUES_MATERIALS"] == null)) {
+                    return new PARAMETERVALUESRow[0];
+                }
+                else {
+                    return ((PARAMETERVALUESRow[])(base.GetChildRows(this.Table.ChildRelations["PARAMETERVALUES_MATERIALS"])));
+                }
+            }
+        }
+        
+        /// <summary>
+        ///Represents strongly named DataRow class.
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+        public partial class PARAMETERNAMESRow : global::System.Data.DataRow {
+            
+            private PARAMETERNAMESDataTable tablePARAMETERNAMES;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            internal PARAMETERNAMESRow(global::System.Data.DataRowBuilder rb) : 
+                    base(rb) {
+                this.tablePARAMETERNAMES = ((PARAMETERNAMESDataTable)(this.Table));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public int PN_NR {
+                get {
+                    return ((int)(this[this.tablePARAMETERNAMES.PN_NRColumn]));
+                }
+                set {
+                    this[this.tablePARAMETERNAMES.PN_NRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public string PN_NAME {
+                get {
+                    try {
+                        return ((string)(this[this.tablePARAMETERNAMES.PN_NAMEColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'PN_NAME\' in table \'PARAMETERNAMES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tablePARAMETERNAMES.PN_NAMEColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsPN_NAMENull() {
+                return this.IsNull(this.tablePARAMETERNAMES.PN_NAMEColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetPN_NAMENull() {
+                this[this.tablePARAMETERNAMES.PN_NAMEColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public PARAMETERVALUESRow[] GetPARAMETERVALUESRows() {
+                if ((this.Table.ChildRelations["PARAMETERNAMES_PARAMETERVALUES"] == null)) {
+                    return new PARAMETERVALUESRow[0];
+                }
+                else {
+                    return ((PARAMETERVALUESRow[])(base.GetChildRows(this.Table.ChildRelations["PARAMETERNAMES_PARAMETERVALUES"])));
+                }
+            }
+        }
+        
+        /// <summary>
+        ///Represents strongly named DataRow class.
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+        public partial class PARAMETERVALUESRow : global::System.Data.DataRow {
+            
+            private PARAMETERVALUESDataTable tablePARAMETERVALUES;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            internal PARAMETERVALUESRow(global::System.Data.DataRowBuilder rb) : 
+                    base(rb) {
+                this.tablePARAMETERVALUES = ((PARAMETERVALUESDataTable)(this.Table));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public int PV_NR {
+                get {
+                    return ((int)(this[this.tablePARAMETERVALUES.PV_NRColumn]));
+                }
+                set {
+                    this[this.tablePARAMETERVALUES.PV_NRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public int MA_NR {
+                get {
+                    try {
+                        return ((int)(this[this.tablePARAMETERVALUES.MA_NRColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'MA_NR\' in table \'PARAMETERVALUES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tablePARAMETERVALUES.MA_NRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public int PN_NR {
+                get {
+                    try {
+                        return ((int)(this[this.tablePARAMETERVALUES.PN_NRColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'PN_NR\' in table \'PARAMETERVALUES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tablePARAMETERVALUES.PN_NRColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public double PV_VALUE {
+                get {
+                    try {
+                        return ((double)(this[this.tablePARAMETERVALUES.PV_VALUEColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'PV_VALUE\' in table \'PARAMETERVALUES\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tablePARAMETERVALUES.PV_VALUEColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public MATERIALSRow MATERIALSRow {
+                get {
+                    return ((MATERIALSRow)(this.GetParentRow(this.Table.ParentRelations["PARAMETERVALUES_MATERIALS"])));
+                }
+                set {
+                    this.SetParentRow(value, this.Table.ParentRelations["PARAMETERVALUES_MATERIALS"]);
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public PARAMETERNAMESRow PARAMETERNAMESRow {
+                get {
+                    return ((PARAMETERNAMESRow)(this.GetParentRow(this.Table.ParentRelations["PARAMETERNAMES_PARAMETERVALUES"])));
+                }
+                set {
+                    this.SetParentRow(value, this.Table.ParentRelations["PARAMETERNAMES_PARAMETERVALUES"]);
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsMA_NRNull() {
+                return this.IsNull(this.tablePARAMETERVALUES.MA_NRColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetMA_NRNull() {
+                this[this.tablePARAMETERVALUES.MA_NRColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsPN_NRNull() {
+                return this.IsNull(this.tablePARAMETERVALUES.PN_NRColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetPN_NRNull() {
+                this[this.tablePARAMETERVALUES.PN_NRColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public bool IsPV_VALUENull() {
+                return this.IsNull(this.tablePARAMETERVALUES.PV_VALUEColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public void SetPV_VALUENull() {
+                this[this.tablePARAMETERVALUES.PV_VALUEColumn] = global::System.Convert.DBNull;
+            }
+        }
+        
+        /// <summary>
+        ///Row event argument class
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+        public class ODGEOMETRIESRowChangeEvent : global::System.EventArgs {
+            
+            private ODGEOMETRIESRow eventRow;
+            
+            private global::System.Data.DataRowAction eventAction;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public ODGEOMETRIESRowChangeEvent(ODGEOMETRIESRow row, global::System.Data.DataRowAction action) {
+                this.eventRow = row;
+                this.eventAction = action;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public ODGEOMETRIESRow Row {
+                get {
+                    return this.eventRow;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataRowAction Action {
+                get {
+                    return this.eventAction;
+                }
+            }
+        }
+        
+        /// <summary>
+        ///Row event argument class
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+        public class ODGEOLAYERSRowChangeEvent : global::System.EventArgs {
+            
+            private ODGEOLAYERSRow eventRow;
+            
+            private global::System.Data.DataRowAction eventAction;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public ODGEOLAYERSRowChangeEvent(ODGEOLAYERSRow row, global::System.Data.DataRowAction action) {
+                this.eventRow = row;
+                this.eventAction = action;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public ODGEOLAYERSRow Row {
+                get {
+                    return this.eventRow;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataRowAction Action {
+                get {
+                    return this.eventAction;
+                }
+            }
+        }
+        
+        /// <summary>
+        ///Row event argument class
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+        public class MATERIALSRowChangeEvent : global::System.EventArgs {
+            
+            private MATERIALSRow eventRow;
+            
+            private global::System.Data.DataRowAction eventAction;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public MATERIALSRowChangeEvent(MATERIALSRow row, global::System.Data.DataRowAction action) {
+                this.eventRow = row;
+                this.eventAction = action;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public MATERIALSRow Row {
+                get {
+                    return this.eventRow;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataRowAction Action {
+                get {
+                    return this.eventAction;
+                }
+            }
+        }
+        
+        /// <summary>
+        ///Row event argument class
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+        public class PARAMETERNAMESRowChangeEvent : global::System.EventArgs {
+            
+            private PARAMETERNAMESRow eventRow;
+            
+            private global::System.Data.DataRowAction eventAction;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public PARAMETERNAMESRowChangeEvent(PARAMETERNAMESRow row, global::System.Data.DataRowAction action) {
+                this.eventRow = row;
+                this.eventAction = action;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public PARAMETERNAMESRow Row {
+                get {
+                    return this.eventRow;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataRowAction Action {
+                get {
+                    return this.eventAction;
+                }
+            }
+        }
+        
+        /// <summary>
+        ///Row event argument class
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+        public class PARAMETERVALUESRowChangeEvent : global::System.EventArgs {
+            
+            private PARAMETERVALUESRow eventRow;
+            
+            private global::System.Data.DataRowAction eventAction;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public PARAMETERVALUESRowChangeEvent(PARAMETERVALUESRow row, global::System.Data.DataRowAction action) {
+                this.eventRow = row;
+                this.eventAction = action;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public PARAMETERVALUESRow Row {
+                get {
+                    return this.eventRow;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public global::System.Data.DataRowAction Action {
+                get {
+                    return this.eventAction;
+                }
+            }
+        }
+    }
+}
+namespace WebApplication1.SoilProfileDataSetTableAdapters {
+    
+    
+    /// <summary>
+    ///Represents the connection and commands used to retrieve and save data.
+    ///</summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+    [global::System.ComponentModel.DesignerCategoryAttribute("code")]
+    [global::System.ComponentModel.ToolboxItem(true)]
+    [global::System.ComponentModel.DataObjectAttribute(true)]
+    [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" +
+        ", Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+    [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+    public partial class ODGEOMETRIESTableAdapter : global::System.ComponentModel.Component {
+        
+        private global::System.Data.Odbc.OdbcDataAdapter _adapter;
+        
+        private global::System.Data.Odbc.OdbcConnection _connection;
+        
+        private global::System.Data.Odbc.OdbcTransaction _transaction;
+        
+        private global::System.Data.Odbc.OdbcCommand[] _commandCollection;
+        
+        private bool _clearBeforeFill;
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public ODGEOMETRIESTableAdapter() {
+            this.ClearBeforeFill = true;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        protected internal global::System.Data.Odbc.OdbcDataAdapter Adapter {
+            get {
+                if ((this._adapter == null)) {
+                    this.InitAdapter();
+                }
+                return this._adapter;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        internal global::System.Data.Odbc.OdbcConnection Connection {
+            get {
+                if ((this._connection == null)) {
+                    this.InitConnection();
+                }
+                return this._connection;
+            }
+            set {
+                this._connection = value;
+                if ((this.Adapter.InsertCommand != null)) {
+                    this.Adapter.InsertCommand.Connection = value;
+                }
+                if ((this.Adapter.DeleteCommand != null)) {
+                    this.Adapter.DeleteCommand.Connection = value;
+                }
+                if ((this.Adapter.UpdateCommand != null)) {
+                    this.Adapter.UpdateCommand.Connection = value;
+                }
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    if ((this.CommandCollection[i] != null)) {
+                        ((global::System.Data.Odbc.OdbcCommand)(this.CommandCollection[i])).Connection = value;
+                    }
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        internal global::System.Data.Odbc.OdbcTransaction Transaction {
+            get {
+                return this._transaction;
+            }
+            set {
+                this._transaction = value;
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    this.CommandCollection[i].Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.DeleteCommand != null))) {
+                    this.Adapter.DeleteCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.InsertCommand != null))) {
+                    this.Adapter.InsertCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.UpdateCommand != null))) {
+                    this.Adapter.UpdateCommand.Transaction = this._transaction;
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        protected global::System.Data.Odbc.OdbcCommand[] CommandCollection {
+            get {
+                if ((this._commandCollection == null)) {
+                    this.InitCommandCollection();
+                }
+                return this._commandCollection;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public bool ClearBeforeFill {
+            get {
+                return this._clearBeforeFill;
+            }
+            set {
+                this._clearBeforeFill = value;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private void InitAdapter() {
+            this._adapter = new global::System.Data.Odbc.OdbcDataAdapter();
+            global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping();
+            tableMapping.SourceTable = "Table";
+            tableMapping.DataSetTable = "ODGEOMETRIES";
+            tableMapping.ColumnMappings.Add("OD_NR", "OD_NR");
+            tableMapping.ColumnMappings.Add("OD_NAME", "OD_NAME");
+            tableMapping.ColumnMappings.Add("OD_DESCR", "OD_DESCR");
+            tableMapping.ColumnMappings.Add("OD_RDX", "OD_RDX");
+            tableMapping.ColumnMappings.Add("OD_RDY", "OD_RDY");
+            tableMapping.ColumnMappings.Add("OD_CPTNR", "OD_CPTNR");
+            tableMapping.ColumnMappings.Add("OD_BORINGNR", "OD_BORINGNR");
+            tableMapping.ColumnMappings.Add("OD_GEOL_ZONE", "OD_GEOL_ZONE");
+            tableMapping.ColumnMappings.Add("OD_CHANCE_OCCUR", "OD_CHANCE_OCCUR");
+            this._adapter.TableMappings.Add(tableMapping);
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private void InitConnection() {
+            this._connection = new global::System.Data.Odbc.OdbcConnection();
+            this._connection.ConnectionString = System.Configuration.ConfigurationManager.ConnectionStrings["ConnectionString"].ConnectionString;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private void InitCommandCollection() {
+            this._commandCollection = new global::System.Data.Odbc.OdbcCommand[1];
+            this._commandCollection[0] = new global::System.Data.Odbc.OdbcCommand();
+            this._commandCollection[0].Connection = this.Connection;
+            this._commandCollection[0].CommandText = "SELECT OD_NR, OD_NAME, OD_DESCR, OD_RDX, OD_RDY, OD_CPTNR, OD_BORINGNR, OD_GEOL_Z" +
+                "ONE, OD_CHANCE_OCCUR FROM ODGEOMETRIES";
+            this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
+        public virtual SoilProfileDataSet.ODGEOMETRIESDataTable GetData() {
+            this.Adapter.SelectCommand = this.CommandCollection[0];
+            SoilProfileDataSet.ODGEOMETRIESDataTable dataTable = new SoilProfileDataSet.ODGEOMETRIESDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+    }
+    
+    /// <summary>
+    ///Represents the connection and commands used to retrieve and save data.
+    ///</summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+    [global::System.ComponentModel.DesignerCategoryAttribute("code")]
+    [global::System.ComponentModel.ToolboxItem(true)]
+    [global::System.ComponentModel.DataObjectAttribute(true)]
+    [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" +
+        ", Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+    [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+    public partial class ODGEOLAYERSTableAdapter : global::System.ComponentModel.Component {
+        
+        private global::System.Data.Odbc.OdbcDataAdapter _adapter;
+        
+        private global::System.Data.Odbc.OdbcConnection _connection;
+        
+        private global::System.Data.Odbc.OdbcTransaction _transaction;
+        
+        private global::System.Data.Odbc.OdbcCommand[] _commandCollection;
+        
+        private bool _clearBeforeFill;
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public ODGEOLAYERSTableAdapter() {
+            this.ClearBeforeFill = true;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        protected internal global::System.Data.Odbc.OdbcDataAdapter Adapter {
+            get {
+                if ((this._adapter == null)) {
+                    this.InitAdapter();
+                }
+                return this._adapter;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        internal global::System.Data.Odbc.OdbcConnection Connection {
+            get {
+                if ((this._connection == null)) {
+                    this.InitConnection();
+                }
+                return this._connection;
+            }
+            set {
+                this._connection = value;
+                if ((this.Adapter.InsertCommand != null)) {
+                    this.Adapter.InsertCommand.Connection = value;
+                }
+                if ((this.Adapter.DeleteCommand != null)) {
+                    this.Adapter.DeleteCommand.Connection = value;
+                }
+                if ((this.Adapter.UpdateCommand != null)) {
+                    this.Adapter.UpdateCommand.Connection = value;
+                }
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    if ((this.CommandCollection[i] != null)) {
+                        ((global::System.Data.Odbc.OdbcCommand)(this.CommandCollection[i])).Connection = value;
+                    }
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        internal global::System.Data.Odbc.OdbcTransaction Transaction {
+            get {
+                return this._transaction;
+            }
+            set {
+                this._transaction = value;
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    this.CommandCollection[i].Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.DeleteCommand != null))) {
+                    this.Adapter.DeleteCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.InsertCommand != null))) {
+                    this.Adapter.InsertCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.UpdateCommand != null))) {
+                    this.Adapter.UpdateCommand.Transaction = this._transaction;
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        protected global::System.Data.Odbc.OdbcCommand[] CommandCollection {
+            get {
+                if ((this._commandCollection == null)) {
+                    this.InitCommandCollection();
+                }
+                return this._commandCollection;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public bool ClearBeforeFill {
+            get {
+                return this._clearBeforeFill;
+            }
+            set {
+                this._clearBeforeFill = value;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private void InitAdapter() {
+            this._adapter = new global::System.Data.Odbc.OdbcDataAdapter();
+            global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping();
+            tableMapping.SourceTable = "Table";
+            tableMapping.DataSetTable = "ODGEOLAYERS";
+            tableMapping.ColumnMappings.Add("OL_NR", "OL_NR");
+            tableMapping.ColumnMappings.Add("OD_NR", "OD_NR");
+            tableMapping.ColumnMappings.Add("MA_NR", "MA_NR");
+            tableMapping.ColumnMappings.Add("OL_LAYERNR", "OL_LAYERNR");
+            tableMapping.ColumnMappings.Add("OL_LEVEL", "OL_LEVEL");
+            tableMapping.ColumnMappings.Add("OL_PLATTOP", "OL_PLATTOP");
+            tableMapping.ColumnMappings.Add("OL_PLATBOTTOM", "OL_PLATBOTTOM");
+            tableMapping.ColumnMappings.Add("OL_TOPEXCESSPP", "OL_TOPEXCESSPP");
+            tableMapping.ColumnMappings.Add("OL_BOTEXCESSPP", "OL_BOTEXCESSPP");
+            tableMapping.ColumnMappings.Add("OL_OCR", "OL_OCR");
+            this._adapter.TableMappings.Add(tableMapping);
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private void InitConnection() {
+            this._connection = new global::System.Data.Odbc.OdbcConnection();
+            this._connection.ConnectionString = System.Configuration.ConfigurationManager.ConnectionStrings["ConnectionString"].ConnectionString;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private void InitCommandCollection() {
+            this._commandCollection = new global::System.Data.Odbc.OdbcCommand[1];
+            this._commandCollection[0] = new global::System.Data.Odbc.OdbcCommand();
+            this._commandCollection[0].Connection = this.Connection;
+            this._commandCollection[0].CommandText = "SELECT OL_NR, OD_NR, MA_NR, OL_LAYERNR, OL_LEVEL, OL_PLATTOP, OL_PLATBOTTOM, OL_T" +
+                "OPEXCESSPP, OL_BOTEXCESSPP, OL_OCR FROM ODGEOLAYERS";
+            this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
+        public virtual SoilProfileDataSet.ODGEOLAYERSDataTable GetData() {
+            this.Adapter.SelectCommand = this.CommandCollection[0];
+            SoilProfileDataSet.ODGEOLAYERSDataTable dataTable = new SoilProfileDataSet.ODGEOLAYERSDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+    }
+    
+    /// <summary>
+    ///Represents the connection and commands used to retrieve and save data.
+    ///</summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+    [global::System.ComponentModel.DesignerCategoryAttribute("code")]
+    [global::System.ComponentModel.ToolboxItem(true)]
+    [global::System.ComponentModel.DataObjectAttribute(true)]
+    [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" +
+        ", Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+    [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+    public partial class MATERIALSTableAdapter : global::System.ComponentModel.Component {
+        
+        private global::System.Data.Odbc.OdbcDataAdapter _adapter;
+        
+        private global::System.Data.Odbc.OdbcConnection _connection;
+        
+        private global::System.Data.Odbc.OdbcTransaction _transaction;
+        
+        private global::System.Data.Odbc.OdbcCommand[] _commandCollection;
+        
+        private bool _clearBeforeFill;
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public MATERIALSTableAdapter() {
+            this.ClearBeforeFill = true;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        protected internal global::System.Data.Odbc.OdbcDataAdapter Adapter {
+            get {
+                if ((this._adapter == null)) {
+                    this.InitAdapter();
+                }
+                return this._adapter;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        internal global::System.Data.Odbc.OdbcConnection Connection {
+            get {
+                if ((this._connection == null)) {
+                    this.InitConnection();
+                }
+                return this._connection;
+            }
+            set {
+                this._connection = value;
+                if ((this.Adapter.InsertCommand != null)) {
+                    this.Adapter.InsertCommand.Connection = value;
+                }
+                if ((this.Adapter.DeleteCommand != null)) {
+                    this.Adapter.DeleteCommand.Connection = value;
+                }
+                if ((this.Adapter.UpdateCommand != null)) {
+                    this.Adapter.UpdateCommand.Connection = value;
+                }
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    if ((this.CommandCollection[i] != null)) {
+                        ((global::System.Data.Odbc.OdbcCommand)(this.CommandCollection[i])).Connection = value;
+                    }
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        internal global::System.Data.Odbc.OdbcTransaction Transaction {
+            get {
+                return this._transaction;
+            }
+            set {
+                this._transaction = value;
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    this.CommandCollection[i].Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.DeleteCommand != null))) {
+                    this.Adapter.DeleteCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.InsertCommand != null))) {
+                    this.Adapter.InsertCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.UpdateCommand != null))) {
+                    this.Adapter.UpdateCommand.Transaction = this._transaction;
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        protected global::System.Data.Odbc.OdbcCommand[] CommandCollection {
+            get {
+                if ((this._commandCollection == null)) {
+                    this.InitCommandCollection();
+                }
+                return this._commandCollection;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public bool ClearBeforeFill {
+            get {
+                return this._clearBeforeFill;
+            }
+            set {
+                this._clearBeforeFill = value;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private void InitAdapter() {
+            this._adapter = new global::System.Data.Odbc.OdbcDataAdapter();
+            global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping();
+            tableMapping.SourceTable = "Table";
+            tableMapping.DataSetTable = "MATERIALS";
+            tableMapping.ColumnMappings.Add("MA_NR", "MA_NR");
+            tableMapping.ColumnMappings.Add("MA_NAME", "MA_NAME");
+            tableMapping.ColumnMappings.Add("MA_DESCR", "MA_DESCR");
+            tableMapping.ColumnMappings.Add("MA_INDEX", "MA_INDEX");
+            this._adapter.TableMappings.Add(tableMapping);
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private void InitConnection() {
+            this._connection = new global::System.Data.Odbc.OdbcConnection();
+            this._connection.ConnectionString = System.Configuration.ConfigurationManager.ConnectionStrings["ConnectionString"].ConnectionString;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private void InitCommandCollection() {
+            this._commandCollection = new global::System.Data.Odbc.OdbcCommand[1];
+            this._commandCollection[0] = new global::System.Data.Odbc.OdbcCommand();
+            this._commandCollection[0].Connection = this.Connection;
+            this._commandCollection[0].CommandText = "SELECT MA_NR, MA_NAME, MA_DESCR, MA_INDEX FROM MATERIALS";
+            this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
+        public virtual SoilProfileDataSet.MATERIALSDataTable GetData() {
+            this.Adapter.SelectCommand = this.CommandCollection[0];
+            SoilProfileDataSet.MATERIALSDataTable dataTable = new SoilProfileDataSet.MATERIALSDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+    }
+    
+    /// <summary>
+    ///Represents the connection and commands used to retrieve and save data.
+    ///</summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+    [global::System.ComponentModel.DesignerCategoryAttribute("code")]
+    [global::System.ComponentModel.ToolboxItem(true)]
+    [global::System.ComponentModel.DataObjectAttribute(true)]
+    [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" +
+        ", Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+    [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+    public partial class PARAMETERNAMESTableAdapter : global::System.ComponentModel.Component {
+        
+        private global::System.Data.Odbc.OdbcDataAdapter _adapter;
+        
+        private global::System.Data.Odbc.OdbcConnection _connection;
+        
+        private global::System.Data.Odbc.OdbcTransaction _transaction;
+        
+        private global::System.Data.Odbc.OdbcCommand[] _commandCollection;
+        
+        private bool _clearBeforeFill;
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public PARAMETERNAMESTableAdapter() {
+            this.ClearBeforeFill = true;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        protected internal global::System.Data.Odbc.OdbcDataAdapter Adapter {
+            get {
+                if ((this._adapter == null)) {
+                    this.InitAdapter();
+                }
+                return this._adapter;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        internal global::System.Data.Odbc.OdbcConnection Connection {
+            get {
+                if ((this._connection == null)) {
+                    this.InitConnection();
+                }
+                return this._connection;
+            }
+            set {
+                this._connection = value;
+                if ((this.Adapter.InsertCommand != null)) {
+                    this.Adapter.InsertCommand.Connection = value;
+                }
+                if ((this.Adapter.DeleteCommand != null)) {
+                    this.Adapter.DeleteCommand.Connection = value;
+                }
+                if ((this.Adapter.UpdateCommand != null)) {
+                    this.Adapter.UpdateCommand.Connection = value;
+                }
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    if ((this.CommandCollection[i] != null)) {
+                        ((global::System.Data.Odbc.OdbcCommand)(this.CommandCollection[i])).Connection = value;
+                    }
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        internal global::System.Data.Odbc.OdbcTransaction Transaction {
+            get {
+                return this._transaction;
+            }
+            set {
+                this._transaction = value;
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    this.CommandCollection[i].Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.DeleteCommand != null))) {
+                    this.Adapter.DeleteCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.InsertCommand != null))) {
+                    this.Adapter.InsertCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.UpdateCommand != null))) {
+                    this.Adapter.UpdateCommand.Transaction = this._transaction;
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        protected global::System.Data.Odbc.OdbcCommand[] CommandCollection {
+            get {
+                if ((this._commandCollection == null)) {
+                    this.InitCommandCollection();
+                }
+                return this._commandCollection;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public bool ClearBeforeFill {
+            get {
+                return this._clearBeforeFill;
+            }
+            set {
+                this._clearBeforeFill = value;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private void InitAdapter() {
+            this._adapter = new global::System.Data.Odbc.OdbcDataAdapter();
+            global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping();
+            tableMapping.SourceTable = "Table";
+            tableMapping.DataSetTable = "PARAMETERNAMES";
+            tableMapping.ColumnMappings.Add("PN_NR", "PN_NR");
+            tableMapping.ColumnMappings.Add("PN_NAME", "PN_NAME");
+            this._adapter.TableMappings.Add(tableMapping);
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private void InitConnection() {
+            this._connection = new global::System.Data.Odbc.OdbcConnection();
+            this._connection.ConnectionString = System.Configuration.ConfigurationManager.ConnectionStrings["ConnectionString"].ConnectionString;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private void InitCommandCollection() {
+            this._commandCollection = new global::System.Data.Odbc.OdbcCommand[1];
+            this._commandCollection[0] = new global::System.Data.Odbc.OdbcCommand();
+            this._commandCollection[0].Connection = this.Connection;
+            this._commandCollection[0].CommandText = "SELECT PN_NR, PN_NAME FROM PARAMETERNAMES";
+            this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
+        public virtual SoilProfileDataSet.PARAMETERNAMESDataTable GetData() {
+            this.Adapter.SelectCommand = this.CommandCollection[0];
+            SoilProfileDataSet.PARAMETERNAMESDataTable dataTable = new SoilProfileDataSet.PARAMETERNAMESDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+    }
+    
+    /// <summary>
+    ///Represents the connection and commands used to retrieve and save data.
+    ///</summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+    [global::System.ComponentModel.DesignerCategoryAttribute("code")]
+    [global::System.ComponentModel.ToolboxItem(true)]
+    [global::System.ComponentModel.DataObjectAttribute(true)]
+    [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" +
+        ", Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+    [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+    public partial class PARAMETERVALUESTableAdapter : global::System.ComponentModel.Component {
+        
+        private global::System.Data.Odbc.OdbcDataAdapter _adapter;
+        
+        private global::System.Data.Odbc.OdbcConnection _connection;
+        
+        private global::System.Data.Odbc.OdbcTransaction _transaction;
+        
+        private global::System.Data.Odbc.OdbcCommand[] _commandCollection;
+        
+        private bool _clearBeforeFill;
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public PARAMETERVALUESTableAdapter() {
+            this.ClearBeforeFill = true;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        protected internal global::System.Data.Odbc.OdbcDataAdapter Adapter {
+            get {
+                if ((this._adapter == null)) {
+                    this.InitAdapter();
+                }
+                return this._adapter;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        internal global::System.Data.Odbc.OdbcConnection Connection {
+            get {
+                if ((this._connection == null)) {
+                    this.InitConnection();
+                }
+                return this._connection;
+            }
+            set {
+                this._connection = value;
+                if ((this.Adapter.InsertCommand != null)) {
+                    this.Adapter.InsertCommand.Connection = value;
+                }
+                if ((this.Adapter.DeleteCommand != null)) {
+                    this.Adapter.DeleteCommand.Connection = value;
+                }
+                if ((this.Adapter.UpdateCommand != null)) {
+                    this.Adapter.UpdateCommand.Connection = value;
+                }
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    if ((this.CommandCollection[i] != null)) {
+                        ((global::System.Data.Odbc.OdbcCommand)(this.CommandCollection[i])).Connection = value;
+                    }
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        internal global::System.Data.Odbc.OdbcTransaction Transaction {
+            get {
+                return this._transaction;
+            }
+            set {
+                this._transaction = value;
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    this.CommandCollection[i].Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.DeleteCommand != null))) {
+                    this.Adapter.DeleteCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.InsertCommand != null))) {
+                    this.Adapter.InsertCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.UpdateCommand != null))) {
+                    this.Adapter.UpdateCommand.Transaction = this._transaction;
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        protected global::System.Data.Odbc.OdbcCommand[] CommandCollection {
+            get {
+                if ((this._commandCollection == null)) {
+                    this.InitCommandCollection();
+                }
+                return this._commandCollection;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public bool ClearBeforeFill {
+            get {
+                return this._clearBeforeFill;
+            }
+            set {
+                this._clearBeforeFill = value;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private void InitAdapter() {
+            this._adapter = new global::System.Data.Odbc.OdbcDataAdapter();
+            global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping();
+            tableMapping.SourceTable = "Table";
+            tableMapping.DataSetTable = "PARAMETERVALUES";
+            tableMapping.ColumnMappings.Add("PV_NR", "PV_NR");
+            tableMapping.ColumnMappings.Add("MA_NR", "MA_NR");
+            tableMapping.ColumnMappings.Add("PN_NR", "PN_NR");
+            tableMapping.ColumnMappings.Add("PV_VALUE", "PV_VALUE");
+            this._adapter.TableMappings.Add(tableMapping);
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private void InitConnection() {
+            this._connection = new global::System.Data.Odbc.OdbcConnection();
+            this._connection.ConnectionString = System.Configuration.ConfigurationManager.ConnectionStrings["ConnectionString"].ConnectionString;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private void InitCommandCollection() {
+            this._commandCollection = new global::System.Data.Odbc.OdbcCommand[1];
+            this._commandCollection[0] = new global::System.Data.Odbc.OdbcCommand();
+            this._commandCollection[0].Connection = this.Connection;
+            this._commandCollection[0].CommandText = "SELECT PV_NR, MA_NR, PN_NR, PV_VALUE FROM PARAMETERVALUES";
+            this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
+        public virtual SoilProfileDataSet.PARAMETERVALUESDataTable GetData() {
+            this.Adapter.SelectCommand = this.CommandCollection[0];
+            SoilProfileDataSet.PARAMETERVALUESDataTable dataTable = new SoilProfileDataSet.PARAMETERVALUESDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+    }
+    
+    /// <summary>
+    ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios
+    ///</summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+    [global::System.ComponentModel.DesignerCategoryAttribute("code")]
+    [global::System.ComponentModel.ToolboxItem(true)]
+    [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerDesigner, Microsoft.VSD" +
+        "esigner, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+    [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapterManager")]
+    public partial class TableAdapterManager : global::System.ComponentModel.Component {
+        
+        private UpdateOrderOption _updateOrder;
+        
+        private bool _backupDataSetBeforeUpdate;
+        
+        private global::System.Data.IDbConnection _connection;
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public UpdateOrderOption UpdateOrder {
+            get {
+                return this._updateOrder;
+            }
+            set {
+                this._updateOrder = value;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public bool BackupDataSetBeforeUpdate {
+            get {
+                return this._backupDataSetBeforeUpdate;
+            }
+            set {
+                this._backupDataSetBeforeUpdate = value;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.ComponentModel.Browsable(false)]
+        public global::System.Data.IDbConnection Connection {
+            get {
+                if ((this._connection != null)) {
+                    return this._connection;
+                }
+                return null;
+            }
+            set {
+                this._connection = value;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.ComponentModel.Browsable(false)]
+        public int TableAdapterInstanceCount {
+            get {
+                int count = 0;
+                return count;
+            }
+        }
+        
+        /// <summary>
+        ///Update rows in top-down order.
+        ///</summary>
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private int UpdateUpdatedRows(SoilProfileDataSet dataSet, global::System.Collections.Generic.List<global::System.Data.DataRow> allChangedRows, global::System.Collections.Generic.List<global::System.Data.DataRow> allAddedRows) {
+            int result = 0;
+            return result;
+        }
+        
+        /// <summary>
+        ///Insert rows in top-down order.
+        ///</summary>
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private int UpdateInsertedRows(SoilProfileDataSet dataSet, global::System.Collections.Generic.List<global::System.Data.DataRow> allAddedRows) {
+            int result = 0;
+            return result;
+        }
+        
+        /// <summary>
+        ///Delete rows in bottom-up order.
+        ///</summary>
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private int UpdateDeletedRows(SoilProfileDataSet dataSet, global::System.Collections.Generic.List<global::System.Data.DataRow> allChangedRows) {
+            int result = 0;
+            return result;
+        }
+        
+        /// <summary>
+        ///Remove inserted rows that become updated rows after calling TableAdapter.Update(inserted rows) first
+        ///</summary>
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        private global::System.Data.DataRow[] GetRealUpdatedRows(global::System.Data.DataRow[] updatedRows, global::System.Collections.Generic.List<global::System.Data.DataRow> allAddedRows) {
+            if (((updatedRows == null) 
+                        || (updatedRows.Length < 1))) {
+                return updatedRows;
+            }
+            if (((allAddedRows == null) 
+                        || (allAddedRows.Count < 1))) {
+                return updatedRows;
+            }
+            global::System.Collections.Generic.List<global::System.Data.DataRow> realUpdatedRows = new global::System.Collections.Generic.List<global::System.Data.DataRow>();
+            for (int i = 0; (i < updatedRows.Length); i = (i + 1)) {
+                global::System.Data.DataRow row = updatedRows[i];
+                if ((allAddedRows.Contains(row) == false)) {
+                    realUpdatedRows.Add(row);
+                }
+            }
+            return realUpdatedRows.ToArray();
+        }
+        
+        /// <summary>
+        ///Update all changes to the dataset.
+        ///</summary>
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public virtual int UpdateAll(SoilProfileDataSet dataSet) {
+            if ((dataSet == null)) {
+                throw new global::System.ArgumentNullException("dataSet");
+            }
+            if ((dataSet.HasChanges() == false)) {
+                return 0;
+            }
+            global::System.Data.IDbConnection workConnection = this.Connection;
+            if ((workConnection == null)) {
+                throw new global::System.ApplicationException("TableAdapterManager contains no connection information. Set each TableAdapterMana" +
+                        "ger TableAdapter property to a valid TableAdapter instance.");
+            }
+            bool workConnOpened = false;
+            if (((workConnection.State & global::System.Data.ConnectionState.Broken) 
+                        == global::System.Data.ConnectionState.Broken)) {
+                workConnection.Close();
+            }
+            if ((workConnection.State == global::System.Data.ConnectionState.Closed)) {
+                workConnection.Open();
+                workConnOpened = true;
+            }
+            global::System.Data.IDbTransaction workTransaction = workConnection.BeginTransaction();
+            if ((workTransaction == null)) {
+                throw new global::System.ApplicationException("The transaction cannot begin. The current data connection does not support transa" +
+                        "ctions or the current state is not allowing the transaction to begin.");
+            }
+            global::System.Collections.Generic.List<global::System.Data.DataRow> allChangedRows = new global::System.Collections.Generic.List<global::System.Data.DataRow>();
+            global::System.Collections.Generic.List<global::System.Data.DataRow> allAddedRows = new global::System.Collections.Generic.List<global::System.Data.DataRow>();
+            global::System.Collections.Generic.List<global::System.Data.Common.DataAdapter> adaptersWithAcceptChangesDuringUpdate = new global::System.Collections.Generic.List<global::System.Data.Common.DataAdapter>();
+            global::System.Collections.Generic.Dictionary<object, global::System.Data.IDbConnection> revertConnections = new global::System.Collections.Generic.Dictionary<object, global::System.Data.IDbConnection>();
+            int result = 0;
+            global::System.Data.DataSet backupDataSet = null;
+            if (this.BackupDataSetBeforeUpdate) {
+                backupDataSet = new global::System.Data.DataSet();
+                backupDataSet.Merge(dataSet);
+            }
+            try {
+                // ---- Prepare for update -----------
+                //
+                // 
+                //---- Perform updates -----------
+                //
+                if ((this.UpdateOrder == UpdateOrderOption.UpdateInsertDelete)) {
+                    result = (result + this.UpdateUpdatedRows(dataSet, allChangedRows, allAddedRows));
+                    result = (result + this.UpdateInsertedRows(dataSet, allAddedRows));
+                }
+                else {
+                    result = (result + this.UpdateInsertedRows(dataSet, allAddedRows));
+                    result = (result + this.UpdateUpdatedRows(dataSet, allChangedRows, allAddedRows));
+                }
+                result = (result + this.UpdateDeletedRows(dataSet, allChangedRows));
+                // 
+                //---- Commit updates -----------
+                //
+                workTransaction.Commit();
+                if ((0 < allAddedRows.Count)) {
+                    global::System.Data.DataRow[] rows = new System.Data.DataRow[allAddedRows.Count];
+                    allAddedRows.CopyTo(rows);
+                    for (int i = 0; (i < rows.Length); i = (i + 1)) {
+                        global::System.Data.DataRow row = rows[i];
+                        row.AcceptChanges();
+                    }
+                }
+                if ((0 < allChangedRows.Count)) {
+                    global::System.Data.DataRow[] rows = new System.Data.DataRow[allChangedRows.Count];
+                    allChangedRows.CopyTo(rows);
+                    for (int i = 0; (i < rows.Length); i = (i + 1)) {
+                        global::System.Data.DataRow row = rows[i];
+                        row.AcceptChanges();
+                    }
+                }
+            }
+            catch (global::System.Exception ex) {
+                workTransaction.Rollback();
+                // ---- Restore the dataset -----------
+                if (this.BackupDataSetBeforeUpdate) {
+                    global::System.Diagnostics.Debug.Assert((backupDataSet != null));
+                    dataSet.Clear();
+                    dataSet.Merge(backupDataSet);
+                }
+                else {
+                    if ((0 < allAddedRows.Count)) {
+                        global::System.Data.DataRow[] rows = new System.Data.DataRow[allAddedRows.Count];
+                        allAddedRows.CopyTo(rows);
+                        for (int i = 0; (i < rows.Length); i = (i + 1)) {
+                            global::System.Data.DataRow row = rows[i];
+                            row.AcceptChanges();
+                            row.SetAdded();
+                        }
+                    }
+                }
+                throw ex;
+            }
+            finally {
+                if (workConnOpened) {
+                    workConnection.Close();
+                }
+                if ((0 < adaptersWithAcceptChangesDuringUpdate.Count)) {
+                    global::System.Data.Common.DataAdapter[] adapters = new System.Data.Common.DataAdapter[adaptersWithAcceptChangesDuringUpdate.Count];
+                    adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters);
+                    for (int i = 0; (i < adapters.Length); i = (i + 1)) {
+                        global::System.Data.Common.DataAdapter adapter = adapters[i];
+                        adapter.AcceptChangesDuringUpdate = true;
+                    }
+                }
+            }
+            return result;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        protected virtual void SortSelfReferenceRows(global::System.Data.DataRow[] rows, global::System.Data.DataRelation relation, bool childFirst) {
+            global::System.Array.Sort<global::System.Data.DataRow>(rows, new SelfReferenceComparer(relation, childFirst));
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        protected virtual bool MatchTableAdapterConnection(global::System.Data.IDbConnection inputConnection) {
+            if ((this._connection != null)) {
+                return true;
+            }
+            if (((this.Connection == null) 
+                        || (inputConnection == null))) {
+                return true;
+            }
+            if (string.Equals(this.Connection.ConnectionString, inputConnection.ConnectionString, global::System.StringComparison.Ordinal)) {
+                return true;
+            }
+            return false;
+        }
+        
+        /// <summary>
+        ///Update Order Option
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+        public enum UpdateOrderOption {
+            
+            InsertUpdateDelete = 0,
+            
+            UpdateInsertDelete = 1,
+        }
+        
+        /// <summary>
+        ///Used to sort self-referenced table's rows
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
+        private class SelfReferenceComparer : object, global::System.Collections.Generic.IComparer<global::System.Data.DataRow> {
+            
+            private global::System.Data.DataRelation _relation;
+            
+            private int _childFirst;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            internal SelfReferenceComparer(global::System.Data.DataRelation relation, bool childFirst) {
+                this._relation = relation;
+                if (childFirst) {
+                    this._childFirst = -1;
+                }
+                else {
+                    this._childFirst = 1;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            private bool IsChildAndParent(global::System.Data.DataRow child, global::System.Data.DataRow parent) {
+                global::System.Diagnostics.Debug.Assert((child != null));
+                global::System.Diagnostics.Debug.Assert((parent != null));
+                global::System.Data.DataRow newParent = child.GetParentRow(this._relation, global::System.Data.DataRowVersion.Default);
+                for (
+                ; ((newParent != null) 
+                            && ((object.ReferenceEquals(newParent, child) == false) 
+                            && (object.ReferenceEquals(newParent, parent) == false))); 
+                ) {
+                    newParent = newParent.GetParentRow(this._relation, global::System.Data.DataRowVersion.Default);
+                }
+                if ((newParent == null)) {
+                    for (newParent = child.GetParentRow(this._relation, global::System.Data.DataRowVersion.Original); ((newParent != null) 
+                                && ((object.ReferenceEquals(newParent, child) == false) 
+                                && (object.ReferenceEquals(newParent, parent) == false))); 
+                    ) {
+                        newParent = newParent.GetParentRow(this._relation, global::System.Data.DataRowVersion.Original);
+                    }
+                }
+                if (object.ReferenceEquals(newParent, parent)) {
+                    return true;
+                }
+                return false;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public int Compare(global::System.Data.DataRow row1, global::System.Data.DataRow row2) {
+                if (object.ReferenceEquals(row1, row2)) {
+                    return 0;
+                }
+                if ((row1 == null)) {
+                    return -1;
+                }
+                if ((row2 == null)) {
+                    return 1;
+                }
+
+                // Is row1 the child or grandchild of row2
+                if (this.IsChildAndParent(row1, row2)) {
+                    return this._childFirst;
+                }
+
+                // Is row2 the child or grandchild of row1
+                if (this.IsChildAndParent(row2, row1)) {
+                    return (-1 * this._childFirst);
+                }
+                return 0;
+            }
+        }
+    }
+}
+
+#pragma warning restore 1591
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoHelperServices.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoHelperServices.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoHelperServices.cs	(revision 3305)
@@ -0,0 +1,585 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Xml.Linq;
+using Deltares.Standard.Extensions;
+
+namespace Deltares.Standard.IO.DtoAssembler
+{
+    /// <summary>
+    /// Extnesion helper methods
+    /// </summary>
+    public static class DtoHelperServices
+    {
+        /// <summary>
+        /// TODO: Solve this hack in a good way!!!
+        /// </summary>
+        /// <param name="doc"></param>
+        /// <returns></returns>
+        public static string ToUtf8EncodedStringFix(this XDocument doc)
+        {
+            string xmlData = doc.ToString();
+
+            // Hack to 
+            if (!xmlData.Contains("encoding"))
+                xmlData = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" + Environment.NewLine + xmlData;
+
+            return xmlData;
+        }
+
+        /// <summary>
+        /// Assembles a XElement from a domain object
+        /// </summary>
+        /// <remarks>
+        /// Only public properties will be used
+        /// </remarks>
+        /// <typeparam name="TDomaiObject"></typeparam>
+        /// <param name="domainObject"></param>
+        /// <param name="elementName"></param>
+        /// <returns></returns>
+        public static XElement ToXElement<TDomaiObject>(this TDomaiObject domainObject, string elementName)
+        {
+            return ToXElement(domainObject, elementName, null);
+        }
+
+        /// <summary>
+        /// Assembles a XElement from a domain object
+        /// </summary>
+        /// <remarks>
+        /// Only public properties will be used
+        /// </remarks>
+        /// <typeparam name="TDomaiObject"></typeparam>
+        /// <param name="domainObject"></param>
+        /// <param name="elementName"></param>
+        /// <param name="elementNamespace"></param>
+        /// <returns></returns>
+        public static XElement ToXElement<TDomaiObject>(this TDomaiObject domainObject, string elementName, string elementNamespace)
+        {
+            if (elementNamespace.HasValidStringValue())
+            {
+                XNamespace ns = elementNamespace;
+                return ToXElement(domainObject, elementName, ns);
+            }
+
+            return ToXElement(domainObject, elementName, null);
+        }
+
+        /// <summary>
+        /// Assembles a XElement from a domain object
+        /// </summary>
+        /// <remarks>
+        /// Only public properties will be used
+        /// </remarks>
+        /// <typeparam name="TDomaiObject"></typeparam>
+        /// <param name="domainObject"></param>
+        /// <param name="elementName"></param>
+        /// <param name="elementNamespace"></param>
+        /// <returns></returns>
+        public static XElement ToXElement<TDomaiObject>(this TDomaiObject domainObject, string elementName, XNamespace elementNamespace)
+        {
+            if (domainObject.Equals(default(TDomaiObject)))
+                return null;
+
+            if (!elementName.HasValidStringValue())
+                throw new DtoAssemblerException("There is no element name specified");
+
+            if (elementNamespace != null)
+            {
+                return new XElement(elementNamespace + elementName).Materialize(domainObject);
+            }
+
+            return new XElement(elementName).Materialize(domainObject);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <typeparam name="TDomainObject"></typeparam>
+        /// <param name="assembler"></param>
+        /// <param name="domainObj"></param>
+        /// <param name="ns"></param>
+        /// <returns></returns>
+        public static XElement ToDto<TDomainObject>(this TDomainObject domainObj, IDtoAssembler<TDomainObject> assembler, XNamespace elementNamespace)
+            where TDomainObject : new()
+        {
+            XElement element = assembler.CreateDataTransferObject(domainObj);
+
+            if (element == null)
+                return null;
+
+            // replace the element name with the given namespace
+            var tmp = new XElement(elementNamespace + assembler.ElementName);
+            element.Name = tmp.Name;
+
+            return element;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <typeparam name="TDomainObject"></typeparam>
+        /// <param name="collection"></param>
+        /// <param name="elementName"></param>
+        /// <returns></returns>
+        public static XElement ToDto<TDomainObject>(this IEnumerable<TDomainObject> collection, XName elementName, XName itemElementName)
+        {
+            return ToDto<TDomainObject>(collection, elementName, itemElementName, null);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <typeparam name="TDomainObject"></typeparam>
+        /// <param name="collection"></param>
+        /// <param name="elementName"></param>
+        /// <param name="itemElementName"></param>
+        /// <param name="itemAttributeName"></param>
+        /// <returns></returns>
+        public static XElement ToDto<TDomainObject>(this IEnumerable<TDomainObject> collection, XName elementName, XName itemElementName, XName itemAttributeName)
+        {
+            if (elementName == null)
+                throw new ArgumentNullException("elementName");
+
+            if (itemElementName == null)
+                throw new ArgumentNullException("itemElementName");
+
+            var el = new XElement(elementName);
+            if (itemAttributeName == null)
+            {
+                foreach (TDomainObject item in collection)
+                    el.Add(new XElement(itemElementName, item));
+            }
+            else
+            {
+                foreach (TDomainObject item in collection)
+                    el.Add(new XElement(itemElementName, new XAttribute(itemAttributeName, item)));
+            }
+            return el;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <typeparam name="TDomainObject"></typeparam>
+        /// <param name="assembler"></param>
+        /// <param name="domainObj"></param>
+        /// <param name="ns"></param>
+        /// <returns></returns>
+        public static XElement ToDto<TDomainObject>(this IEnumerable<TDomainObject> domainObjCollection, IDtoCollectionAssembler<TDomainObject> assembler, XNamespace elementNamespace)
+            where TDomainObject : new()
+        {
+            XElement element = assembler.CreateDataTransferObject(domainObjCollection);
+
+            if (element == null)
+                return null;
+
+            // replace the element name with the given namespace
+            var tmp = new XElement(elementNamespace + assembler.ElementName);
+            element.Name = tmp.Name;
+
+            return element;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="domainObjColl"></param>
+        /// <param name="assembler"></param>
+        /// <returns></returns>
+        public static IEnumerable<XElement> ToDtoIterator<T>(this IEnumerable<T> domainObjColl, IDtoAssembler<T, XElement> assembler)
+        {
+            foreach (T item in domainObjColl)
+                yield return assembler.CreateDataTransferObject(item);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="dtoObjColl"></param>
+        /// <param name="assembler"></param>
+        /// <returns></returns>
+        public static IEnumerable<T> ToDomainObjectIterator<T>(this IEnumerable<XElement> dtoObjColl, IDtoAssembler<T, XElement> assembler)
+        {
+            foreach (XElement item in dtoObjColl)
+                yield return assembler.CreateDomainObject(item);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="dtoObjColl"></param>
+        /// <param name="assembler"></param>
+        /// <returns></returns>
+        public static IEnumerable<T> ToDomainObjectIterator<T>(XElement element, string elementName, string itemElementName, string itemAttributeName)
+        {
+            IEnumerable<XElement> dto = from x in element.Descendants()
+                                        where x.Name.LocalName == itemElementName && x.Parent.Name.LocalName == elementName
+                                        select x;
+
+            foreach (XElement item in dto)
+                yield return item.AttributeAs<T>(itemAttributeName);
+        }
+
+        public static XElement GetFirstOrDefaultElementByLocalName(this XDocument doc, string localName)
+        {
+            return (from x in doc.Descendants()
+                    where x.Name.LocalName == localName
+                    select x).FirstOrDefault();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="type"></param>
+        /// <param name="xsdStream"></param>
+        /// <returns></returns>
+        public static IEnumerable<DtoPropertyAttriubteMapping> ToPropertyMap<T>(this T type, Stream xsdStream)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="type"></param>
+        /// <param name="xsdDocument"></param>
+        /// <returns></returns>
+        public static IEnumerable<DtoPropertyAttriubteMapping> ToPropertyMap<T>(this T type, XDocument xsdDocument)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="src"></param>
+        /// <returns></returns>
+        public static IEnumerable<DtoPropertyAttriubteMapping> ToPropertyMap<T>(this T type)
+        {
+            foreach (PropertyInfo pInfo in type.GetType().GetProperties())
+            {
+                object val = null;
+                try
+                {
+                    val = pInfo.GetValue(type, null);
+                }
+                catch
+                {
+                    throw new DtoPropertyMapException(string.Format("Error reading property {0} of type {1}", pInfo.Name, pInfo.ReflectedType.Name));
+                }
+
+                if (val != null)
+                {
+                    yield return new DtoPropertyAttriubteMapping()
+                                     {
+                                         PropertyName = pInfo.Name,
+                                         AttributeName = pInfo.Name,
+                                         Importance = DtoPropertyImportance.Optional
+                                     };
+                }
+            }
+        }
+
+        private static IEnumerable<AttributeInfo> GetAttributes(XDocument doc, string elementName)
+        {
+            IEnumerable<XElement> element = from x in doc.Descendants()
+                                            where x.Attribute("name") != null && x.Attribute("name").Value == elementName
+                                            select x;
+
+            if (element.Any())
+            {
+                if (element.First().Name.LocalName == "complexType")
+                {
+                    IEnumerable<AttributeInfo> q1 = from x in element.Elements()
+                                                    where x.Name.LocalName == "attribute"
+                                                    select new AttributeInfo()
+                                                               {
+                                                                   Name = x.Attribute("name").Value,
+                                                                   Use = x.Attribute("use") == null ? "optional" : x.Attribute("use").Value
+                                                               };
+
+                    return q1;
+                }
+                if (element.First().Name.LocalName == "element" &&
+                    element.ElementAt(0).HasElements &&
+                    element.ElementAt(0).Elements().ElementAt(0).Name.LocalName == "complexType")
+                {
+                    IEnumerable<AttributeInfo> q2 = from x in element.ElementAt(0).Elements().ElementAt(0).Elements()
+                                                    where x.Name.LocalName == "attribute"
+                                                    select new AttributeInfo()
+                                                               {
+                                                                   Name = x.Attribute("name").Value,
+                                                                   Use = x.Attribute("use") == null ? "optional" : x.Attribute("use").Value
+                                                               };
+
+                    return q2;
+                }
+            }
+
+            return new List<AttributeInfo>() {};
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="src"></param>
+        /// <returns></returns>
+        public static IEnumerable<DtoPropertyAttriubteMapping> ToPropertyMap<T>(this T type, string elementName, XDocument doc)
+        {
+            IEnumerable<AttributeInfo> refTable = GetAttributes(doc, elementName);
+
+            foreach (PropertyInfo pInfo in type.GetType().GetProperties())
+            {
+                if (refTable.Count() > 0)
+                {
+                    // does the property exist in the xsd?
+                    IEnumerable<AttributeInfo> q = from x in refTable
+                                                   where x.Name.Equals(pInfo.Name, StringComparison.InvariantCultureIgnoreCase)
+                                                   select x;
+
+                    if (q.Any())
+                    {
+                        // ok we have a property attribute match we can now 
+                        // safely create and return the mapping object
+                        AttributeInfo item = q.Single();
+                        yield return new DtoPropertyAttriubteMapping()
+                                         {
+                                             PropertyName = pInfo.Name,
+                                             AttributeName = item.Name,
+                                             Importance = item.Use == "optional" ?
+                                                                                     DtoPropertyImportance.Optional : DtoPropertyImportance.Required
+                                         };
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Materializes a simple object with the data from a xml file
+        /// </summary>
+        /// <remarks>
+        /// Materialization happens on equal name basis. So the attribute 
+        /// local name should be the same as the property name. Also the property type should 
+        /// be known by the this method
+        /// </remarks>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="dest"></param>
+        /// <param name="src"></param>
+        public static T Materialize<T>(this T dest, XElement src)
+        {
+            return Materialize(dest, src, null);
+        }
+
+        /// <summary>
+        /// Materializes a domain object with the data from a xml file based on a property map
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="dest"></param>
+        /// <param name="src"></param>
+        /// <param name="propertyMap"></param>
+        public static T Materialize<T>(this T dest, XElement src, DtoPropertyAttributeMap propertyMap)
+        {
+            bool hasPropertyMap = propertyMap != null && propertyMap.Count > 0;
+
+            if (src.HasAttributes)
+            {
+                XAttribute att = src.FirstAttribute;
+                try
+                {
+                    do
+                    {
+                        string attName = att.Name.LocalName;
+                        object v = att.Value;
+                        if (v != null)
+                        {
+                            PropertyInfo pInfo = null;
+                            DtoPropertyAttriubteMapping mapItem = null;
+                            if (hasPropertyMap)
+                            {
+                                mapItem = propertyMap.GetByAttributeName(attName);
+
+                                // Is the property found in the map?
+                                if (mapItem != null)
+                                    pInfo = typeof (T).GetProperty(mapItem.PropertyName);
+                                // else throw ?
+                            }
+                            else
+                                // No property map so try to get property name based on 
+                                // the attribute name
+                                pInfo = typeof (T).GetProperty(attName);
+
+                            if (pInfo != null)
+                            {
+                                // does the mapping contains a translation rule for 
+                                // the object to parse?
+                                if (mapItem != null && mapItem.ToPropertyTranslationRule != null)
+                                {
+                                    pInfo.SetObjectValue(dest, v, mapItem.ToPropertyTranslationRule);
+                                }
+                                else
+                                {
+                                    pInfo.SetObjectValue(dest, v, null);
+                                }
+                            }
+                        }
+                    } while ((att = att.NextAttribute) != null);
+                }
+                catch (DtoAssemblerConversionException ex)
+                {
+                    throw new DtoAssemblerConversionException(ex.Message);
+                }
+                catch
+                {
+                    throw;
+                }
+            }
+            return dest;
+        }
+
+        /// <summary>
+        /// Extension helper method which materializes a xml element with attributes and its values
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="element"></param>
+        /// <param name="src"></param>
+        /// <returns></returns>
+        public static XElement Materialize<T>(this XElement element, T src)
+        {
+            var map = new DtoPropertyAttributeMap();
+
+            foreach (PropertyInfo pInfo in src.GetType().GetProperties())
+            {
+                object val = pInfo.GetValue(src, null);
+                if (val != null)
+                {
+                    map.Add(pInfo.Name, new DtoPropertyAttriubteMapping()
+                                            {
+                                                PropertyName = pInfo.Name,
+                                                AttributeName = pInfo.Name,
+                                                Importance = DtoPropertyImportance.Optional
+                                            });
+                }
+            }
+            return element.Materialize(src, map);
+        }
+
+        /// <summary>
+        /// Extension helper method which materializes an xml element with attributes and its values
+        /// </summary>
+        /// <exception cref="DtoAssemblerRequiredValueException">Throws a required field exception if property is set to required in property map</exception>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="element"></param>
+        /// <param name="src"></param>
+        /// <param name="propertyMap"></param>
+        /// <returns></returns>
+        public static XElement Materialize<T>(this XElement element, T src, DtoPropertyAttributeMap propertyMap)
+        {
+            PropertyInfo pInfo;
+            foreach (var item in propertyMap)
+            {
+                pInfo = typeof (T).GetProperty(item.Key);
+                object val = pInfo.GetValue(src, null);
+                if (val != null)
+                {
+                    string attName = item.Value.AttributeName;
+                    element.Add(new XAttribute(attName, val));
+                }
+                else
+                {
+                    // Throw required field exception..
+                    if (item.Value.Importance == DtoPropertyImportance.Required)
+                        throw new MissingRequiredValueException(item.Key);
+                }
+            }
+            return element;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="element"></param>
+        /// <param name="elementName"></param>
+        /// <param name="elementNamespace"></param>
+        /// <returns></returns>
+        public static XElement SetNamespace(this XElement element, string elementName, string elementNamespace)
+        {
+            XNamespace ns = elementNamespace;
+            element.Name = new XElement(ns + elementName).Name;
+            return element;
+        }
+
+        public static XElement SetNamespace(this XElement element, XNamespace elementNamespace)
+        {
+            element.Name = elementNamespace.GetName(element.Name.LocalName);
+            return element;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static bool HasValidStringValue(this string value)
+        {
+            return !string.IsNullOrEmpty(value) && value.Trim() != "";
+        }
+
+        public static T ToEnum<T>(this object value, IDictionary<string, T> lookup)
+        {
+            if (value == null)
+                throw new ArgumentNullException("value");
+
+            return value.ToEnumType(lookup);
+        }
+
+        public static T AttributeAs<T>(this XElement element, XName name)
+        {
+            var xAttribute = element.Attribute(name);
+            if (xAttribute != null)
+                return xAttribute.Value.ToType<T>();
+
+            return default(T);
+        }
+
+        #region Nested type: AttributeInfo
+
+        private struct AttributeInfo
+        {
+            public string Name;
+            public string Use;
+            //public string Type;            
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Domain/CoverageFunctionTest.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Domain/CoverageFunctionTest.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Domain/CoverageFunctionTest.cs	(revision 3305)
@@ -0,0 +1,333 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of the application DAM - UI.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+
+using GeoAPI.Geometries;
+
+using NetTopologySuite.Geometries;
+
+using NUnit.Framework;
+
+using Rhino.Mocks;
+
+namespace Deltares.Maps.Tests.Domain
+{
+    [TestFixture]
+    public class CoverageFunctionTest
+    {
+        private MockRepository mocks;
+        private IFeatureRepository repository;
+
+        #region Setup
+
+        [TestFixtureSetUp]
+        public void FixtureSetup()
+        {
+            mocks = new MockRepository();
+        }
+
+        [TestFixtureTearDown]
+        public void FixtureTearDown()
+        {
+        }
+
+        [SetUp]
+        public void TestSetup()
+        {
+            repository = mocks.DynamicMock<IFeatureRepository>();
+        }
+
+        [TearDown]
+        public void TestTearDown()
+        {
+            mocks.VerifyAll();
+        }
+
+        #endregion
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void GetCoverageFunction_NoAttributesInList_Throws()
+        {
+            mocks.ReplayAll();
+            CoverageFunction.GetCoverageFunc(repository, new List<string>());
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentException))]
+        public void GetCoverageFunction_AttributeListContainsInvalidString_Throws()
+        {
+            mocks.ReplayAll();
+            CoverageFunction.GetCoverageFunc(repository, new List<string> { "" });
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void GetCoverageFunction_SupportedAttributeListIsNull_Throws()
+        {
+            mocks.ReplayAll();
+            repository.GetCoverageFunc("SomeAttribute", null);
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void GetCoverageFunction_RepositoryIsNull_Throws()
+        {
+            mocks.ReplayAll();
+            CoverageFunction.GetCoverageFunc(null, new[] { "SomeAttribute" });
+        }
+
+        [Test]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void UsingCoverageFunction_AttributeNameIsNullOrEmpty_Throws()
+        {
+            mocks.ReplayAll();
+            Func<string, double, double, object> func = CoverageFunction.GetCoverageFunc(repository, new[] { "SomeAttribute" });
+            func("", 0, 0);
+        }
+
+        [Test]
+        public void CoverageFunction_AttributeNamesAndDifferentCase_ReturnsExpectedValue()
+        {
+            var lineString = new LineString(new[] { new Coordinate(1, 1), new Coordinate(1, 2) });
+
+            var rep = new FeatureRepository();
+
+            Feature geom = Feature.Create(lineString);
+            rep.Add(geom);
+
+            //Expect.Call(repository.Features).Return(new[] { geom });
+
+            const string attribute = "SomeAttribute";
+            const string expected = "test";
+            geom.AddAttribute(attribute, expected);
+
+            //Expect.Call(repository.SupportedAttributes).Return(new[] { attribute });
+
+            Func<string, double, double, object> func = rep.GetCoverageFunc();
+            var actual = (string)func(attribute.ToUpper(), 1, 1);
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual);
+
+            actual = (string)func(attribute.ToLower(), 1, 1);
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual);
+
+            mocks.ReplayAll();
+        }
+
+        [Test]
+        [ExpectedException(typeof(AttributeMissingException))]
+        public void UsingCoverageFunction_AttributeNamenotContainedInAttributeList_Throws()
+        {
+            mocks.ReplayAll();
+            Func<string, double, double, object> func = CoverageFunction.GetCoverageFunc(repository, new[] { "SomeAttribute" });
+            func("AnotherAttribute", 0, 0);
+        }
+
+        [Test]
+        [ExpectedException(typeof(FeatureCoverageException), ExpectedMessage = "Multiple geometries found covering point (0 0)")]
+        public void UsingCoverageFunction_MoreThenOneGeometyFoundAtGivenLocation_Throws()
+        {
+            var square = new Polygon(new LinearRing(new[]
+            {
+                new Coordinate(-1, 1),
+                new Coordinate(1, 1),
+                new Coordinate(1, -1),
+                new Coordinate(-1, -1),
+                new Coordinate(-1, 1)
+            }));
+
+            Feature geom = Feature.Create(square);
+            //Expect.Call(repository.Features).Return(new[] {geom, geom});
+            Expect.Call(repository.Query((IGeometry)null)).IgnoreArguments().Return(new[] { geom, geom });
+
+            const string attribute = "SomeAttribute";
+            Expect.Call(repository.SupportedAttributes).Return(new[]
+            {
+                attribute.ToUpper()
+            });
+
+            mocks.ReplayAll();
+
+            Func<string, double, double, object> func = repository.GetCoverageFunc();
+
+            func(attribute, 0, 0);
+        }
+
+        [Test]
+        [ExpectedException(typeof(FeatureCoverageException), ExpectedMessage = "No geometries found covering point (10 10)")]
+        public void UsingCoverageFunction_NoGeometyFoundAtGivenLocation_Throws()
+        {
+            var square = new Polygon(new LinearRing(new[]
+            {
+                new Coordinate(-1, 1),
+                new Coordinate(1, 1),
+                new Coordinate(1, -1),
+                new Coordinate(-1, -1),
+                new Coordinate(-1, 1)
+            }));
+
+            const string attribute = "SomeAttribute";
+            Expect.Call(repository.SupportedAttributes).Return(new[]
+            {
+                attribute.ToUpper()
+            });
+
+            Feature geom = Feature.Create(square);
+            //Expect.Call(repository.Features).Return(new[] { geom });
+            Expect.Call(repository.Query((IGeometry)null)).IgnoreArguments().Return(new[] { geom });
+
+            mocks.ReplayAll();
+
+            Func<string, double, double, object> func = repository.GetCoverageFunc();
+            func("SomeAttribute", 10, 10);
+        }
+
+        [Test]
+        public void UsingCoverageFunction_GeometyFoundAtGivenLocation_ReturnsAttributeValueAsDouble()
+        {
+            var square = new Polygon(new LinearRing(new[]
+            {
+                new Coordinate(-1, 1),
+                new Coordinate(1, 1),
+                new Coordinate(1, -1),
+                new Coordinate(-1, -1),
+                new Coordinate(-1, 1)
+            }));
+
+            Feature geom = Feature.Create(square);
+            //Expect.Call(repository.Features).Return(new[] { geom });
+            Expect.Call(repository.Query((IGeometry)null)).IgnoreArguments().Return(new[] { geom });
+
+            const string attribute = "SomeAttribute";
+            const double expected = 20;
+            geom.AddAttribute(attribute, expected);
+
+            Expect.Call(repository.SupportedAttributes).Return(new[]
+            {
+                attribute.ToUpper()
+            });
+
+            mocks.ReplayAll();
+
+            Func<string, double, double, object> func = repository.GetCoverageFunc();
+            var actual = (double)func(attribute, 0, 0);
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual, 0.0001);
+        }
+
+        [Test]
+        public void UsingCoverageFunction_GeometyFoundAtGivenLocation_ReturnsAttributeValueAsStringType()
+        {
+            var square = new Polygon(new LinearRing(new[]
+            {
+                new Coordinate(-1, 1),
+                new Coordinate(1, 1),
+                new Coordinate(1, -1),
+                new Coordinate(-1, -1),
+                new Coordinate(-1, 1)
+            }));
+
+            Feature geom = Feature.Create(square);
+            //Expect.Call(repository.Features).Return(new[] { geom });
+            Expect.Call(repository.Query((IGeometry)null)).IgnoreArguments().Return(new[] { geom });
+
+            const string attribute = "SomeAttribute";
+            const string expected = "test";
+            geom.AddAttribute(attribute, expected);
+
+            Expect.Call(repository.SupportedAttributes).Return(new[] { attribute });
+
+            mocks.ReplayAll();
+
+            Func<string, double, double, object> func = repository.GetCoverageFunc();
+            var actual = (string)func(attribute, 0, 0);
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        public void UsingCoverageFunctionForGivenLocation_RepositoryContainsLinestringGeometryType_ReturnsValue()
+        {
+            var lineString = new LineString(new[] { new Coordinate(1, 1), new Coordinate(1, 2) });
+
+            Feature geom = Feature.Create(lineString);
+            //Expect.Call(repository.Features).Return(new[] { geom });
+            Expect.Call(repository.Query((IGeometry)null)).IgnoreArguments().Return(new[] { geom });
+
+            const string attribute = "SomeAttribute";
+            const double expected = 5;
+            geom.AddAttribute(attribute, expected);
+
+            Expect.Call(repository.SupportedAttributes).Return(new[] { attribute });
+
+            mocks.ReplayAll();
+
+            Func<string, double, double, object> func = repository.GetCoverageFunc();
+            var actual = (double)func(attribute, 1, 1);
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual);
+
+            actual = (double)func(attribute, 1, 2);
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual);
+
+            actual = (double)func(attribute, 1, 1.5);
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual);
+        }
+
+        [Test]
+        public void UsingCoverageFunctionCreatedByGeometryRepository_GeometyFoundAtGivenLocation_ReturnsAttributeValue()
+        {
+            const string attribute = "SomeAttribute";
+            const double expected = 20;
+
+            var square = new Polygon(new LinearRing(new[]
+            {
+                new Coordinate(-1, 1),
+                new Coordinate(1, 1),
+                new Coordinate(1, -1),
+                new Coordinate(-1, -1),
+                new Coordinate(-1, 1)
+            }));
+
+            Feature geom = Feature.Create(square);
+            geom.AddAttribute(attribute, expected);
+            //Expect.Call(repository.Features).Return(new[] { geom });
+            Expect.Call(repository.Query((IGeometry)null)).IgnoreArguments().Return(new[] { geom });
+            Expect.Call(repository.SupportedAttributes).Return(new[]
+            {
+                attribute.ToUpper()
+            });
+
+            mocks.ReplayAll();
+
+            Func<double, double, object> func = repository.GetCoverageFunc(attribute);
+            var actual = (double)func(0, 0);
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(expected, actual, 0.0001);
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/PLLineConstructor.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/PLLineConstructor.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/PLLineConstructor.cs	(revision 3305)
@@ -0,0 +1,72 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+
+namespace Deltares.Dam.Data.Sensors
+{
+    /// <summary>
+    /// This class is responsible for creating a PL line where the coordinates are sorted on x. 
+    /// No logic will be applied on how the PL is constructed. Just a simple data structure with an 
+    /// insert method to insert new points.
+    /// </summary>
+    internal class PLLineConstructor
+    {
+        readonly IDictionary<double,PLLinePoint> line = new SortedDictionary<double, PLLinePoint>();
+
+        /// <summary>
+        /// Inserts the specified point.
+        /// </summary>
+        /// <remarks>The point will be inserted in the line based on the X value</remarks>
+        /// <param name="point">The point.</param>
+        public void Insert(PLLinePoint point)
+        {
+            if (line.ContainsKey(point.X))
+                line[point.X] = point;
+            else
+                line.Add(point.X, point);
+        }
+
+        /// <summary>
+        /// Inserts the specified point.
+        /// </summary>
+        /// <remarks>The point will be inserted in the line based on the X value</remarks>
+        /// <param name="x">The x.</param>
+        /// <param name="z">The z.</param>
+        public void Insert(double x, double z)
+        {
+            Insert(new PLLinePoint(x, z));
+        }
+
+        /// <summary>
+        /// Gets the PL line from the internal constructed line.
+        /// </summary>
+        public PLLine CreatePLLine(PLLineType type)
+        {
+            var plLine = new PLLine() { PLLineType = type };
+            foreach (var kvp in line)
+            {
+                plLine.Points.Add(kvp.Value);
+            }
+            return plLine;
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IFileReader.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IFileReader.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IFileReader.cs	(revision 3305)
@@ -0,0 +1,65 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+
+namespace Deltares.Maps
+{
+    public interface IReader<TObject>
+    {
+        IEnumerable<TObject> Read();
+    }
+
+    public interface IFileReader<TFile, TObject> : IReader<TObject>
+    {
+        TFile File { get; }
+    }
+
+    public abstract class FileReader<TFile, TObject> : IFileReader<TFile, TObject>
+        // note: restricted to geometry stuff for now, this can change in the future
+        where TFile : class, IFile
+        where TObject : IFeature
+    {
+        private readonly TFile file;
+
+        protected FileReader(TFile file)
+        {
+            if (file == null)
+            {
+                throw new ArgumentNullException("file");
+            }
+
+            this.file = file;
+        }
+
+        #region Implementation of IFileReader<TFile,TObject>
+
+        public TFile File
+        {
+            get { return file; }
+        }
+
+        public abstract IEnumerable<TObject> Read();
+
+        #endregion
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/UpliftFactorToBetaCalculator.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/UpliftFactorToBetaCalculator.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/UpliftFactorToBetaCalculator.cs	(revision 3305)
@@ -0,0 +1,64 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+
+namespace Deltares.Dam.Data
+{
+
+    /// <summary>
+    /// Exception class for UpliftFactorToBetaCalculator
+    /// </summary>
+    public class UpliftFactorToBetaCalculatorException : ApplicationException
+    {
+        public UpliftFactorToBetaCalculatorException(string message) : base(message) { }
+    }
+
+    /// <summary>
+    /// Class to calculate the probability of uplift from upliftfactor
+    /// </summary>
+    public class UpliftFactorToBetaCalculator
+    {
+        /// <summary>
+        /// Compute the Beta from the Upliftfactor
+        /// </summary>
+        /// <param name="upliftFactor"></param>
+        /// <returns></returns>
+        static public double ComputeBetaFromUpliftFactor(double upliftFactor)
+        {
+            ThrowWhenUpliftFactorOutOfRange(upliftFactor);
+            return ((upliftFactor - 1) * 18.0);
+        }
+
+        /// <summary>
+        /// Check if upliftfactor in correct range
+        /// </summary>
+        /// <param name="upliftFactor"></param>
+        /// <returns></returns>
+        static public void ThrowWhenUpliftFactorOutOfRange(double upliftFactor)
+        {
+            if (upliftFactor < 0)
+            {
+                throw new UpliftFactorToBetaCalculatorException(String.Format("Upliftfactor of {0} is < 0.0 not allowed", upliftFactor));
+            }
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Segment.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Segment.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Segment.cs	(revision 3305)
@@ -0,0 +1,258 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using Deltares.Geotechnics.Soils;
+using Deltares.Standard.Attributes;
+
+namespace Deltares.Dam.Data
+{
+    
+    public class SoilGeometryProbability : IComparable<SoilGeometryProbability>
+    {
+        public virtual SoilProfile1D SoilProfile { get; set; }
+        public virtual string SoilGeometry2DName { get; set; }
+        public virtual SoilProfile2D SoilProfile2D { get; set; }
+        public virtual FailureMechanismSystemType? SegmentFailureMechanismType { get; set; }
+        public virtual double Probability { get; set; } // Probability of occurance; number between 0.0 and 100.0
+
+        /// <summary>
+        /// Assigns the specified soil geometry probability.
+        /// </summary>
+        /// <param name="soilGeometryProbability">The soil geometry probability.</param>
+        public void Assign(SoilGeometryProbability soilGeometryProbability)
+        {
+            if (soilGeometryProbability.SoilProfile != null)
+            {
+                SoilProfile = new SoilProfile1D();
+                SoilProfile.Assign(soilGeometryProbability.SoilProfile);
+            }
+            SegmentFailureMechanismType = soilGeometryProbability.SegmentFailureMechanismType;
+            Probability = soilGeometryProbability.Probability;
+            SoilGeometry2DName = soilGeometryProbability.SoilGeometry2DName;
+        }
+
+        [XmlOldName("SoilGeometryType")]
+        public SoilProfileType SoilProfileType
+        {
+            get
+            {
+                if (SoilProfile2D == null && SoilProfile != null)
+                {
+                    return SoilProfileType.SoilProfile1D;
+                }
+                if (SoilProfile2D != null)
+                {
+                    return SoilProfileType.SoilProfile2D;
+                }
+                if (SoilGeometry2DName == null)
+                {
+                    throw new Exception("No soilprofile assigned");
+                }
+                return SoilProfileType.SoilGeometryStiFile;                
+            }
+        }
+
+        /// <summary>
+        /// Returns either the 1D-geometry or the 2D-geometry name
+        /// </summary>
+        public virtual string SoilGeometryName 
+        { 
+            get 
+            {
+                if (SoilProfile2D == null && SoilProfile != null)
+                {
+                    return SoilProfile.Name;
+                }
+                if (SoilProfile2D != null)
+                {
+                    return SoilProfile2D.Name;
+                }
+                return SoilGeometry2DName;
+            } 
+        }
+
+        public int CompareTo(SoilGeometryProbability other)
+        {
+            return - this.Probability.CompareTo(other.Probability);
+        }
+    }
+
+    public class Segment
+    {
+        private List<SoilGeometryProbability> soilGeometryProbabilities = new List<SoilGeometryProbability>();
+
+        public virtual string Name { get; set; }
+
+        /// <summary>
+        /// Gets the soil probalilities for this segment
+        /// </summary>
+        public virtual List<SoilGeometryProbability> SoilProfileProbabilities
+        {
+            get { return this.soilGeometryProbabilities; }
+        }
+
+        public SoilProfile1D GetMostProbableProfile(FailureMechanismSystemType? segmentFailureMechanismType)
+        {
+            IEnumerable<SoilGeometryProbability> spps = from SoilGeometryProbability spp in this.soilGeometryProbabilities
+                                                        where !spp.SegmentFailureMechanismType.HasValue || !segmentFailureMechanismType.HasValue || spp.SegmentFailureMechanismType == segmentFailureMechanismType
+                                                       orderby spp.Probability descending
+                                                       select spp;
+            if (spps.Count() > 0)
+                return spps.First().SoilProfile;
+            else
+                return null;
+        }
+
+        public string GetMostProbableGeometry2DName(FailureMechanismSystemType? segmentFailureMechanismType)
+        {
+            IEnumerable<SoilGeometryProbability> spps = from SoilGeometryProbability spp in this.soilGeometryProbabilities
+                                                        where !spp.SegmentFailureMechanismType.HasValue || !segmentFailureMechanismType.HasValue || spp.SegmentFailureMechanismType == segmentFailureMechanismType
+                                                        orderby spp.Probability descending
+                                                        select spp;
+            if (spps.Count() > 0)
+                return spps.First().SoilGeometry2DName;
+            else
+                return null;
+        }
+
+        public void AddSoilProfileProbability(SoilProfile1D soilProfile, double probability, FailureMechanismSystemType? segmentFailureMechanismType)
+        {
+            if (this.soilGeometryProbabilities.Where(x => x.SoilProfile == soilProfile && x.SegmentFailureMechanismType == segmentFailureMechanismType).Count() == 0)
+                this.soilGeometryProbabilities.Add(new SoilGeometryProbability() { SoilProfile = soilProfile, Probability = probability, SegmentFailureMechanismType = segmentFailureMechanismType, SoilGeometry2DName = null });
+        }
+
+        public double? GetSoilProfileProbability(SoilProfile1D soilProfile, FailureMechanismSystemType? segmentFailureMechanismType)
+        {
+            if (soilProfile != null)
+            {
+                IEnumerable<SoilGeometryProbability> probs =
+                    soilGeometryProbabilities.Where(x => (x.SoilProfile.Name == soilProfile.Name));
+                if ((segmentFailureMechanismType != null) && (probs.Count() > 0))
+                {
+                    probs = probs.Where(x =>
+                        (x.SegmentFailureMechanismType == segmentFailureMechanismType) ||
+                        (x.SegmentFailureMechanismType == null));
+                }
+
+                if (probs.Count() > 0)
+                    return probs.Select(x => x.Probability).Average();
+            }
+            return null;
+        }
+
+        public void AddSoilGeometry2DProbability(string soilGeometry2DName, double probability, FailureMechanismSystemType? segmentFailureMechanismType)
+        {
+            if (this.soilGeometryProbabilities.Where(x => x.SoilGeometry2DName == soilGeometry2DName && x.SegmentFailureMechanismType == segmentFailureMechanismType).Count() == 0)
+                this.soilGeometryProbabilities.Add(new SoilGeometryProbability() { SoilProfile = null, Probability = probability, SegmentFailureMechanismType = segmentFailureMechanismType, SoilGeometry2DName = soilGeometry2DName });
+        }
+
+        public double? GetSoilGeometry2DProbability(string soilGeometry2DName, FailureMechanismSystemType? segmentFailureMechanismType)
+        {
+            IEnumerable<SoilGeometryProbability> probs = this.soilGeometryProbabilities.Where(
+                x => (x.SoilGeometry2DName == soilGeometry2DName) &&
+                (segmentFailureMechanismType == null || x.SegmentFailureMechanismType == segmentFailureMechanismType || x.SegmentFailureMechanismType == null));
+
+            if (probs.Count() > 0)
+                return probs.Select(x => x.Probability).Average();
+            else
+                return null;
+        }
+
+        public override string ToString()
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append(this.Name);
+            sb.Append(": ");
+            foreach (FailureMechanismSystemType type in Enum.GetValues(typeof(FailureMechanismSystemType)))
+            {
+                sb.Append(type.ToString());
+                sb.Append(": ");
+                foreach (SoilGeometryProbability spp in this.SoilProfileProbabilities.Where(x => x.SegmentFailureMechanismType == null || x.SegmentFailureMechanismType == type))
+                {
+                    if (spp.SoilProfile != null)
+                    {
+                        sb.Append(String.Format("(1D) {0} ({1}%) ", spp.SoilProfile.Name, spp.Probability));
+                    }
+                    else
+                    {
+                        sb.Append(String.Format("(2D) {0} ({1}%) ", spp.SoilGeometry2DName, spp.Probability));
+                    }
+                }
+            }
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Assemble a list of key/value pairs with the relevant parameters for the specified 1d-profile
+        /// </summary>
+        /// <returns></returns>
+        public Dictionary<string, string> GetParametersForSoilProfile1DAsNameValuePairs(string soilProfile1DId, FailureMechanismSystemType failureMechanismSystemType)
+        {
+            SoilGeometryProbability soilProfileProbability = this.SoilProfileProbabilities.FirstOrDefault(x => (x.SoilProfile != null && 
+                                                                                                                x.SoilProfile.Name.Equals(soilProfile1DId) &&
+                                                                                                                x.SegmentFailureMechanismType == failureMechanismSystemType
+                ));
+            if (soilProfileProbability != null)
+            {
+                var nameValuePairs = new Dictionary<string, string>();
+                var numberFormatInfo = new NumberFormatInfo();
+                numberFormatInfo.NumberDecimalSeparator = ".";
+                nameValuePairs.Add("Probability", soilProfileProbability.Probability.ToString(numberFormatInfo));
+                nameValuePairs.Add("FailureMechanismType", soilProfileProbability.SegmentFailureMechanismType.ToString());
+                return nameValuePairs;
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Assemble a list of key/value pairs with the relevant parameters for the specified 2d-profile
+        /// </summary>
+        /// <returns></returns>
+        public Dictionary<string, string> GetParametersForSoilProfile2DAsNameValuePairs(string soilProfile2DId, FailureMechanismSystemType failureMechanismSystemType)
+        {
+            SoilGeometryProbability soilProfileProbability = this.SoilProfileProbabilities.FirstOrDefault(x => x.SoilGeometry2DName.Equals(soilProfile2DId) && 
+                                                                                                          x.SegmentFailureMechanismType == failureMechanismSystemType);
+            if (soilProfileProbability != null)
+            {
+                var nameValuePairs = new Dictionary<string, string>();
+                var numberFormatInfo = new NumberFormatInfo();
+                numberFormatInfo.NumberDecimalSeparator = ".";
+                nameValuePairs.Add("Probability", soilProfileProbability.Probability.ToString(numberFormatInfo));
+                nameValuePairs.Add("FailureMechanismType", soilProfileProbability.SegmentFailureMechanismType.ToString());
+                return nameValuePairs;
+            } 
+            else
+            {
+                return null;
+            }
+        }
+    }
+
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterScenarios.cs	(revision 3305)
@@ -0,0 +1,307 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using Deltares.Dam.Data.Importers;
+using Deltares.Standard.IO;
+using Deltares.Standard.Language;
+using LumenWorks.Framework.IO.Csv;
+
+namespace Deltares.Dam.Data.CsvImporters
+{
+    public class CsvImporterScenariosException : ApplicationException
+    {
+        public CsvImporterScenariosException(string message)
+            : base(message)
+        {
+        }
+    }
+
+    public class CsvImporterScenarios
+    {
+        private List<ScenarioRecord> scenarioRecords = new List<ScenarioRecord>();
+        private List<string> errorMessages = new List<string>();
+
+        public class ScenarioRecord
+        {
+            public ScenarioRecord()
+            {
+                LocationScenarioId = null;
+            }
+
+            public int ScenarioRecordId { get; set; } 
+            public string LocationId { get; set; } //required
+            public string LocationScenarioId { get; set; } //required
+            public double? RiverLevel { get; set; } //optional
+            public double? RiverLevelLow { get; set; } //optional
+            public double? DikeTableHeight { get; set; } //optional
+            public double? PlLineOffsetBelowDikeTopAtRiver { get; set; } //optional
+            public double? PlLineOffsetBelowDikeTopAtPolder { get; set; } //optional
+            public double? PlLineOffsetBelowShoulderBaseInside { get; set; } //optional
+            public double? PlLineOffsetBelowDikeToeAtPolder { get; set; } //optional
+            public double? PlLineOffsetBelowDikeCrestMiddle { get; set; } //optional
+            public double? PlLineOffsetFactorBelowShoulderCrest { get; set; } //optional
+            public bool? UsePlLineOffsetBelowDikeCrestMiddle { get; set; } //optional
+            public bool? UsePlLineOffsetFactorBelowShoulderCrest { get; set; } //optional
+            public double? HeadPl3 { get; set; } //optional
+            public double? HeadPl4 { get; set; } //optional
+
+            public double? PolderLevel { get; set; } // optional
+
+            public double? HeadPl2 { get; set; } // Optional
+
+            public double? UpliftCriterionPiping { get; set; } //optional
+            public double? UpliftCriterionStability { get; set; } //optional
+            public double? RequiredSafetyFactorPiping { get; set; } //optional
+            public double? RequiredSafetyFactorStabilityInnerSlope { get; set; } //optional
+            public double? RequiredSafetyFactorStabilityOuterSlope { get; set; } //optional
+        }
+
+        private void CheckColumn(int index, string fileName, string fieldName)
+        {
+            if (index < 0)
+            {
+                var csvHeaderFieldError = LocalizationManager.GetTranslatedText(this.GetType(), "csvHeaderFieldError");
+                throw new CsvImporterScenariosException(String.Format("{0} : {1} {2}", fileName, csvHeaderFieldError, fieldName));
+            }
+        }
+
+        public CsvImporterScenarios(string fileName)
+        {
+            errorMessages.Clear();
+            ThrowHelper.ThrowIfStringArgumentNullOrEmpty(fileName, StringResourceNames.CsvFileNotValid);
+            ThrowHelper.ThrowIfFileNotExist(fileName, StringResourceNames.CsvFileNotFound);
+           
+
+            var oldcur = Thread.CurrentThread.CurrentCulture;
+            try
+            {
+                Thread.CurrentThread.CurrentCulture = CsvReaderUtilities.DetermineCultureForFile(fileName);
+                using (CsvReader csv = new CsvReader(new StreamReader(fileName), true, ';'))
+                {
+                    string[] headers = CsvImporterHelper.GetFieldHeaders(this, csv);
+                    if (headers.Count() < 2)
+                    {
+                        var csvHeaderError = LocalizationManager.GetTranslatedText(this.GetType(), "csvHeaderError");
+                        throw new CsvImporterSegmentsException(String.Format("{0} : {1}", fileName, csvHeaderError));                        
+                    }
+
+                    const string fieldLocationId = CsvColumnNames.LocationColumnName;
+                    int colIndexLocationId = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldLocationId);
+                    CheckColumn(colIndexLocationId, fileName, fieldLocationId);
+
+                    const string fieldLocationScenarioId = CsvColumnNames.LocationScenarioColumnName;
+                    int colIndexLocationScenarioId = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldLocationScenarioId);
+                    CheckColumn(colIndexLocationScenarioId, fileName, fieldLocationScenarioId);
+
+                    int colIndexRiverLevel = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RiverLevelColumnName);
+                    int colIndexRiverLevelLow = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RiverLevelLowColumnName);
+                    int colIndexDikeTableHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DikeTableHeightColumnName);
+
+                    int colIndexSafetyFactorPiping = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.SafetyFactorPiping);
+                    int colIndexSafetyFactorStabilityInnerSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.SafetyFactorStabilityInnerslope);
+                    int colIndexSafetyFactorStabilityOuterSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.SafetyFactorStabilityOuterslope);
+                    int colIndexUpliftCriterionPiping = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.UpliftCriterionPiping);
+                    int colIndexUpliftCriterionStability = CsvReaderUtilities.GetHeaderIndexByString(headers, ModelFactorCsvIdentifiers.UpliftCriterionStability);
+
+                    int colIndexPlLineOffsetBelowDikeTopAtRiver = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetBelowDikeTopAtRiverColumnName);
+                    int colIndexPlLineOffsetBelowDikeTopAtPolder = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetBelowDikeTopAtPolderColumnName);
+                    int colIndexPlLineOffsetBelowShoulderBaseInside = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetBelowShoulderBaseInsideColumnName);
+                    int colIndexPlLineOffsetBelowDikeToeAtPolder = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetBelowDikeToeAtPolderColumnName);
+                    int colIndexPlLineOffsetBelowDikeCrestMiddle = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetBelowDikeCrestMiddleColumnName);
+                    int colIndexPlLineOffsetFactorBelowShoulderCrest = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetFactorBelowShoulderCrestColumnName);
+                    int colIndexUsePlLineOffsetBelowDikeCrestMiddle = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UsePlLineOffsetBelowDikeCrestMiddleColumnName);
+                    int colIndexUsePlLineOffsetFactorBelowShoulderCrest = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UsePlLineOffsetFactorBelowShoulderCrestColumnName);
+                    int colIndexHeadPl3 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.HeadPl3ColumnName);
+                    int colIndexHeadPl4 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.HeadPl4ColumnName);
+                    int colIndexHeadPl3OldFormat = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.HeadPl3OldFormatColumnName);
+                    int colIndexHeadPl4OldFormat = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.HeadPl4OldFormatColumnName);
+                    int colIndexPolderLevel = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PolderLevelColumnName);
+                    int colIndexHeadPl2 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.HeadPl2ColumnName);
+
+                    var index = 1;
+                    while (csv.ReadNextRecord())
+                    {
+                        ScenarioRecord scenario = new ScenarioRecord();
+                        int colIndex = -1;  // Keep track of column for error message
+                        try
+                        {
+                            scenario.ScenarioRecordId = index;
+                            index++;
+
+                            scenario.LocationId = csv[colIndexLocationId];
+
+                            // faassen: changed location scenario id type from int to string (default value was -1 now null is used)
+                            string value = csv[colIndexLocationScenarioId];
+                            scenario.LocationScenarioId = string.IsNullOrWhiteSpace(value) ? null : value;
+
+                            if (colIndexRiverLevel > -1)
+                            {
+                                colIndex = colIndexRiverLevel;
+                                scenario.RiverLevel = Convert.ToDouble(csv[colIndexRiverLevel]);
+                            }
+                            if (colIndexRiverLevelLow > -1)
+                            {
+                                colIndex = colIndexRiverLevelLow;
+                                scenario.RiverLevelLow = Convert.ToDouble(csv[colIndex]);
+                            }
+                            if (colIndexDikeTableHeight > -1)
+                            {
+                                colIndex = colIndexDikeTableHeight;
+                                scenario.DikeTableHeight = Convert.ToDouble(csv[colIndexDikeTableHeight]);
+                            }
+                            if (colIndexSafetyFactorPiping > -1)
+                            {
+                                colIndex = colIndexSafetyFactorPiping;
+                                scenario.RequiredSafetyFactorPiping = Convert.ToDouble(csv[colIndex]);
+                            }
+                            if (colIndexSafetyFactorStabilityInnerSlope > -1)
+                            {
+                                colIndex = colIndexSafetyFactorStabilityInnerSlope;
+                                scenario.RequiredSafetyFactorStabilityInnerSlope = Convert.ToDouble(csv[colIndex]);
+                            }
+                            if (colIndexSafetyFactorStabilityOuterSlope > -1)
+                            {
+                                colIndex = colIndexSafetyFactorStabilityOuterSlope;
+                                scenario.RequiredSafetyFactorStabilityOuterSlope = Convert.ToDouble(csv[colIndex]);
+                            }
+                            if (colIndexUpliftCriterionPiping > -1)
+                            {
+                                colIndex = colIndexUpliftCriterionPiping;
+                                scenario.UpliftCriterionPiping = Convert.ToDouble(csv[colIndex]);
+                            }
+                            if (colIndexUpliftCriterionStability > -1)
+                            {
+                                colIndex = colIndexUpliftCriterionStability;
+                                scenario.UpliftCriterionStability = Convert.ToDouble(csv[colIndex]);
+                            }
+                            if (colIndexPlLineOffsetBelowDikeTopAtRiver > -1)
+                            {
+                                colIndex = colIndexPlLineOffsetBelowDikeTopAtRiver;
+                                scenario.PlLineOffsetBelowDikeTopAtRiver = Convert.ToDouble(csv[colIndex]);
+                            }
+                            if (colIndexPlLineOffsetBelowDikeTopAtPolder > -1)
+                            {
+                                colIndex = colIndexPlLineOffsetBelowDikeTopAtPolder;
+                                scenario.PlLineOffsetBelowDikeTopAtPolder = Convert.ToDouble(csv[colIndex]);
+                            }
+                            if (colIndexPlLineOffsetBelowShoulderBaseInside > -1)
+                            {
+                                colIndex = colIndexPlLineOffsetBelowShoulderBaseInside;
+                                scenario.PlLineOffsetBelowShoulderBaseInside = Convert.ToDouble(csv[colIndex]);
+                            }
+                            if (colIndexPlLineOffsetBelowDikeToeAtPolder > -1)
+                            {
+                                colIndex = colIndexPlLineOffsetBelowDikeToeAtPolder;
+                                scenario.PlLineOffsetBelowDikeToeAtPolder = Convert.ToDouble(csv[colIndex]);
+                            }
+                            if (colIndexPlLineOffsetBelowDikeCrestMiddle > -1)
+                            {
+                                colIndex = colIndexPlLineOffsetBelowDikeCrestMiddle;
+                                scenario.PlLineOffsetBelowDikeCrestMiddle = Convert.ToDouble(csv[colIndex]);                                
+                            }
+                            if (colIndexPlLineOffsetFactorBelowShoulderCrest > -1)
+                            {
+                                colIndex = colIndexPlLineOffsetFactorBelowShoulderCrest;
+                                scenario.PlLineOffsetFactorBelowShoulderCrest = Convert.ToDouble(csv[colIndex]);                                
+                            }
+                            if (colIndexUsePlLineOffsetBelowDikeCrestMiddle > -1)
+                            {
+                                colIndex = colIndexUsePlLineOffsetBelowDikeCrestMiddle;
+                                scenario.UsePlLineOffsetBelowDikeCrestMiddle = Convert.ToBoolean(csv[colIndex]);
+                            }
+                            if (colIndexUsePlLineOffsetFactorBelowShoulderCrest > -1)
+                            {
+                                colIndex = colIndexUsePlLineOffsetFactorBelowShoulderCrest;
+                                scenario.UsePlLineOffsetFactorBelowShoulderCrest = Convert.ToBoolean(csv[colIndex]);
+                            }
+                            if (colIndexHeadPl3 > -1)
+                            {
+                                colIndex = colIndexHeadPl3;
+                                scenario.HeadPl3 = Convert.ToDouble(csv[colIndex]);
+                            }
+                            else
+                            {
+                                if (colIndexHeadPl3OldFormat > -1)
+                                {
+                                    colIndex = colIndexHeadPl3OldFormat;
+                                    scenario.HeadPl3 = Convert.ToDouble(csv[colIndex]);
+                                }
+                            }
+                            if (colIndexHeadPl4 > -1)
+                            {
+                                colIndex = colIndexHeadPl4;
+                                scenario.HeadPl4 = Convert.ToDouble(csv[colIndex]);
+                            }
+                            else
+                            {
+                                if (colIndexHeadPl4OldFormat > -1)
+                                {
+                                    colIndex = colIndexHeadPl4OldFormat;
+                                    scenario.HeadPl4 = Convert.ToDouble(csv[colIndex]);
+                                }
+                            }
+
+                            if (colIndexPolderLevel > -1)
+                            {
+                                colIndex = colIndexPolderLevel;
+                                scenario.PolderLevel = Convert.ToDouble(csv[colIndex]);
+                            }
+
+                            if (colIndexHeadPl2 > -1)
+                            {
+                                colIndex = colIndexHeadPl2;
+                                scenario.HeadPl2 = Convert.ToDouble(csv[colIndex]);
+                            }
+
+                            scenarioRecords.Add(scenario);
+                        }
+                        catch (Exception e)
+                        {
+                            var csvScenarioError = String.Format(LocalizationManager.GetTranslatedText(this.GetType(), "csvScenarioError"), scenario.LocationId, colIndex + 1);
+                            errorMessages.Add(csvScenarioError + e.Message);
+                        }                        
+                    }
+                }
+            }
+            finally
+            {
+                Thread.CurrentThread.CurrentCulture = oldcur;
+            }
+        }
+
+        public List<ScenarioRecord> ImportedItems
+        {
+            get { return scenarioRecords; }
+        }
+
+        public List<string> ErrorMessages
+        {
+            get { return errorMessages; }
+            set { errorMessages = value; }
+        }
+
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DikeJob.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DikeJob.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DikeJob.cs	(revision 3305)
@@ -0,0 +1,62 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Xml.Serialization;
+
+namespace Deltares.Dam.Data
+{
+    public class DikeJob : CompositeJob
+    {
+        public DikeJob()
+        {
+        }
+
+        public DikeJob(object subject) : base(subject)
+        {
+        }
+
+        [XmlIgnore]
+        public Dike Dike
+        {
+            get
+            {
+                return this.Subject as Dike;
+            }
+            set
+            {
+                this.Subject = value;
+            }
+        }
+
+        public bool AreAllLocationWaterLevelTimeSeriesAssigned()
+        {
+            bool areAssigned = true;
+            foreach (DamJob damJob in Jobs)
+            {
+                if (damJob.GetType() == typeof(LocationJob))
+                {
+                    areAssigned = areAssigned && (((LocationJob)damJob).WaterLevelTimeSerie != null);
+                }
+            }
+            return areAssigned;
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/RequiredEntityNotExistException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/RequiredEntityNotExistException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/RequiredEntityNotExistException.cs	(revision 3305)
@@ -0,0 +1,46 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Deltares.Dam.Data
+{
+    [Serializable]
+    public class RequiredEntityNotExistException : Exception
+    {
+        public RequiredEntityNotExistException(string messageFormat, Type type, object idValue)
+            : base(string.Format(messageFormat, type.Name, idValue), null)
+        {
+        }
+
+        public RequiredEntityNotExistException(string messageFormat, Type type, object idValue, Exception inner)
+            : base(string.Format(messageFormat, type.Name, idValue), inner)
+        {
+        }
+
+        protected RequiredEntityNotExistException(
+            SerializationInfo info,
+            StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/ThrowHelper.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/ThrowHelper.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/ThrowHelper.cs	(revision 3305)
@@ -0,0 +1,293 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Resources;
+using System.Reflection;
+using System.Globalization;
+
+namespace Deltares.Dam.Data
+{
+
+    /// <summary>
+    /// Declares the string resource names
+    /// </summary>
+    internal enum StringResourceNames
+    {
+        CsvFileNotFound,
+        CsvFileNotValid,
+        CsvHeaderNullOrEmpty,
+        CsvHeaderNotValid,
+        CsvObjectMaterializerNotValid,
+        CsvSplitterPatternNotValid,
+        DataImportArgumentNull,
+        EntityAlreadyExist,
+        EntityFactoryArgumentNull,
+        ImportFileNotExist,
+        ImportFolderNotExist,
+        ImportFolderNullOrEmpty,
+        MStabExecutableFileNameNotFound,
+        SlopeWExecutableFileNameNotFound,
+        OutputFileNotExist,
+        OutputFileHasNoContent,
+        OutputFileNameNotValid,
+        ProjectFileNameNullOrEmpty,
+        ProjectFileNotExist,
+        SegmentIdArgumentNullOrEmpty,
+        SoilProfileIdArgumentNullOrEmpty,
+        SurfaceLineIdArgumentNullOrEmpty,
+        RequiredEntityDoesNotExist,
+        ImportFilesNotValidated,
+        RequiredParameterMissing,
+        SurfacelineIsNotInsideSoilprofile,
+        TopLayerToBeEvaluatedNotInsideSoilprofile,
+        SoilAttachedToLayerNotValid,
+        ImportDataNotValid,
+        ImportedLocationDoesntHaveValidSurfaceLines,
+        ImportedLocationDoesntHaveValidPL1Lines,
+        SurfaceLinePointNotExtists,
+        NonExistentLocation,
+        TwoSandlayersRequiredInSoilProfile,
+        CsvColumnIndexAlreadyExists,
+        WaterLevelInputFileNullOrEmpty,
+        NoSoilProfileDefinedForLocation,
+        LocationHasNoSegment,
+        FileNameNotValid,
+        GaugeIdArgumentNullOrEmpty,
+        LocationIdArgumentNullOrEmpty,
+        ImportedLocationDoesntHaveSoilprofile,
+        SoildatabaseNotFound,
+        SurfaceLineNotAssigned,
+        SoilProfileNotAssigned,
+        SoilListIsNull,
+        PL1NotCreated,
+        NoDikeDefined,
+        NoLocationsDefined,
+        NoCalculationTypeSpecified,
+        NoScenariosDefinedInLocation,
+        NoRiverLevel,
+        NoSurfaceLines,
+        NoSoilsDefinedInProject,
+        NoSoilprofiles1DDefinedInProject
+    }
+
+    /// <summary>
+    /// Defines a helper class for getting string resources
+    /// </summary>
+    /// <remarks>
+    /// The class implements a singleton pattern
+    /// </remarks>
+    internal class StringResources
+    {
+        /// <summary>
+        /// Holds a single reference to this class
+        /// </summary>
+        private static StringResources instance;
+
+        /// <summary>
+        /// The sync method for making this class thread safe
+        /// </summary>
+        private static readonly object sync = new object();
+
+        /// <summary>
+        /// The actual resource manager
+        /// </summary>
+        private readonly ResourceManager resources;
+
+        // Methods
+        internal StringResources()
+        {
+            this.resources = new ResourceManager("Deltares.Dam.Data.Properties.Resources", Assembly.GetExecutingAssembly());
+        }
+
+        /// <summary>
+        /// Gets the sinlgeton instance 
+        /// </summary>
+        /// <returns>A reference to this class instance</returns>
+        private static StringResources GetInstance()
+        {
+            if (instance == null)
+            {
+                lock (sync)
+                {
+                    if (instance == null)
+                    {
+                        instance = new StringResources();
+                    }
+                }
+            }
+            return instance;
+        }
+
+        /// <summary>
+        /// Getst the string from the from the resource manager
+        /// </summary>
+        /// <param name="name">The name of the resource</param>
+        /// <returns>The resource string</returns>
+        public static string GetString(string name)
+        {
+            var loader = GetInstance();
+            if (loader == null)
+            {
+                return null;
+            }
+            return loader.resources.GetString(name, CultureInfo.CurrentCulture);
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    internal static class ThrowHelper
+    {
+        internal static string GetResourceString(StringResourceNames resourceNames)
+        {
+            return StringResources.GetString(resourceNames.ToString());
+        }
+
+        internal static void ThrowIfArgumentNull(object value, string parameter, StringResourceNames resourceNamesName)
+        {
+            if (value == null)
+                throw new ArgumentNullException(parameter, GetResourceString(resourceNamesName));
+        }
+
+        internal static void ThrowIfArgumentNull(object value, string parameter, string message)
+        {
+            if (value == null)
+                throw new ArgumentNullException(parameter, message);
+        }
+
+        internal static void ThrowIfStringArgumentNullOrEmpty(string value, StringResourceNames resourceNamesName)
+        {
+            if (string.IsNullOrEmpty(value) || value.Trim() == "")
+                throw new ArgumentException(GetResourceString(resourceNamesName));
+        }
+
+        internal static void ThrowIfFileNameNullOrEmpty(string fileName)
+        {
+            ThrowIfFileNameNullOrEmpty(fileName, StringResourceNames.FileNameNotValid);
+        }
+
+        internal static void ThrowIfFileNameNullOrEmpty(string fileName, StringResourceNames resourceName)
+        {
+            ThrowIfFileNameNullOrEmpty<ArgumentNullException>(fileName, resourceName);
+        }
+
+        internal static void ThrowIfFileNameNullOrEmpty<TException>(string fileName, StringResourceNames resourceName)
+            where TException : Exception
+        {
+            ThrowWhenConditionIsTrue<TException>(resourceName,
+                () => string.IsNullOrEmpty(fileName) || fileName.Trim() == "");
+        }
+
+        internal static void ThrowIfFileNotExist(string fileName, StringResourceNames resourceNamesName)
+        {
+            if (!File.Exists(fileName))
+                throw new FileNotFoundException(string.Format(GetResourceString(resourceNamesName), String.Format("{0} in {1}", (fileName ?? ""), DamProject.ProjectWorkingPath)));
+        }
+
+        internal static void ThrowIfDirectoryNotExist(string dirName, StringResourceNames resourceNamesName)
+        {
+            if (!Directory.Exists(dirName))
+                throw new DirectoryNotFoundException(string.Format(GetResourceString(resourceNamesName), dirName ?? "supplied"));
+        }
+
+        internal static void ThrowWhenConditionIsTrue<TException>(Func<bool> condition, Func<TException> exceptionFactory)
+            where TException : Exception
+        {
+            if (condition())
+                throw exceptionFactory();
+        }       
+
+        public static void ThrowWhenConditionIsTrue<TException>(string message, Func<bool> condition)
+            where TException : Exception
+        {
+            var exception = (Exception)Activator.CreateInstance(typeof(TException), new object[] { message });
+
+            if (condition())
+                throw exception;
+        }
+
+        internal static void ThrowWhenConditionIsTrue<TException>(StringResourceNames resourceName, Func<bool> condition)
+            where TException : Exception
+        {
+            var exception = (Exception)Activator.CreateInstance(
+                typeof(TException), new object[] { GetResourceString(resourceName) });
+
+            if (condition())
+                throw exception;
+        }
+
+        internal static void ThrowWhenConditionIsTrue<TException, TArgument>(TArgument arg, StringResourceNames resourceName, 
+            Func<TArgument, bool> condition, Func<StringResourceNames, TException> exceptionFactory)
+            where TException : Exception
+        {
+            var exception = exceptionFactory(resourceName);
+            if (condition(arg))
+                throw exception;
+        }
+
+        public static void ThrowWhenParameterIsMissing(object owner, string parameterName, object parameterValue)
+        {
+            if (parameterValue == null)
+            {
+                throw new ParameterMissingException(
+                    string.Format(GetResourceString(StringResourceNames.RequiredParameterMissing), parameterName, owner.GetType().Name));
+            }
+        }
+
+        public static void ThrowWhenParameterIsMissing(object owner, string propertyName)
+        {
+            var pi = owner.GetType().GetProperty(propertyName);
+            var propertyValue = pi.GetValue(owner, null);
+
+            if (propertyValue == null)
+            {
+                throw new ParameterMissingException(
+                    string.Format(GetResourceString(StringResourceNames.RequiredParameterMissing), propertyName, owner.GetType().Name));
+            }
+        }
+
+        public static void ThrowWhenRequiredEntityDoesntExistInLookup<T>(object id) where T : new()
+        {
+            throw new RequiredEntityNotExistException(
+                GetResourceString(StringResourceNames.RequiredEntityDoesNotExist),
+                typeof(T),
+                id);
+        }
+
+        public static T ThrowWhenRequiredEntityDoesntExistInLookup<T>(IEnumerable<T> lookup, object id, Func<T, bool> predicate) where T : new()
+        {
+            var entity = lookup.FirstOrDefault(predicate);
+            if (Equals(entity, default(T)))
+            {
+                throw new RequiredEntityNotExistException(
+                    GetResourceString(StringResourceNames.RequiredEntityDoesNotExist),
+                    typeof(T),
+                    id);
+            }
+            return entity;
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/MinimumAttribute.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/MinimumAttribute.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/MinimumAttribute.cs	(revision 3305)
@@ -0,0 +1,41 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+
+namespace Deltares.Standard.Specifications
+{
+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, Inherited = false, AllowMultiple = true)]
+    public sealed class MinimumAttribute : Attribute
+    {
+        private readonly double attributeValue;
+
+        public MinimumAttribute(double minValue)
+        {
+            this.attributeValue = minValue;
+        }
+
+        public double AttributeValue
+        {
+            get { return this.attributeValue; }
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilbaseDataSet.xss
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilbaseDataSet.xss	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Xsd/SoilbaseDataSet.xss	(revision 3305)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--<autogenerated>
+     This code was generated by a tool to store the dataset designer's layout information.
+     Changes to this file may cause incorrect behavior and will be lost if
+     the code is regenerated.
+</autogenerated>-->
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+  <Shapes>
+    <Shape ID="DesignTable:MATERIALS" ZOrder="5" X="274" Y="177" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:PARAMETERVALUES" ZOrder="4" X="343" Y="338" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:PARAMETERNAMES" ZOrder="3" X="447" Y="176" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+  </Shapes>
+  <Connectors>
+    <Connector ID="DesignRelation:FK_PARAMETE_RELATION__MATERIAL" ZOrder="2" LineWidth="11">
+      <RoutePoints>
+        <GeometryPoint>
+          <X>302</X>
+          <Y>267</Y>
+        </GeometryPoint>
+        <GeometryPoint>
+          <X>302</X>
+          <Y>355</Y>
+        </GeometryPoint>
+        <GeometryPoint>
+          <X>343</X>
+          <Y>355</Y>
+        </GeometryPoint>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_PARAMETE_RELATION__PARAMETE" ZOrder="1" LineWidth="11">
+      <RoutePoints>
+        <GeometryPoint>
+          <X>490</X>
+          <Y>266</Y>
+        </GeometryPoint>
+        <GeometryPoint>
+          <X>490</X>
+          <Y>338</Y>
+        </GeometryPoint>
+      </RoutePoints>
+    </Connector>
+  </Connectors>
+</DiagramLayout>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/TestData/Gemeenten.dbf
===================================================================
diff -u
Binary files differ
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorFactory.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorFactory.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorFactory.cs	(revision 3305)
@@ -0,0 +1,83 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using Deltares.Standard;
+using Deltares.Standard.Extensions;
+
+namespace Deltares.Dam.Data.Sensors
+{
+    public class SensorFactory
+    {
+        /// <summary>
+        /// Creates a unique sensor. The name and id are generated and set in the 
+        /// context of the given sensor collection
+        /// </summary>
+        /// <param name="sensors">The sensors.</param>
+        /// <returns></returns>
+        internal Sensor CreateUniqueSensor(IEnumerable<Sensor> sensors)
+        {
+            if (sensors == null) throw new ArgumentNullException("sensors");
+
+            // TODO: see of these calls can be combined for performance reason
+            var id = sensors.GetUniqueID(x => x.ID);
+
+            Sensor sensor = new Sensor { ID = id, Type = SensorType.PiezometricHead }; 
+            UniqueNameProvider.ProvideUniqueName(new List<Sensor>(sensors), sensor);
+
+            return  sensor;            
+        }
+
+        /// <summary>
+        /// Creates a sensor location.
+        /// </summary>
+        /// <param name="location">The location.</param>
+        /// <returns></returns>
+        internal SensorLocation CreateSensorLocation(Location location)
+        {
+            return CreateSensorLocation(location, new Group());
+        }
+
+        /// <summary>
+        /// Creates a sensor location.
+        /// </summary>
+        /// <param name="location">The location.</param>
+        /// <param name="group">The group to associate the location with</param>
+        /// <returns>Should return a valid instance</returns>
+        internal SensorLocation CreateSensorLocation(Location location, Group group)
+        {
+            return new SensorLocation
+            {
+                Group = group,
+                Location = location,
+                SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData,
+                SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData,
+                SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData,
+                SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData,
+                SourceTypePl1PlLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData,
+                SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData,
+                SourceTypePl3 = DataSourceTypeSensors.LocationData,
+                SourceTypePl4 = DataSourceTypeSensors.LocationData
+            };
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardImporter.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardImporter.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardImporter.cs	(revision 3305)
@@ -0,0 +1,785 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using Deltares.Standard.EventPublisher;
+using Deltares.Geotechnics.GeotechnicalGeometry;
+using Deltares.Geotechnics.IO;
+using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.SurfaceLines;
+using Deltares.Standard.Logging;
+
+namespace Deltares.Dam.Data
+{
+    using DataPlugins.Configuration;
+    using DataPlugins;
+    using Standard;
+    using Maps;
+
+    public class WaterBoardImporterException : Exception
+    {
+        public WaterBoardImporterException(string message)
+            : base(message)
+        {
+        }
+    }
+
+    /// <summary>
+    /// Import all data into Waterboard
+    /// </summary>
+    public class WaterBoardImporter
+    {
+        //
+        // Members & Properties
+        //
+        private readonly IDataPlugin importer;
+
+        private readonly WaterBoard waterBoard = new WaterBoard();
+
+        private readonly DamProjectType damProjectType;
+        private readonly List<LogMessage> importCsvLogMessages = new List<LogMessage>();
+
+        /// <summary>
+        /// Gets the import CSV log messages.
+        /// </summary>
+        /// <value>
+        /// The import CSV log messages.
+        /// </value>
+        public List<LogMessage> ImportCsvLogMessages
+        {
+            get { return importCsvLogMessages; }
+        }
+
+        /// <summary>
+        /// Gets all dike ring ids.
+        /// </summary>
+        /// <value>
+        /// All dike ring i ds.
+        /// </value>
+        private IEnumerable<string> AllDikeRingIDs
+        {
+            get
+            {
+                importCsvLogMessages.Clear();
+                var dikeRingIdList = importer.GetDikeRingIdList().ToList();
+                importCsvLogMessages.AddRange(importer.ImportLogMessages);
+                return dikeRingIdList;
+            }
+        }
+
+        /// <summary>
+        /// Gets the data source list.
+        /// </summary>
+        /// <value>
+        /// The data source list.
+        /// </value>
+        private IEnumerable<DataSource> DataSourceList
+        {
+            get { return importer.DataSources; }
+        }
+
+        /// <summary>
+        /// Gets the data folder.
+        /// </summary>
+        /// <value>
+        /// The data folder.
+        /// </value>
+        private string DataFolder
+        {
+            get { return importer.DataFolder; }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WaterBoardImporter"/> class.
+        /// </summary>
+        public WaterBoardImporter()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WaterBoardImporter"/> class.
+        /// </summary>
+        /// <param name="dataFolder">The data folder.</param>
+        /// <param name="dataSourceContainer">The data source container.</param>
+        /// <param name="damProjectType">Type of the dam project.</param>
+        private WaterBoardImporter(string dataFolder, DataSourceContainer dataSourceContainer, DamProjectType damProjectType)
+        {
+            this.damProjectType = damProjectType;
+            importer = CreateDataPlugin(dataFolder, dataSourceContainer);
+            importer.DamProjectType = damProjectType;
+        }
+
+        /// <summary>
+        /// Creates the data plugin.
+        /// </summary>
+        /// <param name="dataFolder">The data folder.</param>
+        /// <param name="dataSourceContainer">The data source container.</param>
+        /// <returns></returns>
+        private static DataPluginImporter CreateDataPlugin(string dataFolder, DataSourceContainer dataSourceContainer)
+        {
+            var plugin = new DataPluginImporter();
+            plugin.SetDataSources(dataFolder, dataSourceContainer.DataSourceList);
+            plugin.Attributes = dataSourceContainer.DataAttributes;
+
+            return plugin;
+        }
+
+        /// <summary>
+        /// Imports the dike ring ids.
+        /// </summary>
+        /// <param name="dataFolder">The data folder.</param>
+        /// <param name="dataSourceContainer">The data source container.</param>
+        /// <param name="damProjectType">Type of the dam project.</param>
+        /// <param name="importLogMessages">The import log messages.</param>
+        /// <returns></returns>
+        public static IEnumerable<string> ImportDikeRingIds(
+            string dataFolder, DataSourceContainer dataSourceContainer, DamProjectType damProjectType, out List<LogMessage> importLogMessages)
+        {
+            var importer = new WaterBoardImporter(dataFolder, dataSourceContainer, damProjectType);
+
+            var allDikeRingIds = importer.AllDikeRingIDs;
+            importLogMessages = new List<LogMessage>(importer.ImportCsvLogMessages);
+            
+            return allDikeRingIds;
+        }
+
+        /// <summary>
+        /// Imports all data.
+        /// </summary>
+        /// <param name="dataFolder">The data folder.</param>
+        /// <param name="dataSourceContainer">The data source container.</param>
+        /// <param name="damProjectType">Type of the dam project.</param>
+        /// <param name="progress">The progress.</param>
+        /// <param name="logMessages">The log messages.</param>
+        /// <returns></returns>
+        public static WaterBoard ImportAllData(string dataFolder,
+            DataSourceContainer dataSourceContainer, DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress,
+            out List<LogMessage> logMessages)
+        {
+            var importer = CreateDataPlugin(dataFolder, dataSourceContainer);
+            var dikeRingIds = importer.GetDikeRingIdList();
+            WaterBoard waterboard = ImportDataForDikeRings("", dataFolder, dataSourceContainer,
+                dikeRingIds, damProjectType, progress, out logMessages);
+            return waterboard;
+        }
+
+        /// <summary>
+        /// Imports all data.
+        /// </summary>
+        /// <param name="dataFolder">The data folder.</param>
+        /// <param name="dataSourceContainer">The data source container.</param>
+        /// <param name="damProjectType">Type of the dam project.</param>
+        /// <param name="progress">The progress.</param>
+        /// <returns></returns>
+        public static WaterBoard ImportAllData(string dataFolder,
+            DataSourceContainer dataSourceContainer, DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress)
+        {
+            List<LogMessage> dummy;
+            return ImportAllData(dataFolder, dataSourceContainer, damProjectType, progress, out dummy);
+        }
+
+        /// <summary>
+        /// Imports the data for dike rings.
+        /// </summary>
+        /// <param name="damProjectFolder">The dam project folder.</param>
+        /// <param name="dataFolder">The data folder.</param>
+        /// <param name="dataSourceContainer">The data source container.</param>
+        /// <param name="dikeRingIds">The dike ring ids.</param>
+        /// <param name="damProjectType">Type of the dam project.</param>
+        /// <param name="progress">The progress.</param>
+        /// <returns></returns>
+        public static WaterBoard ImportDataForDikeRings(string damProjectFolder, string dataFolder,
+            DataSourceContainer dataSourceContainer, IEnumerable<string> dikeRingIds,
+            DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress)
+        {
+            List<LogMessage> dummy;
+            return ImportDataForDikeRings(damProjectFolder, dataFolder, dataSourceContainer,
+                dikeRingIds, damProjectType, progress, out dummy);
+        }
+
+        /// <summary>
+        /// Imports the data for dike rings.
+        /// </summary>
+        /// <param name="damProjectFolder">The dam project folder.</param>
+        /// <param name="dataFolder">The data folder.</param>
+        /// <param name="dataSourceContainer">The data source container.</param>
+        /// <param name="dikeRingIds">The dike ring ids.</param>
+        /// <param name="damProjectType">Type of the dam project.</param>
+        /// <param name="progress">The progress.</param>
+        /// <param name="logMessages">The log messages.</param>
+        /// <returns></returns>
+        public static WaterBoard ImportDataForDikeRings(string damProjectFolder, string dataFolder,
+            DataSourceContainer dataSourceContainer, IEnumerable<string> dikeRingIds,
+            DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress, out List<LogMessage> logMessages)
+        {
+            var importer = new WaterBoardImporter(dataFolder, dataSourceContainer, damProjectType);
+
+            logMessages = new List<LogMessage>();
+            WaterBoard waterBoard = new WaterBoard();
+            try
+            {
+                waterBoard = importer.ImportDataForDikeRings(damProjectFolder, dikeRingIds, progress);
+                foreach (Dike dike in waterBoard.Dikes)
+                {
+                    if (String.IsNullOrEmpty(dike.MapForSoilGeometries2D) && !String.IsNullOrEmpty(dataSourceContainer.MapSoilProfile2D))
+                    {
+                        dike.MapForSoilGeometries2D = dataSourceContainer.MapSoilProfile2D;
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                string errorMessage = e.Message;
+                Exception innerException = e.InnerException;
+                while (innerException != null)
+                {
+                    errorMessage = errorMessage + ";" + innerException.Message;
+                    innerException = innerException.InnerException;
+                }
+                logMessages.Add(new LogMessage(LogMessageType.FatalError, null, errorMessage));
+            }
+
+            logMessages.AddRange(importer.ImportCsvLogMessages);
+
+            return waterBoard;
+        }
+
+        /// <summary>
+        /// Imports the data for dike rings.
+        /// </summary>
+        /// <param name="damProjectFolder">The dam project folder.</param>
+        /// <param name="dikeRingIds">The dike ring ids.</param>
+        /// <param name="progress">The progress.</param>
+        /// <returns></returns>
+        private WaterBoard ImportDataForDikeRings(string damProjectFolder, IEnumerable<string> dikeRingIds, DamEngine.Data.Standard.Calculation.ProgressDelegate progress)
+        {
+            var dikeRingList = ValidateDikeRingIDs(dikeRingIds);
+
+            importer.DamProjectFolder = damProjectFolder;
+
+            // Import dikes
+            var importOk = ImportDikes(dikeRingList, progress);
+
+            if (!importOk) return waterBoard;
+
+            // import data for dike rings
+            foreach (var dikeRingId in dikeRingList)
+            {
+                // Add dikes to waterboard
+                var dike = ImportDataForDikeRing(dikeRingId);
+                waterBoard.Dikes.Add(dike);
+            }
+
+            ImportBackground();
+            return waterBoard;
+        }
+
+
+
+        /// <summary>
+        /// Validates the dike ring i ds.
+        /// </summary>
+        /// <param name="dikeRingIds">The dike ring ids.</param>
+        /// <returns></returns>
+        private List<string> ValidateDikeRingIDs(IEnumerable<string> dikeRingIds)
+        {
+            // if no dike ring IDs specified, take all
+            return dikeRingIds == null
+                       ? importer.GetDikeRingIdList().ToList()
+                       : (dikeRingIds as List<string> ?? dikeRingIds.ToList());
+        }
+
+        /// <summary>
+        /// Creates the soil base for dike.
+        /// </summary>
+        /// <param name="dike">The dike.</param>
+        private void CreateSoilBaseForDike(Dike dike)
+        {
+            // TODO: soildatabase should be created. Now we make a direct link
+            // must be based on dike.SoilDatabaseName
+        }
+
+        /// <summary>
+        /// Determines the database name from data sources.
+        /// </summary>
+        /// <param name="dike">The dike.</param>
+        private void DetermineDatabaseNameFromDataSources(Dike dike)
+        {
+            var sources = DataSourceList.ToList();
+
+            // get the data base name from the data sources
+            var dataSource =
+                sources.FirstOrDefault(ds => ds.DataSourceType == DataSourceType.MSoilBase) ??
+                sources.FirstOrDefault(ds => ds.DataSourceType == DataSourceType.CsvFiles);
+
+            if (dataSource != null)
+            {
+                if (dataSource.DataSourceType == DataSourceType.MSoilBase)
+                {
+                    dike.SoilDatabaseName = Path.Combine(DataFolder, dataSource.DataLocation);
+                }
+                else
+                {
+                    var subFolder = Path.Combine(DataFolder, dataSource.DataLocation);
+                    dike.SoilDatabaseName = Path.Combine(subFolder, "soilmaterials.mdb");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Imports the soils.
+        /// </summary>
+        /// <param name="dikeRingID">The dike ring identifier.</param>
+        /// <param name="dike">The dike.</param>
+        private void ImportSoils(string dikeRingID, Dike dike)
+        {
+            dike.SoilList = GetSoils(dikeRingID);
+            DetermineDatabaseNameFromDataSources(dike);
+            dike.FillDataBaseSoilListFromSoilBase();
+        }
+
+        /// <summary>
+        /// Gets the soils.
+        /// </summary>
+        /// <param name="dikeRingID">The dike ring identifier.</param>
+        /// <returns></returns>
+        private SoilList GetSoils(string dikeRingID)
+        {
+            var soilIdList = importer.GetSoilIdList(dikeRingID);
+            var soils = soilIdList
+                .Select(soilID => ImportSoil(dikeRingID, soilID))
+                .ToList();
+
+            var aquifers = importer.GetSoilAquiferValues(dikeRingID);
+            var soilList = new SoilList();
+            soilList.Soils = soils;
+
+            foreach (var nameValueParameter in aquifers)
+            {
+                bool vala;
+                bool.TryParse(nameValueParameter.ParameterValue, out vala);
+                soilList.AquiferDictionary.Add(soilList.GetSoilByName(nameValueParameter.ParameterName), vala);
+            }
+            return soilList;
+        }
+
+        /// <summary>
+        /// Imports a soil.
+        /// </summary>
+        /// <param name="dikeRingID">The dike ring identifier.</param>
+        /// <param name="soilID">The soil identifier.</param>
+        /// <returns></returns>
+        private Soil ImportSoil(string dikeRingID, string soilID)
+        {
+            var soil = new Soil { Name = soilID };
+            var soilDetails = importer.GetSoilDetails(dikeRingID, soilID);
+
+            foreach (var soilDetail in soilDetails)
+            {
+                SoilUtils.SetParameterFromNameValuePair(soil, soilDetail.ParameterName, soilDetail.ParameterValue);
+                DataSourceManager.SetSource(soil, soilDetail.ParameterName, soilDetail.Source);
+            }
+
+            return soil;
+        }
+
+        /// <summary>
+        /// Imports the data for dike ring.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <returns></returns>
+        private Dike ImportDataForDikeRing(string dikeRingId)
+        {
+            var dike = new Dike { Name = dikeRingId };
+            ImportSoils(dikeRingId, dike);
+
+            ImportSoilProfiles1D(dikeRingId, dike);
+
+            ImportSegments(dikeRingId, dike);
+
+            ImportSurfaceLines(dikeRingId, dike);
+
+            ImportModelParameters(dikeRingId, dike);
+
+            // TODO: Import PL1-lines 
+
+            ImportLocations(dikeRingId, dike);
+
+            //ImportScenarios(importer, dikeRingId, dike, waterBoard);
+            ImportScenarios(dikeRingId, dike);
+
+            // Use InvokeWithoutPublishingEvents for performance reasons after introducint SurfaceLine2
+            DataEventPublisher.InvokeWithoutPublishingEvents(() =>
+            {
+                var dikeCoordinateSystemConverter = new DikeCoordinateSystemConverter();
+                if (dike.Locations.Count > 0)
+                {
+                    dikeCoordinateSystemConverter.CreateLocalXZObjects(dike);
+                }
+            });
+
+            ImportCsvLogMessages.AddRange(dike.MakeDataConsistent());
+
+            CreateSoilBaseForDike(dike);
+
+            DisposeImportedItem(dikeRingId);
+
+            return dike;
+        }
+
+        private void DisposeImportedItem(string dikeRingId)
+        {
+            importer.DisposeImportedItem(dikeRingId);
+        }
+
+        /// <summary>
+        /// Imports all specified dikes.
+        /// </summary>
+        /// <param name="dikeRingIds">The dike ring ids.</param>
+        /// <param name="progress">The progress.</param>
+        /// <returns></returns>
+        private bool ImportDikes(IEnumerable<string> dikeRingIds, DamEngine.Data.Standard.Calculation.ProgressDelegate progress)
+        {
+            // Import dikes
+            importer.ImportDataForDikeRings(dikeRingIds, progress);
+
+            // add log messages
+            ImportCsvLogMessages.AddRange(importer.ImportLogMessages);
+
+            // import is ok if no fatal messages
+            return ImportCsvLogMessages.All(message => message.MessageType != LogMessageType.FatalError);
+        }
+
+        /// <summary>
+        /// Imports the background layer.
+        /// </summary>
+        private void ImportBackground()
+        {
+            var geometryFeatures = importer.MapGeometryIdList
+                .Select(id => importer.GetMapGeometry(id))
+                .Select(Feature.Create);
+
+            foreach (var geometry in geometryFeatures)
+            {
+                waterBoard.AddBackgroundGeometry(geometry);
+            }
+            waterBoard.FillFeatureList();
+        }
+
+        /// <summary>
+        /// Imports the scenarios.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="dike">The dike.</param>
+        private void ImportScenarios(string dikeRingId, Dike dike)
+        {
+
+            AddScenariosToLocations(dike, dikeRingId);
+
+        }
+
+        /// <summary>
+        /// Adds the scenarios to locations.
+        /// </summary>
+        /// <param name="dike">The dike.</param>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        private void AddScenariosToLocations(Dike dike, string dikeRingId)
+        {
+            foreach (var location in dike.Locations)
+            {
+                var scenarioList = importer.GetScenarioList(dikeRingId, location.Name);
+                foreach (var scenarioId in scenarioList)
+                {
+                    var nameValues =
+                        importer.GetScenarioDetails(dikeRingId, location.Name, scenarioId);
+                    var scenario = new Scenario { LocationScenarioID = scenarioId };
+                    foreach (var nameValueParameter in nameValues)
+                    {
+                        scenario.SetParameterFromNameValuePair(
+                            nameValueParameter.ParameterName,
+                            nameValueParameter.ParameterValue);
+                    }
+                    scenario.Location = location;
+                    location.Scenarios.Add(scenario);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Imports the locations.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="dike">The dike.</param>
+        private void ImportLocations(string dikeRingId, Dike dike)
+        {
+            var locationIdList = importer.GetLocationIdList(dikeRingId);
+
+            foreach (string locationId in locationIdList)
+            {
+                var location = new Location
+                {
+                    Name = locationId
+                };
+
+                Info locationInfo = importer.GetLocationInfo(dikeRingId, locationId);
+
+                location.Name = locationInfo.Name;
+                DataSourceManager.SetSource(location, "Name", locationInfo.Source);
+
+                location.Description = locationInfo.Description;
+                DataSourceManager.SetSource(location, "Description", locationInfo.Source);
+
+                IEnumerable<NameValueParameter> locationDetails = importer.GetLocationDetails(dikeRingId, locationId);
+                foreach (NameValueParameter locationDetail in locationDetails)
+                {
+                    location.SetParameterFromNameValuePair(locationDetail.ParameterName, locationDetail.ParameterValue);
+                    DataSourceManager.SetSource(location, locationDetail.ParameterName, locationDetail.Source);
+                    if (locationDetail.ParameterName.Equals(LocationParameterNames.SegmentId))
+                    {
+                        Segment segment = waterBoard.Segments.FirstOrDefault(x => x.Name.Equals(locationDetail.ParameterValue));
+                        location.Segment = segment;
+                    }
+                    // See comment below: the test WaterBoardImportedWithCsvFilesHasValidData using Groot Salland\Binnenwaarts proves Erik wrong
+                    if (locationDetail.ParameterName.Equals(LocationParameterNames.SurfaceLineId))
+                    {
+                        SurfaceLine2 surfaceLine = dike.SurfaceLines2.FirstOrDefault(x => x.Name.Equals(locationDetail.ParameterValue));
+                        location.SurfaceLine2 = surfaceLine;
+                    }
+                    // TODO: Assign PL1-line 
+                }
+                // According to Erik Vastenburg, locations and surfacelines must match for matching pairs! So to find proper surfaceline
+                // for location, just search for it by name in surfacelines. SurfaceLineId can and should be removed entirely! But see above!
+                if (location.SurfaceLine2 == null)
+                {
+                    location.SurfaceLine2 = dike.SurfaceLines2.FirstOrDefault(s => s.Name == location.Name);
+                }
+                location.SoilList = dike.SoilList;
+                dike.Locations.Add(location);
+            }
+            dike.SortLocations();
+        }
+
+        /// <summary>
+        /// Imports the model parameters.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="dike">The dike.</param>
+        private void ImportModelParameters(string dikeRingId, Dike dike)
+        {
+            var modelParameters = importer.GetDikeParameters(dikeRingId);
+            foreach (NameValueParameter modelParameter in modelParameters)
+            {
+                dike.SetParameterFromNameValuePair(modelParameter.ParameterName, modelParameter.ParameterValue);
+                DataSourceManager.SetSource(dike, modelParameter.ParameterName, modelParameter.Source);
+            }
+        }
+
+        /// <summary>
+        /// Imports the surface lines.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="dike">The dike.</param>
+        private void ImportSurfaceLines(string dikeRingId, Dike dike)
+        {
+            // Use InvokeWithoutPublishingEvents for performance reasons after introducint SurfaceLine2
+            DataEventPublisher.InvokeWithoutPublishingEvents(() =>
+            {
+                var surfaceLineIdList = importer.GetSurfaceLineIdList(dikeRingId);
+                foreach (var surfaceLineId in surfaceLineIdList)
+                {
+                    var surfaceLine = new SurfaceLine2
+                    {
+                        Name = surfaceLineId,
+                        Geometry = new LocalizedGeometryPointString(),
+                        CharacteristicPoints = { GeometryMustContainPoint = true }
+                    };
+
+                    // load the surface line points
+                    var surfaceLinePoints = importer.GetSurfaceLinePoints(dikeRingId, surfaceLineId);
+                    foreach (var surfaceLinePoint in surfaceLinePoints)
+                    {
+                        surfaceLine.AddCharacteristicPoint(surfaceLinePoint);
+                    }
+
+                    // load the characteristic points
+                    var characteristicPoints = importer.GetSurfaceLineCharacteristicPoints(dikeRingId, surfaceLineId);
+                    foreach (var cp in characteristicPoints)
+                    {
+                        var cpType = (CharacteristicPointType)Enum.Parse(
+                            typeof(CharacteristicPointType), cp.Id);
+                        surfaceLine.EnsurePointOfType(cp.X, cp.Y, cp.Z, cpType);
+                    }
+
+                    // add the surface line to the dike
+                    dike.SurfaceLines2.Add(surfaceLine);
+                }
+            });
+        }
+
+        /// <summary>
+        /// Imports the segments.
+        /// </summary>
+        /// <param name="dikeRingID">The dike ring identifier.</param>
+        /// <param name="dike">The dike.</param>
+        private void ImportSegments(string dikeRingID, Dike dike)
+        {
+            var segmentIdList = importer.GetSegmentIdList(dikeRingID);
+            foreach (var segmentID in segmentIdList)
+            {
+                var segment = new Segment { Name = segmentID };
+
+                foreach (FailureMechanismSystemType failureMechanismSystemType in Enum.GetValues(typeof(FailureMechanismSystemType)))
+                {
+                    AddSoilProfiles(segment, dikeRingID, segmentID, failureMechanismSystemType, dike);
+                    AddSoilGeometry(segment, dikeRingID, segmentID, failureMechanismSystemType);
+                }
+
+                waterBoard.Segments.Add(segment);
+            }
+        }
+
+        /// <summary>
+        /// Adds the soil profiles.
+        /// </summary>
+        /// <param name="segment">The segment.</param>
+        /// <param name="dikeRingID">The dike ring identifier.</param>
+        /// <param name="segmentID">The segment identifier.</param>
+        /// <param name="failureMechanismSystemType">Type of the failure mechanism system.</param>
+        /// <param name="dike">The dike.</param>
+        private void AddSoilProfiles(Segment segment, string dikeRingID, string segmentID, FailureMechanismSystemType failureMechanismSystemType, Dike dike)
+        {
+            var profile1DIdListForSegment = importer.GetProfile1DIdListForSegment(dikeRingID, segmentID, failureMechanismSystemType);
+
+            foreach (var soilProfile1DId in profile1DIdListForSegment)
+            {
+                var numberFormatInfo = new NumberFormatInfo { NumberDecimalSeparator = "." };
+
+                // get soil profile
+                var soilProfile1DDetails = importer.GetSegmentProfile1DDetails(dikeRingID, segmentID, soilProfile1DId, failureMechanismSystemType);
+                var soilProfile1D = dike.SoilProfiles.FirstOrDefault(x => x.Name.Equals(soilProfile1DId));
+
+                double probability = 0;
+                foreach (var nameValueparameter in soilProfile1DDetails)
+                {
+                    if (nameValueparameter.ParameterName.Equals("Probability"))
+                        probability = Convert.ToDouble(nameValueparameter.ParameterValue, numberFormatInfo);
+                }
+                segment.AddSoilProfileProbability(soilProfile1D, probability, failureMechanismSystemType);
+            }
+        }
+
+        /// <summary>
+        /// Adds the soil geometry.
+        /// </summary>
+        /// <param name="segment">The segment.</param>
+        /// <param name="dikeRingID">The dike ring identifier.</param>
+        /// <param name="segmentID">The segment identifier.</param>
+        /// <param name="failureMechanismSystemType">Type of the failure mechanism system.</param>
+        private void AddSoilGeometry(Segment segment, string dikeRingID, string segmentID, FailureMechanismSystemType failureMechanismSystemType)
+        {
+            var profile2DIdListForSegment = importer.GetProfile2DIdListForSegment(dikeRingID, segmentID, failureMechanismSystemType);
+            foreach (string soilGeometry2DName in profile2DIdListForSegment)
+            {
+                var numberFormatInfo = new NumberFormatInfo { NumberDecimalSeparator = "." };
+                var soilProfile2DDetails = importer.GetSegmentProfile2DDetails(dikeRingID, segmentID, soilGeometry2DName, failureMechanismSystemType);
+                double probability = 0.0;
+                foreach (var nameValueparameter in soilProfile2DDetails)
+                {
+                    if (nameValueparameter.ParameterName.Equals("Probability"))
+                        probability = Convert.ToDouble(nameValueparameter.ParameterValue, numberFormatInfo);
+                }
+                segment.AddSoilGeometry2DProbability(soilGeometry2DName, probability, failureMechanismSystemType);
+            }
+        }
+
+        /// <summary>
+        /// Imports the soil profiles1 d.
+        /// </summary>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="dike">The dike.</param>
+        private void ImportSoilProfiles1D(string dikeRingId, Dike dike)
+        {
+            var soilProfile1DIdList = importer.GetSoilProfile1DIdList(dikeRingId);
+            foreach (var soilProfile1DId in soilProfile1DIdList)
+            {
+                dike.SoilProfiles.Add(ImportProfile(soilProfile1DId, dikeRingId, dike));
+            }
+        }
+
+        /// <summary>
+        /// Imports a profile.
+        /// </summary>
+        /// <param name="soilProfile1DId">The soil profile1 d identifier.</param>
+        /// <param name="dikeRingId">The dike ring identifier.</param>
+        /// <param name="dike">The dike.</param>
+        /// <returns></returns>
+        /// <exception cref="Deltares.Dam.Data.WaterBoardImporterException">
+        /// </exception>
+        private SoilProfile1D ImportProfile(string soilProfile1DId, string dikeRingId, Dike dike)
+        {
+            var soilProfile = new SoilProfile1D { Name = soilProfile1DId };
+            double bottomLevel = 0.0;
+
+            var dpSoilProfile = importer.GetSoilProfile1DDetails(dikeRingId, soilProfile1DId);
+            for (int layerIndex = 0; layerIndex < dpSoilProfile.Layers.Count; layerIndex++)
+            {
+                var layer = dpSoilProfile.Layers[layerIndex];
+                if (layer.SoilName == SoilProfile1D.SoilProfileBottomLevelId)
+                {
+                    // This is a hack to communicate the bottomlevel via a layer
+                    bottomLevel = layer.TopLevel;
+                }
+                else
+                {
+                    int soilIndex = dike.SoilList.GetSoilIndexByName(layer.SoilName);
+                    if (soilIndex < 0)
+                    {
+                        throw new WaterBoardImporterException(String.Format("Soil '{0}' not found in 1d-profile '{1}'",
+                            dpSoilProfile.Layers[layerIndex].SoilName, soilProfile1DId));
+
+                    }
+                    soilProfile.Layers.Add(new SoilLayer1D
+                    {
+                        TopLevel = layer.TopLevel,
+                        Soil = dike.SoilList.Soils[soilIndex]
+                    });
+
+                }
+            }
+            soilProfile.EnsureUniqueLayerIds();
+            soilProfile.BottomLevel = bottomLevel;
+            if (soilProfile.LayerCount > 0)
+            {
+                soilProfile.EnsureLastLayerHasHeight();
+            }
+            else
+            {
+                throw new WaterBoardImporterException(String.Format("Soil 1d-profile '{0}' has no layers", soilProfile.Name));
+            }
+
+            return soilProfile;
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/PolyLine.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/PolyLine.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/PolyLine.cs	(revision 3305)
@@ -0,0 +1,351 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Geometry;
+
+namespace Deltares.Dam.Data
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Text;
+
+    public class PolyLineException : Exception
+    {
+        public PolyLineException(string message)
+            : base(message)
+        {
+        }
+    }
+
+    public class PolyLine<T> where T : GeometryPoint, new()
+    {
+        protected IList<T> points;
+
+        public PolyLine()
+        {
+            this.points = new List<T>();
+        }
+
+        public virtual int Id { get; private set; }
+
+        public virtual string Name { get; set; }
+
+        public virtual IList<T> Points { get { return this.points; } private set { this.points = value; } }
+
+        /// <summary>
+        /// Check if lines are equal
+        /// </summary>
+        /// <param name="other"></param>
+        /// <returns></returns>
+        public virtual bool Equals(PolyLine<T> other)
+        {
+            bool isEqual = (other.Points.Count == this.Points.Count);
+            if (isEqual)
+            {
+                for (int pointIndex = 0; pointIndex < this.Points.Count; pointIndex++)
+                {
+                    isEqual = isEqual && (this.Points[pointIndex].LocationEquals(other.Points[pointIndex]));
+                }
+            }
+            return isEqual;
+        }
+
+        /// <summary>
+        /// Check if line has a minimum of two points
+        /// </summary>
+        /// <returns></returns>
+        public bool Exists()
+        {
+            return (this.Points.Count > 1);
+        }
+
+        /// <summary>
+        /// Check if all the points are in strict ascending X order
+        /// </summary>
+        /// <returns></returns>
+        public bool IsXStrictAscending()
+        {
+            bool isStrictAscending = true;
+            for (int pointIndex = 0; pointIndex < this.Points.Count - 1; pointIndex++)
+            {
+                if (this.Points[pointIndex + 1].X <= this.Points[pointIndex].X)
+                {
+                    isStrictAscending = false;
+                    break;
+                }
+            }
+            return isStrictAscending;
+        }
+
+        /// <summary>
+        /// Check if all the points are in ascending X order
+        /// </summary>
+        /// <returns></returns>
+        public bool IsXAscending()
+        {
+            bool isAscending = true;
+            for (int pointIndex = 0; pointIndex < this.Points.Count - 1; pointIndex++)
+            {
+                if (this.Points[pointIndex + 1].X < this.Points[pointIndex].X)
+                {
+                    isAscending = false;
+                    break;
+                }
+            }
+            return isAscending;
+        }
+
+        /// <summary>
+        /// Gets point at X if present within tolerance or null if not present.
+        /// </summary>
+        /// <returns></returns>
+        public T GetPointAtX(double X, double tolerance)
+        {
+            return (from T point in this.points
+                    where Math.Abs(point.X - X) < tolerance
+                    select point).FirstOrDefault();
+        }
+
+        private T InsertPointAtX(double X)
+        {
+            T newPoint = new T();
+            newPoint.X = X;
+            try
+            {
+                T pointAfter = (from T point in this.points
+                                where point.X > X
+                                select point).First();
+
+                this.points.Insert(this.points.IndexOf(pointAfter), newPoint);
+            }
+            catch
+            {
+                this.points.Add(newPoint);
+            }
+            return newPoint;
+        }
+
+        /// <summary>
+        /// Gets point at X if present within tolerance; creates one there if not present.
+        /// </summary>
+        /// <returns></returns>
+        public T EnsurePointAtX(double X, double tolerance)
+        {
+            T point = GetPointAtX(X, tolerance);
+            if (point == null)
+            {
+                point = InsertPointAtX(X);
+            }
+            return point;
+        }
+
+        /// <summary>
+        /// If IsXStrictAscending then return the interpolated value for any X-value 
+        /// </summary>
+        /// <param name="X"></param>
+        /// <returns></returns>
+        public double YFromX(double X)
+        {
+            return YZFromX(X, PointType.XY);
+        }
+
+        public double ZFromX(double X)
+        {
+            return YZFromX(X, PointType.XZ);
+        }
+
+        private double YZFromX(double X, PointType pointType)
+        {
+            if (!this.IsXAscending())
+            {
+                throw new PolyLineException("Interpolation only possible with ascending polyline");
+            }
+
+            double valueYZ = 0.0;
+
+            // Less then first X 
+            if (X <= this.Points[0].X)
+            {
+                valueYZ = pointType == PointType.XZ ? this.Points[0].Z : this.Points[0].Y;
+            }
+            // More then last X 
+            else if (X >= this.Points[this.Points.Count - 1].X)
+            {
+                valueYZ = pointType == PointType.XZ ? this.Points[this.Points.Count - 1].Z : this.Points[this.Points.Count - 1].Y;
+            }
+            else
+            {
+                // X is inside boundaries
+                for (int pointIndex = 0; pointIndex < this.Points.Count - 1; pointIndex++)
+                {
+                    if ((X > this.Points[pointIndex].X) && (X <= this.Points[pointIndex + 1].X))
+                    {
+                        // interpolate in this section
+                        double fractionX = (X - this.Points[pointIndex].X) / (this.Points[pointIndex + 1].X - this.Points[pointIndex].X);
+                        if (pointType == PointType.XZ)
+                            valueYZ = this.Points[pointIndex].Z + fractionX * (this.Points[pointIndex + 1].Z - this.Points[pointIndex].Z);
+                        else
+                            valueYZ = this.Points[pointIndex].Y + fractionX * (this.Points[pointIndex + 1].Y - this.Points[pointIndex].Y);
+                        break;
+                    }
+                }
+            }
+            return valueYZ;
+        }
+
+        public IList<double> IntersectionsXAtZ(double z)
+        {
+            var intersectionsX = new List<double>();
+
+            if (this.points.Count >= 2)
+            {  //#bka: Tom is dit geen circular reference? Line staat PLLinesCreator! Die dit weer roept!?
+                var lineAtZ = new Deltares.Geometry.Line { BeginPoint = new GeometryPoint(this.points.First().X, 0, z), EndPoint = new GeometryPoint(this.points.Last().X, 0, z) };
+
+                for (int pointIndex = 0; pointIndex < this.points.Count - 1; pointIndex++)
+                {
+                    var line = new Deltares.Geometry.Line { BeginPoint = this.points[pointIndex], EndPoint = this.points[pointIndex + 1] };
+
+                    GeometryPoint intersectionPoint = new GeometryPoint();
+                    if (LineHelper.GetStrictIntersectionPoint(line, lineAtZ, ref intersectionPoint))
+                    {
+                        intersectionsX.Add(intersectionPoint.X);
+                    }
+                }
+            }
+
+            return intersectionsX;
+        }
+
+        public IList<GeometryPoint> IntersectionPointsXzWithLineXz(Deltares.Geometry.Line line)
+        {
+            var intersectionPointsWithLine = new List<GeometryPoint>();
+
+            if (this.points.Count >= 2)
+            {  
+                for (int pointIndex = 0; pointIndex < this.points.Count - 1; pointIndex++)
+                {
+                    var lineInPoly = new Deltares.Geometry.Line { BeginPoint = this.points[pointIndex], EndPoint = this.points[pointIndex + 1] };
+
+                    GeometryPoint intersectionPoint = new GeometryPoint();
+                    if (LineHelper.GetStrictIntersectionPoint(lineInPoly, line, ref intersectionPoint))
+                    {
+                        intersectionPointsWithLine.Add(intersectionPoint);
+                    }
+                }
+            }
+
+            return intersectionPointsWithLine;
+        }
+
+        public override string ToString()
+        {
+            StringBuilder stringBuilder = new StringBuilder();
+
+            stringBuilder.Append(this.Name);
+            stringBuilder.Append(" [");
+            foreach (T point in this.points)
+            {
+                if (this.points.IndexOf(point) > 0)
+                    stringBuilder.Append(", ");
+                stringBuilder.Append(point.ToString());
+            }
+            stringBuilder.Append("]");
+
+            return stringBuilder.ToString();
+        }
+
+        public virtual void CopyPoints(PolyLine<T> polyLine)
+        {
+            foreach (T point in polyLine.Points)
+            {
+                points.Add(point);
+            }
+        }
+
+        /// <summary>
+        /// Deletes the coinsiding points.
+        /// </summary>
+        /// <param name="tolerance">The tolerance.</param>
+        public virtual void DeleteCoinsidingPoints(double tolerance)
+        {
+            // First build a list of indices of points that have to be removed (from end of list to start)
+            var indicesToDelete = new List<int>();
+            for (int pointIndex = Points.Count - 1; pointIndex > 0; pointIndex--)
+            {
+                for (int i = pointIndex - 1; i >= 0; i--)
+                {
+                    if (Points[pointIndex].LocationEquals(Points[i], tolerance))
+                    {
+                        indicesToDelete.Add(i);
+                    }
+                }
+            }
+
+            // Remove duplicate points beginning from the end
+            for (int index = 0; index < indicesToDelete.Count; index++)
+            {
+                Points.RemoveAt(indicesToDelete[index]);
+            }
+            
+        }
+
+        public virtual void DeleteCoinsidingPoints()
+        {
+            const double defaultTolerance = 0.001;
+            DeleteCoinsidingPoints(defaultTolerance);
+        }
+
+        public virtual double MinZ()
+        {
+            if (this.Points.Count > 1)
+            {
+                double minZ = this.points.First().Z;
+                foreach (T point in this.points)
+                {
+                    minZ = Math.Min(minZ, point.Z);
+                }
+                return minZ;
+            }
+            else
+            {
+                return 0.0;
+            }
+        }
+
+        public virtual double MaxZ()
+        {
+            if (this.Points.Count > 1)
+            {
+                double maxZ = this.points.First().Z;
+                foreach (T point in this.points)
+                {
+                    maxZ = Math.Max(maxZ, point.Z);
+                }
+                return maxZ;
+            }
+            else
+            {
+                return 0.0;
+            }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExporterException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExporterException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvExporterException.cs	(revision 3305)
@@ -0,0 +1,49 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Deltares.Dam.Data
+{
+
+    [Serializable]
+    public class CsvExporterException : Exception
+    {
+        public CsvExporterException()
+        {
+        }
+
+        public CsvExporterException(string message) : base(message)
+        {
+        }
+
+        public CsvExporterException(string message, Exception inner) : base(message, inner)
+        {
+        }
+
+        protected CsvExporterException(
+            SerializationInfo info,
+            StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs	(revision 3305)
@@ -0,0 +1,526 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Geotechnics.Converter;
+using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.SurfaceLines;
+using Deltares.Geotechnics.Validation;
+using Deltares.Standard.Attributes;
+using Deltares.Standard.Data;
+using Deltares.Standard.Language;
+using Deltares.Standard.Logging;
+
+namespace Deltares.Dam.Data
+{
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Linq;
+    using Soilbase;
+    using Standard;
+    using Geotechnics;
+    using System.ComponentModel;
+    using System.Xml.Serialization;
+
+    using Standard.Extensions;
+
+    public class DikeException : Exception
+    {
+        public DikeException(string message)
+            : base(message)
+        {
+        }
+    }
+
+    public class DikeParameterNames
+    {
+        public const string MapForSoilGeometries2D = "MapForSoilGeometries2D";
+    }
+
+    [TrackChanges]
+    public class Dike: IVisibleEnabled, IDisposable
+    {
+        private string description = "";
+        public virtual string MapForSoilGeometries2D { get; set; }
+        private IList<Location> locations;
+
+        private IList<PL1Line> pl1Lines;
+        private bool removeStiFiles;
+        private MStabShearStrength shearmodel;
+        private SoilList soilList;
+        private IList<Gauge> gauges = new List<Gauge>();
+        private IList<GaugePLLine> gaugePLLines = new List<GaugePLLine>();
+        private IList<SoilProfile1D> soilProfiles;
+        private string soilDatabaseName = "";
+        private List<Soil> databaseSoils = new List<Soil>();
+
+        public Dike()
+        {
+            this.Name = "Dijkring";
+            this.MapForSoilGeometries2D = "";
+
+            this.locations = new List<Location>();
+            this.soilProfiles = new List<SoilProfile1D>();
+
+            this.surfaceLines = new DelegatedList<SurfaceLine> { AddMethod = ConvertAddedOldSurfaceLineToNewFormat };
+            SurfaceLines2 = new List<SurfaceLine2>();
+            this.pl1Lines = new List<PL1Line>();
+            this.soilList = new SoilList();
+            removeStiFiles = true;
+        }
+
+        public bool IsRemoveStiFiles { get { return removeStiFiles; } set { removeStiFiles = value; } }
+        public MStabShearStrength ShearStrengthModel { get { return shearmodel; } set { shearmodel = value; } }
+
+        public virtual string Name { get; set; }
+
+        public virtual string SoilDatabaseName
+        {
+            get { return this.soilDatabaseName; }
+            set
+            {
+                this.soilDatabaseName = value;
+                UpdateLocationsDatabaseName();
+            }
+        }
+
+        /// <summary>
+        /// Updates the locations for scenarios.
+        /// </summary>
+        public void UpdateLocationsForScenarios()
+        {
+            foreach (Location location in this.Locations)
+            {
+                foreach (Scenario scenario in location.Scenarios)
+                {
+                    scenario.Location = location;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Updates the name soil database for all locations.
+        /// </summary>
+        public void UpdateLocationsDatabaseName()
+        {
+            foreach (Location location in this.Locations)
+            {
+                location.SoildatabaseName = this.SoilDatabaseName;
+            }
+
+        }
+
+        [XmlIgnore]
+        public SoilbaseDB SoilBaseDB { get; set; }
+
+        /// <summary>
+        /// Gets the locations.
+        /// </summary>
+        /// <value>
+        /// The locations.
+        /// </value>
+        public virtual IList<Location> Locations
+        {
+            get { return this.locations; }
+            private set { this.locations = value; }
+        }
+
+        /// <summary>
+        /// Sorts the locations.
+        /// </summary>
+        public void SortLocations()
+        {
+            this.locations = this.Locations.OrderBy(o => o.Name).ToList();
+        }
+
+        public IList<SurfaceLine2> SurfaceLines2 { get; set; }
+
+        public virtual IList<PL1Line> PL1Lines
+        {
+            get { return this.pl1Lines; }
+            set { this.pl1Lines = value; }
+        }
+
+        public virtual IList<SoilProfile1D> SoilProfiles
+        {
+            get { return this.soilProfiles; }
+            set { this.soilProfiles = value; }
+        }
+
+        public virtual SoilList SoilList
+        {
+            get { return this.soilList; }
+            set { this.soilList = value; }
+        }
+
+        [Browsable(false)]
+        public virtual IList<Gauge> Gauges
+        {
+            get { return this.gauges; }
+            set { this.gauges = value; }
+        }
+
+        [Browsable(false)]
+        public virtual IList<GaugePLLine> GaugePLLines
+        {
+            get { return this.gaugePLLines; }
+            set { this.gaugePLLines = value; }
+        }
+
+        public bool UsesGauges { get { return this.GaugePLLines != null && this.GaugePLLines.Count > 0 && this.Gauges != null; } }
+
+        public virtual List<Scenario> Scenarios
+        {
+            get
+            {
+                var scenarios = new List<Scenario>();
+                foreach (Location location in Locations)
+                {
+                    scenarios.AddRange(location.Scenarios);
+                }
+                return scenarios;
+            }
+        }
+
+        public string Description
+        {
+            get { return description; }
+            set { description = value; }
+        }
+
+        public void Validate()
+        {
+            if (Locations == null || Locations.Count < 1)
+            {
+                throw new DikeException("The dike ring has no locations defined");
+            }
+            foreach (Location location in Locations)
+            {
+                if (location.LocalXZSurfaceLine2 != null)
+                {
+                    var validator = new SurfaceLine2Validator();
+                    var validationResults = validator.ValidateCharacteristicPointsAreOrdered(location.LocalXZSurfaceLine2)
+                            .Concat(validator.ValidateGeometryPointsAreOrdered(location.LocalXZSurfaceLine2)).ToArray();
+                    if (validationResults.Length > 0)
+                    {
+                        throw new SurfaceLineException(validationResults[0].Text);
+                    }
+                }
+            }
+        }
+
+        public void CreateSoilBase()
+        {
+            if (this.SoilDatabaseName == null || !File.Exists(this.SoilDatabaseName))
+            {
+                throw new DikeException(String.Format("The soil database '{0}' cannot be found", this.SoilDatabaseName));
+            }
+            this.SoilBaseDB = SoilbaseDB.Create(this.SoilDatabaseName);
+        }
+
+        /// <summary>
+        /// Read all the soils and their parameters from the database
+        /// </summary>
+        public void FillDataBaseSoilListFromSoilBase()
+        {
+            using (var geoDatabase = new GeoDatabase(this.SoilDatabaseName))
+            {
+                geoDatabase.ReUseSoils = true;
+                var newSoilList = geoDatabase.ReadSoils(soilList.Soils);
+                databaseSoils = newSoilList.Soils;
+            }
+        }
+
+        /// <summary>
+        /// Add 1D-soilprofiles from MGeobase database
+        /// </summary>
+        public void AddSoilProfilesFromDB()
+        {
+            if (this.SoilDatabaseName == null || !File.Exists(this.SoilDatabaseName))
+            {
+                throw new DikeException(String.Format("The MGeobase database '{0}' cannot be found", this.SoilDatabaseName));
+            }
+            if (soilList.Soils.Count == 0)
+            {
+                FillDataBaseSoilListFromSoilBase();
+                soilList.Soils.AddRange(databaseSoils);
+            }
+            if (soilList.Soils.Count == 0)
+            {
+                throw new DikeException(String.Format("The MGeobase database '{0}' does not contain soils and can not be used.", this.SoilDatabaseName));
+            }
+            MGeobaseDB mgbDB = new MGeobaseDB(soilList);
+            IList<SoilProfile1D> addedSoilProfiles = mgbDB.AddSoilProfiles(this.SoilDatabaseName);
+            foreach (var addedSoilProfile in addedSoilProfiles)
+            {
+                soilProfiles.Add(addedSoilProfile);
+            }
+        }
+
+        /// <summary>
+        /// Adapt data so it is consistent
+        /// </summary>
+        public List<LogMessage> MakeDataConsistent()
+        {
+            var errorSoils = TryToMakeSoilDataConsistent();
+            var logMessages = new List<LogMessage>();
+            // Delete all locations without surfaceline
+            logMessages.AddRange(DeleteLocationsWithoutSurfaceLines());
+            // Delete all locations that have profiles (in their segment) which hold soils 
+            // that are not in the soil database and so have no parameters.
+            logMessages.AddRange(DeleteLocationsWithProfilesWithUnknownSoils(errorSoils));
+            return logMessages;
+        }
+
+        /// <summary>
+        /// Tries to make the soil data as read for 1D profiles consistent with the data in the soil database.
+        /// In the end we have a neat soil list with parameters for every soil as read from the database.
+        /// We might have a list with errors (soils that were not to be found in the database so soils for which
+        /// no parameters could be found).
+        /// </summary>
+        /// <returns></returns>
+        private List<Soil> TryToMakeSoilDataConsistent()
+        {
+            var errorSoils = new List<Soil>();
+            // Fill the list of errorSoils with soils that are in the current soillist (as result of importing
+            // 1D profiles) but that are not found in the soil database because that are errors
+            foreach (var soil in soilList.Soils)
+            {
+                var fs = databaseSoils.Find(t => String.Equals(t.Name, soil.Name, StringComparison.CurrentCultureIgnoreCase));
+                if (fs == null)
+                {
+                    errorSoils.Add(soil);
+                }
+            }
+            // Remove the error soils form the list
+            foreach (var errorSoil in errorSoils)
+            {
+                soilList.Soils.Remove(errorSoil);
+            }
+            // Get the parameters for every soil in the now proper soil list from the database. Add soils
+            // that are in the database but not yet in the soil list.
+            foreach (Soil soil in databaseSoils)
+            {
+                Soil existingSoil = this.soilList.GetSoilByName(soil.Name);
+                if (existingSoil == null)
+                {
+                    this.soilList.Soils.Add(soil);
+                }
+                else
+                {
+                    existingSoil.Assign(soil);
+                }
+            }
+            return errorSoils;
+        }
+
+        /// <summary>
+        /// Removes all locations which have profiles that have invalid soils
+        /// </summary>
+        private List<LogMessage> DeleteLocationsWithProfilesWithUnknownSoils(List<Soil> invalidSoils)
+        {
+            var logMessages = new List<LogMessage>();
+            var invalidLocations = new List<Location>();
+            string soilProf;
+            string invSoil;
+            foreach (var location in locations)
+            {
+                bool isInValid;
+                string message = "";
+                if (location.Segment == null)
+                {
+                    isInValid = true;
+                    message = String.Format(LocalizationManager.GetTranslatedText(this.GetType(), "LocationWitNameHasNoSegment"), location.Name);
+                }
+                else
+                {
+                    isInValid = DoesLocationHaveInvalidSoils(invalidSoils, location, out soilProf, out invSoil);
+                    if (isInValid)
+                    {
+                        message = String.Format(LocalizationManager.GetTranslatedText(this.GetType(), "LocationHasProfileWithInvalidSoils"), location.Name, soilProf, invSoil);
+                    }
+                }
+                if (isInValid)
+                {
+                    invalidLocations.Add(location);
+                    logMessages.Add(new LogMessage(LogMessageType.Warning, this, message));
+                }
+            }
+            foreach (var invalidLocation in invalidLocations)
+            {
+
+                locations.Remove(invalidLocation);
+            }
+            return logMessages;
+        }
+
+        /// <summary>
+        /// Checks wether a location (or rather the soilprofiles in the segement of the location) contains invalid soils.
+        /// A soil is hereby considered invalid if it is not found in the database.
+        /// </summary>
+        /// <param name="invalidSoils"></param>
+        /// <param name="location"></param>
+        /// <param name="soilProf"></param>
+        /// <param name="invSoil"></param>
+        /// <returns></returns>
+        private bool DoesLocationHaveInvalidSoils(List<Soil> invalidSoils, Location location, out string soilProf, out string invSoil)
+        {
+            soilProf = " ";
+            invSoil = " ";
+            foreach (var spp in location.Segment.SoilProfileProbabilities)
+            {
+                foreach (var invalidSoil in invalidSoils)
+                {
+                    var fl = spp.SoilProfile.Layers.Find(l => String.Equals(l.Soil.Name, invalidSoil.Name, StringComparison.CurrentCultureIgnoreCase));
+
+                    if (fl != null)
+                    {
+                        soilProf = spp.SoilProfile.Name;
+                        invSoil = invalidSoil.Name;
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Delete all locations without surfacelines
+        /// </summary>
+        private List<LogMessage> DeleteLocationsWithoutSurfaceLines()
+        {
+            var logMessages = new List<LogMessage>();
+
+            //Add all locations with valid surfaceline
+            var newLocations = new List<Location>();
+            newLocations.AddRange(this.Locations.Where(loc => loc.SurfaceLine2 != null));
+
+            // Report which locations are not added because no valid surfaceline is found
+            var deletedLocations = new List<Location>();
+            deletedLocations.AddRange(this.Locations.Where(loc => loc.SurfaceLine2 == null));
+            foreach (var deletedLocation in deletedLocations)
+            {
+                var locationHasNoSurfaceLine = LocalizationManager.GetTranslatedText(this.GetType(), "LocationHasNoSurfaceLine");
+                logMessages.Add(new LogMessage(LogMessageType.Warning, this,
+                    String.Format(locationHasNoSurfaceLine, deletedLocation.Name)));
+            }
+
+            this.Locations = newLocations;
+            return logMessages;
+        }
+
+        public override string ToString()
+        {
+            return this.Name;
+        }
+
+        public Dictionary<string, string> GetParametersAsNameValuePairs()
+        {
+            var nameValuePairs = new Dictionary<string, string>();
+            nameValuePairs.Add(DikeParameterNames.MapForSoilGeometries2D, MapForSoilGeometries2D);
+            return nameValuePairs;
+        }
+
+        public void SetParameterFromNameValuePair(string parameterName, string parameterValue)
+        {
+            if (parameterName.Equals(DikeParameterNames.MapForSoilGeometries2D))
+                this.MapForSoilGeometries2D = parameterValue;
+        }
+
+        public void UpdateLocation(Location location)
+        {
+            location.SoildatabaseName = this.SoilDatabaseName;
+            location.SoilList = this.SoilList;
+            location.MapForSoilGeometries2D = this.MapForSoilGeometries2D;
+
+            location.Gauges.Clear();
+            location.Gauges.AddRange(this.Gauges);
+
+            location.GaugePLLines.Clear();
+            location.GaugePLLines.AddRange(this.GaugePLLines);
+        }
+
+        public bool IsVisible(string property)
+        {
+            return true;
+        }
+
+        public bool IsEnabled(string property)
+        {
+            switch (property)
+            {
+                case "Name": return false;
+                case "SoilList": return false;
+                default: return true;
+            }
+        }
+
+        #region Backwards compatibility
+
+        private IList<SurfaceLine> surfaceLines;
+
+        /// <summary>
+        /// Gets or sets all surface lines instances associated with this dike.
+        /// </summary>
+        /// <remarks>Composite owner of all <see cref="SurfaceLine"/> that are part of the
+        /// application that are associated with this dike.</remarks>
+        [Obsolete("Do not use this member; Only exists for backwards compatibility.", true)]
+        public virtual IList<SurfaceLine> SurfaceLines
+        {
+            get { return surfaceLines; }
+            set { surfaceLines = value; }
+        }
+
+        /// <summary>
+        /// Performs backwards compatibility conversion from old-style surfaceline to new-style
+        /// surfaceline, and ensures that shared references are set correctly.
+        /// </summary>
+        /// <param name="argument">Persisted version of the old-style surfaceline.</param>
+        private void ConvertAddedOldSurfaceLineToNewFormat(SurfaceLine argument)
+        {
+            var surfaceLine2 = new OldSurfaceLineToNewConverter().Convert(argument);
+            SurfaceLines2.Add(surfaceLine2);
+
+            foreach (var location in Locations)
+            {
+                location.SetNewSurfaceLineIfMatchesWithOldPersistedSurfaceLine(surfaceLine2);
+            }
+
+            // Remove old entry; it is no longer required.
+            surfaceLines.Remove(argument);
+            argument.Dispose();
+        }
+
+        #endregion
+
+        public void Dispose()
+        {
+            foreach (var location in Locations)
+            {
+                location.Dispose();
+            }
+            foreach (var surfaceLine2 in SurfaceLines2)
+            {
+                surfaceLine2.Dispose();
+            }
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Specifications/DitchWaterLevelSensorSpecification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Specifications/DitchWaterLevelSensorSpecification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Specifications/DitchWaterLevelSensorSpecification.cs	(revision 3305)
@@ -0,0 +1,46 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Standard.Specifications;
+
+namespace Deltares.Dam.Data.Sensors.Specifications
+{
+    internal class DitchWaterLevelSensorSpecification : PredicateSpecification<Sensor>
+    {
+        private readonly double xDitchDikeSide;
+        private readonly double xDitchPolderSide;
+
+        public DitchWaterLevelSensorSpecification(double xDitchDikeSide, double xDitchPolderSide) :
+            base(s => s.Type == SensorType.PolderLevel)
+        {
+            this.xDitchDikeSide = xDitchDikeSide;
+            this.xDitchPolderSide = xDitchPolderSide;
+        }
+
+        public override bool IsSatisfiedBy(Sensor candidate)
+        {
+            if (base.IsSatisfiedBy(candidate))
+                return true;
+
+            return candidate.RelativeLocation > xDitchDikeSide && candidate.RelativeLocation < xDitchPolderSide;
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/IDataPlugin.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/IDataPlugin.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/IDataPlugin.cs	(revision 3305)
@@ -0,0 +1,133 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Dam.Data.DataPlugins.Configuration;
+using Deltares.Geometry;
+using Deltares.Standard;
+using System.Collections.Generic;
+using Deltares.Standard.Logging;
+
+namespace Deltares.Dam.Data.DataPlugins
+{
+    public struct Info
+    {
+        public string Name;
+        public string Description;
+        public DataSourceSystemType Source;
+    }
+
+    public struct NameValueParameter
+    {
+        public string ParameterName;
+        public string ParameterValue;
+        public DataSourceSystemType Source;
+    }
+
+    public struct DpCharacteristicPoint
+    {
+        public string Id;
+        public double X;
+        public double Y;
+        public double Z;
+    }
+
+    public struct DpLayer
+    {
+        public double TopLevel;
+        public string SoilName;
+    }
+
+    public struct DpSoilProfile
+    {
+        public List<DpLayer> Layers;
+    }
+
+
+    interface IDataPlugin
+    {
+        IEnumerable<DataSource> DataSources { get; }
+
+        IEnumerable<string> MapGeometryIdList { get; }
+
+        Info WaterBoardInfo { get; }
+        
+        string DataFolder { get; }
+        string DamProjectFolder { get; set; }
+        List<LogMessage> ImportLogMessages { get; }
+        DamProjectType DamProjectType { set; }
+
+        void SetDataSources(string dataFolder, IEnumerable<DataSource> dataSources);
+
+        IEnumerable<string> GetDikeRingIdList();
+
+        void ImportDataForDikeRings(IEnumerable<string> dikeRingIds,
+            DamEngine.Data.Standard.Calculation.ProgressDelegate progress);
+
+        Info GetDikeRingInfo(string dikeRingId);
+
+        IEnumerable<NameValueParameter> GetDikeParameters(string dikeRingId);
+
+        IEnumerable<string> GetLocationIdList(string dikeRingId);
+
+        Info GetLocationInfo(string dikeRingId, string locationId);
+
+        IEnumerable<NameValueParameter> GetLocationDetails(string dikeRingId, string locationId);
+
+        IEnumerable<string> GetSurfaceLineIdList(string dikeRingId);
+
+        IList<GeometryPoint> GetSurfaceLinePoints(string dikeRingId, string surfaceLineId);
+
+        IEnumerable<DpCharacteristicPoint> GetSurfaceLineCharacteristicPoints(string dikeRingId, string surfaceLineId);
+
+        IEnumerable<string> GetSegmentIdList(string dikeRingId);
+
+        IEnumerable<string> GetProfile1DIdListForSegment(string dikeRingId, string segmentId, FailureMechanismSystemType segmentFailureMechanismType);
+
+        IEnumerable<string> GetProfile2DIdListForSegment(string dikeRingId, string segmentId, FailureMechanismSystemType segmentFailureMechanismType);
+
+        IEnumerable<NameValueParameter> GetSegmentProfile1DDetails(string dikeRingId, string segmentId, string profileId, FailureMechanismSystemType failureMechanismSystemType);
+
+        IEnumerable<NameValueParameter> GetSegmentProfile2DDetails(string dikeRingId, string segmentId, string profileId, FailureMechanismSystemType failureMechanismSystemType);
+
+        IEnumerable<string> GetSoilProfile1DIdList(string dikeRingId);
+
+        DpSoilProfile GetSoilProfile1DDetails(string dikeRingId, string soilProfile1DId);
+
+        IEnumerable<string> GetSoilProfile2DIdList(string dikeRingId);
+
+        string GetSoilProfile2DDetails(string dikeRingId, string soilProfile2DId);
+
+        IEnumerable<string> GetSoilIdList(string dikeRingId);
+
+        IEnumerable<NameValueParameter> GetSoilAquiferValues(string dikeRingId);
+
+        IEnumerable<NameValueParameter> GetSoilDetails(string dikeRingId, string soilId);
+
+        string GetMapGeometry(string mapGeometryId);
+
+        IEnumerable<NameValueParameter> GetMapGeometryAttributes(string mapGeometryId);
+        
+        IEnumerable<string> GetScenarioList(string dikeRingId, string name);
+        IEnumerable<NameValueParameter> GetScenarioDetails(string dikeRingId, string name, string scenarioId);
+
+        void DisposeImportedItem(string dikeRingId);
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlOutputFromDamUi.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlOutputFromDamUi.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlOutputFromDamUi.cs	(revision 3305)
@@ -0,0 +1,123 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using Deltares.DamEngine.Io.XmlOutput;
+
+namespace Deltares.Dam.Data.DamEngineIo
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class FillXmlOutputFromDamUi
+    {
+        /// <summary>
+        /// Class to fill the output xml based on the results in DamProjectData
+        /// </summary>
+        public static Output CreateOutput(DamProjectData damProjectData)
+        {
+            var output = new Output();
+            output.Results = new OutputResults();
+            output.Results.CalculationMessages = new Message[damProjectData.CalculationMessages.Count];
+            TransferOutputCalculationMessages(damProjectData.CalculationMessages, output.Results);
+            if (damProjectData.OutputTimeSerieCollection != null)
+            {
+                output.Results.OperationalOutputTimeSeries = new DamEngine.Io.XmlOutput.TimeSerie[damProjectData.OutputTimeSerieCollection.Series.Count];
+                TransferOutputTimeSeries(damProjectData.OutputTimeSerieCollection, output.Results.OperationalOutputTimeSeries);
+            }
+            return output;
+        }
+
+        private static void TransferOutputTimeSeries(TimeSerieCollection outputTimeSerieCollection, DamEngine.Io.XmlOutput.TimeSerie[] outputTimeSeries)
+        {
+            int timeSerieIndex = 0;
+            foreach (var damTimeSerie in outputTimeSerieCollection.Series)
+            {
+                var outputTimeSerie = new DamEngine.Io.XmlOutput.TimeSerie();
+                outputTimeSerie.Entries = new TimeSerieEntries();
+                outputTimeSerie.Entries.TimeSerieEntry = new TimeSerieEntriesTimeSerieEntry[damTimeSerie.Entries.Count];
+                outputTimeSerie.TimeStep = new TimeSerieTimeStep();
+                outputTimeSerie.LocationId = damTimeSerie.LocationId;
+                outputTimeSerie.ParameterId = damTimeSerie.ParameterId;
+                outputTimeSerie.ForecastDateTime = damTimeSerie.ForecastDateTime;
+                outputTimeSerie.Type = damTimeSerie.Type;
+                outputTimeSerie.StartDateTime = damTimeSerie.StartDateTime;
+                outputTimeSerie.EndDateTime = damTimeSerie.EndDateTime;
+                outputTimeSerie.MissVal = damTimeSerie.MissVal;
+                outputTimeSerie.LongName = damTimeSerie.LongName;
+                outputTimeSerie.StationName = damTimeSerie.StationName;
+                outputTimeSerie.Units = damTimeSerie.Units;
+                outputTimeSerie.SourceOrganisation = damTimeSerie.SourceOrganisation;
+                outputTimeSerie.SourceSystem = damTimeSerie.SourceSystem;
+                outputTimeSerie.FileDescription = damTimeSerie.FileDescription;
+                outputTimeSerie.Region = damTimeSerie.Region;
+                outputTimeSerie.TimeStep.Multiplier = damTimeSerie.TimeStep.Multiplier;
+                outputTimeSerie.TimeStep.Divider = damTimeSerie.TimeStep.Divider;
+                outputTimeSerie.TimeStep.MultiplierSpecified1 = damTimeSerie.TimeStep.MultiplierSpecified;
+                outputTimeSerie.TimeStep.DividerSpecified1 = damTimeSerie.TimeStep.DividerSpecified;
+                outputTimeSerie.TimeStep.TimeStepUnit = ConversionHelper.ConvertToInputTimeStepUnit(damTimeSerie.TimeStep.Unit);
+                int timeSerieEntryIndex = 0;
+                foreach (var timestepEntry in damTimeSerie.Entries)
+                {
+                    TimeSerieEntriesTimeSerieEntryStochastValue stochastValue = null;
+                    if (timestepEntry.StochastValue != null)
+                    {
+                        stochastValue = new TimeSerieEntriesTimeSerieEntryStochastValue()
+                        {
+                            Distribution = timestepEntry.StochastValue.Distribution,
+                            Mean = timestepEntry.StochastValue.Mean,
+                            StandardDeviation = timestepEntry.StochastValue.StandardDeviation
+                        };
+                    }
+                    TimeSerieEntriesTimeSerieEntry timeStep = new TimeSerieEntriesTimeSerieEntry()
+                    {
+                        DateTime = timestepEntry.DateTime,
+                        Value = timestepEntry.Value,
+                        BasisFileNameWMF = timestepEntry.BasisFileName,
+                        Flagnietechtgebruikt = timestepEntry.Flag,
+                        RelativeCalculationPathName = timestepEntry.RelativeCalculationPathName,
+                        StochastValue = stochastValue
+                    };
+                    outputTimeSerie.Entries.TimeSerieEntry[timeSerieEntryIndex] = timeStep;
+                    timeSerieEntryIndex++;
+                }
+                outputTimeSeries[timeSerieIndex] = outputTimeSerie;
+                timeSerieIndex++;
+            }
+        }
+
+        private static void TransferOutputCalculationMessages(List<Standard.Logging.LogMessage> calculationMessages, OutputResults outputResults)
+        {
+            //var calculationMessages = damProjectData.CalculationMessages;
+            if (calculationMessages != null)
+            {
+                outputResults.CalculationMessages = new Message[calculationMessages.Count];
+                for (int i = 0; i < calculationMessages.Count; i++)
+                {
+                    var message = new Message();
+                    message.MessageType = ConversionHelper.ConvertToInputMessageType(calculationMessages[i].MessageType);
+                    message.Message1 = calculationMessages[i].Message;
+                    outputResults.CalculationMessages[i] = message;
+                }
+            }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj	(revision 3305)
@@ -0,0 +1,473 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F1CD9620-15CF-41F8-AF70-5AE004A50F60}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Deltares.Dam.Data</RootNamespace>
+    <AssemblyName>Deltares.Dam.Data</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+    <CodeContractsAssemblyMode>0</CodeContractsAssemblyMode>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+    <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
+    <CodeContractsEnableRuntimeChecking>False</CodeContractsEnableRuntimeChecking>
+    <CodeContractsRuntimeOnlyPublicSurface>False</CodeContractsRuntimeOnlyPublicSurface>
+    <CodeContractsRuntimeThrowOnFailure>True</CodeContractsRuntimeThrowOnFailure>
+    <CodeContractsRuntimeCallSiteRequires>False</CodeContractsRuntimeCallSiteRequires>
+    <CodeContractsRuntimeSkipQuantifiers>False</CodeContractsRuntimeSkipQuantifiers>
+    <CodeContractsRunCodeAnalysis>False</CodeContractsRunCodeAnalysis>
+    <CodeContractsNonNullObligations>True</CodeContractsNonNullObligations>
+    <CodeContractsBoundsObligations>True</CodeContractsBoundsObligations>
+    <CodeContractsArithmeticObligations>False</CodeContractsArithmeticObligations>
+    <CodeContractsEnumObligations>False</CodeContractsEnumObligations>
+    <CodeContractsRedundantAssumptions>False</CodeContractsRedundantAssumptions>
+    <CodeContractsMissingPublicRequiresAsWarnings>True</CodeContractsMissingPublicRequiresAsWarnings>
+    <CodeContractsInferRequires>True</CodeContractsInferRequires>
+    <CodeContractsInferEnsures>False</CodeContractsInferEnsures>
+    <CodeContractsInferObjectInvariants>False</CodeContractsInferObjectInvariants>
+    <CodeContractsSuggestAssumptions>False</CodeContractsSuggestAssumptions>
+    <CodeContractsSuggestRequires>True</CodeContractsSuggestRequires>
+    <CodeContractsSuggestObjectInvariants>False</CodeContractsSuggestObjectInvariants>
+    <CodeContractsRunInBackground>True</CodeContractsRunInBackground>
+    <CodeContractsShowSquigglies>True</CodeContractsShowSquigglies>
+    <CodeContractsUseBaseLine>False</CodeContractsUseBaseLine>
+    <CodeContractsEmitXMLDocs>False</CodeContractsEmitXMLDocs>
+    <CodeContractsCustomRewriterAssembly />
+    <CodeContractsCustomRewriterClass />
+    <CodeContractsLibPaths />
+    <CodeContractsExtraRewriteOptions />
+    <CodeContractsExtraAnalysisOptions />
+    <CodeContractsSQLServerOption />
+    <CodeContractsBaseLineFile />
+    <CodeContractsCacheAnalysisResults>True</CodeContractsCacheAnalysisResults>
+    <CodeContractsFailBuildOnWarnings>False</CodeContractsFailBuildOnWarnings>
+    <CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
+    <CodeContractsReferenceAssembly>DoNotBuild</CodeContractsReferenceAssembly>
+    <CodeContractsAnalysisWarningLevel>0</CodeContractsAnalysisWarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>..\..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+    <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Deltares.Authorization, Version=7.21.5457.26349, Culture=neutral, PublicKeyToken=379d563066715186, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\Authorization\x86\Deltares.Authorization.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.DamEngine.Data, Version=18.1.0.1468, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\DamEngine\Deltares.DamEngine.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.DamEngine.Io, Version=18.1.0.1468, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\DamEngine\Deltares.DamEngine.Io.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Geographic">
+      <HintPath>..\..\..\lib\DSL-Geographic\Deltares.Geographic.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Geometry">
+      <HintPath>..\..\..\lib\DSL-Geo\Deltares.Geometry.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Geotechnics">
+      <HintPath>..\..\..\lib\DSL-Geo\Deltares.Geotechnics.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Geotechnics.IO, Version=16.1.0.0, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\DSL-GeoIO\Deltares.Geotechnics.IO.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Mathematics, Version=1.0.0.0, Culture=neutral, PublicKeyToken=582f89ef4e0ea16b, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\DSL-Core\Deltares.Mathematics.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Soilbase, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\DSL-GeoIO\Deltares.Soilbase.dll</HintPath>
+    </Reference>
+    <Reference Include="Deltares.Standard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31fe100197c68040, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
+    </Reference>
+    <Reference Include="DotSpatial.Data, Version=1.8.0.0, Culture=neutral, PublicKeyToken=c29dbf30e059ca9d, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\DotSpatial\DotSpatial.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="DotSpatial.Projections, Version=1.8.0.0, Culture=neutral, PublicKeyToken=272632bddd08a38b, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\DotSpatial\DotSpatial.Projections.dll</HintPath>
+    </Reference>
+    <Reference Include="DotSpatial.Topology, Version=1.8.0.0, Culture=neutral, PublicKeyToken=a66b5e9434ca3671, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\DotSpatial\DotSpatial.Topology.dll</HintPath>
+    </Reference>
+    <Reference Include="GeoAPI, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\GeoAPI.1.7.1.1\lib\net403-client\GeoAPI.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="LumenWorks.Framework.IO, Version=3.8.0.0, Culture=neutral, PublicKeyToken=5ad3ea2f85776344, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\LumenWorks.Framework.IO.3.8.0\lib\net20\LumenWorks.Framework.IO.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NetTopologySuite, Version=1.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.1.13.1\lib\net403-client\NetTopologySuite.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="PowerCollections, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.1.13.1\lib\net403-client\PowerCollections.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.configuration" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ApplicationLogger.cs" />
+    <Compile Include="Assemblers\CalculationParametersAssembler.cs" />
+    <Compile Include="Assemblers\TimeSeriesAssembler.cs" />
+    <Compile Include="BackgroundRepositoryFeature.cs" />
+    <Compile Include="CalculationParameters.cs" />
+    <Compile Include="CsvExportSurfaceLineIdentifiers.cs" />
+    <Compile Include="CsvImporters\CsvImporter.cs" />
+    <Compile Include="CsvImporters\CsvImporterCharacteristicPoints.cs" />
+    <Compile Include="CsvImporters\csvImporterException.cs" />
+    <Compile Include="CsvImporters\CsvImporterHelper.cs" />
+    <Compile Include="CsvImporters\CsvImporterLocations.cs" />
+    <Compile Include="CsvImporters\CsvImporterScenarios.cs" />
+    <Compile Include="CsvImporters\CsvImporterSegments.cs" />
+    <Compile Include="CsvImporters\CsvImporterSoilProfiles.cs" />
+    <Compile Include="CsvImporters\CsvImporterSurfaceLines.cs" />
+    <Compile Include="CsvImporters\SurfaceLineCsvColumnNames.cs" />
+    <Compile Include="DamEngineIo\ConversionHelper.cs" />
+    <Compile Include="DamEngineIo\FillDamUiFromXmlHelper.cs" />
+    <Compile Include="DamEngineIo\FillDamUiFromXmlInput.cs" />
+    <Compile Include="DamEngineIo\FillDamUiFromXmlOutput.cs" />
+    <Compile Include="DamEngineIo\FillXmlInputFromDamUi.cs" />
+    <Compile Include="DamEngineIo\FillXmlOutputFromDamUi.cs" />
+    <Compile Include="DAMEnumerations.cs" />
+    <Compile Include="DamGlobalConstants.cs" />
+    <Compile Include="DamHelperFunctions.cs" />
+    <Compile Include="IAssignable.cs" />
+    <Compile Include="IO\DamProjectVersionXmlHandler.cs" />
+    <Compile Include="IO\FailureMechanismeParamatersMStabXmlHandler.cs" />
+    <Compile Include="IO\VersionInfo.cs" />
+    <Compile Include="License\DamLicense.cs" />
+    <Compile Include="Sensors\SensorData.cs" />
+    <Compile Include="Sensors\SensorImportFromExcelSheet.cs" />
+    <Compile Include="Sensors\Specifications\PolderLevelSensorSpecification.cs" />
+    <Compile Include="WaterBoardPostProcessRelativeProfiles.cs" />
+    <Compile Include="DtoAssembler\Assemblers\FileIdentificationAssembler.cs" />
+    <Compile Include="DtoAssembler\Assemblers\InputOutputDocumentAssembler.cs" />
+    <Compile Include="DtoAssembler\CollectionRequirementsNotSatisfiedException.cs" />
+    <Compile Include="DtoAssembler\Common.cs" />
+    <Compile Include="DtoAssembler\DtoAssembler.cs" />
+    <Compile Include="DtoAssembler\DtoAssemblerConversionException.cs" />
+    <Compile Include="DtoAssembler\DtoAssemblerException.cs" />
+    <Compile Include="DtoAssembler\DtoCollectionAssembler.cs" />
+    <Compile Include="DtoAssembler\DtoDocumentAssembler.cs" />
+    <Compile Include="DtoAssembler\DtoHelperServices.cs" />
+    <Compile Include="DtoAssembler\DtoPropertyAttributeMap.cs" />
+    <Compile Include="DtoAssembler\DtoPropertyAttributeMapping.cs" />
+    <Compile Include="DtoAssembler\DtoPropertyMapException.cs" />
+    <Compile Include="DtoAssembler\FileIdentification.cs" />
+    <Compile Include="DtoAssembler\IDtoAssembler.cs" />
+    <Compile Include="DtoAssembler\MissingRequiredFieldValueException.cs" />
+    <Compile Include="DtoAssembler\Serialization.cs" />
+    <Compile Include="ICalculator.cs" />
+    <Compile Include="Importers\LocationShapeFileImporter.cs" />
+    <Compile Include="Importers\LineAttributeImporter.cs" />
+    <Compile Include="Importers\LocationAttributeMapping.cs" />
+    <Compile Include="Importers\CsvColumnNames.cs" />
+    <Compile Include="Importers\LocationImportHelper.cs" />
+    <Compile Include="Importers\LocationShapeFileAttributeMap.cs" />
+    <Compile Include="IO\CombineImportedData.cs" />
+    <Compile Include="JobResultInterpreter.cs" />
+    <Compile Include="LogHelper.cs" />
+    <Compile Include="CompositeJob.cs" />
+    <Compile Include="IO\AbstractExporter.cs" />
+    <Compile Include="IO\IExport.cs" />
+    <Compile Include="IO\ShapeFileExporter.cs" />
+    <Compile Include="IO\TextFileExporter.cs" />
+    <Compile Include="PolyLine.cs" />
+    <Compile Include="DamJob.cs" />
+    <Compile Include="DamProjectCalculationSpecification.cs" />
+    <Compile Include="DataPlugins\Configuration\DataAttribute.cs" />
+    <Compile Include="DataPlugins\DataPluginImporter.cs" />
+    <Compile Include="DataPlugins\Configuration\DataSource.cs" />
+    <Compile Include="DataPlugins\Configuration\DataSourceContainer.cs" />
+    <Compile Include="DataPlugins\IDataPlugin.cs" />
+    <Compile Include="Importers\LocationPropertyImporter.cs" />
+    <Compile Include="Importers\LocationCharacteristicPointImporter.cs" />
+    <Compile Include="DikeJob.cs" />
+    <Compile Include="FailureMechanismeParamatersMStab.cs" />
+    <Compile Include="Geometry2DBoundaryLine.cs" />
+    <Compile Include="Geometry2DData.cs" />
+    <Compile Include="LocationJob.cs" />
+    <Compile Include="LocationResult.cs" />
+    <Compile Include="CsvExportCharacteristicPoints.cs" />
+    <Compile Include="CsvExportSurfaceLine.cs" />
+    <Compile Include="DamProject.cs" />
+    <Compile Include="DamProjectData.cs" />
+    <Compile Include="Importers\ModelFactorCsvIdentifiers.cs" />
+    <Compile Include="ModelFactors.cs" />
+    <Compile Include="PipingResults.cs" />
+    <Compile Include="Geometry2DSectionParameters.cs" />
+    <Compile Include="DikeCoordinateSystemConverter.cs" />
+    <Compile Include="GenericLine.cs" />
+    <Compile Include="PL1Line.cs" />
+    <Compile Include="Sensors\Group.cs" />
+    <Compile Include="Sensors\IPLLineCreator.cs" />
+    <Compile Include="Sensors\SensorTimeSeriesProcessorException.cs" />
+    <Compile Include="Sensors\Specifications\PiezometricHeadSensorSpecification.cs" />
+    <Compile Include="Sensors\PLLineConstructor.cs" />
+    <Compile Include="Sensors\Specifications\DitchWaterLevelSensorSpecification.cs" />
+    <Compile Include="Sensors\Sensor.cs" />
+    <Compile Include="Sensors\SensorCalculationArgument.cs" />
+    <Compile Include="Sensors\SensorFactory.cs" />
+    <Compile Include="Sensors\SensorLocation.cs" />
+    <Compile Include="Sensors\SensorRepository.cs" />
+    <Compile Include="Sensors\Specifications\UseLocationAsDataSource.cs" />
+    <Compile Include="Sensors\Specifications\WaterLevelSensorSpecification.cs" />
+    <Compile Include="Specifications\AndSpecification.cs" />
+    <Compile Include="Specifications\CompositeSpecification.cs" />
+    <Compile Include="Specifications\Extensions\SpecificationExtensions.cs" />
+    <Compile Include="Specifications\GreaterThanOrEqualToSpecification.cs" />
+    <Compile Include="Specifications\InBetweenRangeSpecification.cs" />
+    <Compile Include="Specifications\InRangeSpecification.cs" />
+    <Compile Include="Specifications\ISpecification.cs" />
+    <Compile Include="Specifications\LessThanOrEqualToSpecification.cs" />
+    <Compile Include="Specifications\MaximumAttribute.cs" />
+    <Compile Include="Specifications\MinimumAttribute.cs" />
+    <Compile Include="Specifications\NotEmptySpecification.cs" />
+    <Compile Include="Specifications\NotEqualSpecification.cs" />
+    <Compile Include="Specifications\NotNullSpecification.cs" />
+    <Compile Include="Specifications\NotSpecification.cs" />
+    <Compile Include="Specifications\OrSpecification.cs" />
+    <Compile Include="Specifications\ParameterizedSpecification.cs" />
+    <Compile Include="Specifications\PredicateSpecification.cs" />
+    <Compile Include="Specifications\SpecificationBase.cs" />
+    <Compile Include="Specifications\SpecificationBaseAttribute.cs" />
+    <Compile Include="Specifications\ValidationException.cs" />
+    <Compile Include="Specifications\ValidationResult.cs" />
+    <Compile Include="Specifications\Validator.cs" />
+    <Compile Include="Specifications\ValueBoundSpecification.cs" />
+    <Compile Include="TimeSeriesProcessor.cs" />
+    <Compile Include="SoilGeometry.cs" />
+    <Compile Include="SoilGeometry2DName.cs" />
+    <Compile Include="Stochast.cs" />
+    <Compile Include="GaugePLLine.cs" />
+    <Compile Include="CsvExportColumnAttribute.cs" />
+    <Compile Include="CsvExportData.cs" />
+    <Compile Include="CsvExporterException.cs" />
+    <Compile Include="Gauge.cs" />
+    <Compile Include="StabilityTimeSerieEntry.cs" />
+    <Compile Include="FileWriterUtil.cs" />
+    <Compile Include="MStabParameters.cs" />
+    <Compile Include="NonExistentLocationException.cs" />
+    <Compile Include="CsvExporter.cs" />
+    <Compile Include="Scenario.cs" />
+    <Compile Include="Importers\ImportException.cs" />
+    <Compile Include="ParameterMissingException.cs" />
+    <Compile Include="DamFailureMechanismeCalculationSpecification.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="CsvParser.cs" />
+    <Compile Include="CsvParserException.cs" />
+    <Compile Include="EntityAlreadyExistException.cs" />
+    <Compile Include="EntityFactoryException.cs" />
+    <Compile Include="Importers\ICsvImporter.cs" />
+    <Compile Include="ImportDirector.cs" />
+    <Compile Include="EntityFactory.cs" />
+    <Compile Include="Importers\ImportFilesNotValidatedException.cs" />
+    <Compile Include="ObjectMaterializer.cs" />
+    <Compile Include="PLLine.cs" />
+    <Compile Include="Dike.cs" />
+    <Compile Include="Location.cs" />
+    <Compile Include="PointNotExistsException.cs" />
+    <Compile Include="PLLines.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+    <Compile Include="RdLatLngConverter.cs" />
+    <Compile Include="RequiredEntityNotExistException.cs" />
+    <Compile Include="RequiredImportFileNotExistException.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Segment.cs" />
+    <Compile Include="ThrowHelper.cs" />
+    <Compile Include="TimeSerie.cs" />
+    <Compile Include="TimeSerieCollection.cs" />
+    <Compile Include="TimeSerieEntry.cs" />
+    <Compile Include="TimeSerieSchemaValidationException.cs" />
+    <Compile Include="TimeStep.cs" />
+    <Compile Include="UISupport\ConfigurationManager.cs" />
+    <Compile Include="UISupport\DAMNewProjectData.cs" />
+    <Compile Include="UpliftFactorToBetaCalculator.cs" />
+    <Compile Include="WaterBoard.cs" />
+    <Compile Include="WaterBoardImporter.cs" />
+    <Compile Include="WaterBoardJobImporter.cs" />
+    <Compile Include="WaterBoardJob.cs" />
+    <Compile Include="Xsd\SoilProfileDataSet.cs">
+      <DependentUpon>SoilProfileDataSet.xsd</DependentUpon>
+    </Compile>
+    <Compile Include="Xsd\SoilProfileDataSet.Designer.cs">
+      <DependentUpon>SoilProfileDataSet.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Xsd\SoilProfileDataSet1.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>SoilProfileDataSet.xsd</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\Copying.GPL.licenseheader">
+      <Link>Copying.GPL.licenseheader</Link>
+    </None>
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="packages.config" />
+    <None Include="Properties\AssemblyInfo.cs.svn" />
+    <EmbeddedResource Include="DtoAssembler\Xsd\FileIdentificationDefinition.xsd">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <EmbeddedResource Include="Xsd\CalculationParametersDefinition.xsd" />
+    <EmbeddedResource Include="Xsd\pi_sharedtypes.xsd" />
+    <EmbeddedResource Include="Xsd\pi_timeseries.xsd" />
+    <EmbeddedResource Include="Xsd\DamMStabDocDefinition.xsd" />
+    <EmbeddedResource Include="Xsd\DamMStabInputDefinition.xsd" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\..\..\lib\DamEngine\DGeoStability.exe">
+      <Link>DGeoStability.exe</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\lib\DamEngine\DGSMStabDAM.dll">
+      <Link>DGSMStabDAM.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\lib\DamEngine\MPipingCalc2.dll">
+      <Link>MPipingCalc2.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Packages.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <EmbeddedResource Include="Xsd\ProfileDefinition.xsd">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <None Include="Xsd\SoilbaseDataSet.xsc">
+      <DependentUpon>SoilbaseDataSet.xsd</DependentUpon>
+    </None>
+    <EmbeddedResource Include="Xsd\SoilbaseDataSet.xsd">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <None Include="Xsd\SoilbaseDataSet.xss">
+      <DependentUpon>SoilbaseDataSet.xsd</DependentUpon>
+    </None>
+    <None Include="Xsd\SoilProfileDataSet.xsc">
+      <DependentUpon>SoilProfileDataSet.xsd</DependentUpon>
+    </None>
+    <None Include="Xsd\SoilProfileDataSet.xsd">
+      <Generator>MSDataSetGenerator</Generator>
+      <LastGenOutput>SoilProfileDataSet1.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Xsd\SoilProfileDataSet.xss">
+      <DependentUpon>SoilProfileDataSet.xsd</DependentUpon>
+    </None>
+    <EmbeddedResource Include="Translations.xml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Deltares.Maps\Deltares.Maps.csproj">
+      <Project>{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}</Project>
+      <Name>Deltares.Maps</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="DtoAssembler\Properties\" />
+    <Folder Include="MetaInfo\" />
+  </ItemGroup>
+  <Import Project="$(ProjectDir)..\build\Deltares.DamClientsLibrary.Version.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/NotEmptySpecification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/NotEmptySpecification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/NotEmptySpecification.cs	(revision 3305)
@@ -0,0 +1,39 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Standard.Specifications
+{
+    /// <summary>
+    /// Checks if the candidate is not empty null or contians only whitespace 
+    /// </summary>
+    public class NotEmptySpecification : SpecificationBase<string>
+    {
+        public NotEmptySpecification()
+        {
+            Name = "Not empty specification";
+            Description = "The candidate should have a value. It is not allowed to be null, empty or a string that contains white spaces only";
+        }
+        public override bool IsSatisfiedBy(string candidate)
+        {
+            return !string.IsNullOrWhiteSpace(candidate);
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/csvImporterException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/csvImporterException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/csvImporterException.cs	(revision 3305)
@@ -0,0 +1,35 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+
+namespace Deltares.Dam.Data.CsvImporters
+{
+    /// <summary>
+    /// Exception class for CsvImporter
+    /// </summary>
+    public class CsvImporterException : Exception
+    {
+        public CsvImporterException(string message): base(message)
+        {
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IAssignable.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IAssignable.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IAssignable.cs	(revision 3305)
@@ -0,0 +1,31 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Runtime.InteropServices;
+
+namespace Deltares.Dam.Data
+{
+    [ComVisible(true)]
+    public interface IAssignable<T>
+    {
+        void Assign(T t);
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/packages.config
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/packages.config	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/packages.config	(revision 3305)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) Stichting Deltares 2019. All rights reserved.
+
+This file is part of the DAM - Clients Library.
+
+The DAM - UI is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+<packages>
+  <package id="GeoAPI" version="1.7.1.1" targetFramework="net45" />
+  <package id="log4net" version="2.0.3" targetFramework="net45" />
+  <package id="LumenWorks.Framework.IO" version="3.8.0" targetFramework="net45" />
+  <package id="NetTopologySuite" version="1.13.1" targetFramework="net45" />
+</packages>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporter.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporter.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporter.cs	(revision 3305)
@@ -0,0 +1,324 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Deltares.Standard.Logging;
+
+namespace Deltares.Dam.Data.CsvImporters
+{
+    public class CsvImporter
+    {
+        private string folderName;
+        private const string FileExtension = "csv";
+        private const string FilePattern = "{0}\\{1}." + FileExtension;
+
+        private string locationsFileNamePart = "locations";
+        private string segmentsFileNamePart = "segments";
+        private string soilProfilesFileNamePart = "soilprofiles";
+        private string surfaceLinesFileNamePart = "surfacelines";
+        private string characteristicPointFileNamePart = "characteristicpoints";
+        private string ScenariosFileNamePart = "scenarios";
+
+
+        private List<LogMessage> errorMessages = new List<LogMessage>();
+        private List<CsvImporterLocations.LocationRecord> locationRecords = new List<CsvImporterLocations.LocationRecord>();
+        private List<CsvImporterSegments.SegmentRecord> segmentRecords = new List<CsvImporterSegments.SegmentRecord>();
+        private List<CsvImporterCharacteristicPoints.CharacteristicPointsRecord> characteristicPointsRecords = new List<CsvImporterCharacteristicPoints.CharacteristicPointsRecord>();
+        private List<CsvImporterSoilProfiles.SoilProfileRecord> soilProfilesRecords = new List<CsvImporterSoilProfiles.SoilProfileRecord>();
+        private List<CsvImporterSurfaceLines.SurfaceLineRecord> surfaceLinesRecords = new List<CsvImporterSurfaceLines.SurfaceLineRecord>();
+        private List<CsvImporterScenarios.ScenarioRecord> scenariosRecords = new List<CsvImporterScenarios.ScenarioRecord>();
+
+        private string ImportFolderLocation
+        {
+            get { return folderName != null && folderName.EndsWith("\\") ? folderName.Substring(0, folderName.Length - 1) : folderName; }
+        }
+
+        private string LocationsFileName
+        {
+            get { return string.Format(FilePattern, ImportFolderLocation, locationsFileNamePart); }
+        }
+
+        private string SegmentsFileName
+        {
+            get { return string.Format(FilePattern, ImportFolderLocation, segmentsFileNamePart); }
+        }
+
+        private string SoilProfilesFileName
+        {
+            get { return string.Format(FilePattern, ImportFolderLocation, soilProfilesFileNamePart); }
+        }
+
+        private string SurfaceLinesFileName
+        {
+            get { return string.Format(FilePattern, ImportFolderLocation, surfaceLinesFileNamePart); }
+        }
+
+        private string CharacteristicPointsFileName
+        {
+            get { return string.Format(FilePattern, ImportFolderLocation, characteristicPointFileNamePart); }
+        }
+
+        private string ScenariosFileName
+        {
+            get { return string.Format(FilePattern, ImportFolderLocation, ScenariosFileNamePart); }
+        }
+
+
+        public List<LogMessage> ErrorMessages
+        {
+            get { return errorMessages; }
+            set { errorMessages = value; }
+        }
+
+        public List<CsvImporterLocations.LocationRecord> LocationRecords
+        {
+            get { return locationRecords; }
+            set { locationRecords = value; }
+        }
+
+        public List<CsvImporterSegments.SegmentRecord> SegmentRecords
+        {
+            get { return segmentRecords; }
+        }
+
+        public List<CsvImporterCharacteristicPoints.CharacteristicPointsRecord> CharacteristicPointsRecords
+        {
+            get { return characteristicPointsRecords; }
+        }
+
+        public List<CsvImporterSoilProfiles.SoilProfileRecord> SoilProfilesRecords
+        {
+            get { return soilProfilesRecords; }
+        }
+
+        public List<CsvImporterSurfaceLines.SurfaceLineRecord> SurfaceLinesRecords
+        {
+            get { return surfaceLinesRecords; }
+        }
+
+        public List<CsvImporterScenarios.ScenarioRecord> ScenariosRecords
+        {
+            get { return scenariosRecords; }
+        }
+
+        /// <summary>
+        /// Imports the locations.
+        /// </summary>
+        /// <param name="fileName">Name of the file.</param>
+        private void ImportLocations(string fileName)
+        {
+            // Locations are optional, so check if the locations are available before trying to import
+            if (File.Exists(fileName))
+            {
+                try
+                {
+                    var csvImporterLocations = new CsvImporterLocations(fileName);
+                    locationRecords = csvImporterLocations.ImportedItems;
+                    foreach (var errorMessage in csvImporterLocations.ErrorMessages)
+                    {
+                        LogMessage logmessage = new LogMessage(LogMessageType.Error, this, errorMessage);
+                        errorMessages.Add(logmessage);
+                    }                    
+                }
+                catch (CsvImporterSegmentsException e)
+                {
+                    LogMessage logmessage = new LogMessage(LogMessageType.FatalError, this, e.Message);
+                    errorMessages.Add(logmessage);
+                }
+
+            }
+        }
+
+        /// <summary>
+        /// Imports the segments.
+        /// </summary>
+        /// <param name="fileName">Name of the file.</param>
+        private void ImportSegments(string fileName)
+        {
+            try
+            {
+                CsvImporterSegments csvImporterSegments = new CsvImporterSegments(fileName);
+                segmentRecords = csvImporterSegments.ImportedItems;
+                foreach (var errorMessage in csvImporterSegments.ErrorMessages)
+                {
+                    LogMessage logmessage = new LogMessage(LogMessageType.Error, this, errorMessage);
+                    errorMessages.Add(logmessage);
+                }
+            }
+            catch (CsvImporterSegmentsException e)
+            {
+                LogMessage logmessage = new LogMessage(LogMessageType.FatalError, this, e.Message);
+                errorMessages.Add(logmessage);
+            }
+
+        }
+
+        /// <summary>
+        /// Imports the characteristic points.
+        /// </summary>
+        /// <param name="fileName">Name of the file.</param>
+        private void ImportCharacteristicPoints(string fileName)
+        {
+            try
+            {
+                CsvImporterCharacteristicPoints csvImporterCharacteristicPoints = new CsvImporterCharacteristicPoints(fileName);
+                characteristicPointsRecords = csvImporterCharacteristicPoints.ImportedItems;
+                foreach (var errorMessage in csvImporterCharacteristicPoints.ErrorMessages)
+                {
+                    LogMessage logmessage = new LogMessage(LogMessageType.Error, this, errorMessage);
+                    errorMessages.Add(logmessage);
+                }
+            }
+            catch (CsvImporterCharacteristicPointsException e)
+            {
+                LogMessage logmessage = new LogMessage(LogMessageType.FatalError, this, e.Message);
+                errorMessages.Add(logmessage);
+            }
+        }
+
+        /// <summary>
+        /// Imports the soil profiles.
+        /// </summary>
+        /// <param name="fileName">Name of the file.</param>
+        private void ImportSoilProfiles(string fileName)
+        {
+            // 1D Soilprofiles are not mandatory. The project can use 2D-geometries
+            if (File.Exists(fileName))
+            {
+                try
+                {
+                    CsvImporterSoilProfiles csvImporterSoilProfiles = new CsvImporterSoilProfiles(fileName);
+                    soilProfilesRecords = csvImporterSoilProfiles.ImportedItems;
+                    foreach (var errorMessage in csvImporterSoilProfiles.ErrorMessages)
+                    {
+                        LogMessage logmessage = new LogMessage(LogMessageType.Error, this, errorMessage);
+                        errorMessages.Add(logmessage);
+                    }
+                }
+                catch (CsvImporterSoilProfilesException e)
+                {
+                    LogMessage logmessage = new LogMessage(LogMessageType.FatalError, this, e.Message);
+                    errorMessages.Add(logmessage);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Imports the surface lines.
+        /// </summary>
+        /// <param name="fileName">Name of the file.</param>
+        private void ImportSurfaceLines(string fileName)
+        {
+            try
+            {
+                CsvImporterSurfaceLines csvImporterSurfaceLines = new CsvImporterSurfaceLines(fileName);
+                surfaceLinesRecords = csvImporterSurfaceLines.ImportedItems;
+                foreach (var errorMessage in csvImporterSurfaceLines.ErrorMessages)
+                {
+                    LogMessage logmessage = new LogMessage(LogMessageType.Error, this, errorMessage);
+                    errorMessages.Add(logmessage);
+                }
+            }
+            catch (CsvImporterSurfaceLinesException e)
+            {
+                LogMessage logmessage = new LogMessage(LogMessageType.FatalError, this, e.Message);
+                errorMessages.Add(logmessage);
+            }
+        }
+
+        /// <summary>
+        /// Imports the scenarios.
+        /// </summary>
+        /// <param name="fileName">Name of the file.</param>
+        private void ImportScenarios(string fileName)
+        {
+            try
+            {
+                var csvImporterScenarios = new CsvImporterScenarios(fileName);
+                scenariosRecords = csvImporterScenarios.ImportedItems;
+                foreach (var errorMessage in csvImporterScenarios.ErrorMessages)
+                {
+                    var logmessage = new LogMessage(LogMessageType.Error, this, errorMessage);
+                    errorMessages.Add(logmessage);
+                }
+            }
+            catch (CsvImporterScenariosException e)
+            {
+                var logmessage = new LogMessage(LogMessageType.FatalError, this, e.Message);
+                errorMessages.Add(logmessage);
+            }
+            catch(Exception e)
+            {
+                var logmessage = new LogMessage(LogMessageType.FatalError, this, e.Message);
+                errorMessages.Add(logmessage);
+            }
+        }
+
+        /// <summary>
+        /// Imports the CSV data from directory.
+        /// </summary>
+        /// <param name="csvDir">The CSV dir.</param>
+        /// <param name="isImportOnlyLocations">if set to <c>true</c> [is import only locations].</param>
+        /// <param name="progress">The progress.</param>
+        /// <param name="damProjectType">Type of the dam project.</param>
+        public void ImportCsvDataFromDirectory(string csvDir, bool isImportOnlyLocations, 
+            DamEngine.Data.Standard.Calculation.ProgressDelegate progress, DamProjectType damProjectType)
+        {
+            folderName = csvDir;
+            if (progress != null) progress(0.03);
+            ImportLocations(LocationsFileName);
+            if (!isImportOnlyLocations)
+            {
+                if (progress != null) progress(0.08);
+                ImportSegments(SegmentsFileName);
+                if (progress != null) progress(0.12);
+                ImportCharacteristicPoints(CharacteristicPointsFileName);
+                if (progress != null) progress(0.16);
+                ImportSoilProfiles(SoilProfilesFileName);
+                if (progress != null) progress(0.2);
+                ImportSurfaceLines(SurfaceLinesFileName);
+                // Scenario file is required for design projects and optional for the rest
+                if (damProjectType == DamProjectType.Design)
+                {
+                    if (progress != null) progress(0.25);
+                    ImportScenarios(ScenariosFileName);
+                }
+                else
+                {
+                    if (File.Exists(ScenariosFileName))
+                    {
+                        if (progress != null) progress(0.25);
+                        ImportScenarios(ScenariosFileName);
+                    }   
+                }
+                if (progress != null) progress(0.30);
+            }           
+        }
+
+        public override string ToString()
+        {
+            return "CsvImporter";
+        }
+
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Specifications/WaterLevelSensorSpecification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Specifications/WaterLevelSensorSpecification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/Specifications/WaterLevelSensorSpecification.cs	(revision 3305)
@@ -0,0 +1,34 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Standard.Specifications;
+
+namespace Deltares.Dam.Data.Sensors.Specifications
+{
+    internal class WaterLevelSensorSpecification : PredicateSpecification<Sensor>
+    {
+        public WaterLevelSensorSpecification() :
+            base(s => s.Type == SensorType.WaterLevel)
+        {
+        }
+    }
+
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Domain/FeatureRepositoryTest.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Domain/FeatureRepositoryTest.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/Domain/FeatureRepositoryTest.cs	(revision 3305)
@@ -0,0 +1,64 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of the application DAM - UI.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using NUnit.Framework;
+
+namespace Deltares.Maps.Tests.Domain
+{
+    [TestFixture]
+    public class FeatureRepositoryTest
+    {
+        private IFeatureRepository repository;
+
+        #region Setup
+
+        [TestFixtureSetUp]
+        public void FixtureSetup()
+        {
+        }
+
+        [TestFixtureTearDown]
+        public void FixtureTearDown()
+        {
+        }
+
+        [SetUp]
+        public void TestSetup()
+        {
+            repository = new FeatureRepository();
+        }
+
+        [TearDown]
+        public void TestTearDown()
+        {
+        }
+
+        #endregion
+
+        /// <summary>
+        ///     TODO: make tests
+        /// </summary>
+        [Test]
+        public void TestMethod()
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IntersectionResult.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IntersectionResult.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IntersectionResult.cs	(revision 3305)
@@ -0,0 +1,34 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+
+using GeoAPI.Geometries;
+
+namespace Deltares.Maps
+{
+    public class IntersectionResult
+    {
+        public IFeature Source { get; set; }
+        public IFeature Target { get; set; }
+        public IEnumerable<Coordinate> IntersectionPoints { get; set; }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs	(revision 3305)
@@ -0,0 +1,566 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using Deltares.Dam.Data.Importers;
+using Deltares.Standard.IO;
+using Deltares.Standard.Language;
+using LumenWorks.Framework.IO.Csv;
+
+namespace Deltares.Dam.Data.CsvImporters
+{
+    public class CsvImporterLocations
+    {
+        private List<LocationRecord> locationRecords = new List<LocationRecord>();
+        private List<string> errorMessages = new List<string>();
+
+        public class LocationRecord
+        {
+            public int LocationRecordId { get; set; }
+            public string LocationId { get; set; } 
+            public string SurfaceLineId { get; set; } 
+            public string SegmentId { get; set; }
+
+            public string DikeRingId { get; set; }
+            public double? GeoX { get; set; }
+            public double? GeoY { get; set; }
+            public double? XSoilGeometry2DOrigin { get; set; }
+            public double? PolderLevel { get; set; }
+            public double? HeadPl2 { get; set; }
+            public double? HeadPl3 { get; set; }
+            public double? HeadPl4 { get; set; }
+            public string DikeEmbankmentMaterial { get; set; }
+            public string ShoulderEmbankmentMaterial { get; set; }
+            public double? PenetrationLength { get; set; }
+            public double? TrafficLoad { get; set; }
+            public double? TL_DegreeOfConsolidation { get; set; }
+            public double? MinimalCircleDepth { get; set; }
+            public double? DampingFactorPl3 { get; set; }
+            public double? DampingFactorPl4 { get; set; }
+            public PLLineCreationMethod? PLLineCreationMethod { get; set; }
+            public double? RequiredSafetyFactorPiping { get; set; }
+            public double? RequiredSafetyFactorStabilityInnerSlope { get; set; }
+            public double? RequiredSafetyFactorStabilityOuterSlope { get; set; }
+            public double? UpliftCriterionPiping { get; set; }
+            public double? UpliftCriterionStability { get; set; }
+            public double? DistanceToEntryPoint { get; set; }
+            public double? PlLineOffsetBelowDikeTopAtRiver { get; set; }
+            public double? PlLineOffsetBelowDikeTopAtPolder { get; set; }
+            public double? PlLineOffsetBelowShoulderBaseInside { get; set; }
+            public double? PlLineOffsetBelowDikeToeAtPolder { get; set; }
+            public double? PlLineOffsetBelowDikeCrestMiddle { get; set; }
+            public double? PlLineOffsetFactorBelowShoulderCrest { get; set; }
+            public bool? UsePlLineOffsetBelowDikeCrestMiddle { get; set; }
+            public bool? UsePlLineOffsetFactorBelowShoulderCrest { get; set; }
+
+            public IntrusionVerticalWaterPressureType? IntrusionVerticalWaterPressure;
+            public double? StabilityShoulderGrowSlope { get; set; }
+            public double? StabilityShoulderGrowDeltaX { get; set; }
+            public double? StabilitySlopeAdaptionDeltaX { get; set; }
+            public double? SlopeDampingPiezometricHeightPolderSide { get; set; }
+            public StabilityDesignMethod? StabilityDesignMethod { get; set; }
+            public MStabZonesType? StabilityZoneType { get; set; }
+            public double? ForbiddenZoneFactor { get; set; }
+            public double? ZoneAreaRestSlopeCrestWidth { get; set; }
+            public double? SlopeAdaptionStartCotangent { get; set; }
+            public double? SlopeAdaptionEndCotangent { get; set; }
+            public double? SlopeAdaptionStepCotangent { get; set; }
+            public double? NewDikeTopWidth { get; set; }
+            public bool? UseNewDikeTopWidth { get; set; }
+            public double? NewDikeSlopeInside { get; set; }
+            public bool? UseNewDikeSlopeInside { get; set; }
+            public double? NewDikeSlopeOutside { get; set; }
+            public bool? UseNewDikeSlopeOutside { get; set; }
+            public double? NewShoulderTopSlope { get; set; }
+            public bool? UseNewShoulderTopSlope { get; set; }
+            public double? NewShoulderBaseSlope { get; set; }
+            public bool? UseNewShoulderBaseSlope { get; set; }
+            public double? NewMaxHeightShoulderAsFraction { get; set; }
+            public bool? UseNewMaxHeightShoulderAsFraction { get; set; }
+            public double? NewMinDistanceDikeToeStartDitch { get; set; }
+            public bool? UseNewMinDistanceDikeToeStartDitch { get; set; }
+            public bool? UseNewDitchDefinition { get; set; }
+            public double? NewWidthDitchBottom { get; set; }
+            public double? NewSlopeAngleDitch { get; set; }
+            public double? NewDepthDitch { get; set; }
+            public double? DikeTableHeight { get; set; }
+            public double? RiverLevel { get; set; }
+            public double? RiverLevelLow { get; set; }
+        }
+
+        public CsvImporterLocations(string fileName)
+        {
+            errorMessages.Clear();
+            ThrowHelper.ThrowIfStringArgumentNullOrEmpty(fileName, StringResourceNames.CsvFileNotValid);
+            ThrowHelper.ThrowIfFileNotExist(fileName, StringResourceNames.CsvFileNotFound);
+
+
+            var oldcur = Thread.CurrentThread.CurrentCulture;
+            try
+            {
+                Thread.CurrentThread.CurrentCulture = CsvReaderUtilities.DetermineCultureForFile(fileName);
+                using (var csv = new CsvReader(new StreamReader(fileName), true, ';'))
+                {
+                    string[] headers = CsvImporterHelper.GetFieldHeaders(this, csv);
+                    if (headers.Count() < 3)
+                    {
+                        var csvHeaderError = LocalizationManager.GetTranslatedText(this.GetType(), "csvHeaderError");
+                        throw new CsvImporterSegmentsException(String.Format("{0} : {1}", fileName, csvHeaderError));
+                    }
+
+                    int colIndexLocationId = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.LocationColumnName);
+                    int colIndexSurfacelineId = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SurfaceLineColumnName);
+                    int colIndexSegmentId = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SegmentColumnName);
+                    int colIndexDikeRingId = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DikeRingColumnName);
+                    int colIndexGeoX = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.XValueColumnName);
+                    int colIndexGeoY = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.YValueColumnName);
+                    int colIndexXSoilgeometry2DOrigin = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.XSoilGeometry2DOriginColumnName);
+                    int colIndexPolderlevel = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PolderLevelColumnName);
+                    int colIndexHeadPl2 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.HeadPl2ColumnName);
+                    int colIndexHeadPl3 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.HeadPl3ColumnName);
+                    int colIndexHeadPl4 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.HeadPl4ColumnName);
+                    int colIndexOphoogmateriaaldijk = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DikeEmbankmentMaterialColumnName);
+                    int colIndexOphoogmateriaalberm = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.ShoulderEmbankmentMaterialColumnName);
+                    int colIndexPenetrationLength = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PenetrationLengthColumnName);
+                    int colIndexTrafficLoad = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.TrafficLoadColumnName);
+                    int colIndexTL_DegreeOfConsolidation = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.TlDegreeOfConsolidationColumnName);
+                    int colIndexMinimalCircleDepth = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.MinimalCircleDepthColumnName);
+                    int colIndexDempingsfactorPl3 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DampingFactorPl3ColumnName);
+                    int colIndexDempingsfactorPl4 = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DampingFactorPl4ColumnName);
+                    int colIndexPLLineCreationMethod = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineCreationMethodColumnName);
+                    int colIndexSafetyFactorPiping = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RequiredSafetyFactorPipingColumnName);
+                    int colIndexSafetyFactorStabilityInnerSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RequiredSafetyFactorStabilityInnerSlopeColumnName);
+                    int colIndexSafetyFactorStabilityOuterSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RequiredSafetyFactorStabilityOuterSlopeColumnName);
+                    int colIndexUpliftCriterionPiping = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UpliftCriterionPipingColumnName);
+                    int colIndexUpliftCriterionStability = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UpliftCriterionStabilityColumnName);
+                    int colIndexDistanceToEntryPoint = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DistanceToEntryPointColumnName);
+                    int colIndexPLLineOffsetBelowDikeTopAtRiver = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetBelowDikeTopAtRiverColumnName);
+                    int colIndexPLLineOffsetBelowDikeTopAtPolder = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetBelowDikeTopAtPolderColumnName);
+                    int colIndexPLLineOffsetBelowShoulderBaseInside = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetBelowShoulderBaseInsideColumnName);
+                    int colIndexPLLineOffsetBelowDikeToeAtPolder = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetBelowDikeToeAtPolderColumnName);
+                    int colIndexPlLineOffsetBelowDikeCrestMiddle = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetBelowDikeCrestMiddleColumnName);
+                    int colIndexPlLineOffsetFactorBelowShoulderCrest = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.PlLineOffsetFactorBelowShoulderCrestColumnName);
+                    int colIndexUsePlLineOffsetBelowDikeCrestMiddle = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UsePlLineOffsetBelowDikeCrestMiddleColumnName);
+                    int colIndexUsePlLineOffsetFactorBelowShoulderCrest = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UsePlLineOffsetFactorBelowShoulderCrestColumnName);
+                    int colIndexIntrusionVerticalWaterPressure = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.IntrusionVerticalWaterPressureColumnName);
+                    int colIndexStabilityShoulderGrowSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.StabilityShoulderGrowSlopeColumnName);
+                    int colIndexStabilityShoulderGrowDeltaX = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.StabilityShoulderGrowDeltaXColumnName);
+                    int colIndexStabilitySlopeAdaptionDeltaX = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.StabilitySlopeAdaptionDeltaXColumnName);
+                    int colIndexSlopeDampingPiezometricHeightPolderSide = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SlopeDampingPiezometricHeightPolderSideColumnName);
+                    int colIndexStabilityDesignMethod = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.StabilityDesignMethodColumnName);
+                    int colIndexStabilityZoneType = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.ZoneTypeColumnName);
+                    int colIndexForbiddenZoneFactor = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.ForbiddenZoneFactorColumnName);
+                    int colIndexZoneAreaRestSlopeCrestWidth = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.ZoneAreaRestSlopeCrestWidthColumnName);
+                    int colIndexSlopeAdaptionStartCotangent = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SlopeAdaptionStartCotangentColumnName);
+                    int colIndexSlopeAdaptionEndCotangent = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SlopeAdaptionEndCotangentColumnName);
+                    int colIndexSlopeAdaptionStepCotangent = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SlopeAdaptionStepCotangentColumnName);
+                    int colIndexNewDikeTopWidth = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewDikeTopWidthColumnName);
+                    int colIndexUseNewDikeTopWidth = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UseNewDikeTopWidthColumnName);
+                    int colIndexNewDikeSlopeInside = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewDikeSlopeInsideColumnName);
+                    int colIndexUseNewDikeSlopeInside = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UseNewDikeSlopeInsideColumnName);
+                    int colIndexNewDikeSlopeOutside = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewDikeSlopeOutsideColumnName);
+                    int colIndexUseNewDikeSlopeOutside = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UseNewDikeSlopeOutsideColumnName);
+                    int colIndexNewShoulderTopSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewShoulderTopSlopeColumnName);
+                    int colIndexUseNewShoulderTopSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UseNewShoulderTopSlopeColumnName);
+                    int colIndexNewShoulderBaseSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewShoulderBaseSlopeColumnName);
+                    int colIndexUseNewShoulderBaseSlope = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UseNewShoulderBaseSlopeColumnName);
+                    int colIndexNewMaxHeightShoulderAsFraction = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewMaxHeightShoulderAsFractionColumnName);
+                    int colIndexUseNewMaxHeightShoulderAsFraction = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UseNewMaxHeightShoulderAsFractionColumnName);
+                    int colIndexNewMinDistanceDikeToeStartDitch = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewMinDistanceDikeToeStartDitchColumnName);
+                    int colIndexUseNewMinDistanceDikeToeStartDitch = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UseNewMinDistanceDikeToeStartDitchColumnName);
+                    int colIndexUseNewDitchDefinition = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.UseNewDitchDefinitionColumnName);
+                    int colIndexNewWidthDitchBottom = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewWidthDitchBottomColumnName);
+                    int colIndexNewSlopeAngleDitch = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewSlopeAngleDitchColumnName);
+                    int colIndexNewDepthDitch = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.NewDepthDitchColumnName);
+                    int colIndexDikeTableHeight = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DikeTableHeightColumnName);
+                    int colIndexRiverLevel = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RiverLevelColumnName);
+                    int colIndexRiverLevelLow = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.RiverLevelLowColumnName);
+                    
+                    var index = 1;
+                    while (csv.ReadNextRecord())
+                    {
+                        var locationRecord = new LocationRecord();
+                        var colIndex = -1;  // Keep track of column for error message
+                        try
+                        {
+                            locationRecord.LocationRecordId = index++;
+
+                            /*
+                             * Required columns
+                             */
+                            locationRecord.LocationId = csv[colIndexLocationId];
+                            locationRecord.SurfaceLineId = csv[colIndexSurfacelineId];
+                            locationRecord.SegmentId = csv[colIndexSegmentId];
+
+                            /*
+                             * Optional columns
+                             */
+                            if (colIndexDikeRingId > -1)
+                            {
+                                colIndex = colIndexDikeRingId;
+                                locationRecord.DikeRingId = csv[colIndexDikeRingId];
+                            }
+                            if (colIndexGeoX > -1)
+                            {
+                                colIndex = colIndexGeoX;
+                                locationRecord.GeoX = Convert.ToDouble(csv[colIndexGeoX]);
+                            }
+                            if (colIndexGeoY > -1)
+                            {
+                                colIndex = colIndexGeoY;
+                                locationRecord.GeoY = Convert.ToDouble(csv[colIndexGeoY]);
+                            }
+                            if (colIndexXSoilgeometry2DOrigin > -1)
+                            {
+                                colIndex = colIndexXSoilgeometry2DOrigin;
+                                locationRecord.XSoilGeometry2DOrigin = Convert.ToDouble(csv[colIndexXSoilgeometry2DOrigin]);
+                            }
+                            if (colIndexPolderlevel > -1)
+                            {
+                                colIndex = colIndexPolderlevel;
+                                locationRecord.PolderLevel = Convert.ToDouble(csv[colIndexPolderlevel]);
+                            }
+                            if (colIndexHeadPl2 > -1)
+                            {
+                                colIndex = colIndexHeadPl2;
+                                locationRecord.HeadPl2 = Convert.ToDouble(csv[colIndexHeadPl2]);
+                            }
+                            if (colIndexHeadPl3 > -1)
+                            {
+                                colIndex = colIndexHeadPl3;
+                                locationRecord.HeadPl3 = Convert.ToDouble(csv[colIndexHeadPl3]);
+                            }
+                            if (colIndexHeadPl4 > -1)
+                            {
+                                colIndex = colIndexHeadPl4;
+                                locationRecord.HeadPl4 = Convert.ToDouble(csv[colIndexHeadPl4]);
+                            }
+                            if (colIndexOphoogmateriaaldijk > -1)
+                            {
+                                colIndex = colIndexOphoogmateriaaldijk;
+                                locationRecord.DikeEmbankmentMaterial = csv[colIndexOphoogmateriaaldijk];
+                            }
+                            if (colIndexOphoogmateriaalberm > -1)
+                            {
+                                colIndex = colIndexOphoogmateriaalberm;
+                                locationRecord.ShoulderEmbankmentMaterial = csv[colIndexOphoogmateriaalberm];
+                            }
+                            if (colIndexPenetrationLength > -1)
+                            {
+                                colIndex = colIndexPenetrationLength;
+                                locationRecord.PenetrationLength = Convert.ToDouble(csv[colIndexPenetrationLength]);
+                            }
+                            if (colIndexTrafficLoad > -1)
+                            {
+                                colIndex = colIndexTrafficLoad;
+                                locationRecord.TrafficLoad = Convert.ToDouble(csv[colIndexTrafficLoad]);
+                            }
+                            if (colIndexTL_DegreeOfConsolidation > -1)
+                            {
+                                colIndex = colIndexTL_DegreeOfConsolidation;
+                                locationRecord.TL_DegreeOfConsolidation = Convert.ToDouble(csv[colIndexTL_DegreeOfConsolidation]);
+                            }
+                            if (colIndexMinimalCircleDepth > -1)
+                            {
+                                colIndex = colIndexMinimalCircleDepth;
+                                locationRecord.MinimalCircleDepth = Convert.ToDouble(csv[colIndexMinimalCircleDepth]);
+                            }
+                            if (colIndexDempingsfactorPl3 > -1)
+                            {
+                                colIndex = colIndexDempingsfactorPl3;
+                                locationRecord.DampingFactorPl3 = Convert.ToDouble(csv[colIndexDempingsfactorPl3]);
+                            }
+                            if (colIndexDempingsfactorPl4 > -1)
+                            {
+                                colIndex = colIndexDempingsfactorPl4;
+                                locationRecord.DampingFactorPl4 = Convert.ToDouble(csv[colIndexDempingsfactorPl4]);
+                            }
+                            if (colIndexPLLineCreationMethod > -1)
+                            {
+                                colIndex = colIndexPLLineCreationMethod;
+                                locationRecord.PLLineCreationMethod = LocationImportHelper.ToPLLineCreationMethod(csv[colIndexPLLineCreationMethod]);
+                            }
+                            if (colIndexSafetyFactorPiping > -1)
+                            {
+                                colIndex = colIndexSafetyFactorPiping;
+                                locationRecord.RequiredSafetyFactorPiping = Convert.ToDouble(csv[colIndexSafetyFactorPiping]);
+                            }
+                            if (colIndexSafetyFactorStabilityInnerSlope > -1)
+                            {
+                                colIndex = colIndexSafetyFactorStabilityInnerSlope;
+                                locationRecord.RequiredSafetyFactorStabilityInnerSlope = Convert.ToDouble(csv[colIndexSafetyFactorStabilityInnerSlope]);
+                            }
+                            if (colIndexSafetyFactorStabilityOuterSlope > -1)
+                            {
+                                colIndex = colIndexSafetyFactorStabilityOuterSlope;
+                                locationRecord.RequiredSafetyFactorStabilityOuterSlope = Convert.ToDouble(csv[colIndexSafetyFactorStabilityOuterSlope]);
+                            }
+                            if (colIndexUpliftCriterionPiping > -1)
+                            {
+                                colIndex = colIndexUpliftCriterionPiping;
+                                locationRecord.UpliftCriterionPiping = Convert.ToDouble(csv[colIndexUpliftCriterionPiping]);
+                            }
+                            if (colIndexUpliftCriterionStability > -1)
+                            {
+                                colIndex = colIndexUpliftCriterionStability;
+                                locationRecord.UpliftCriterionStability = Convert.ToDouble(csv[colIndexUpliftCriterionStability]);
+                            }
+                            if (colIndexDistanceToEntryPoint > -1)
+                            {
+                                colIndex = colIndexDistanceToEntryPoint;
+                                locationRecord.DistanceToEntryPoint = Convert.ToDouble(csv[colIndexDistanceToEntryPoint]);
+                            }
+                            if (colIndexPLLineOffsetBelowDikeTopAtRiver > -1)
+                            {
+                                colIndex = colIndexPLLineOffsetBelowDikeTopAtRiver;
+                                locationRecord.PlLineOffsetBelowDikeTopAtRiver = Convert.ToDouble(csv[colIndexPLLineOffsetBelowDikeTopAtRiver]);
+                            }
+                            if (colIndexPLLineOffsetBelowDikeTopAtPolder > -1)
+                            {
+                                colIndex = colIndexPLLineOffsetBelowDikeTopAtPolder;
+                                locationRecord.PlLineOffsetBelowDikeTopAtPolder = Convert.ToDouble(csv[colIndexPLLineOffsetBelowDikeTopAtPolder]);
+                            }
+                            if (colIndexPLLineOffsetBelowShoulderBaseInside > -1)
+                            {
+                                colIndex = colIndexPLLineOffsetBelowShoulderBaseInside;
+                                locationRecord.PlLineOffsetBelowShoulderBaseInside = Convert.ToDouble(csv[colIndexPLLineOffsetBelowShoulderBaseInside]);
+                            }
+                            if (colIndexPLLineOffsetBelowDikeToeAtPolder > -1)
+                            {
+                                colIndex = colIndexPLLineOffsetBelowDikeToeAtPolder;
+                                locationRecord.PlLineOffsetBelowDikeToeAtPolder = Convert.ToDouble(csv[colIndexPLLineOffsetBelowDikeToeAtPolder]);
+                            }
+                            if (colIndexPlLineOffsetBelowDikeCrestMiddle > -1)
+                            {
+                                colIndex = colIndexPlLineOffsetBelowDikeCrestMiddle;
+                                locationRecord.PlLineOffsetBelowDikeCrestMiddle = Convert.ToDouble(csv[colIndex]);                                
+                            }
+                            if (colIndexPlLineOffsetFactorBelowShoulderCrest > -1)
+                            {
+                                colIndex = colIndexPlLineOffsetFactorBelowShoulderCrest;
+                                locationRecord.PlLineOffsetFactorBelowShoulderCrest = Convert.ToDouble(csv[colIndex]);                                
+                            }
+                            if (colIndexUsePlLineOffsetBelowDikeCrestMiddle > -1)
+                            {
+                                colIndex = colIndexUsePlLineOffsetBelowDikeCrestMiddle;
+                                locationRecord.UsePlLineOffsetBelowDikeCrestMiddle = Convert.ToBoolean(csv[colIndex]);
+                            }
+                            if (colIndexUsePlLineOffsetFactorBelowShoulderCrest > -1)
+                            {
+                                colIndex = colIndexUsePlLineOffsetFactorBelowShoulderCrest;
+                                locationRecord.UsePlLineOffsetFactorBelowShoulderCrest = Convert.ToBoolean(csv[colIndex]);
+                            }
+                            if (colIndexIntrusionVerticalWaterPressure > -1)
+                            {
+                                colIndex = colIndexIntrusionVerticalWaterPressure;
+                                locationRecord.IntrusionVerticalWaterPressure = LocationImportHelper.ToIntrusionVerticalWaterPressure(csv[colIndex]);
+                            }
+                            if (colIndexStabilityShoulderGrowSlope > -1)
+                            {
+                                colIndex = colIndexStabilityShoulderGrowSlope;
+                                locationRecord.StabilityShoulderGrowSlope = Convert.ToDouble(csv[colIndexStabilityShoulderGrowSlope]);
+                            }
+                            if (colIndexStabilityShoulderGrowDeltaX > -1)
+                            {
+                                colIndex = colIndexStabilityShoulderGrowDeltaX;
+                                locationRecord.StabilityShoulderGrowDeltaX = Convert.ToDouble(csv[colIndexStabilityShoulderGrowDeltaX]);
+                            }
+                            if (colIndexStabilitySlopeAdaptionDeltaX > -1)
+                            {
+                                colIndex = colIndexStabilitySlopeAdaptionDeltaX;
+                                locationRecord.StabilitySlopeAdaptionDeltaX = Convert.ToDouble(csv[colIndexStabilitySlopeAdaptionDeltaX]);
+                            }
+                            if (colIndexStabilityDesignMethod > -1)
+                            {
+                                colIndex = colIndexStabilityDesignMethod;
+                                locationRecord.StabilityDesignMethod = LocationImportHelper.ToStabilityDesignMethod(csv[colIndexStabilityDesignMethod]); 
+                            }
+                            if (colIndexStabilityZoneType > -1)
+                            {
+                                colIndex = colIndexStabilityZoneType;
+                                locationRecord.StabilityZoneType = LocationImportHelper.ToMStabZonesTypeMethod(csv[colIndexStabilityZoneType]);
+                            }
+                            if (colIndexForbiddenZoneFactor > -1)
+                            {
+                                colIndex = colIndexForbiddenZoneFactor;
+                                locationRecord.ForbiddenZoneFactor = Convert.ToDouble(csv[colIndexForbiddenZoneFactor]);
+                            }
+                            if (colIndexZoneAreaRestSlopeCrestWidth > -1)
+                            {
+                                colIndex = colIndexZoneAreaRestSlopeCrestWidth;
+                                locationRecord.ZoneAreaRestSlopeCrestWidth = Convert.ToDouble(csv[colIndexZoneAreaRestSlopeCrestWidth]);
+                            }
+                            if (colIndexSlopeAdaptionStartCotangent > -1)
+                            {
+                                colIndex = colIndexSlopeAdaptionStartCotangent;
+                                locationRecord.SlopeAdaptionStartCotangent = Convert.ToDouble(csv[colIndexSlopeAdaptionStartCotangent]);
+                            }
+                            if (colIndexSlopeAdaptionEndCotangent > -1)
+                            {
+                                colIndex = colIndexSlopeAdaptionEndCotangent;
+                                locationRecord.SlopeAdaptionEndCotangent = Convert.ToDouble(csv[colIndexSlopeAdaptionEndCotangent]);
+                            }
+                            if (colIndexSlopeAdaptionStepCotangent > -1)
+                            {
+                                colIndex = colIndexSlopeAdaptionStepCotangent;
+                                locationRecord.SlopeAdaptionStepCotangent = Convert.ToDouble(csv[colIndexSlopeAdaptionStepCotangent]);
+                            }
+                            if (colIndexSlopeDampingPiezometricHeightPolderSide > -1)
+                            {
+                                colIndex = colIndexSlopeDampingPiezometricHeightPolderSide;
+                                locationRecord.SlopeDampingPiezometricHeightPolderSide = Convert.ToDouble(csv[colIndexSlopeDampingPiezometricHeightPolderSide]);
+                            }
+                            if (colIndexNewDikeTopWidth > -1)
+                            {
+                                colIndex = colIndexNewDikeTopWidth;
+                                locationRecord.NewDikeTopWidth = Convert.ToDouble(csv[colIndexNewDikeTopWidth]);
+                            }
+                            if (colIndexNewDikeSlopeInside > -1)
+                            {
+                                colIndex = colIndexNewDikeSlopeInside;
+                                locationRecord.NewDikeSlopeInside = Convert.ToDouble(csv[colIndexNewDikeSlopeInside]);
+                            }
+                            if (colIndexNewDikeSlopeOutside > -1)
+                            {
+                                colIndex = colIndexNewDikeSlopeOutside;
+                                locationRecord.NewDikeSlopeOutside = Convert.ToDouble(csv[colIndexNewDikeSlopeOutside]);
+                            }
+                            if (colIndexNewShoulderTopSlope > -1)
+                            {
+                                colIndex = colIndexNewShoulderTopSlope;
+                                locationRecord.NewShoulderTopSlope = Convert.ToDouble(csv[colIndexNewShoulderTopSlope]);
+                            }
+                            if (colIndexNewShoulderBaseSlope > -1)
+                            {
+                                colIndex = colIndexNewShoulderBaseSlope;
+                                locationRecord.NewShoulderBaseSlope = Convert.ToDouble(csv[colIndexNewShoulderBaseSlope]);
+                            }
+                            if (colIndexNewMaxHeightShoulderAsFraction > -1)
+                            {
+                                colIndex = colIndexNewMaxHeightShoulderAsFraction;
+                                locationRecord.NewMaxHeightShoulderAsFraction = Convert.ToDouble(csv[colIndexNewMaxHeightShoulderAsFraction]);
+                            }
+                            if (colIndexNewMinDistanceDikeToeStartDitch > -1)
+                            {
+                                colIndex =colIndexNewMinDistanceDikeToeStartDitch;
+                                locationRecord.NewMinDistanceDikeToeStartDitch = Convert.ToDouble(csv[colIndexNewMinDistanceDikeToeStartDitch]);
+                            }
+                            if (colIndexNewWidthDitchBottom > -1)
+                            {
+                                colIndex = colIndexNewWidthDitchBottom;
+                                locationRecord.NewWidthDitchBottom = Convert.ToDouble(csv[colIndexNewWidthDitchBottom]);
+                            }
+                            if (colIndexNewSlopeAngleDitch > -1)
+                            {
+                                colIndex = colIndexNewSlopeAngleDitch;
+                                locationRecord.NewSlopeAngleDitch = Convert.ToDouble(csv[colIndexNewSlopeAngleDitch]);
+                            }
+                            if (colIndexNewDepthDitch > -1)
+                            {
+                                colIndex = colIndexNewDepthDitch;
+                                locationRecord.NewDepthDitch = Convert.ToDouble(csv[colIndexNewDepthDitch]);
+                            }
+                            if (colIndexUseNewDikeTopWidth > -1)
+                            {
+                                colIndex = colIndexUseNewDikeTopWidth;
+                                locationRecord.UseNewDikeTopWidth = Convert.ToBoolean(csv[colIndexUseNewDikeTopWidth]);
+                            }
+                            if (colIndexUseNewDikeSlopeInside > -1)
+                            {
+                                colIndex =colIndexUseNewDikeSlopeInside;
+                                locationRecord.UseNewDikeSlopeInside = Convert.ToBoolean(csv[colIndexUseNewDikeSlopeInside]);
+                            }
+                            if (colIndexUseNewDikeSlopeOutside > -1)
+                            {
+                                colIndex = colIndexUseNewDikeSlopeOutside;
+                                locationRecord.UseNewDikeSlopeOutside = Convert.ToBoolean(csv[colIndexUseNewDikeSlopeOutside]);
+                            }
+                            if (colIndexUseNewShoulderTopSlope > -1)
+                            {
+                                colIndex = colIndexUseNewShoulderTopSlope;
+                                locationRecord.UseNewShoulderTopSlope = Convert.ToBoolean(csv[colIndexUseNewShoulderTopSlope]);
+                            }
+                            if (colIndexUseNewShoulderBaseSlope > -1)
+                            {
+                                colIndex = colIndexUseNewShoulderBaseSlope;
+                                locationRecord.UseNewShoulderBaseSlope = Convert.ToBoolean(csv[colIndexUseNewShoulderBaseSlope]);
+                            }
+                            if (colIndexUseNewMaxHeightShoulderAsFraction > -1)
+                            {
+                                colIndex = colIndexUseNewMaxHeightShoulderAsFraction;
+                                locationRecord.UseNewMaxHeightShoulderAsFraction = Convert.ToBoolean(csv[colIndexUseNewMaxHeightShoulderAsFraction]);
+                            }
+                            if (colIndexUseNewMinDistanceDikeToeStartDitch > -1)
+                            {
+                                colIndex = colIndexUseNewMinDistanceDikeToeStartDitch;
+                                locationRecord.UseNewMinDistanceDikeToeStartDitch = Convert.ToBoolean(csv[colIndexUseNewMinDistanceDikeToeStartDitch]);
+                            }
+                            if (colIndexUseNewDitchDefinition > -1)
+                            {
+                                colIndex = colIndexUseNewDitchDefinition;
+                                locationRecord.UseNewDitchDefinition = Convert.ToBoolean(csv[colIndexUseNewDitchDefinition]);
+                            }    
+                            if (colIndexDikeTableHeight > -1)
+                            {
+                                colIndex = colIndexDikeTableHeight;
+                                locationRecord.DikeTableHeight = Convert.ToDouble(csv[colIndexDikeTableHeight]);
+                            }
+                            if (colIndexRiverLevel > -1)
+                            {
+                                colIndex = colIndexRiverLevel;
+                                locationRecord.RiverLevel = Convert.ToDouble(csv[colIndexRiverLevel]);
+                            }
+                            if (colIndexRiverLevelLow > -1)
+                            {
+                                colIndex = colIndexRiverLevelLow;
+                                locationRecord.RiverLevelLow = Convert.ToDouble(csv[colIndexRiverLevelLow]);
+                            }
+                            locationRecords.Add(locationRecord);
+                        }
+                        catch (Exception e)
+                        {
+                            var csvLocationError = String.Format(LocalizationManager.GetTranslatedText(this.GetType(), "csvLocationError"), locationRecord.LocationId, colIndex + 1);
+                            errorMessages.Add(csvLocationError + e.Message);
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                Thread.CurrentThread.CurrentCulture = oldcur;
+            }
+        }
+        public List<LocationRecord> ImportedItems
+        {
+            get { return locationRecords; }
+        }
+
+        public List<string> ErrorMessages
+        {
+            get { return errorMessages; }
+            set { errorMessages = value; }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs	(revision 3305)
@@ -0,0 +1,192 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Deltares.Dam.Data.UISupport
+{
+    public class ConfigurationManager
+    {
+        private const int maxModelCount = 10; // #Bka added SpencerHigh/SpencerLow as quick fix. Should be reset to 8 
+
+        [ThreadStatic]
+        private static readonly ConfigurationManager instance = new ConfigurationManager();
+
+        private static ConfigurationStatus[,,,] configurationStatus;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConfigurationManager"/> class.
+        /// </summary>
+        public ConfigurationManager()
+        {
+            InitDefaultStatus();
+        }
+
+        public static ConfigurationManager Instance
+        {
+            get
+            {
+                return instance;
+            }
+        }
+
+        /// <summary>
+        /// Indexer
+        /// </summary>
+        /// <param name="kernelType"></param>
+        /// <param name="damProjectType"></param>
+        /// <param name="failureMechanismSystemType"></param>
+        /// <param name="i"></param>
+        /// <returns></returns>
+        public ConfigurationStatus this[StabilityKernelType kernelType, DamProjectType damProjectType, FailureMechanismSystemType failureMechanismSystemType, int i]
+        {
+            get
+            {
+                return configurationStatus[(int) kernelType, (int) damProjectType, (int) failureMechanismSystemType, i];
+            }
+            set
+            {
+                configurationStatus[(int) kernelType, (int) damProjectType, (int) failureMechanismSystemType, i] = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the available dam project types.
+        /// </summary>
+        /// <returns></returns>
+        public ICollection GetAvailableDamProjectTypes()
+        {
+            return new[]
+            {
+                DamProjectType.Calamity,
+                DamProjectType.Design
+            };
+        }
+
+        /// <summary>
+        /// Gets the available failure mechanisms.
+        /// </summary>
+        /// <param name="kernelType"></param>
+        /// <param name="damProjectType">Type of the dam project.</param>
+        /// <returns></returns>
+        public ICollection GetAvailableFailureMechanisms(StabilityKernelType kernelType, DamProjectType damProjectType)
+        {
+            var availableList = new List<FailureMechanismSystemType>();
+            foreach (FailureMechanismSystemType failureMechanismSystemType in Enum.GetValues(typeof(FailureMechanismSystemType)))
+            {
+                for (int i = 0; i < maxModelCount; i++)
+                {
+                    if (this[kernelType, damProjectType, failureMechanismSystemType, i] == ConfigurationStatus.Available)
+                    {
+                        availableList.Add(failureMechanismSystemType);
+                        break;
+                    }
+                }
+            }
+            return availableList;
+        }
+
+        /// <summary>
+        /// Gets the available mechanism models.
+        /// </summary>
+        /// <param name="kernelType"></param>
+        /// <param name="damProjectType">Type of the dam project.</param>
+        /// <param name="failureMechanismSystemType">Type of the failure mechanism system.</param>
+        /// <returns></returns>
+        public ICollection GetAvailableMechanismModels(StabilityKernelType kernelType, DamProjectType damProjectType, FailureMechanismSystemType failureMechanismSystemType)
+        {
+            var availableList = new List<object>();
+            for (int i = 0; i < maxModelCount; i++)
+            {
+                if (this[kernelType, damProjectType, failureMechanismSystemType, i] == ConfigurationStatus.Available)
+                {
+                    switch (failureMechanismSystemType)
+                    {
+                        case FailureMechanismSystemType.Piping:
+                            var pipingModeltype = (PipingModelType) i;
+                            availableList.Add(pipingModeltype);
+                            break;
+                        case FailureMechanismSystemType.StabilityInside:
+                        case FailureMechanismSystemType.StabilityOutside:
+                        case FailureMechanismSystemType.HorizontalBalance:
+                            availableList.Add((MStabModelType) i);
+                            break;
+                        case FailureMechanismSystemType.FlowSlide:
+                            availableList.Add((FlowSlideModelType) i);
+                            break;
+                    }
+                }
+            }
+            return availableList;
+        }
+
+        private static int GetLength<T>() where T : struct
+        {
+            return Enum.GetValues(typeof(T)).Length;
+        }
+
+        /// <summary>
+        /// Inits the default status.
+        /// </summary>
+        private void InitDefaultStatus()
+        {
+            configurationStatus = new ConfigurationStatus[GetLength<StabilityKernelType>(), GetLength<DamProjectType>(),
+                GetLength<FailureMechanismSystemType>(),
+                maxModelCount];
+            foreach (StabilityKernelType kernelType in Enum.GetValues(typeof(StabilityKernelType)))
+            {
+                foreach (DamProjectType damProjectType in Enum.GetValues(typeof(DamProjectType)))
+                {
+                    foreach (FailureMechanismSystemType failureMechanismSystemType in Enum.GetValues(typeof(FailureMechanismSystemType)))
+                    {
+                        for (int i = 0; i < maxModelCount; i++)
+                        {
+                            this[kernelType, damProjectType, failureMechanismSystemType, i] =
+                                ConfigurationStatus.NotImplemented;
+                        }
+                    }
+                }
+            }
+            // This is the place to enable new possible failure mechanisms and models
+            this[StabilityKernelType.DamClassicStability, DamProjectType.Design, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available;
+            this[StabilityKernelType.DamClassicStability, DamProjectType.Design, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available;
+            this[StabilityKernelType.DamClassicStability, DamProjectType.Design, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.BishopUpliftVan] = ConfigurationStatus.Available;
+            this[StabilityKernelType.DamClassicStability, DamProjectType.Design, FailureMechanismSystemType.StabilityOutside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available;
+            this[StabilityKernelType.DamClassicStability, DamProjectType.Design, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer] = ConfigurationStatus.Available;
+            this[StabilityKernelType.DamClassicStability, DamProjectType.Design, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer2Forces] = ConfigurationStatus.NotAvailable;
+            this[StabilityKernelType.DamClassicStability, DamProjectType.Design, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer4Forces] = ConfigurationStatus.Available;
+            this[StabilityKernelType.DamClassicStability, DamProjectType.Design, FailureMechanismSystemType.Piping, (int) PipingModelType.Bligh] = ConfigurationStatus.Available;
+            this[StabilityKernelType.DamClassicStability, DamProjectType.Design, FailureMechanismSystemType.Piping, (int) PipingModelType.Wti2017] = ConfigurationStatus.Available;
+            this[StabilityKernelType.DamClassicStability, DamProjectType.Design, FailureMechanismSystemType.FlowSlide, (int) FlowSlideModelType.All] = ConfigurationStatus.NotAvailable;
+            
+            this[StabilityKernelType.DamClassicStability, DamProjectType.Calamity, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available;
+            this[StabilityKernelType.DamClassicStability, DamProjectType.Calamity, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available;
+            this[StabilityKernelType.DamClassicStability, DamProjectType.Calamity, FailureMechanismSystemType.StabilityOutside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available;
+            this[StabilityKernelType.DamClassicStability, DamProjectType.Calamity, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer] = ConfigurationStatus.Available;
+            this[StabilityKernelType.DamClassicStability, DamProjectType.Calamity, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer4Forces] = ConfigurationStatus.Available;
+            this[StabilityKernelType.DamClassicStability, DamProjectType.Calamity, FailureMechanismSystemType.Piping, (int) PipingModelType.Bligh] = ConfigurationStatus.Available;
+
+            this[StabilityKernelType.WtiMacroStabilityKernel, DamProjectType.Design, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available;            
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/ShapeFileExporter.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/ShapeFileExporter.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/ShapeFileExporter.cs	(revision 3305)
@@ -0,0 +1,38 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.Maps;
+
+namespace Deltares.Dam.Data.IO
+{
+    public class ShapeFileExporter : AbstractExporter<IFeatureRepository>
+    {
+        public ShapeFileExporter(string name, string outputFolder, IFeatureRepository repository)
+            : base(name, outputFolder, repository)
+        {
+        }
+
+        protected override void Export(string fileName, IFeatureRepository data)
+        {
+            ShapeFileCreator.Create(this.Path, this.Name, data);            
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectCalculationSpecification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectCalculationSpecification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectCalculationSpecification.cs	(revision 3305)
@@ -0,0 +1,245 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Xml.Serialization;
+using Deltares.Dam.Data.UISupport;
+using Deltares.Standard;
+using Deltares.Standard.Attributes;
+using Deltares.Standard.EventPublisher;
+using Deltares.Standard.Language;
+using Deltares.Standard.Validation;
+
+namespace Deltares.Dam.Data
+{
+    /// <summary>
+    /// Represents the calculation specifications at project level for DAM.
+    /// These are the main choices that specify the calculation
+    /// </summary>
+    public class DamProjectCalculationSpecification : IVisibleEnabled, IDomain, IRepairer, IDisposable
+    {
+        private readonly List<DamFailureMechanismeCalculationSpecification> damCalculationSpecifications;
+
+        private static AnalysisType selectedAnalysisType = AnalysisType.AdaptGeometry;
+        private DamFailureMechanismeCalculationSpecification currentSpecification = null;
+        private StabilityKernelType selectedStabilityKernelType;
+        private IVisibleEnabledProvider visibleEnabledProvider;
+
+        public DamProjectCalculationSpecification()
+        {
+            damCalculationSpecifications = new List<DamFailureMechanismeCalculationSpecification>();
+            //waterLevelTimeSeriesFileName = @"d:\src\delftgeosystems\trunk\data\Dam\RRD\Groot Salland\DAM UI Testdata\inputshortstart_dam.xml";
+
+            DataEventPublisher.OnAfterChange += DataEventPublisher_OnAfterChange;
+        }
+
+        private void DataEventPublisher_OnAfterChange(object sender, PublishEventArgs e)
+        {
+            if (sender == this.currentSpecification)
+            {
+                DataEventPublisher.AfterChange(this);
+            }
+        }
+
+        [ReadOnly(true)] //For now make read only as only 1 spec is allowed at this moment
+        [Validate]
+        public List<DamFailureMechanismeCalculationSpecification> DamCalculationSpecifications
+        {
+            get
+            {
+                return damCalculationSpecifications;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the analysis type for serialization purpose only.
+        /// This "dummy" property is and must be only used for serialization/deserialization purposes as the real static property 
+        /// SelectedAnalysisType is NOT serialized. This is way its name is deliberately strange.
+        /// </summary>
+        /// <value>
+        /// The analysis type for serialization purpose only.
+        /// </value>
+        public AnalysisType AnalysisTypeForSerializationPurposeOnly
+        {
+            get
+            {
+                return selectedAnalysisType;
+            }
+            set
+            {
+                selectedAnalysisType = value;
+            }
+
+        }
+
+        /// <summary>
+        /// Gets or sets the type of the selected analysis.
+        /// </summary>
+        /// <value>
+        /// The type of the selected analysis.
+        /// </value>
+        [Label("Analysis type")]
+        public static AnalysisType SelectedAnalysisType
+        {
+            get { return selectedAnalysisType; }
+            set
+            {
+                // Create local instance of DamProjectCalculationSpecification because event handlers need sender
+                var r = new DamProjectCalculationSpecification();
+                DataEventPublisher.BeforeChange(r, "SelectedAnalysisType");
+                selectedAnalysisType = value;
+                DataEventPublisher.AfterChange(r, "SelectedAnalysisType");
+            }
+        }
+
+        [XmlIgnore]
+        public DamFailureMechanismeCalculationSpecification CurrentSpecification
+        {
+            get
+            {
+                if (currentSpecification == null && damCalculationSpecifications.Count > 0)
+                {
+                    currentSpecification = damCalculationSpecifications[0];
+                }
+                
+                return currentSpecification;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "CurrentSpecification");
+                currentSpecification = value;                
+                DataEventPublisher.AfterChange(this, "CurrentSpecification");
+            }
+        }
+
+        public StabilityKernelType SelectedStabilityKernelType
+        {
+            get { return selectedStabilityKernelType; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, x => x.SelectedStabilityKernelType);
+                selectedStabilityKernelType = value;
+                if (currentSpecification != null)
+                {
+                    currentSpecification.StabilityKernelType = selectedStabilityKernelType;
+                }
+                DataEventPublisher.AfterChange(this, x => x.SelectedStabilityKernelType);
+            }
+        }
+
+        [XmlIgnore]
+        [Browsable(false)]
+        public IVisibleEnabledProvider VisibleEnabledProvider
+        {
+            get { return visibleEnabledProvider; }
+            set { visibleEnabledProvider = value; }
+        }
+
+        public bool IsVisible(string property)
+        {
+            if (damCalculationSpecifications.Count <= 0) return false;
+            switch (property)
+            {
+                case "SelectedAnalysisType": return Location.DamProjectType == DamProjectType.Design;
+                case "CurrentSpecification":
+                {
+                    var bol = (damCalculationSpecifications.Count > 0) &&
+                           (this.CurrentSpecification.FailureMechanismSystemType ==
+                            FailureMechanismSystemType.StabilityInside ||
+                            this.CurrentSpecification.FailureMechanismSystemType ==
+                            FailureMechanismSystemType.StabilityOutside);
+                    return bol;
+                }
+                case "SelectedStabilityKernelType":
+                {
+                    return visibleEnabledProvider != null && visibleEnabledProvider.IsVisible(this, "SelectedStabilityKernelType");
+                }
+                default : return true;
+            }
+        }
+
+        public bool IsEnabled(string property)
+        {
+            switch (property)
+            {
+                default: return true;
+            }            
+        }
+
+        public ICollection GetDomain(string property)
+        {
+            switch (property)
+            {
+                case "SelectedAnalysisType": return new[] { AnalysisType.AdaptGeometry, AnalysisType.NoAdaption };
+                default: return null;
+            }
+        }
+
+        [Validate]
+        public ValidationResult[] Validate()
+        {
+            if (damCalculationSpecifications.Count > 1)
+            {
+                return new[]{ new ValidationResult(ValidationResultType.Error, LocalizationManager.GetTranslatedText(this, "MaxOneCalculationSpecification"),
+                    this, "DamCalculationSpecifications", "DamCalculationSpecifications", this)};
+            }
+            else
+            {
+                return new ValidationResult[0];    
+            }
+            
+        }
+
+        private void RepairTooManySpecifications()
+        {
+            for (int i = damCalculationSpecifications.Count - 1; i > 0 ; i--)
+            {
+                damCalculationSpecifications.Remove(damCalculationSpecifications[i]);
+            }
+        }
+
+        public void Repair(object subject, string property, string id)
+        {
+            switch (id)
+            {
+                case "DamCalculationSpecifications": this.RepairTooManySpecifications(); break;
+            }
+        }
+
+        public string GetRepairDescription(object subject, string property, string id)
+        {
+            switch (id)
+            {
+                case "DamCalculationSpecifications":
+                    return LocalizationManager.GetTranslatedText(this, "KeepFirstCalculationSpecification");
+                default: return "";
+            }
+        }
+
+        public void Dispose()
+        {
+            DataEventPublisher.OnAfterChange -= DataEventPublisher_OnAfterChange;
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileImporter.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileImporter.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileImporter.cs	(revision 3305)
@@ -0,0 +1,145 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Deltares.Dam.Data.CsvImporters;
+using Deltares.Dam.Data.DataPlugins.Configuration;
+using Deltares.Maps;
+
+namespace Deltares.Dam.Data.Importers
+{
+    internal class LocationShapeFileImporter : IImporter<CsvImporterLocations.LocationRecord>
+    {
+        /// <summary>
+        /// Creates a location shape file importer instance.
+        /// </summary>
+        /// <param name="existingLocationRecords">The existing location list.</param>
+        /// <param name="configuredAttributes">The configured attributes.</param>
+        /// <param name="shapeFileLocation">The shape file location.</param>
+        /// <returns></returns>
+        public static LocationShapeFileImporter Create(IEnumerable<CsvImporterLocations.LocationRecord> existingLocationRecords, IEnumerable<DataAttribute> configuredAttributes, string shapeFileLocation)
+        {
+            if (string.IsNullOrEmpty(shapeFileLocation) || shapeFileLocation.Trim() == "")
+                throw new ArgumentException("shapeFileLocation");
+
+            const string locationAttrId = LocationShapeFileAttributeMap.LocationAttributeId;
+            var configuredAttribute = configuredAttributes.SingleOrDefault(a => a.AttributeId.Equals(locationAttrId, StringComparison.InvariantCultureIgnoreCase));
+
+            if (configuredAttribute == null)
+                return null;
+
+            var locationMapping = LocationShapeFileAttributeMap.GetAttributeMapping(configuredAttribute, locationAttrId);
+
+            var file = new ShapeFileLocation(shapeFileLocation, locationMapping.File);
+            if (!file.Exists)
+                throw new FileNotFoundException(string.Format("The file '{0}' is not found", file.FullPath));
+
+            var importer = new LocationShapeFileImporter(existingLocationRecords, configuredAttributes)
+                               {
+                                   Repository = FeatureRepository.CreateFromShapeFile(file)
+                               };
+
+            return importer;
+        }
+
+        private readonly IEnumerable<DataAttribute> configuredAttributes;
+        private readonly ICollection<CsvImporterLocations.LocationRecord> locationRecords;
+        private readonly IList<Exception> errors;
+
+        /// <summary>
+        /// Constructs a location importer class were data will be imported from ShapeFiles
+        /// </summary>
+        /// <param name="existingLocationRecords"></param>
+        /// <param name="configuredAttributes"></param>
+        public LocationShapeFileImporter(IEnumerable<CsvImporterLocations.LocationRecord> existingLocationRecords, IEnumerable<DataAttribute> configuredAttributes)
+        {
+            this.configuredAttributes = configuredAttributes;
+            this.locationRecords = new List<CsvImporterLocations.LocationRecord>();
+
+            if (existingLocationRecords != null)
+            {
+                foreach (var location in existingLocationRecords.Where(location => location != null))
+                {
+                    this.locationRecords.Add(location);
+                }
+            }
+
+            this.errors = new List<Exception>();
+        }
+
+        public IEnumerable<Exception> ImportErrors
+        {
+            get { return this.errors; }
+        }
+
+        internal IFeatureRepository Repository { get; set; }
+
+        #region Implementation of IImporter<Location>
+
+        public IEnumerable<CsvImporterLocations.LocationRecord> ImportedItems
+        {
+            get { return locationRecords; }
+        }
+
+        #endregion
+
+        public void Import()
+        {
+            if (Repository == null)
+                return;
+
+            const string locationAttrId = LocationShapeFileAttributeMap.LocationAttributeId;
+            var configuredAttribute = configuredAttributes.Single(a => a.AttributeId.Equals(locationAttrId, StringComparison.InvariantCultureIgnoreCase));
+            var locationMapping = LocationShapeFileAttributeMap.GetAttributeMapping(configuredAttribute, locationAttrId);
+
+            const string dikeRingAttrId = LocationShapeFileAttributeMap.DikeRingAttributeId;
+            configuredAttribute = configuredAttributes.SingleOrDefault(a => a.AttributeId.Equals(dikeRingAttrId, StringComparison.InvariantCultureIgnoreCase));
+            var dikeRingMapping = LocationShapeFileAttributeMap.GetAttributeMapping(configuredAttribute, dikeRingAttrId);
+
+            foreach (var feature in Repository.Features)
+            {
+                var locationIDValue = feature.Attributes[locationMapping.Name].ToString();
+                var dikeRingIdValue = feature.Attributes[dikeRingMapping.Name].ToString();
+
+                //Locations are read from shapefile after the locations have been read from locations.csv
+                //If a location already exists, overwrite the existing location
+                //otherwise create a new location
+                var locationRecord = locationRecords.FirstOrDefault(l => l.LocationId == locationIDValue);
+                var newLocation = locationRecord == null;
+                if (newLocation)
+                {
+                    locationRecord = new CsvImporterLocations.LocationRecord();
+                }
+                locationRecord.LocationId = locationIDValue;
+                locationRecord.DikeRingId = dikeRingIdValue;
+                locationRecord.GeoX = feature.Geometry.Coordinate.X;
+                locationRecord.GeoY = feature.Geometry.Coordinate.Y;
+                if (newLocation)
+                {
+                    locationRecords.Add(locationRecord);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Settings.settings
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Settings.settings	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Properties/Settings.settings	(revision 3305)
@@ -0,0 +1,96 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Deltares.Dam.Data.Properties" GeneratedClassName="Settings">
+  <Profiles />
+  <Settings>
+    <Setting Name="SegmentImportFileName" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">segments</Value>
+    </Setting>
+    <Setting Name="LocationImportFileName" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">locations</Value>
+    </Setting>
+    <Setting Name="SoilProfileImportFileName" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">soilprofiles</Value>
+    </Setting>
+    <Setting Name="SurfaceLineImportFileName" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">surfacelines</Value>
+    </Setting>
+    <Setting Name="CharacteristicPointsImportFileName" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">characteristicpoints</Value>
+    </Setting>
+    <Setting Name="ImportFileExtension" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">csv</Value>
+    </Setting>
+    <Setting Name="SoilDatabaseFile" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">Soilbase\soilbase.mdb</Value>
+    </Setting>
+    <Setting Name="ModelParametersImportFileName" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">modelparameters</Value>
+    </Setting>
+    <Setting Name="IJkdijkPipingLengthPredictionParameter" Type="System.Double" Scope="Application">
+      <Value Profile="(Default)">0.66</Value>
+    </Setting>
+    <Setting Name="PL1LineImportFileName" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">pl1lines</Value>
+    </Setting>
+    <Setting Name="GaugesImportFileName" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">gauges</Value>
+    </Setting>
+    <Setting Name="MStabExePath" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">.\DGeoStability.exe</Value>
+    </Setting>
+    <Setting Name="SlopeWExePath" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">.\GeoStudio.exe</Value>
+    </Setting>
+    <Setting Name="SlipCircleGridSizeDetermination" Type="Deltares.Dam.Data.GridSizeDetermination" Scope="Application">
+      <Value Profile="(Default)">Automatic</Value>
+    </Setting>
+    <Setting Name="SlipCircleUpliftVanLeftGridVerticalPointCount" Type="System.Int32" Scope="Application">
+      <Value Profile="(Default)">36</Value>
+    </Setting>
+    <Setting Name="SlipCircleUpliftVanLeftGridVerticalPointDistance" Type="System.Double" Scope="Application">
+      <Value Profile="(Default)">2</Value>
+    </Setting>
+    <Setting Name="SlipCircleUpliftVanLeftGridHorizontalPointCount" Type="System.Int32" Scope="Application">
+      <Value Profile="(Default)">14</Value>
+    </Setting>
+    <Setting Name="SlipCircleUpliftVanLeftGridHorizontalPointDistance" Type="System.Double" Scope="Application">
+      <Value Profile="(Default)">2</Value>
+    </Setting>
+    <Setting Name="SlipCircleUpliftVanRightGridVerticalPointCount" Type="System.Int32" Scope="Application">
+      <Value Profile="(Default)">3</Value>
+    </Setting>
+    <Setting Name="SlipCircleUpliftVanRightGridVerticalPointDistance" Type="System.Double" Scope="Application">
+      <Value Profile="(Default)">2</Value>
+    </Setting>
+    <Setting Name="SlipCircleUpliftVanRightGridHorizontalPointCount" Type="System.Int32" Scope="Application">
+      <Value Profile="(Default)">6</Value>
+    </Setting>
+    <Setting Name="SlipCircleUpliftVanRightGridHorizontalPointDistance" Type="System.Double" Scope="Application">
+      <Value Profile="(Default)">2</Value>
+    </Setting>
+    <Setting Name="SlipCircleBishopGridVerticalPointCount" Type="System.Int32" Scope="Application">
+      <Value Profile="(Default)">10</Value>
+    </Setting>
+    <Setting Name="SlipCircleBishopGridVerticalPointDistance" Type="System.Double" Scope="Application">
+      <Value Profile="(Default)">2.5</Value>
+    </Setting>
+    <Setting Name="SlipCircleBishopGridHorizontalPointCount" Type="System.Int32" Scope="Application">
+      <Value Profile="(Default)">10</Value>
+    </Setting>
+    <Setting Name="SlipCircleBishopGridHorizontalPointDistance" Type="System.Double" Scope="Application">
+      <Value Profile="(Default)">2.5</Value>
+    </Setting>
+    <Setting Name="SlipCircleUpliftVanTangentLinesDefinition" Type="Deltares.Dam.Data.TangentLinesDefinition" Scope="Application">
+      <Value Profile="(Default)">OnBoundaryLines</Value>
+    </Setting>
+    <Setting Name="SlipCircleUpliftVanTangentLinesDistance" Type="System.Double" Scope="Application">
+      <Value Profile="(Default)">0.25</Value>
+    </Setting>
+    <Setting Name="SlipCircleBishopTangentLinesDefinition" Type="Deltares.Dam.Data.TangentLinesDefinition" Scope="Application">
+      <Value Profile="(Default)">OnBoundaryLines</Value>
+    </Setting>
+    <Setting Name="SlipCircleBishopTangentLinesDistance" Type="System.Double" Scope="Application">
+      <Value Profile="(Default)">0.25</Value>
+    </Setting>
+  </Settings>
+</SettingsFile>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/StabilityTimeSerieEntry.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/StabilityTimeSerieEntry.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/StabilityTimeSerieEntry.cs	(revision 3305)
@@ -0,0 +1,36 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Dam.Data
+{
+//    using System;
+//    using System.Collections.Specialized;
+//
+//    public class StabilityTimeSerieEntry : TimeSerieEntry
+//    {
+//        public StabilityTimeSerieEntry()
+//        {
+//            this.MStabProjectPaths = new StringCollection();
+//        }
+//
+//        public StringCollection MStabProjectPaths { get; set; }
+//    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/InRangeSpecification.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/InRangeSpecification.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Specifications/InRangeSpecification.cs	(revision 3305)
@@ -0,0 +1,46 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Standard.Specifications
+{
+    /// <summary>
+    /// Checks if the candidate is within the range boundaries. Boundaries are included
+    /// </summary>
+    public class InRangeSpecification : SpecificationBase<double>
+    {
+        private readonly double min;
+        private readonly double max;
+
+        public InRangeSpecification(double min, double max)
+        {
+            this.min = min;
+            this.max = max;
+
+            Name = "In range specification";
+            Description = string.Format("The candidate value should have a value between {0} and {1}. Boundaries are included", min, max);
+        }
+
+        public override bool IsSatisfiedBy(double candidate)
+        {
+            return (min <= candidate && max >= candidate);
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/Common.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/Common.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/Common.cs	(revision 3305)
@@ -0,0 +1,76 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.IO;
+using System.Reflection;
+
+namespace Deltares.Standard
+{
+    public static class Common
+    {
+        /// <summary>
+        /// Extracts an embedded file out of a given assembly.
+        /// </summary>
+        /// <param name="assemblyName">The namespace of you assembly.</param>
+        /// <param name="fileName">The name of the file to extract.</param>
+        /// <returns>A stream containing the file data.</returns>
+        public static Stream GetEmbeddedFile(string assemblyName, string fileName)
+        {
+            try
+            {
+                Assembly a = Assembly.Load(assemblyName);
+                Stream str = a.GetManifestResourceStream(assemblyName + "." + fileName);
+
+                if (str == null)
+                    throw new Exception("Could not locate embedded resource '" + fileName + "' in assembly '" + assemblyName + "'");
+                return str;
+            }
+            catch (Exception e)
+            {
+                throw new Exception(string.Format("{0}: {1}", assemblyName, e.Message));
+            }
+        }
+
+        /// <summary>
+        /// Extracts an embedded file out of a given assembly.
+        /// </summary>
+        /// <param name="resourceName">The name of the resource which normally is the namespace of you assembly and the file.</param>
+        /// <returns>A stream containing the file data.</returns>
+        public static Stream GetEmbeddedFile(Assembly assembly, string resourceName)
+        {
+            try
+            {
+                Stream str = assembly.GetManifestResourceStream(resourceName);
+
+                if (str == null)
+                    throw new Exception(
+                        string.Format("Could not locate embedded resource '{0}' in assembly '{1}'",
+                                      resourceName, assembly.GetName()));
+                return str;
+            }
+            catch (Exception e)
+            {
+                throw new Exception(string.Format("{0}: {1}", assembly.GetName(), e.Message));
+            }
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DikeCoordinateSystemConverter.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DikeCoordinateSystemConverter.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DikeCoordinateSystemConverter.cs	(revision 3305)
@@ -0,0 +1,100 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Linq;
+using Deltares.Geometry;
+using Deltares.Geotechnics.SurfaceLines;
+
+namespace Deltares.Dam.Data
+{
+    using System;
+
+    /// <summary>
+    /// Exception class for DikeCoordinateSystemConverter
+    /// </summary>
+    public class DikeCoordinateSystemConverterException : Exception
+    {
+        public DikeCoordinateSystemConverterException(string message)
+            : base(message)
+        {
+        }
+    }
+    /// <summary>
+    /// class for converting dike object coordinates from global to local system
+    /// </summary>
+    public class DikeCoordinateSystemConverter
+    {
+        public void CreateLocalXZObjects(Dike dike)
+        {
+            ThrowIfInvalidDike(dike);
+            foreach (Location location in dike.Locations.Where(x => null != x.SurfaceLine2))
+            {
+                // This can obviously only be done when SurfaceLine is available
+                // In unit test situations sometimes the surfaceline is not defined
+                ThrowIfAlreadyConvertedToLocalCoordinates(location.AreLocalXZObjectsCreated, String.Format("Location {0}", location.Name));
+                var coordinateSystemConverter = new CoordinateSystemConverter();
+                coordinateSystemConverter.DefineGlobalXYZBasedOnLine(location.SurfaceLine2.Geometry);
+                PL1Line localPL1Line = (location.PL1Line != null) ? location.PL1Line.Clone() : null;
+                SurfaceLine2 localSurfaceLine = location.SurfaceLine2.FullDeepClone();
+                coordinateSystemConverter.ConvertGlobalXYZToLocalXZ(localSurfaceLine.Geometry);
+                if (localPL1Line != null)
+                    coordinateSystemConverter.ConvertGlobalXYZToLocalXZ(localPL1Line);
+                location.LocalXZPL1Line = localPL1Line;
+
+                if (location.LocalXZSurfaceLine2 != null)
+                {
+                    location.LocalXZSurfaceLine2.Dispose();
+                }
+                location.LocalXZSurfaceLine2 = localSurfaceLine;
+                location.AreLocalXZObjectsCreated = true;
+            }
+        }
+
+        /// <summary>
+        /// Validate dike and throw exception if not valid
+        /// </summary>
+        /// <param name="dike"></param>
+        private static void ThrowIfInvalidDike(Dike dike)
+        {
+            try
+            {
+                dike.Validate();
+            }
+            catch (Exception exception)
+            {
+                throw new DikeCoordinateSystemConverterException(exception.Message);
+            }
+        }
+
+        /// <summary>
+        /// Throws exception if surfaceline already has been converted
+        /// </summary>
+        /// <param name="dike"></param>
+        private static void ThrowIfAlreadyConvertedToLocalCoordinates(bool isConvertedToLocalCoordinates, string objectDescription)
+        {
+            if (isConvertedToLocalCoordinates)
+            {
+                throw new DikeCoordinateSystemConverterException(String.Format("{0} has already been converted from global to local coordinates", objectDescription));
+            }
+        }
+
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamJob.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamJob.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamJob.cs	(revision 3305)
@@ -0,0 +1,72 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.ComponentModel;
+using Deltares.Standard.Attributes;
+using Deltares.Standard.EventPublisher;
+
+namespace Deltares.Dam.Data
+{
+    public class DamJob
+    {
+        private bool? run = false;
+        private object subject = null;
+        private string name;
+
+        public DamJob()
+        {
+        }
+
+        public DamJob(object subject) : this()
+        {
+            this.subject = subject;
+        }
+
+        [Label("Name")]
+        [ReadOnly(true)]
+        [PropertyOrder(0,0)]
+        public virtual string Name
+        {
+            get { return this.subject != null ? this.subject.ToString() : ""; }
+            set { name = value; }
+        }
+
+        [Label("Run")]
+        [PropertyOrder(0, 1)]
+        public virtual bool? Run
+        {
+            get { return run; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "Run");
+                run = value;
+                DataEventPublisher.AfterChange(this, "Run");
+            }
+        }
+
+        [Browsable(false)]
+        public virtual object Subject
+        {
+            get { return subject; }
+            set { subject = value; }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/EntityAlreadyExistException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/EntityAlreadyExistException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/EntityAlreadyExistException.cs	(revision 3305)
@@ -0,0 +1,48 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Deltares.Dam.Data
+{
+    [Serializable]
+    public class EntityAlreadyExistException : Exception
+    {
+        public EntityAlreadyExistException()
+        {
+        }
+
+        public EntityAlreadyExistException(string message) : base(message)
+        {
+        }
+
+        public EntityAlreadyExistException(string message, Exception inner) : base(message, inner)
+        {
+        }
+
+        protected EntityAlreadyExistException(
+            SerializationInfo info,
+            StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/FeatureCoverageException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/FeatureCoverageException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/FeatureCoverageException.cs	(revision 3305)
@@ -0,0 +1,48 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Deltares.Maps
+{
+    [Serializable]
+    public class FeatureCoverageException : Exception
+    {
+        public FeatureCoverageException()
+        {
+        }
+
+        public FeatureCoverageException(string message) : base(message)
+        {
+        }
+
+        public FeatureCoverageException(string message, Exception inner) : base(message, inner)
+        {
+        }
+
+        protected FeatureCoverageException(
+            SerializationInfo info,
+            StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/FeatureRepositoryTests.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/FeatureRepositoryTests.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Test/FeatureRepositoryTests.cs	(revision 3305)
@@ -0,0 +1,38 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of the application DAM - UI.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using NUnit.Framework;
+
+namespace Deltares.Maps.Tests
+{
+    [TestFixture]
+    public class FeatureRepositoryTests
+    {
+        [Test]
+        [Category("Integration")]
+        [ExpectedException(typeof(FeatureImportException))]
+        public void CreateFromShapeFile_UsingShapeFileThatContainsOneCompositeShapeAndNRecords_Throws()
+        {
+            string plLinesFilename = @"..\..\..\..\data\Dam\Waterboards\HD\shapefiles\PLLINES.shp";
+            FeatureRepository.CreateFromShapeFile(new ShapeFileLocation(plLinesFilename));
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Translations.xml
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Translations.xml	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Translations.xml	(revision 3305)
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Stichting Deltares 2019. All rights reserved.
+
+This file is part of the DAM - Clients Library.
+
+The DAM - UI is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+<Translations>
+  <Translation ID="NoMatchError" en-US="For target {0}, the shape file {1} does not contain information for point ({2} {3})" 
+               nl-NL="Voor doel {0} bevat de shape file {1} geen informatie voor punt ({2} {3})" />  
+  
+</Translations>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.DamClientsLibrary.Version/Properties/AssemblyInfo.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.DamClientsLibrary.Version/Properties/AssemblyInfo.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.DamClientsLibrary.Version/Properties/AssemblyInfo.cs	(revision 3305)
@@ -0,0 +1,28 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Deltares.DamClientsLibrary.Version")]
+[assembly: AssemblyDescription("")]
+[assembly: ComVisible(false)]
+[assembly: Guid("48691761-637b-4eff-a04c-2047e5fa9843")]
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/PolygonAttributeImporter.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/PolygonAttributeImporter.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/PolygonAttributeImporter.cs	(revision 3305)
@@ -0,0 +1,150 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Deltares.Standard.Language;
+
+namespace Deltares.Maps
+{
+    /// <summary>
+    ///     Sets property values of target objects which are retrieved from the ShapeFile attributes covering a given point
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public class PolygonAttributeImporter<T> : IAttributeImporter<T>
+    {
+        private readonly IList<Exception> errors;
+
+        public PolygonAttributeImporter()
+        {
+            errors = new List<Exception>();
+        }
+
+        public IEnumerable<Exception> Errors
+        {
+            get { return errors; }
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the file.
+        /// </summary>
+        /// <value>
+        /// The name of the file.
+        /// </value>
+        public string FileName { private get; set; }
+
+        public void AddError(Exception exception)
+        {
+            errors.Add(exception);
+        }
+
+        /// <summary>
+        ///     Sets the feature repository containing the attribute data
+        /// </summary>
+        public IFeatureRepository AttributeRepository { private get; set; }
+
+        /// <summary>
+        ///     Sets the target objects containing the properties to set the retrieved coverage values on
+        /// </summary>
+        public IEnumerable<T> Targets { private get; set; }
+
+        /// <summary>
+        ///     Sets the x getter function, which is used to get the x value from a target object
+        /// </summary>
+        public Func<T, double> XGetter { private get; set; }
+
+        /// <summary>
+        ///     Sets the y getter function, which is used to get the y value from the target object
+        /// </summary>
+        public Func<T, double> YGetter { private get; set; }
+
+        /// <summary>
+        ///     Sets the list of attributes to read from the repository when a match is found
+        /// </summary>
+        public IEnumerable<AttributeMapping<T>> AttributeMappings { private get; set; }
+
+        /// <summary>
+        ///     Materializes the target object properties using its x and y values in the coverage function
+        /// </summary>
+        public void Import()
+        {
+            if (Targets == null)
+            {
+                throw new InvalidOperationException("No targets set");
+            }
+
+            if (AttributeRepository == null)
+            {
+                throw new InvalidOperationException("No repository set");
+            }
+
+            if (!AttributeRepository.SupportedAttributes.Any())
+            {
+                throw new InvalidOperationException("The repository doesn't contain attributes");
+            }
+
+            if (AttributeMappings == null)
+            {
+                throw new InvalidOperationException("No attribute set");
+            }
+
+            foreach (T target in Targets)
+            {
+                double x = XGetter(target);
+                double y = YGetter(target);
+
+                Debug.Write(string.Format("analyzing location at ({0} {1})", x, y));
+
+                List<IFeature> features = AttributeRepository.GetFeaturesCovering(x, y).ToList();
+                if (features.Count == 0)
+                {
+                    Debug.WriteLine("Error: No match");
+                    AddError(new FeatureCoverageException(string.Format(LocalizationManager.GetTranslatedText(this, "NoMatchError"), target, FileName, x.ToString("F2"), y.ToString("F2"))));
+                    continue;
+                }
+
+                if (features.Count > 1)
+                {
+                    Debug.WriteLine("Error: Multiple matches");
+                    AddError(new FeatureCoverageException(string.Format("Multiple geometries found covering point ({0} {1})", x.ToString("F2"), y.ToString("F2"))));
+                    continue;
+                }
+
+                Debug.WriteLine("Success");
+                IFeature match = features[0];
+
+                foreach (var mapping in AttributeMappings)
+                {
+                    string attributeName = mapping.Name;
+                    if (!match.Attributes.Exists(attributeName))
+                    {
+                        AddError(new AttributeMissingException(attributeName));
+                        continue;
+                    }
+
+                    mapping.Action(target, match.Attributes[attributeName]);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/TextFileExporter.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/TextFileExporter.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/IO/TextFileExporter.cs	(revision 3305)
@@ -0,0 +1,56 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.IO;
+
+namespace Deltares.Dam.Data.IO
+{
+    /// <summary>
+    /// Class added to test the export functionality and interface
+    /// </summary>
+    public class TextFileExporter : AbstractExporter<string>
+    {
+        const string Extension = ".txt";
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="name">The name of the file to export to</param>
+        public TextFileExporter(string name) : base(name)
+        {
+            base.FileExtension = Extension;
+        }
+
+        public TextFileExporter(string name, string outputPath) 
+            : base(name, outputPath)
+        {
+            base.FileExtension = Extension;
+        }
+
+        protected override void Export(string fileName, string data)
+        {
+            using (var writer = File.CreateText(fileName))
+            {
+                writer.Write(Data ?? "");
+            }
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorLocation.cs	(revision 3305)
@@ -0,0 +1,523 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Xml.Serialization;
+using Deltares.Dam.Data.Sensors.Specifications;
+using Deltares.Geotechnics.SurfaceLines;
+using Deltares.Standard;
+using Deltares.Standard.Attributes;
+using Deltares.Standard.IO.Xml;
+using Deltares.Standard.Reflection;
+using Deltares.Standard.Specifications;
+using Deltares.Standard.Specifications.Extensions;
+using Validator = Deltares.Standard.Specifications.Validator;
+using XmlSerializer = Deltares.Standard.IO.Xml.XmlSerializer;
+
+namespace Deltares.Dam.Data.Sensors
+{
+    /// <summary>
+    /// Association class for sensor data and a location
+    /// </summary>
+    [Serializable]
+    public class SensorLocation : IDomain
+    {
+        #region Business Rules
+
+        /// <summary>
+        /// Specication to test if the value of the candidate is valid
+        /// </summary>
+        internal class IgnoreOrLocationData : PredicateSpecification<DataSourceTypeSensors>
+        {
+            public IgnoreOrLocationData()
+                : base(x => x == DataSourceTypeSensors.Ignore || x == DataSourceTypeSensors.LocationData)
+            {
+                Description = "Only Ignore or LocationData value allowed for this property.";
+            }
+        }
+
+        /// <summary>
+        /// Specication to test if the value of the candidate is valid
+        /// </summary>
+        internal class SensorOrLocationData : PredicateSpecification<DataSourceTypeSensors>
+        {
+            public SensorOrLocationData()
+                : base(x => x == DataSourceTypeSensors.Sensor || x == DataSourceTypeSensors.LocationData)
+            {
+                Description = "Only Sensor or LocationData value allowed for this property.";
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Constructor is needed for XML deserialization
+        /// </summary>
+        [Browsable(false)]
+        public SensorLocation()
+        {
+            SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData;
+            SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData;
+        }
+
+        /// <summary>
+        /// Gets or sets the DAM location.
+        /// </summary>
+        /// <value>
+        /// The location.
+        /// </value>
+        [XmlIgnore]
+        [Specification(typeof(NotNullSpecification))]
+        [Browsable(false)]
+        public Location Location { get; set; }
+
+        /// <summary>
+        /// Gets the location Name.
+        /// </summary>
+        /// <remarks>
+        /// If the Name is empty it could indicate that there is no reference 
+        /// to a valid location
+        /// </remarks>
+        [XmlIgnore]
+        [PropertyOrder(1, 1)]
+        public string LocationName
+        {
+            get { return (Location != null) ? Location.Name : string.Empty; }
+        }
+
+        /// <summary>
+        /// Gets or sets the sensor group.
+        /// </summary>
+        /// <value>
+        /// The group.
+        /// </value>
+        [Specification(typeof(NotNullSpecification))]
+        [PropertyOrder(1, 5)]
+        public Group Group { get; set; }
+
+        /// <summary>
+        /// Gets the group ID. 
+        /// </summary>
+        /// <remarks>
+        /// If the ID has value -1 then the there is no valid reference (null) 
+        /// or the group is transient. 
+        /// </remarks>
+        [XmlIgnore]
+        [Browsable(false)]
+        public int GroupID
+        {
+            get
+            {
+                if (Group == null)
+                    return -1;
+
+                return Group.ID;
+            }
+        }
+
+        /// <summary>
+        /// Resets the group identifier.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        public void ResetGroupID(int id)
+        {
+            Group.ID = id;
+        }
+
+        /// <summary>
+        /// Gets the sensor selection.
+        /// </summary>
+        [XmlIgnore]
+        [Browsable(false)]
+        public IEnumerable<Sensor> Sensors
+        {
+            get
+            {
+                if (Group == null)
+                    return new Sensor[0];
+
+                return Group.Selection;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the source type PL3.
+        /// </summary>
+        /// <value>
+        /// The source type PL3.
+        /// </value>
+        [Specification(typeof(SensorOrLocationData))]
+        [PropertyOrder(1, 12)]
+        [XmlOldName("PL3")]
+        public DataSourceTypeSensors SourceTypePl3 { get; set; }
+
+        /// <summary>
+        /// Gets or sets the source type PL4.
+        /// </summary>
+        /// <value>
+        /// The source type PL4.
+        /// </value>
+        [Specification(typeof(SensorOrLocationData))]
+        [PropertyOrder(1, 13)]
+        [XmlOldName("PL4")]
+        public DataSourceTypeSensors SourceTypePl4 { get; set; }
+
+
+        /// <summary>
+        /// Gets or sets the source type PL1 water level at river.
+        /// </summary>
+        /// <value>
+        /// The source type PL1 water level at river.
+        /// </value>
+        [Specification(typeof(SensorOrLocationData))]
+        [PropertyOrder(1, 6)]
+        [XmlOldName("PL1WaterLevelAtRiver")]
+        public DataSourceTypeSensors SourceTypePl1WaterLevelAtRiver { get; set; }
+
+        /// <summary>
+        /// Gets or sets the source type PL1 pl line offset below dike top at river.
+        /// </summary>
+        /// <value>
+        /// The source type PL1 pl line offset below dike top at river.
+        /// </value>
+        [Specification(typeof(IgnoreOrLocationData))]
+        [PropertyOrder(1, 7)]
+        [XmlOldName("PL1PLLineOffsetBelowDikeTopAtRiver")]
+        public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowDikeTopAtRiver { get; set; }
+
+        /// <summary>
+        /// Gets or sets the source type PL1 pl line offset below dike top at polder.
+        /// </summary>
+        /// <value>
+        /// The source type PL1 pl line offset below dike top at polder.
+        /// </value>
+        [Specification(typeof(IgnoreOrLocationData))]
+        [PropertyOrder(1, 8)]
+        [XmlOldName("PL1PLLineOffsetBelowDikeTopAtPolder")]
+        public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowDikeTopAtPolder { get; set; }
+
+        [Specification(typeof(IgnoreOrLocationData))]
+        [PropertyOrder(1, 9)]
+        public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowShoulderBaseInside { get; set; }
+
+        /// <summary>
+        /// Gets or sets the source type PL1 pl line offset below dike toe at polder.
+        /// </summary>
+        /// <value>
+        /// The source type PL1 pl line offset below dike toe at polder.
+        /// </value>
+        [Specification(typeof(IgnoreOrLocationData))]
+        [PropertyOrder(1, 10)]
+        [XmlOldName("PL1PLLineOffsetBelowDikeToeAtPolder")]
+        public DataSourceTypeSensors SourceTypePl1PlLineOffsetBelowDikeToeAtPolder { get; set; }
+
+        /// <summary>
+        /// Gets or sets the source type PL1 water level at polder.
+        /// </summary>
+        /// <value>
+        /// The source type PL1 water level at polder.
+        /// </value>
+        [Specification(typeof(SensorOrLocationData))]
+        [PropertyOrder(1, 11)]
+        [XmlOldName("PL1WaterLevelAtPolder")]
+        public DataSourceTypeSensors SourceTypePl1WaterLevelAtPolder { get; set; }
+
+        /// <summary>
+        /// Gets the sensor count.
+        /// </summary>
+        [Browsable(false)]
+        public int SensorCount
+        {
+            get
+            {
+                return Group?.SensorCount ?? 0;
+            }
+        }
+
+        [Browsable(false)]
+        public SurfaceLine2 SurfaceLine
+        {
+            get { return Location.SurfaceLine2; }
+        }
+
+        [PropertyOrder(1, 3)]
+        public string Alias { get; set; }
+
+        [Browsable(false)]
+        public string Profile { get; set; }
+
+        /// <summary>
+        /// Gets the PiezometricHead type sensors sorted by relative location along profile.
+        /// </summary>
+        /// <param name="plLineType">Type of the pl line.</param>
+        /// <returns></returns>
+        internal SortedDictionary<double, Sensor> GetSensorsSortedByRelativeLocationAlongProfile(PLLineType plLineType)
+        {
+            var calculatedRelativeLocations = BuildRelativeLocationTable();
+
+            var table = new SortedDictionary<double, Sensor>();
+
+            // leave out the water level and polder level sensors
+            var candidateSensors =
+                Sensors.GetBySpecification(new PiezometricHeadSensorSpecification());
+
+            foreach (var sensor in candidateSensors)
+            {
+                if (sensor.PLLineMappings.Contains(plLineType))
+                {
+                    double relativeLocation = sensor.RelativeLocationSpecified ?
+                        sensor.RelativeLocation : calculatedRelativeLocations[sensor];
+
+                    if (table.ContainsKey(relativeLocation))
+                    {
+                        throw new InvalidOperationException(
+                            "Error creating lookup table with sensors sorted by relative location along profile. The x-location " + relativeLocation + " already exists. Sensor " + sensor);
+                    }
+
+                    table.Add(relativeLocation, sensor);
+                }
+            }
+            return table;
+        }
+
+        /// <summary>
+        /// Builds the relative location table.
+        /// </summary>
+        /// <returns></returns>
+        internal IDictionary<Sensor, double> BuildRelativeLocationTable()
+        {
+            var surfaceLevelOutside = SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelOutside);
+            if (surfaceLevelOutside == null)
+                throw new InvalidOperationException("No SurfaceLevelOutside point on surface line defined");
+
+            double startPoint = surfaceLevelOutside.X;
+
+            var dict = new Dictionary<Sensor, double>();
+            foreach (Sensor sensor in Sensors)
+            {
+                double relativeLocation = startPoint + (Location.XRdDikeLine - sensor.XRd);
+                dict.Add(sensor, relativeLocation);
+            }
+            return dict;
+        }
+
+        internal static class MemberNames
+        {
+            internal static readonly string WaterLevelAtRiver = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl1WaterLevelAtRiver);
+            internal static readonly string PolderLevel = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl1WaterLevelAtPolder);
+            internal static readonly string PL3 = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl3);
+            internal static readonly string PL4 = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl4);
+            internal static readonly string Pl1PlLineOffsetBelowDikeToeAtPolder = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder);
+            internal static readonly string Pl1PlLineOffsetBelowDikeTopAtPolder = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder);
+            internal static readonly string Pl1PlLineOffsetBelowDikeTopAtRiver = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver);
+            internal static readonly string Pl1PlLineOffsetBelowShoulderBaseInside = StaticReflection.GetMemberName<SensorLocation>(x => x.SourceTypePl1PlLineOffsetBelowShoulderBaseInside);
+        }
+
+        /// <summary>
+        /// Gets the requested sensor value.
+        /// </summary>
+        /// <param name="expression">The expression.</param>
+        /// <param name="sensorValues">The sensor values.</param>
+        /// <param name="sensor">The sensor.</param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentNullException">
+        /// sensorValues
+        /// or
+        /// sensor
+        /// </exception>
+        /// <exception cref="ArgumentException">The given sensor is not an item/key in the table of sensor values</exception>
+        public double? GetValue(Expression<Func<SensorLocation, object>> expression, IDictionary<Sensor, double> sensorValues, Sensor sensor)
+        {
+            if (sensorValues == null) throw new ArgumentNullException("sensorValues");
+            if (sensor == null) throw new ArgumentNullException("sensor");
+
+            if (!sensorValues.ContainsKey(sensor))
+                throw new ArgumentException("The given sensor is not an item/key in the table of sensor values");
+
+            var memberName = StaticReflection.GetMemberName(expression);
+
+            if (memberName == MemberNames.WaterLevelAtRiver)
+            {
+                if (SourceTypePl1WaterLevelAtRiver == DataSourceTypeSensors.Sensor)
+                    return sensorValues[sensor];
+                if (SourceTypePl1WaterLevelAtRiver == DataSourceTypeSensors.LocationData)
+                    return Location.Scenarios[0].RiverLevel;
+            }
+
+            if (memberName == MemberNames.PolderLevel)
+            {
+                if (SourceTypePl1WaterLevelAtPolder == DataSourceTypeSensors.LocationData)
+                    return Location.Scenarios[0].PolderLevel;
+
+                if (SourceTypePl1WaterLevelAtPolder == DataSourceTypeSensors.Sensor)
+                    return sensorValues[sensor];
+            }
+
+            if (memberName == MemberNames.PL3)
+            {
+                if (SourceTypePl3 == DataSourceTypeSensors.Sensor)
+                    return sensorValues[sensor];
+                if (SourceTypePl3 == DataSourceTypeSensors.LocationData)
+                    return Location.Scenarios[0].HeadPl3;
+            }
+
+            if (memberName == MemberNames.PL4)
+            {
+                if (SourceTypePl4 == DataSourceTypeSensors.Sensor)
+                    return sensorValues[sensor];
+                if (SourceTypePl4 == DataSourceTypeSensors.LocationData)
+                    return Location.Scenarios[0].HeadPl4;
+            }
+
+            if (memberName == MemberNames.Pl1PlLineOffsetBelowDikeToeAtPolder)
+            {
+                if (SourceTypePl1PlLineOffsetBelowDikeToeAtPolder == DataSourceTypeSensors.LocationData)
+                    return Location.Scenarios[0].PlLineOffsetBelowDikeToeAtPolder;
+            }
+
+            if (memberName == MemberNames.Pl1PlLineOffsetBelowDikeTopAtPolder)
+            {
+                if (SourceTypePl1PlLineOffsetBelowDikeTopAtPolder == DataSourceTypeSensors.LocationData)
+                    return Location.Scenarios[0].PlLineOffsetBelowDikeTopAtPolder;
+            }
+            if (memberName == MemberNames.Pl1PlLineOffsetBelowDikeTopAtRiver)
+            {
+                if (SourceTypePl1PlLineOffsetBelowDikeTopAtRiver == DataSourceTypeSensors.LocationData)
+                    return Location.Scenarios[0].PlLineOffsetBelowDikeTopAtRiver;
+            }
+
+            if (memberName == MemberNames.Pl1PlLineOffsetBelowShoulderBaseInside)
+            {
+                if (SourceTypePl1PlLineOffsetBelowShoulderBaseInside == DataSourceTypeSensors.LocationData)
+                    return Location.Scenarios[0].PlLineOffsetBelowShoulderBaseInside;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Determines whether this instance is valid.
+        /// </summary>
+        /// <returns>
+        ///   <c>true</c> if this instance is valid; otherwise, <c>false</c>.
+        /// </returns>
+        public bool IsValid()
+        {
+
+            if (IsLocationDataAsDataSourceUsed() && Location != null)
+            {
+                if (Location.Scenarios.Count != 1)
+                {
+                    return false;
+                }
+            }
+
+            if (Validator.Validate(this).Any())
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Checks if LocationData is used as a source.
+        /// </summary>
+        /// <returns></returns>
+        private bool IsLocationDataAsDataSourceUsed()
+        {
+            if (SourceTypePl1WaterLevelAtRiver == DataSourceTypeSensors.LocationData ||
+                SourceTypePl1WaterLevelAtPolder == DataSourceTypeSensors.LocationData ||
+                SourceTypePl3 == DataSourceTypeSensors.LocationData ||
+                SourceTypePl4 == DataSourceTypeSensors.LocationData ||
+                SourceTypePl1PlLineOffsetBelowDikeToeAtPolder == DataSourceTypeSensors.LocationData ||
+                SourceTypePl1PlLineOffsetBelowDikeTopAtPolder == DataSourceTypeSensors.LocationData ||
+                SourceTypePl1PlLineOffsetBelowDikeTopAtRiver == DataSourceTypeSensors.LocationData ||
+                SourceTypePl1PlLineOffsetBelowShoulderBaseInside == DataSourceTypeSensors.LocationData)
+            {
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Serializes this instance.
+        /// </summary>
+        /// <returns></returns>
+        public string Serialize()
+        {
+            var xmlSerializer = new XmlSerializer();
+            return xmlSerializer.SerializeToString(this);
+        }
+
+        /// <summary>
+        /// Deserializes the specified XML.
+        /// </summary>
+        /// <param name="xml">The XML.</param>
+        /// <returns></returns>
+        public static SensorLocation Deserialize(string xml)
+        {
+            var xmlDeserializer = new XmlDeserializer();
+            return (SensorLocation)xmlDeserializer.XmlDeserializeFromString(xml, typeof(SensorLocation));
+        }
+
+        /// <summary>
+        /// Gets or sets the GetGroups function (injectable list, for UI purposes).
+        /// </summary>
+        /// <value>
+        /// The list of available Groups.
+        /// </value>
+        [XmlIgnore]
+        [Browsable(false)]
+        public static Func<SensorLocation, IEnumerable<Group>> GetGroups { get; set; }
+
+        private ICollection GetGroupsDomain()
+        {
+            if (GetGroups == null)
+            {
+                return null;
+            }
+
+            return GetGroups(this).ToList();
+        }
+
+        /// <summary>
+        /// Gets the domain for properties in the UI.
+        /// </summary>
+        /// <param name="property">The property.</param>
+        /// <returns></returns>
+        public ICollection GetDomain(string property)
+        {
+            switch (property)
+            {
+                case "Group":
+                    return GetGroupsDomain();
+                default:
+                    return null;
+            }
+        }
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/CollectionRequirementsNotSatisfiedException.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/CollectionRequirementsNotSatisfiedException.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/CollectionRequirementsNotSatisfiedException.cs	(revision 3305)
@@ -0,0 +1,51 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Deltares.Standard
+{
+    [Serializable]
+    public class CollectionRequirementsNotSatisfiedException : Exception
+    {
+        public CollectionRequirementsNotSatisfiedException()
+        {
+        }
+
+        public CollectionRequirementsNotSatisfiedException(string collectionElementName, string itemElementName, object coll) : base(GetMessage(collectionElementName, itemElementName, coll))
+        {
+        }
+
+        protected CollectionRequirementsNotSatisfiedException(
+            SerializationInfo info,
+            StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        private static string GetMessage(string collectionElementName, string itemElementName, object coll)
+        {
+            string msg = "Cannot write the xml sequence '{0}' with the element '{1}', because it doesn't satisfy the requirements in the xsd schema. See the schema for min and max occurences";
+            return string.Format(msg, collectionElementName, itemElementName);
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj	(revision 3305)
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Deltares.Maps</RootNamespace>
+    <AssemblyName>Deltares.Maps</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+    <CodeContractsAssemblyMode>0</CodeContractsAssemblyMode>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+    <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
+    <CodeContractsEnableRuntimeChecking>False</CodeContractsEnableRuntimeChecking>
+    <CodeContractsRuntimeOnlyPublicSurface>False</CodeContractsRuntimeOnlyPublicSurface>
+    <CodeContractsRuntimeThrowOnFailure>True</CodeContractsRuntimeThrowOnFailure>
+    <CodeContractsRuntimeCallSiteRequires>False</CodeContractsRuntimeCallSiteRequires>
+    <CodeContractsRuntimeSkipQuantifiers>False</CodeContractsRuntimeSkipQuantifiers>
+    <CodeContractsRunCodeAnalysis>False</CodeContractsRunCodeAnalysis>
+    <CodeContractsNonNullObligations>True</CodeContractsNonNullObligations>
+    <CodeContractsBoundsObligations>True</CodeContractsBoundsObligations>
+    <CodeContractsArithmeticObligations>False</CodeContractsArithmeticObligations>
+    <CodeContractsEnumObligations>False</CodeContractsEnumObligations>
+    <CodeContractsRedundantAssumptions>False</CodeContractsRedundantAssumptions>
+    <CodeContractsMissingPublicRequiresAsWarnings>True</CodeContractsMissingPublicRequiresAsWarnings>
+    <CodeContractsInferRequires>True</CodeContractsInferRequires>
+    <CodeContractsInferEnsures>False</CodeContractsInferEnsures>
+    <CodeContractsInferObjectInvariants>False</CodeContractsInferObjectInvariants>
+    <CodeContractsSuggestAssumptions>False</CodeContractsSuggestAssumptions>
+    <CodeContractsSuggestRequires>True</CodeContractsSuggestRequires>
+    <CodeContractsSuggestObjectInvariants>False</CodeContractsSuggestObjectInvariants>
+    <CodeContractsRunInBackground>True</CodeContractsRunInBackground>
+    <CodeContractsShowSquigglies>True</CodeContractsShowSquigglies>
+    <CodeContractsUseBaseLine>False</CodeContractsUseBaseLine>
+    <CodeContractsEmitXMLDocs>False</CodeContractsEmitXMLDocs>
+    <CodeContractsCustomRewriterAssembly />
+    <CodeContractsCustomRewriterClass />
+    <CodeContractsLibPaths />
+    <CodeContractsExtraRewriteOptions />
+    <CodeContractsExtraAnalysisOptions />
+    <CodeContractsSQLServerOption />
+    <CodeContractsBaseLineFile />
+    <CodeContractsCacheAnalysisResults>True</CodeContractsCacheAnalysisResults>
+    <CodeContractsFailBuildOnWarnings>False</CodeContractsFailBuildOnWarnings>
+    <CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
+    <CodeContractsReferenceAssembly>DoNotBuild</CodeContractsReferenceAssembly>
+    <CodeContractsAnalysisWarningLevel>0</CodeContractsAnalysisWarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>..\..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+    <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Deltares.Standard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31fe100197c68040, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
+    </Reference>
+    <Reference Include="GeoAPI, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\GeoAPI.1.7.1.1\lib\net403-client\GeoAPI.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NetTopologySuite, Version=1.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.1.13.1\lib\net403-client\NetTopologySuite.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NetTopologySuite.IO.GeoTools, Version=1.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.IO.1.13.1\lib\net403-client\NetTopologySuite.IO.GeoTools.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NetTopologySuite.IO.MsSqlSpatial, Version=1.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.IO.1.13.1\lib\net403-client\NetTopologySuite.IO.MsSqlSpatial.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NetTopologySuite.IO.PostGis, Version=1.13.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.IO.1.13.1\lib\net403-client\NetTopologySuite.IO.PostGis.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="PowerCollections, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.1.13.1\lib\net403-client\PowerCollections.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AttributeWrongValueException.cs" />
+    <Compile Include="CultureHelper.cs" />
+    <Compile Include="AttributeMissingException.cs" />
+    <Compile Include="AttributesDictionary.cs" />
+    <Compile Include="FeatureCoverageException.cs" />
+    <Compile Include="FeatureRepository.cs" />
+    <Compile Include="Feature.cs" />
+    <Compile Include="FileLocation.cs" />
+    <Compile Include="IFeature.cs" />
+    <Compile Include="IFeatureCollection.cs" />
+    <Compile Include="IFeatureRepository.cs" />
+    <Compile Include="NtsFeature.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="AttributeMapping.cs" />
+    <Compile Include="FeatureImportException.cs" />
+    <Compile Include="IAttributeImporter.cs" />
+    <Compile Include="IntersectionResult.cs" />
+    <Compile Include="GeometryRepositoryExtensions.cs" />
+    <Compile Include="FeatureImporter.cs" />
+    <Compile Include="IFeatureImporter.cs" />
+    <Compile Include="CoverageFunction.cs" />
+    <Compile Include="IFileReader.cs" />
+    <Compile Include="PolygonAttributeImporter.cs" />
+    <Compile Include="IFeatureReader.cs" />
+    <Compile Include="ShapeFileCreator.cs" />
+    <Compile Include="ShapeFileReader.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\Copying.GPL.licenseheader">
+      <Link>Copying.GPL.licenseheader</Link>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Translations.xml" />
+  </ItemGroup>
+  <Import Project="$(ProjectDir)..\build\Deltares.DamClientsLibrary.Version.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IFeatureImporter.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IFeatureImporter.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Maps/IFeatureImporter.cs	(revision 3305)
@@ -0,0 +1,31 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Deltares.Maps
+{
+    public interface IFeatureImporter
+    {
+        IFeatureRepository Repository { get; }
+        IReader<IFeature> Reader { set; }
+
+        void Import();
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs	(revision 3305)
@@ -0,0 +1,607 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Deltares.Dam.Data.Sensors;
+using Deltares.DamEngine.Io.XmlInput;
+using Deltares.Geotechnics;
+using Deltares.Geotechnics.Soils;
+using Deltares.Geotechnics.SurfaceLines;
+using Deltares.Standard.Extensions;
+using Soil = Deltares.Geotechnics.Soils.Soil;
+using SoilProfile1D = Deltares.Geotechnics.Soils.SoilProfile1D;
+using SurfaceLine = Deltares.DamEngine.Io.XmlInput.SurfaceLine;
+
+namespace Deltares.Dam.Data.DamEngineIo
+{
+    /// <summary>
+    /// Create DAM UI project from XML Input object
+    /// </summary>
+    public class FillDamUiFromXmlInput
+    {
+        /// <summary>
+        /// Creates the dam project data.
+        /// </summary>
+        /// <param name="input">The input.</param>
+        /// <returns></returns>
+        public static DamProjectData CreateDamProjectData(Input input)
+        {
+            ValidateInput(input);
+            var damProjectData = new DamProjectData();
+
+            if (input.MaxCalculationCoresSpecified)
+            {
+                damProjectData.MaxCalculationCores = input.MaxCalculationCores;
+            }
+
+            damProjectData.WaterBoard = new WaterBoard();
+            damProjectData.WaterBoard.Dikes = new List<Dike>();
+            damProjectData.WaterBoard.Dikes.Add(new Dike());
+            Dike dike = damProjectData.WaterBoard.Dikes[0];
+
+            TransferAnalysisSpecification(input, damProjectData);
+            TransferStabilityParameters(input, damProjectData);
+
+            var localSurfaceLines = new List<SurfaceLine2>();
+            TransferSurfaceLines(input.SurfaceLines, localSurfaceLines);
+            dike.SoilList = new SoilList();
+            TransferSoils(input.Soils, dike.SoilList);
+            TransferAquiferSoils(input.AquiferSoils, dike.SoilList);
+            TransferSoilProfiles1D(input.SoilProfiles1D, dike.SoilProfiles, dike.SoilList);
+            TransferSegments(input.Segments, dike.SoilProfiles, damProjectData.WaterBoard.Segments);
+            TransferLocations(input.Locations, dike.Locations, localSurfaceLines, damProjectData.WaterBoard.Segments);
+            if (input.OperationalInputTimeSeries != null)
+            {
+                damProjectData.InputTimeSerieCollection = new TimeSerieCollection();
+                TransferInputTimeSeries(input.OperationalInputTimeSeries, damProjectData.InputTimeSerieCollection);
+            }
+            if (input.SensorData != null)
+            {
+                damProjectData.SensorData = new SensorData();
+                TransferSensorData(input.SensorData, damProjectData.SensorData, dike.Locations);
+            }
+            return damProjectData;
+        }
+
+        private static void TransferSensorData(InputSensorData inputSensorData, SensorData sensorData, IList<Location> locations)
+        {
+            // Transfer sensors
+            foreach (var inputSensor in inputSensorData.Sensors)
+            {
+                var plLineMappings = new PLLineType[inputSensor.PlLineMapping.Length];
+                int plLineMappingIndex = 0;
+                foreach (var plLineMapping in inputSensor.PlLineMapping)
+                {
+                    plLineMappings[plLineMappingIndex] = ConversionHelper.ConvertToPlLineType(plLineMapping.PLineType);
+                    plLineMappingIndex++;
+                }
+                sensorData.Sensors.Add(new Sensors.Sensor()
+                {
+                    ID = inputSensor.Id,
+                    Name = inputSensor.Name,
+                    RelativeLocation = inputSensor.RelativeLocation,
+                    Type = ConversionHelper.ConvertToSensorType(inputSensor.SensorType),
+                    PLLineMappings = plLineMappings
+                });
+            }
+
+            // Transfer sensorgroups
+            foreach (var inputSensorGroup in inputSensorData.SensorGroups)
+            {
+                var sensorGroup = new Data.Sensors.Group();
+                sensorGroup.ID = inputSensorGroup.Id;
+                foreach (var sensorId in inputSensorGroup.SensorIds)
+                {
+                    var sensor = sensorData.Sensors.First(s => s.ID.Equals(sensorId.SensorId));
+                    sensorGroup.Add(sensor);
+                }
+                sensorData.SensorGroups.Add(sensorGroup);
+            }
+
+            // Transfer sensorlocations
+            foreach (var inputSensorLocation in inputSensorData.SensorLocations)
+            {
+                var sensorLocation = new Data.Sensors.SensorLocation();
+                sensorLocation.Location = locations.First(l => l.Name.Equals(inputSensorLocation.LocationId));
+                sensorLocation.Location.SensorLocation = sensorLocation;
+                sensorLocation.Group = sensorData.SensorGroups.First(sg => sg.ID.Equals(inputSensorLocation.GroupId));
+                sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder = ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder);
+                sensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder);
+                sensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver = ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver);
+                sensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside = ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl1PlLineOffsetBelowShoulderBaseInside);
+                sensorLocation.SourceTypePl1WaterLevelAtPolder = ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl1WaterLevelAtPolder);
+                sensorLocation.SourceTypePl1WaterLevelAtRiver = ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl1WaterLevelAtRiver);
+                sensorLocation.SourceTypePl3 = ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl3);
+                sensorLocation.SourceTypePl4 = ConversionHelper.ConvertToDataSourceTypeSensors(inputSensorLocation.SourceTypePl4);
+                sensorData.SensorLocations.Add(sensorLocation);
+            }
+        }
+
+        private static void TransferInputTimeSeries(DamEngine.Io.XmlInput.TimeSerie[] inputOperationalInputTimeSeries, TimeSerieCollection timeSerieCollection)
+        {
+            foreach (var inputTimeSerie in inputOperationalInputTimeSeries)
+            {
+                var timeSerie = timeSerieCollection.AddNewSeries(inputTimeSerie.LocationId);
+                timeSerie.ParameterId = inputTimeSerie.ParameterId;
+                timeSerie.ForecastDateTime = inputTimeSerie.ForecastDateTime;
+                timeSerie.Type = inputTimeSerie.Type;
+                timeSerie.StartDateTime = inputTimeSerie.StartDateTime;
+                timeSerie.EndDateTime = inputTimeSerie.EndDateTime;
+                timeSerie.MissVal = inputTimeSerie.MissVal;
+                timeSerie.LongName = inputTimeSerie.LongName;
+                timeSerie.StationName = inputTimeSerie.StationName;
+                timeSerie.Units = inputTimeSerie.Units;
+                timeSerie.SourceOrganisation = inputTimeSerie.SourceOrganisation;
+                timeSerie.SourceSystem = inputTimeSerie.SourceSystem;
+                timeSerie.FileDescription = inputTimeSerie.FileDescription;
+                timeSerie.Region = inputTimeSerie.Region;
+                timeSerie.TimeStep.Multiplier = inputTimeSerie.TimeStep.Multiplier;
+                timeSerie.TimeStep.Divider = inputTimeSerie.TimeStep.Divider;
+                timeSerie.TimeStep.MultiplierSpecified = inputTimeSerie.TimeStep.MultiplierSpecified1;
+                timeSerie.TimeStep.DividerSpecified = inputTimeSerie.TimeStep.DividerSpecified1;
+                timeSerie.TimeStep.Unit = ConversionHelper.ConvertToTimeStepUnit(inputTimeSerie.TimeStep.TimeStepUnit);
+                for (int i = 0; i < inputTimeSerie.Entries.TimeSerieEntry.Length; i++)
+                {
+                    var entry = inputTimeSerie.Entries.TimeSerieEntry[i];
+                    Stochast stochastValue = null;
+                    if (entry.StochastValue != null)
+                    {
+                        stochastValue = new Stochast()
+                        {
+                            Distribution = entry.StochastValue.Distribution,
+                            Mean = entry.StochastValue.Mean,
+                            StandardDeviation = entry.StochastValue.StandardDeviation
+                        };
+                    }
+                    TimeSerieEntry timeSerieEntry = new TimeSerieEntry()
+                    {
+                        DateTime = entry.DateTime,
+                        Value = entry.Value,
+                        BasisFileName = entry.BasisFileNameWMF,
+                        Flag = entry.Flagnietechtgebruikt,
+                        RelativeCalculationPathName = entry.RelativeCalculationPathName,
+                        StochastValue = stochastValue
+                    };
+                    timeSerie.Entries.Add(timeSerieEntry);
+                }
+            }
+        }
+        private static void TransferAquiferSoils(InputAquiferSoil[] inputAquiferSoils, SoilList soilList)
+        {
+            if (inputAquiferSoils != null)
+            {
+                soilList.AquiferDictionary = new Dictionary<Soil, bool>();
+                foreach (InputAquiferSoil aquiferSoil in inputAquiferSoils)
+                {
+                    soilList.AquiferDictionary.Add(soilList.GetSoilByName(aquiferSoil.Soilname), aquiferSoil.IsAquifer);
+                }
+            }
+        }
+
+        private static void TransferAnalysisSpecification(Input input, DamProjectData damProjectData)
+        {
+            damProjectData.DamProjectType = ConversionHelper.ConvertToDamProjectType(input.DamProjectType);
+
+            var calculationSpecification = new DamFailureMechanismeCalculationSpecification();
+
+            calculationSpecification.FailureMechanismSystemType = ConversionHelper.ConvertToFailureMechanismSystemType(input.FailureMechanismSystemType);
+
+            if (input.AnalysisTypeSpecified)
+            {
+                DamProjectCalculationSpecification.SelectedAnalysisType = ConversionHelper.ConvertToAnalysisType(input.AnalysisType);
+            }
+
+            if (input.PipingModelTypeSpecified)
+            {
+                calculationSpecification.PipingModelType = ConversionHelper.ConvertToPipingModelType(input.PipingModelType);
+            }
+
+            if (input.StabilityModelTypeSpecified)
+            {
+                calculationSpecification.StabilityModelType = ConversionHelper.ConvertToStabilityModelType(input.StabilityModelType);
+            }
+            damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications.Add(calculationSpecification);
+        }
+
+        private static void TransferStabilityParameters(Input input, DamProjectData damProjectData)
+        {
+            if (input.StabilityParameters != null)
+            {
+                if (damProjectData.DamProjectCalculationSpecification != null)
+                {
+                    var curSpec = damProjectData.DamProjectCalculationSpecification.CurrentSpecification;
+                    if (curSpec != null)
+                    {
+                        curSpec.FailureMechanismeParamatersMStab = new FailureMechanismeParamatersMStab();
+                        curSpec.FailureMechanismeParamatersMStab.MStabParameters = new MStabParameters();
+                        var curStabParamas = curSpec.FailureMechanismeParamatersMStab.MStabParameters;
+                        curStabParamas.SearchMethod = ConversionHelper.ConvertToSearchMethod(input.StabilityParameters.SearchMethod);
+                        curStabParamas.SlipCircleDefinition = new SlipCircleDefinition();
+                        var slipCircleDefinition = curStabParamas.SlipCircleDefinition;
+                        slipCircleDefinition.GridSizeDetermination = ConversionHelper.ConvertToGridDetermination(input.StabilityParameters.GridDetermination);
+
+                        if (input.StabilityParameters.BishopTangentLinesDefinitionSpecified)
+                        {
+                            slipCircleDefinition.BishopTangentLinesDefinition = ConversionHelper.ConvertToTangentLinesDefinition(input.StabilityParameters.BishopTangentLinesDefinition);
+                        }
+                        if (input.StabilityParameters.BishopTangentLinesDistanceSpecified)
+                        {
+                            slipCircleDefinition.BishopTangentLinesDistance = input.StabilityParameters.BishopTangentLinesDistance;
+                        }
+                        if (input.StabilityParameters.BishopGridVerticalPointsCountSpecified)
+                        {
+                            slipCircleDefinition.BishopGridVerticalPointCount = input.StabilityParameters.BishopGridVerticalPointsCount;
+                        }
+                        if (input.StabilityParameters.BishopGridVerticalPointsDistanceSpecified)
+                        {
+                            slipCircleDefinition.BishopGridVerticalPointDistance = input.StabilityParameters.BishopGridVerticalPointsDistance;
+                        }
+                        if (input.StabilityParameters.BishopGridHorizontalPointsCountSpecified)
+                        {
+                            slipCircleDefinition.BishopGridHorizontalPointCount = input.StabilityParameters.BishopGridHorizontalPointsCount;
+                        }
+                        if (input.StabilityParameters.BishopGridHorizontalPointsDistanceSpecified)
+                        {
+                            slipCircleDefinition.BishopGridHorizontalPointDistance = input.StabilityParameters.BishopGridHorizontalPointsDistance;
+                        }
+                        if (input.StabilityParameters.UpliftVanTangentLinesDefinitionSpecified)
+                        {
+                            slipCircleDefinition.UpliftVanTangentLinesDefinition = ConversionHelper.ConvertToTangentLinesDefinition(input.StabilityParameters.UpliftVanTangentLinesDefinition);
+                        }
+                        if (input.StabilityParameters.UpliftVanTangentLinesDistanceSpecified)
+                        {
+                            slipCircleDefinition.UpliftVanTangentLinesDistance = input.StabilityParameters.UpliftVanTangentLinesDistance;
+                        }
+                        if (input.StabilityParameters.UpliftVanGridLeftVerticalPointsCountSpecified)
+                        {
+                            slipCircleDefinition.UpliftVanLeftGridVerticalPointCount = input.StabilityParameters.UpliftVanGridLeftVerticalPointsCount;
+                        }
+                        if (input.StabilityParameters.UpliftVanGridLeftVerticalPointsDistanceSpecified)
+                        {
+                            slipCircleDefinition.UpliftVanLeftGridVerticalPointDistance = input.StabilityParameters.UpliftVanGridLeftVerticalPointsDistance;
+                        }
+                        if (input.StabilityParameters.UpliftVanGridLeftHorizontalPointsCountSpecified)
+                        {
+                            slipCircleDefinition.UpliftVanLeftGridHorizontalPointCount = input.StabilityParameters.UpliftVanGridLeftHorizontalPointsCount;
+                        }
+                        if (input.StabilityParameters.UpliftVanGridLeftHorizontalPointsDistanceSpecified)
+                        {
+                            slipCircleDefinition.UpliftVanLeftGridHorizontalPointDistance = input.StabilityParameters.UpliftVanGridLeftHorizontalPointsDistance;
+                        }
+                        if (input.StabilityParameters.UpliftVanGridRightVerticalPointsCountSpecified)
+                        {
+                            slipCircleDefinition.UpliftVanRightGridVerticalPointCount = input.StabilityParameters.UpliftVanGridRightVerticalPointsCount;
+                        }
+                        if (input.StabilityParameters.UpliftVanGridRightVerticalPointsDistanceSpecified)
+                        {
+                            slipCircleDefinition.UpliftVanRightGridVerticalPointDistance = input.StabilityParameters.UpliftVanGridRightVerticalPointsDistance;
+                        }
+                        if (input.StabilityParameters.UpliftVanGridRightHorizontalPointsCountSpecified)
+                        {
+                            slipCircleDefinition.UpliftVanRightGridHorizontalPointCount = input.StabilityParameters.UpliftVanGridRightHorizontalPointsCount;
+                        }
+                        if (input.StabilityParameters.UpliftVanGridRightHorizontalPointsDistanceSpecified)
+                        {
+                            slipCircleDefinition.UpliftVanRightGridHorizontalPointDistance = input.StabilityParameters.UpliftVanGridRightHorizontalPointsDistance;
+                        }
+                    }
+                }
+            }
+        }
+
+        private static void ValidateInput(Input input)
+        {
+            if (input == null)
+            {
+                throw new NullReferenceException("No input defined");
+            }
+            if (input.Locations == null)
+            {
+                throw new NullReferenceException("No locations defined in the input");
+            }
+            foreach (DamEngine.Io.XmlInput.Location location in input.Locations)
+            {
+                if (location.DesignScenarios == null)
+                {
+                    throw new NullReferenceException("No design scenarios defined in location");
+                }
+            }
+            if (input.SurfaceLines == null)
+            {
+                throw new NullReferenceException("No surfacelines defined in the input");
+            }
+            else
+            {
+                foreach (var surfaceLine in input.SurfaceLines)
+                {
+                    if ((surfaceLine.Points == null) || (surfaceLine.Points.Length < 1))
+                    {
+                        throw new NullReferenceException(string.Format("Surfaceline '{0}' has no points", surfaceLine.Name));
+                    }
+                }
+            }
+            if (input.Soils == null)
+            {
+                throw new NullReferenceException("No soils defined in the input");
+            }
+        }
+
+        private static void TransferSoils(DamEngine.Io.XmlInput.Soil[] inputSoils, SoilList dikeSoilList)
+        {
+            var soils = dikeSoilList.Soils;
+            for (int i = 0; i < inputSoils.Length; i++)
+            {
+                var soil = new Soil();
+                var inputSoil = inputSoils[i];
+                soil.Name = inputSoil.Name;
+                soil.AbovePhreaticLevel = inputSoil.AbovePhreaticLevelSpecified ? inputSoil.AbovePhreaticLevel : Double.NaN;
+                soil.BelowPhreaticLevel = inputSoil.BelowPhreaticLevelSpecified ? inputSoil.BelowPhreaticLevel : Double.NaN;
+                soil.DryUnitWeight = inputSoil.DryUnitWeightSpecified ? inputSoil.DryUnitWeight : Double.NaN;
+                soil.BeddingAngle = inputSoil.BeddingAngleSpecified ? inputSoil.BeddingAngle : Double.NaN;
+                soil.DiameterD70 = inputSoil.DiameterD70Specified ? inputSoil.DiameterD70 : Double.NaN;
+                soil.DiameterD90 = inputSoil.DiameterD90Specified ? inputSoil.DiameterD90 : Double.NaN;
+                soil.PermeabKx = inputSoil.PermeabKxSpecified ? inputSoil.PermeabKx : Double.NaN;
+                soil.WhitesConstant = inputSoil.WhitesConstantSpecified ? inputSoil.WhitesConstant : Double.NaN;
+                soil.ShearStrengthModel = inputSoil.ShearStrengthModelSpecified ?
+                    ConversionHelper.ConvertToShearStrengthModel(inputSoil.ShearStrengthModel) : ShearStrengthModel.CPhi;
+                soil.UseDefaultShearStrengthModel = inputSoil.UseDefaultShearStrengthModelSpecified ?
+                    inputSoil.UseDefaultShearStrengthModel : true;
+                soil.Cohesion = inputSoil.CohesionSpecified ? inputSoil.Cohesion : Double.NaN;
+                soil.FrictionAngle = inputSoil.FrictionAngleSpecified ? inputSoil.FrictionAngle : Double.NaN;
+                soil.OCR = inputSoil.OcrSpecified ? inputSoil.Ocr : Double.NaN;
+                soil.RestSlope = inputSoil.SlopeRestProfileSpecified ? inputSoil.SlopeRestProfile : Double.NaN;
+                soil.DilatancyType = inputSoil.DilatancyTypeSpecified ?
+                    ConversionHelper.ConvertToDilatancyType(inputSoil.DilatancyType) : DilatancyType.Phi;
+                soils.Add(soil);
+            }
+        }
+
+        private static void TransferSurfaceLines(SurfaceLine[] inputSurfaceLines, IList<SurfaceLine2> dikeSurfaceLines)
+        {
+            for (int i = 0; i < inputSurfaceLines.Length; i++)
+            {
+                var inputSurfaceLine = inputSurfaceLines[i];
+                var surfaceLine = FillDamUiFromXmlHelper.ConvertXmlSurfaceLineToSurfaceLine2(inputSurfaceLine);
+                dikeSurfaceLines.Add(surfaceLine);
+            }
+        }
+
+        private static void TransferLocations(DamEngine.Io.XmlInput.Location[] inputLocations, IList<Location> dikeLocations, IList<SurfaceLine2> dikeSurfaceLines, IList<Segment> segments)
+        {
+            for (int i = 0; i < inputLocations.Length; i++)
+            {
+                var location = new Location();
+                var inputLocation = inputLocations[i];
+                var waternetOptions = inputLocation.WaternetOptions;
+                location.Name = inputLocation.Name;
+                if (inputLocation.DistanceToEntryPointSpecified)
+                {
+                    location.DistanceToEntryPoint = inputLocation.DistanceToEntryPoint;
+                }
+                location.XSoilGeometry2DOrigin = inputLocation.XSoilGeometry2DOrigin;
+                location.PLLineCreationMethod = ConversionHelper.ConvertToPhreaticLineCreationMethod(waternetOptions.PhreaticLineCreationMethod);
+                location.IntrusionVerticalWaterPressure = ConversionHelper.ConvertToIntrusionVerticalWaterPressure(waternetOptions.IntrusionVerticalWaterPressure);
+                location.DampingFactorPL3 = waternetOptions.DampingFactorPl3;
+                location.DampingFactorPL4 = waternetOptions.DampingFactorPl4;
+                location.PenetrationLength = waternetOptions.PenetrationLength;
+                location.SlopeDampingPiezometricHeightPolderSide = waternetOptions.SlopeDampingFactor;
+                
+                SurfaceLine2 surfaceLine = dikeSurfaceLines.First(n => n.Name.Equals(inputLocation.SurfaceLineName));
+                location.LocalXZSurfaceLine2 = surfaceLine;
+
+                Segment segment = segments.First(s => s.Name.Equals(inputLocation.SegmentName));
+                location.Segment = segment;
+
+                if (inputLocation.DesignScenarios != null)
+                {
+                    for (int j = 0; j < inputLocation.DesignScenarios.Length; j++)
+                    {
+                        var designScenario = new Scenario();
+                        var inputLocationDesignScenario = inputLocation.DesignScenarios[j];
+                        designScenario.LocationScenarioID = inputLocationDesignScenario.Id;
+                        designScenario.RiverLevel = inputLocationDesignScenario.RiverLevel;
+                        designScenario.RiverLevelLow = (inputLocationDesignScenario.RiverLevelLowSpecified ? (double?)inputLocationDesignScenario.RiverLevelLow : null);
+                        designScenario.DikeTableHeight = (inputLocationDesignScenario.DikeTableHeightSpecified ? (double?)inputLocationDesignScenario.DikeTableHeight : null);
+                        designScenario.PlLineOffsetBelowDikeTopAtRiver = inputLocationDesignScenario.PlLineOffsetBelowDikeTopAtRiver;
+                        designScenario.PlLineOffsetBelowDikeTopAtPolder = inputLocationDesignScenario.PlLineOffsetBelowDikeTopAtPolder;
+                        designScenario.PlLineOffsetBelowShoulderBaseInside = inputLocationDesignScenario.PlLineOffsetBelowShoulderBaseInside;
+                        designScenario.PlLineOffsetBelowDikeToeAtPolder = inputLocationDesignScenario.PlLineOffsetBelowDikeToeAtPolder;
+                        designScenario.UsePlLineOffsetBelowDikeCrestMiddle = inputLocationDesignScenario.PlLineOffsetBelowDikeCrestMiddleSpecified;
+                        designScenario.PlLineOffsetBelowDikeCrestMiddle = inputLocationDesignScenario.PlLineOffsetBelowDikeCrestMiddle;
+                        designScenario.UsePlLineOffsetFactorBelowShoulderCrest = inputLocationDesignScenario.PlLineOffsetFactorBelowShoulderCrestSpecified;
+                        designScenario.PlLineOffsetFactorBelowShoulderCrest = inputLocationDesignScenario.PlLineOffsetFactorBelowShoulderCrest;
+                        designScenario.HeadPl3 = (inputLocationDesignScenario.HeadPl3Specified ? (double?)inputLocationDesignScenario.HeadPl3 : null);
+                        designScenario.HeadPl4 = (inputLocationDesignScenario.HeadPl4Specified ? (double?)inputLocationDesignScenario.HeadPl4 : null);
+                        designScenario.UpliftCriterionStability = inputLocationDesignScenario.UpliftCriterionStability;
+                        designScenario.UpliftCriterionPiping = inputLocationDesignScenario.UpliftCriterionPiping;
+                        designScenario.RequiredSafetyFactorStabilityInnerSlope = inputLocationDesignScenario.RequiredSafetyFactorStabilityInnerSlope;
+                        designScenario.RequiredSafetyFactorStabilityOuterSlope = inputLocationDesignScenario.RequiredSafetyFactorStabilityOuterSlope;
+                        designScenario.RequiredSafetyFactorPiping = inputLocationDesignScenario.RequiredSafetyFactorPiping;
+                        designScenario.PolderLevel = inputLocationDesignScenario.PolderLevel;
+                        designScenario.HeadPl2 = (inputLocationDesignScenario.HeadPl2Specified ? (double?)inputLocationDesignScenario.HeadPl2 : null);
+                        location.Scenarios.Add(designScenario);
+                    }
+                }
+                location.DikeEmbankmentMaterial = inputLocation.DikeEmbankmentMaterial;
+                if (inputLocation.StabilityOptions != null)
+                {
+                    location.MapForSoilGeometries2D = inputLocation.StabilityOptions.MapForSoilgeometries2D;
+                    location.SoildatabaseName = inputLocation.StabilityOptions.SoilDatabaseName;
+                    location.StabilityZoneType = ConversionHelper.ConvertToZoneType(inputLocation.StabilityOptions.ZoneType);
+                    if (inputLocation.StabilityOptions.ForbiddenZoneFactorSpecified)
+                    {
+                        location.ForbiddenZoneFactor = inputLocation.StabilityOptions.ForbiddenZoneFactor;
+                    }
+                    if (inputLocation.StabilityOptions.ZoneAreaRestSlopeCrestWidthSpecified)
+                    {
+                        location.ZoneAreaRestSlopeCrestWidth = inputLocation.StabilityOptions.ZoneAreaRestSlopeCrestWidth;
+                    }
+                    if (inputLocation.StabilityOptions.TrafficLoadSpecified)
+                    {
+                        location.TrafficLoad = inputLocation.StabilityOptions.TrafficLoad;
+                    }
+                    if (inputLocation.StabilityOptions.TrafficLoadDegreeOfConsolidationSpecified)
+                    {
+                        location.TL_DegreeOfConsolidation = inputLocation.StabilityOptions.TrafficLoadDegreeOfConsolidation;
+                    }
+                    if (inputLocation.StabilityOptions.MinimumCircleDepthSpecified)
+                    {
+                        location.MinimalCircleDepth = inputLocation.StabilityOptions.MinimumCircleDepth;
+                    }
+                }
+
+                // Design options
+                var designOptions = inputLocation.DesignOptions;
+                if (designOptions != null)
+                {
+                    location.RedesignDikeHeight = designOptions.RedesignDikeHeight;
+                    location.RedesignDikeShoulder = designOptions.RedesignDikeShoulder;
+                    location.ShoulderEmbankmentMaterial = designOptions.ShoulderEmbankmentMaterial;
+                    location.StabilityShoulderGrowSlope = designOptions.StabilityShoulderGrowSlope;
+                    location.StabilityShoulderGrowDeltaX = designOptions.StabilityShoulderGrowDeltaX;
+                    location.StabilitySlopeAdaptionDeltaX = designOptions.StabilitySlopeAdaptionDeltaX;
+                    location.SlopeAdaptionStartCotangent = designOptions.SlopeAdaptionStartCotangent;
+                    location.SlopeAdaptionEndCotangent = designOptions.SlopeAdaptionEndCotangent;
+                    location.SlopeAdaptionStepCotangent = designOptions.SlopeAdaptionStepCotangent;
+
+                    location.UseNewDikeTopWidth = designOptions.NewDikeTopWidthSpecified;
+                    if (designOptions.NewDikeTopWidthSpecified) location.NewDikeTopWidth = designOptions.NewDikeTopWidth;
+                    location.UseNewDikeSlopeInside = designOptions.NewDikeSlopeInsideSpecified;
+                    if (designOptions.NewDikeSlopeInsideSpecified) location.NewDikeSlopeInside = designOptions.NewDikeSlopeInside;
+                    location.UseNewDikeSlopeOutside = designOptions.NewDikeSlopeOutsideSpecified;
+                    if (designOptions.NewDikeSlopeOutsideSpecified) location.NewDikeSlopeOutside = designOptions.NewDikeSlopeOutside;
+                    location.UseNewShoulderTopSlope = designOptions.NewShoulderTopSlopeSpecified;
+                    if (designOptions.NewShoulderTopSlopeSpecified) location.NewShoulderTopSlope = designOptions.NewShoulderTopSlope;
+                    location.UseNewShoulderBaseSlope = designOptions.NewShoulderBaseSlopeSpecified;
+                    if (designOptions.NewShoulderBaseSlopeSpecified) location.NewShoulderBaseSlope = designOptions.NewShoulderBaseSlope;
+                    location.UseNewMaxHeightShoulderAsFraction = designOptions.NewMaxHeightShoulderAsFractionSpecified;
+                    if (designOptions.NewMaxHeightShoulderAsFractionSpecified) location.NewMaxHeightShoulderAsFraction = designOptions.NewMaxHeightShoulderAsFraction;
+                    location.UseNewMinDistanceDikeToeStartDitch = designOptions.NewMinDistanceDikeToeStartDitchSpecified;
+                    if (designOptions.NewMinDistanceDikeToeStartDitchSpecified) location.NewMinDistanceDikeToeStartDitch = designOptions.NewMinDistanceDikeToeStartDitch;
+                    location.UseNewDitchDefinition = designOptions.UseNewDitchDefinition;
+                    if (designOptions.NewWidthDitchBottomSpecified) location.NewWidthDitchBottom = designOptions.NewWidthDitchBottom;
+                    if (designOptions.NewSlopeAngleDitchSpecified) location.NewSlopeAngleDitch = designOptions.NewSlopeAngleDitch;
+                    if (designOptions.NewDepthDitchSpecified) location.NewDepthDitch = designOptions.NewDepthDitch;
+
+                    location.StabilityDesignMethod = ConversionHelper.ConvertToDamStabilityDesignMethod(designOptions.StabilityDesignMethod);
+                }
+                dikeLocations.Add(location);
+            }
+        }
+        private static void TransferSoilProfiles1D(DamEngine.Io.XmlInput.SoilProfile1D[] inputSoilProfiles1D,
+            IList<SoilProfile1D> dikeSoilProfiles, SoilList soils)
+        {
+            if (inputSoilProfiles1D != null)
+            {
+                for (int i = 0; i < inputSoilProfiles1D.Length; i++)
+                {
+                    var soilProfile1D = new SoilProfile1D();
+                    var inputSoilProfile1D = inputSoilProfiles1D[i];
+                    soilProfile1D.Name = inputSoilProfile1D.Name;
+                    soilProfile1D.BottomLevel = inputSoilProfile1D.BottomLevel;
+                    AddLayers1D(inputSoilProfile1D, soilProfile1D, soils);
+                    dikeSoilProfiles.Add(soilProfile1D);
+                }
+            }
+        }
+
+        private static void AddLayers1D(DamEngine.Io.XmlInput.SoilProfile1D inputSoilProfile1D, SoilProfile1D soilProfile1D, SoilList soils)
+        {
+            if (inputSoilProfile1D != null)
+            {
+                for (int i = 0; i < inputSoilProfile1D.Layers1D.Length; i++)
+                {
+                    var layer = new SoilLayer1D();
+                    var inputLayer = inputSoilProfile1D.Layers1D[i];
+                    layer.Id = inputLayer.Name;
+                    layer.Soil = soils.GetSoilByName(inputLayer.SoilName);
+                    layer.TopLevel = inputLayer.TopLevel;
+                    layer.IsAquifer = inputLayer.IsAquifer;
+                    layer.WaterpressureInterpolationModel = ConversionHelper.ConvertToWaterpressureInterpolationModel(
+                        inputLayer.WaterpressureInterpolationModel);
+                    soilProfile1D.Layers.Add(layer);
+                }
+            }
+        }
+
+        private static void TransferSegments(DamEngine.Io.XmlInput.Segment[] inputSegments, IList<SoilProfile1D> dikeSoilProfiles, IList<Segment> segments)
+        {
+            for (int i = 0; i < inputSegments.Length; i++)
+            {
+                var segment = new Segment();
+                var inputSegment = inputSegments[i];
+                segment.Name = inputSegment.Name;
+                AddSoilProfileProbabilities(inputSegment, dikeSoilProfiles, segment);
+                segments.Add(segment);
+            }
+        }
+
+        private static void AddSoilProfileProbabilities(DamEngine.Io.XmlInput.Segment inputSegment, IList<SoilProfile1D> dikeSoilProfiles, Segment segment)
+        {
+            for (int i = 0; i < inputSegment.SoilGeometryProbability.Length; i++)
+            {
+                var soilGeometryProbability = new SoilGeometryProbability();
+                var inputSoilGeometryProbability = inputSegment.SoilGeometryProbability[i];
+                soilGeometryProbability.Probability = inputSoilGeometryProbability.Probability;
+                if (inputSoilGeometryProbability.SegmentFailureMechanismTypeSpecified)
+                {
+                    soilGeometryProbability.SegmentFailureMechanismType = ConversionHelper.ConvertToSegmentFailureMechanismType(inputSoilGeometryProbability.SegmentFailureMechanismType);
+                }
+                else
+                {
+                    soilGeometryProbability.SegmentFailureMechanismType = null;
+                }
+                if (inputSoilGeometryProbability.SoilProfileType == 0)
+                {
+                    soilGeometryProbability.SoilProfile = FindSoilProfile1DByName(dikeSoilProfiles, inputSoilGeometryProbability.SoilProfileName);
+                }
+                else
+                {
+                    soilGeometryProbability.SoilGeometry2DName = inputSoilGeometryProbability.SoilProfileName;
+                }
+                if (soilGeometryProbability.SoilProfileType != ConversionHelper.ConvertToSoilProfileType(inputSoilGeometryProbability.SoilProfileType))
+                {
+                    throw new ConversionException(typeof(SegmentSoilGeometryProbability), soilGeometryProbability.SoilProfileType);
+                }
+                segment.SoilProfileProbabilities.Add(soilGeometryProbability);
+            }
+        }
+
+        /// <summary>
+        /// Finds the SoilProfile1D by name.
+        /// </summary>
+        /// <param name="soilProfiles">The soil profiles.</param>
+        /// <param name="name">The name.</param>
+        /// <returns></returns>
+        public static SoilProfile1D FindSoilProfile1DByName(IList<SoilProfile1D> soilProfiles, string name)
+        {
+            foreach (var soilProfile1D in soilProfiles)
+            {
+                if (soilProfile1D.Name == name)
+                    return soilProfile1D;
+            }
+            return null;
+        }
+
+    }
+}
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoPropertyAttributeMapping.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoPropertyAttributeMapping.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/DtoAssembler/DtoPropertyAttributeMapping.cs	(revision 3305)
@@ -0,0 +1,110 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+
+namespace Deltares.Standard
+{
+    /// <summary>
+    /// Importance or the requiremen for a value in the domain object 
+    /// before it can be used in a dto
+    /// </summary>
+    public enum DtoPropertyImportance
+    {
+        /// <summary>
+        /// Use this setting when the property or attribute must have a value
+        /// </summary>
+        Required,
+
+        /// <summary>
+        /// Use this setting when the property or attribute value is optional
+        /// </summary>
+        Optional
+    }
+
+    /// <summary>
+    /// Defines a mapping class which can be used in the DtoAssemler for creating 
+    /// mappings between class properties and xml attributes    
+    /// </summary>
+    public class DtoPropertyAttriubteMapping
+    {
+        /// <summary>
+        /// Holds the property to attribute translation rule
+        /// </summary>
+        private Func<object, object> toAttributeTranslationRule;
+
+        /// <summary>
+        /// Holds the attribute to property translation rule.
+        /// </summary>
+        private Func<object, object> toPropTranslationRule;
+
+
+        /// <summary>
+        /// Initializes a new instance of the DtoPropertyAttriubteMapping class
+        /// </summary>
+        public DtoPropertyAttriubteMapping()
+        {
+            this.Importance = DtoPropertyImportance.Optional;
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the property in the domain object
+        /// </summary>
+        public string PropertyName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the xml attribute of the dto
+        /// </summary>
+        public string AttributeName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the importance of the value. Required or optional?
+        /// </summary>
+        public DtoPropertyImportance Importance { get; set; }
+
+        /// <summary>
+        /// Gets or sets the attribute to property translation rule
+        /// </summary>
+        /// <remarks>
+        /// Use this property when a string value in the xml needs to be specifically translated. This can be useful 
+        /// in scenario's when a string value needs to be translated to a specific enum value.
+        /// For example when the enum string value "Belgian Bessel" needs to be translated to the enum type CoordinateSystem.BelgianBessel
+        /// </remarks>
+        public Func<object, object> ToPropertyTranslationRule
+        {
+            get { return this.toPropTranslationRule; }
+            set { this.toPropTranslationRule = new Func<object, object>(value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the property to attribute translation rule
+        /// </summary>
+        /// <remarks>
+        /// Use this property when a property value needs to be translated to a specific string value. 
+        /// For example when the enum type CoordinateSystem.BelgianBessel needs to be translated to the enum string value "Belgian Bessel"
+        /// </remarks>
+        public Func<object, object> ToAttributeTranslationRule
+        {
+            get { return this.toAttributeTranslationRule; }
+            set { this.toAttributeTranslationRule = new Func<object, object>(value); }
+        }
+    }
+}
\ No newline at end of file
Index: DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoard.cs
===================================================================
diff -u
--- DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoard.cs	(revision 0)
+++ DamClients/DamLive/branches/DamLive 19.2/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoard.cs	(revision 3305)
@@ -0,0 +1,272 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of the application DAM - Clients Library.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Xml.Serialization;
+using Deltares.Maps;
+using Deltares.Standard;
+using Deltares.Standard.Attributes;
+using Deltares.Standard.EventPublisher;
+using Deltares.Standard.Language;
+
+namespace Deltares.Dam.Data
+{
+    public class WaterBoard : IVisibleEnabled, IDisposable
+    {
+        private string description = "";
+        private IList<Dike> dikes;
+        private List<Location> locations = null;
+        private readonly FeatureRepository backgroundRepository;
+        private IList<BackgroundRepositoryFeature> featureList = null;
+        private IList<Segment> segments;
+        private IList<SoilGeometry2DName> soilgeometry2DNames;
+        private string waterLevelTimeSeriesFileName;
+        private IVisibleEnabledProvider visibleEnabledProvider;
+        private Dike selectedDike;
+
+        public WaterBoard()
+        {
+            this.dikes = new List<Dike>();
+            this.featureList = new List<BackgroundRepositoryFeature>();
+            this.backgroundRepository = new FeatureRepository();
+            this.segments = new List<Segment>();
+            this.soilgeometry2DNames = new List<SoilGeometry2DName>();
+        }
+
+        public virtual IList<Segment> Segments
+        {
+            get { return this.segments; }
+            set { this.segments = value; }
+        }
+
+        public virtual IList<SoilGeometry2DName> SoilGeometry2DNames
+        {
+            get { return this.soilgeometry2DNames; }
+            set { this.soilgeometry2DNames = value; }
+        }
+
+        public void FillGeometry2DNamesFromSegments()
+        {
+            // Add soilgeometry2D names into list
+            foreach (Segment segment in Segments)
+            {
+                foreach (SoilGeometryProbability soilGeometryProbability in segment.SoilProfileProbabilities)
+                {
+                    if (soilGeometryProbability.SoilGeometry2DName != null && !SoilGeometry2DNamesContains(soilGeometryProbability.SoilGeometry2DName))
+                    {
+                        SoilGeometry2DName soilGeometry2DName = new SoilGeometry2DName();
+                        soilGeometry2DName.Geometry2DName = soilGeometryProbability.SoilGeometry2DName;
+                        SoilGeometry2DNames.Add(soilGeometry2DName);
+                    }
+                }
+            }
+        }
+
+        public void FillFeatureList()
+        {
+            foreach (var feature in backgroundRepository.Features)
+            {
+                BackgroundRepositoryFeature featureStr = new BackgroundRepositoryFeature();
+                featureStr.Feature = feature.WktFormat;
+                featureList.Add(featureStr);
+            }
+        }
+
+        /// <summary>
+        /// Updates the locations for scenarios.
+        /// </summary>
+        public void UpdateLocationsForScenarios()
+        {
+            foreach (Dike dike in this.Dikes)
+            {
+                dike.UpdateLocationsForScenarios();
+            }
+        }
+
+        /// <summary>
+        /// Gets the selected dike.
+        /// Is a helper property to be able to show the soil table. When more Dikes than one are allowed,
+        /// this has to become a "real" property set by the onselectionchanged event.
+        /// </summary>
+        /// <value>
+        /// The selected dike.
+        /// </value>
+        public Dike SelectedDike
+        {
+            get
+            {
+                if (selectedDike != null)
+                {
+                    return selectedDike;
+                }
+                return dikes.Count > 0 ? dikes[0] : null;
+            }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, x => x.SelectedDike);
+                selectedDike = value;
+                DataEventPublisher.AfterChange(this, x => x.SelectedDike);
+            }
+        }
+
+        private bool SoilGeometry2DNamesContains(string Name)
+        {
+            foreach (var soilGeometry2DName in SoilGeometry2DNames)
+            {
+                if (soilGeometry2DName.Geometry2DName == Name)
+                    return true;
+            }
+            return false;
+        }
+
+        private void FillBackGroundRepos()
+        {
+            if (featureList != null)
+            {
+                backgroundRepository.Clear();
+                foreach (BackgroundRepositoryFeature s in featureList)
+                {
+                    backgroundRepository.Add(Feature.Create(s.Feature)); 
+                }                                        
+            }
+
+        }
+
+        public virtual IList<BackgroundRepositoryFeature> BackgroundRepositoryFeatures
+        {
+            get
+            {
+                return this.featureList;
+            }
+            set
+            {
+                this.featureList = value;
+                FillBackGroundRepos();
+            }            
+        }
+
+        public virtual IList<Dike> Dikes
+        {
+            get { return this.dikes; }
+            set { this.dikes = value; }
+        }
+
+        [XmlIgnore]
+        [Browsable(false)]
+        [ReadOnly(true)]
+        [Label("Locations")]
+        public List<Location> Locations
+        {
+            get
+            {
+                if (locations == null)
+                {
+                    locations = new List<Location>();
+                    foreach (Dike dike in this.Dikes)
+                    {
+                        locations.AddRange(dike.Locations);
+                    }
+                }
+
+                return locations;
+            }
+        }
+
+        [Label("Number of Dikes")]
+        public virtual string NumberOfDikes
+        {
+            get { return this.dikes.Count.ToString(); }
+        }        
+
+        public virtual string Name
+        {
+            get { return String.Format(LocalizationManager.GetTranslatedText(this, "WaterBoard")); }           
+        }
+
+        public virtual string Description
+        {
+            get { return description; }
+            set { description = value; }
+        }
+
+        public override string ToString()
+        {
+            return Name;
+        }
+
+        public bool IsVisible(string property)
+        {
+            switch (property)
+            {
+                case "SelectedDike": return visibleEnabledProvider != null && visibleEnabledProvider.IsVisible(this, "SelectedDike");
+                case "WaterLevelTimeSeriesFileName": return Location.DamProjectType == DamProjectType.Calamity;
+                default : return true;
+            }
+        }
+
+        [XmlIgnore]
+        [Browsable(false)]
+        public IVisibleEnabledProvider VisibleEnabledProvider
+        {
+            get { return visibleEnabledProvider; }
+            set { visibleEnabledProvider = value; }
+        }
+
+        public bool IsEnabled(string property)
+        {
+            return true;
+        }
+
+        public void AddBackgroundGeometry(IFeature geometry)
+        {
+            this.backgroundRepository.Add(geometry);
+        }
+
+        [Label("Waterlevel timeseries filename")]
+        public string WaterLevelTimeSeriesFileName
+        {
+            get { return waterLevelTimeSeriesFileName; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, "WaterLevelTimeSeriesFileName");
+                waterLevelTimeSeriesFileName = value;
+                DataEventPublisher.AfterChange(this, "WaterLevelTimeSeriesFileName");
+              }
+        }
+
+        public Segment GetSegmentByName(string segmentId)
+        {
+            Segment segment = this.segments.Where(x => ((x.Name == segmentId))).FirstOrDefault();
+            return segment; 
+        }
+
+        public void Dispose()
+        {
+            foreach (var dike in Dikes)
+            {
+                dike.Dispose();
+            }
+        }
+    }
+}