Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs =================================================================== diff -u -r2089 -r2135 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 2089) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 2135) @@ -400,17 +400,12 @@ location.PLLineCreationMethod = ConversionHelper.ConvertToPhreaticLineCreationMethod(waternetOptions.PhreaticLineCreationMethod); location.IntrusionVerticalWaterPressure = ConversionHelper.ConvertToIntrusionVerticalWaterPressure(waternetOptions.IntrusionVerticalWaterPressure); location.PolderLevel = waternetOptions.PolderLevel; - location.PolderLevelLow = waternetOptions.PolderLevelLow; - // waternetOptions.PolderLevelLowSpecified is not used because the value is not a nullable location.DampingFactorPL4 = waternetOptions.DampingFactorPl3; location.DampingFactorPL3 = waternetOptions.DampingFactorPl4; location.PenetrationLength = waternetOptions.PenetrationLength; location.PlLineOffsetBelowDikeCrestMiddle = (waternetOptions.Pl1BelowCrestMiddleSpecified ? (double?)waternetOptions.Pl1BelowCrestMiddle : null); location.UsePlLineOffsetFactorBelowShoulderCrest = waternetOptions.Pl1FactorBelowShoulderCrestSpecified; location.PlLineOffsetFactorBelowShoulderCrest = waternetOptions.Pl1FactorBelowShoulderCrest; - location.PlLineOffsetDryBelowDikeCrestMiddle = (waternetOptions.DryPl1BelowCrestMiddleSpecified ? (double?)waternetOptions.DryPl1BelowCrestMiddle : null); - location.UsePlLineOffsetDryFactorBelowShoulderCrest = waternetOptions.DryPl1FactorBelowShoulderCrestSpecified; - location.PlLineOffsetDryFactorBelowShoulderCrest = waternetOptions.DryPl1FactorBelowShoulderCrest; location.HeadPL2 = (waternetOptions.HeadPl2Specified ? (double?)waternetOptions.HeadPl2 : null); location.HeadPl3 = (waternetOptions.HeadPl3Specified ? (double?)waternetOptions.HeadPl3 : null); location.HeadPl4 = (waternetOptions.HeadPl4Specified ? (double?)waternetOptions.HeadPl4 : null); @@ -419,30 +414,8 @@ location.PlLineOffsetBelowDikeTopAtPolder = waternetOptions.Pl1BelowCrestPolderside; location.PlLineOffsetBelowShoulderBaseInside = waternetOptions.Pl1BelowShoulderCrestPolderside; location.PlLineOffsetBelowDikeToeAtPolder = waternetOptions.Pl1BelowToeDikePolderside; - location.PLLineOffsetDryBelowDikeTopAtRiver = waternetOptions.DryPl1BelowDikeTopAtRiver; - // waternetOptions.DryPl1BelowDikeTopAtRiverSpecified is not used because the value is not a nullable - location.PLLineOffsetDryBelowDikeTopAtPolder = waternetOptions.DryPl1DryBelowDikeTopAtPolder; - // waternetOptions.DryPl1DryBelowDikeTopAtPolderSpecified is not used because the value is not a nullable - location.PLLineOffsetDryBelowShoulderBaseInside = waternetOptions.DryPl1BelowShoulderBaseInside; - // waternetOptions.DryPl1BelowShoulderBaseInsideSpecified is not used because the value is not a nullable - location.PLLineOffsetDryBelowDikeToeAtPolder = waternetOptions.DryPl1DryBelowDikeToeAtPolder; - // waternetOptions.DryPl1DryBelowDikeToeAtPolderSpecified is not used because the value is not a nullable - - // Regional settings location.DikeTableHeight = inputLocation.DikeTableHeight; - var assesmentRegionalOptions = inputLocation.AssesmentRegionalOptions; - if (assesmentRegionalOptions != null) - { - location.BoezemLevelHbp = assesmentRegionalOptions.BoezemLevelHbp; - location.BoezemLevelLbp = assesmentRegionalOptions.BoezemLevelLbp; - location.BoezemLevelTp = assesmentRegionalOptions.BoezemLevelTp; - location.RwBankProtectionBottomLevel = assesmentRegionalOptions.RegionalBankProtectionBottomLevel; - location.DredgingDepth = assesmentRegionalOptions.DredgingDepth; - location.DetrimentFactor = assesmentRegionalOptions.DetrimentFactor; - location.DikeMaterialType = assesmentRegionalOptions.DikeSoilTypeSpecified ? - ConversionHelper.ConvertToSoilType(assesmentRegionalOptions.DikeSoilType) : - SoilType.Clay; - } + SurfaceLine2 surfaceLine = dikeSurfaceLines.First(n => n.Name.Equals(inputLocation.SurfaceLineName)); location.LocalXZSurfaceLine2 = surfaceLine;