Index: DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs
===================================================================
diff -u -r2885 -r2913
--- DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs	(.../FailureMechanismTests.cs)	(revision 2885)
+++ DamClients/DamUI/trunk/src/Dam/Tests/FailureMechanismTests.cs	(.../FailureMechanismTests.cs)	(revision 2913)
@@ -102,14 +102,6 @@
             Assert.AreEqual(0.63, allCalculationresults[0].RiverLevelLow);
             Assert.AreEqual(4.900, allCalculationresults[0].DikeTableHeight);
             Assert.AreEqual(0.000, allCalculationresults[0].SlopeDampingPiezometricHeightPolderSide);
-            Assert.AreEqual(42.252, allCalculationresults[0].LocalZone1EntryPointX);
-            Assert.AreEqual(0.000, allCalculationresults[0].Zone1EntryPointY);
-            Assert.AreEqual(13.486, allCalculationresults[0].LocalZone1ExitPointX);
-            Assert.AreEqual(0.000, allCalculationresults[0].Zone1ExitPointY);
-            Assert.AreEqual(null, allCalculationresults[0].LocalZone2EntryPointX);
-            Assert.AreEqual(null, allCalculationresults[0].Zone2EntryPointY);
-            Assert.AreEqual(null, allCalculationresults[0].LocalZone2ExitPointX);
-            Assert.AreEqual(null, allCalculationresults[0].Zone2ExitPointY);
             Assert.AreEqual(36.150, allCalculationresults[0].DikeLength);
             Assert.AreEqual(1.837, allCalculationresults[0].Pl3MinUplift, diff);
             Assert.AreEqual(1.60, allCalculationresults[0].Pl3HeadAdjusted);
@@ -167,14 +159,6 @@
             Assert.AreEqual(-2.520, allCalculationresults[1].RiverLevelLow);
             Assert.AreEqual(-2.000, allCalculationresults[1].DikeTableHeight, diff);
             Assert.AreEqual(0.000, allCalculationresults[1].SlopeDampingPiezometricHeightPolderSide);
-            Assert.AreEqual(12.098, allCalculationresults[1].LocalZone1EntryPointX, diff);
-            Assert.AreEqual(448871.711, allCalculationresults[1].Zone1EntryPointY, diff);
-            Assert.AreEqual(9.067, allCalculationresults[1].LocalZone1ExitPointX, diff);
-            Assert.AreEqual(448869.835, allCalculationresults[1].Zone1ExitPointY, diff);
-            Assert.AreEqual(null, allCalculationresults[1].LocalZone2EntryPointX);
-            Assert.AreEqual(null, allCalculationresults[1].Zone2EntryPointY);
-            Assert.AreEqual(null, allCalculationresults[1].LocalZone2ExitPointX);
-            Assert.AreEqual(null, allCalculationresults[1].Zone2ExitPointY);
             Assert.AreEqual(14.12, allCalculationresults[1].DikeLength, diff * 10);
             Assert.AreEqual(1.851, allCalculationresults[1].Pl3MinUplift, diff);
             Assert.AreEqual(-5.370, allCalculationresults[1].Pl3HeadAdjusted, diff);
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs
===================================================================
diff -u -r2513 -r2913
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs	(.../FillDamUiFromXmlOutput.cs)	(revision 2513)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs	(.../FillDamUiFromXmlOutput.cs)	(revision 2913)
@@ -293,12 +293,6 @@
                 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);
 
Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs
===================================================================
diff -u -r2135 -r2913
--- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs	(.../FillDamUiFromXmlOutputTests.cs)	(revision 2135)
+++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs	(.../FillDamUiFromXmlOutputTests.cs)	(revision 2913)
@@ -203,9 +203,6 @@
             Assert.AreEqual(0, combinedDamProjectData.DesignCalculations[0].SafetyFactor);
             Assert.AreEqual(null, combinedDamProjectData.DesignCalculations[0].StabilityShoulderHeight);
             Assert.AreEqual(null, combinedDamProjectData.DesignCalculations[0].DikeLength);
-            Assert.AreEqual(0.0, combinedDamProjectData.DesignCalculations[0].Zone1EntryPointX);
-            Assert.AreEqual(0.0, combinedDamProjectData.DesignCalculations[0].Zone1EntryPointZ);
-            Assert.AreEqual(0, combinedDamProjectData.DesignCalculations[0].Zone1SafetyFactorStability);
             Assert.AreEqual(0.0, combinedDamProjectData.DesignCalculations[0].Pl3HeadAdjusted);
             Assert.AreEqual(0.0, combinedDamProjectData.DesignCalculations[0].Pl3MinUplift);
             Assert.AreEqual(0.0, combinedDamProjectData.DesignCalculations[0].Pl3LocationYMinUplift);
@@ -218,12 +215,6 @@
             Assert.AreEqual(MStabModelType.Bishop, combinedDamProjectData.DesignCalculations[1].StabilityModel);
             Assert.AreEqual(1.2, combinedDamProjectData.DesignCalculations[1].SafetyFactor);
             Assert.AreEqual(null, combinedDamProjectData.DesignCalculations[1].StabilityShoulderHeight);
-            Assert.AreEqual(2.2, combinedDamProjectData.DesignCalculations[1].Zone1EntryPointX);
-            Assert.AreEqual(0.22, combinedDamProjectData.DesignCalculations[1].Zone1EntryPointZ, 0.001);
-            Assert.AreEqual(null, combinedDamProjectData.DesignCalculations[1].Zone1ExitPointX);
-            Assert.AreEqual(3.3, combinedDamProjectData.DesignCalculations[1].Zone2ExitPointX);
-            Assert.AreEqual(0.33, combinedDamProjectData.DesignCalculations[1].Zone2ExitPointZ, 0.001);
-            Assert.AreEqual(1.1, combinedDamProjectData.DesignCalculations[1].Zone1SafetyFactorStability);
             Assert.AreEqual(0.2, combinedDamProjectData.DesignCalculations[1].Pl3HeadAdjusted);
             Assert.AreEqual(0.7, combinedDamProjectData.DesignCalculations[1].Pl3MinUplift);
             Assert.AreEqual(0.0, combinedDamProjectData.DesignCalculations[1].Pl3LocationYMinUplift);
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
===================================================================
diff -u -r2555 -r2913
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 2555)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 2913)
@@ -60,12 +60,6 @@
         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;
@@ -727,295 +721,6 @@
             }
         }
 
-        [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)]
@@ -2354,23 +2059,6 @@
                 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 ||