Index: DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs =================================================================== diff -u -r1194 -r1267 --- DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 1194) +++ DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 1267) @@ -350,6 +350,14 @@ waternetOptions.Pl1BelowCrestPolderside = location.PlLineOffsetBelowDikeTopAtPolder; waternetOptions.Pl1BelowShoulderCrestPolderside = location.PlLineOffsetBelowShoulderBaseInside; waternetOptions.Pl1BelowToeDikePolderside = location.PlLineOffsetBelowDikeToeAtPolder; + waternetOptions.DryPl1BelowDikeTopAtRiver = location.PLLineOffsetDryBelowDikeTopAtRiver; + waternetOptions.DryPl1BelowDikeTopAtRiverSpecified = true; + waternetOptions.DryPl1DryBelowDikeTopAtPolder = location.PLLineOffsetDryBelowDikeTopAtPolder; + waternetOptions.DryPl1DryBelowDikeTopAtPolderSpecified = true; + waternetOptions.DryPl1BelowShoulderBaseInside = location.PLLineOffsetDryBelowShoulderBaseInside; + waternetOptions.DryPl1BelowShoulderBaseInsideSpecified = true; + waternetOptions.DryPl1DryBelowDikeToeAtPolder = location.PLLineOffsetDryBelowDikeToeAtPolder; + waternetOptions.DryPl1DryBelowDikeToeAtPolderSpecified = true; inputLocation.WaternetOptions = waternetOptions; // Regional settings Index: DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs =================================================================== diff -u -r1195 -r1267 --- DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 1195) +++ DamClients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 1267) @@ -290,6 +290,14 @@ 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; Index: DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r1195 -r1267 --- DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 1195) +++ DamClients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 1267) @@ -205,16 +205,20 @@ location.PlLineOffsetBelowDikeTopAtPolder = 1.0 * i + 0.21; location.PlLineOffsetBelowShoulderBaseInside = 1.0 * i + 0.22; location.PlLineOffsetBelowDikeToeAtPolder = 1.0 * i + 0.23; - location.HeadPL2 = 1.0 * i + 0.24; - location.HeadPl3 = 1.0 * i + 0.25; - location.HeadPl4 = 1.0 * i + 0.21; - location.DikeTableHeight = 1.0 * i + 0.27; - location.BoezemLevelHbp = 1.0 * i + 0.28; - location.BoezemLevelLbp = 1.0 * i + 0.29; - location.BoezemLevelTp = 1.0 * i + 0.30; - location.RwBankProtectionBottomLevel = 1.0 * i + 0.31; - location.DredgingDepth = 1.0 * i + 0.32; - location.DetrimentFactor = 1.0 * i + 0.33; + location.PLLineOffsetDryBelowDikeTopAtRiver = 1.0 * i + 0.24; + location.PLLineOffsetDryBelowDikeTopAtPolder = 1.0 * i + 0.25; + location.PLLineOffsetDryBelowShoulderBaseInside = 1.0 * i + 0.26; + location.PLLineOffsetDryBelowDikeToeAtPolder = 1.0 * i + 0.27; + location.HeadPL2 = 1.0 * i + 0.28; + location.HeadPl3 = 1.0 * i + 0.29; + location.HeadPl4 = 1.0 * i + 0.30; + location.DikeTableHeight = 1.0 * i + 0.31; + location.BoezemLevelHbp = 1.0 * i + 0.32; + location.BoezemLevelLbp = 1.0 * i + 0.33; + location.BoezemLevelTp = 1.0 * i + 0.34; + location.RwBankProtectionBottomLevel = 1.0 * i + 0.35; + location.DredgingDepth = 1.0 * i + 0.36; + location.DetrimentFactor = 1.0 * i + 0.37; location.DikeMaterialType = SoilType.Loam; location.LocalXZSurfaceLine2 = surfaceLines[i]; location.Segment = segments[i % 2]; // alternate between the 2 available segments