Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Ringtoets.MacroStabilityInwards.Forms.csproj =================================================================== diff -u -r4a60f6ca9a08736cfaf0fac6e6f2e89e9fa59aae -r015737b4977d3a180f8a962ceeb24e6814227316 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Ringtoets.MacroStabilityInwards.Forms.csproj (.../Ringtoets.MacroStabilityInwards.Forms.csproj) (revision 4a60f6ca9a08736cfaf0fac6e6f2e89e9fa59aae) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Ringtoets.MacroStabilityInwards.Forms.csproj (.../Ringtoets.MacroStabilityInwards.Forms.csproj) (revision 015737b4977d3a180f8a962ceeb24e6814227316) @@ -204,6 +204,7 @@ MacroStabilityInwardsInputView.cs + Designer MacroStabilityInwardsCalculationsView.cs Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs =================================================================== diff -u -r2a8fa4da86b17a87fd71e9574180b3c678a30dfd -r015737b4977d3a180f8a962ceeb24e6814227316 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs (.../MacroStabilityInwardsInputView.cs) (revision 2a8fa4da86b17a87fd71e9574180b3c678a30dfd) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs (.../MacroStabilityInwardsInputView.cs) (revision 015737b4977d3a180f8a962ceeb24e6814227316) @@ -45,19 +45,19 @@ private readonly ChartDataCollection chartDataCollection; private readonly ChartDataCollection soilProfileChartData; private readonly ChartLineData surfaceLineChartData; - private readonly ChartPointData surfaceLevelOutsideChartData; - private readonly ChartPointData dikeToeAtRiverChartData; - private readonly ChartPointData trafficLoadOutsideChartData; + private readonly ChartPointData surfaceLevelInsideChartData; + private readonly ChartPointData ditchPolderSideChartData; + private readonly ChartPointData bottomDitchPolderSideChartData; + private readonly ChartPointData bottomDitchDikeSideChartData; + private readonly ChartPointData ditchDikeSideChartData; + private readonly ChartPointData dikeToeAtPolderChartData; + private readonly ChartPointData shoulderTopInsideChartData; + private readonly ChartPointData shoulderBaseInsideChartData; private readonly ChartPointData trafficLoadInsideChartData; private readonly ChartPointData dikeTopAtPolderChartData; - private readonly ChartPointData shoulderBaseInsideChartData; - private readonly ChartPointData shoulderTopInsideChartData; - private readonly ChartPointData dikeToeAtPolderChartData; - private readonly ChartPointData ditchDikeSideChartData; - private readonly ChartPointData bottomDitchDikeSideChartData; - private readonly ChartPointData bottomDitchPolderSideChartData; - private readonly ChartPointData ditchPolderSideChartData; - private readonly ChartPointData surfaceLevelInsideChartData; + private readonly ChartPointData trafficLoadOutsideChartData; + private readonly ChartPointData dikeToeAtRiverChartData; + private readonly ChartPointData surfaceLevelOutsideChartData; private readonly List soilLayerChartDataLookup; @@ -78,35 +78,35 @@ chartDataCollection = new ChartDataCollection(RingtoetsCommonFormsResources.Calculation_Input); soilProfileChartData = RingtoetsChartDataFactory.CreateSoilProfileChartData(); surfaceLineChartData = RingtoetsChartDataFactory.CreateSurfaceLineChartData(); - surfaceLevelOutsideChartData = MacroStabilityInwardsChartDataFactory.CreateSurfaceLevelOutsideChartData(); - dikeToeAtRiverChartData = MacroStabilityInwardsChartDataFactory.CreateDikeToeAtRiverChartData(); - trafficLoadOutsideChartData = MacroStabilityInwardsChartDataFactory.CreateTrafficLoadOutsideChartData(); + surfaceLevelInsideChartData = MacroStabilityInwardsChartDataFactory.CreateSurfaceLevelInsideChartData(); + ditchPolderSideChartData = MacroStabilityInwardsChartDataFactory.CreateDitchPolderSideChartData(); + bottomDitchPolderSideChartData = MacroStabilityInwardsChartDataFactory.CreateBottomDitchPolderSideChartData(); + bottomDitchDikeSideChartData = MacroStabilityInwardsChartDataFactory.CreateBottomDitchDikeSideChartData(); + ditchDikeSideChartData = MacroStabilityInwardsChartDataFactory.CreateDitchDikeSideChartData(); + dikeToeAtPolderChartData = MacroStabilityInwardsChartDataFactory.CreateDikeToeAtPolderChartData(); + shoulderTopInsideChartData = MacroStabilityInwardsChartDataFactory.CreateShoulderTopInsideChartData(); + shoulderBaseInsideChartData = MacroStabilityInwardsChartDataFactory.CreateShoulderBaseInsideChartData(); trafficLoadInsideChartData = MacroStabilityInwardsChartDataFactory.CreateTrafficLoadInsideChartData(); dikeTopAtPolderChartData = MacroStabilityInwardsChartDataFactory.CreateDikeTopAtPolderChartData(); - shoulderBaseInsideChartData = MacroStabilityInwardsChartDataFactory.CreateShoulderBaseInsideChartData(); - shoulderTopInsideChartData = MacroStabilityInwardsChartDataFactory.CreateShoulderTopInsideChartData(); - dikeToeAtPolderChartData = MacroStabilityInwardsChartDataFactory.CreateDikeToeAtPolderChartData(); - ditchDikeSideChartData = MacroStabilityInwardsChartDataFactory.CreateDitchDikeSideChartData(); - bottomDitchDikeSideChartData = MacroStabilityInwardsChartDataFactory.CreateBottomDitchDikeSideChartData(); - bottomDitchPolderSideChartData = MacroStabilityInwardsChartDataFactory.CreateBottomDitchPolderSideChartData(); - ditchPolderSideChartData = MacroStabilityInwardsChartDataFactory.CreateDitchPolderSideChartData(); - surfaceLevelInsideChartData = MacroStabilityInwardsChartDataFactory.CreateSurfaceLevelInsideChartData(); + trafficLoadOutsideChartData = MacroStabilityInwardsChartDataFactory.CreateTrafficLoadOutsideChartData(); + dikeToeAtRiverChartData = MacroStabilityInwardsChartDataFactory.CreateDikeToeAtRiverChartData(); + surfaceLevelOutsideChartData = MacroStabilityInwardsChartDataFactory.CreateSurfaceLevelOutsideChartData(); chartDataCollection.Add(soilProfileChartData); chartDataCollection.Add(surfaceLineChartData); - chartDataCollection.Add(surfaceLevelOutsideChartData); - chartDataCollection.Add(dikeToeAtRiverChartData); - chartDataCollection.Add(trafficLoadOutsideChartData); + chartDataCollection.Add(surfaceLevelInsideChartData); + chartDataCollection.Add(ditchPolderSideChartData); + chartDataCollection.Add(bottomDitchPolderSideChartData); + chartDataCollection.Add(bottomDitchDikeSideChartData); + chartDataCollection.Add(ditchDikeSideChartData); + chartDataCollection.Add(dikeToeAtPolderChartData); + chartDataCollection.Add(shoulderTopInsideChartData); + chartDataCollection.Add(shoulderBaseInsideChartData); chartDataCollection.Add(trafficLoadInsideChartData); chartDataCollection.Add(dikeTopAtPolderChartData); - chartDataCollection.Add(shoulderBaseInsideChartData); - chartDataCollection.Add(shoulderTopInsideChartData); - chartDataCollection.Add(dikeToeAtPolderChartData); - chartDataCollection.Add(ditchDikeSideChartData); - chartDataCollection.Add(bottomDitchDikeSideChartData); - chartDataCollection.Add(bottomDitchPolderSideChartData); - chartDataCollection.Add(ditchPolderSideChartData); - chartDataCollection.Add(surfaceLevelInsideChartData); + chartDataCollection.Add(trafficLoadOutsideChartData); + chartDataCollection.Add(dikeToeAtRiverChartData); + chartDataCollection.Add(surfaceLevelOutsideChartData); soilLayerChartDataLookup = new List(); // Use lookup because the ordering in the chart data collection might change } @@ -175,22 +175,7 @@ { SetChartData(); - surfaceLineChartData.NotifyObservers(); - surfaceLevelOutsideChartData.NotifyObservers(); - dikeToeAtRiverChartData.NotifyObservers(); - trafficLoadOutsideChartData.NotifyObservers(); - trafficLoadInsideChartData.NotifyObservers(); - dikeTopAtPolderChartData.NotifyObservers(); - shoulderBaseInsideChartData.NotifyObservers(); - shoulderTopInsideChartData.NotifyObservers(); - dikeToeAtPolderChartData.NotifyObservers(); - ditchDikeSideChartData.NotifyObservers(); - bottomDitchDikeSideChartData.NotifyObservers(); - bottomDitchPolderSideChartData.NotifyObservers(); - ditchPolderSideChartData.NotifyObservers(); - surfaceLevelInsideChartData.NotifyObservers(); - - soilProfileChartData.NotifyObservers(); + chartDataCollection.Collection.ForEachElementDo(cd => cd.NotifyObservers()); soilProfileChartData.Collection.ForEachElementDo(cd => cd.NotifyObservers()); } @@ -206,19 +191,19 @@ MacroStabilityInwardsChartDataFactory.UpdateSurfaceLineChartDataName(surfaceLineChartData, surfaceLine); surfaceLineChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateSurfaceLinePoints(surfaceLine); - surfaceLevelOutsideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateSurfaceLevelOutsidePoint(surfaceLine); - dikeToeAtRiverChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateDikeToeAtRiverPoint(surfaceLine); - trafficLoadOutsideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateTrafficLoadOutsidePoint(surfaceLine); + surfaceLevelInsideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateSurfaceLevelInsidePoint(surfaceLine); + ditchPolderSideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateDitchPolderSidePoint(surfaceLine); + bottomDitchPolderSideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateBottomDitchPolderSidePoint(surfaceLine); + bottomDitchDikeSideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateBottomDitchDikeSidePoint(surfaceLine); + ditchDikeSideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateDitchDikeSidePoint(surfaceLine); + dikeToeAtPolderChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateDikeToeAtPolderPoint(surfaceLine); + shoulderTopInsideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateShoulderTopInsidePoint(surfaceLine); + shoulderBaseInsideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateShoulderBaseInsidePoint(surfaceLine); trafficLoadInsideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateTrafficLoadInsidePoint(surfaceLine); dikeTopAtPolderChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateDikeTopAtPolderPoint(surfaceLine); - shoulderBaseInsideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateShoulderBaseInsidePoint(surfaceLine); - shoulderTopInsideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateShoulderTopInsidePoint(surfaceLine); - dikeToeAtPolderChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateDikeToeAtPolderPoint(surfaceLine); - ditchDikeSideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateDitchDikeSidePoint(surfaceLine); - bottomDitchDikeSideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateBottomDitchDikeSidePoint(surfaceLine); - bottomDitchPolderSideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateBottomDitchPolderSidePoint(surfaceLine); - ditchPolderSideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateDitchPolderSidePoint(surfaceLine); - surfaceLevelInsideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateSurfaceLevelInsidePoint(surfaceLine); + trafficLoadOutsideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateTrafficLoadOutsidePoint(surfaceLine); + dikeToeAtRiverChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateDikeToeAtRiverPoint(surfaceLine); + surfaceLevelOutsideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateSurfaceLevelOutsidePoint(surfaceLine); SetSoilProfileChartData(); } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs =================================================================== diff -u -r2a8fa4da86b17a87fd71e9574180b3c678a30dfd -r015737b4977d3a180f8a962ceeb24e6814227316 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision 2a8fa4da86b17a87fd71e9574180b3c678a30dfd) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision 015737b4977d3a180f8a962ceeb24e6814227316) @@ -40,19 +40,19 @@ { private const int soilProfileIndex = 0; private const int surfaceLineIndex = 1; - private const int surfaceLevelOutsideIndex = 2; - private const int dikeToeAtRiverIndex = 3; - private const int trafficLoadOutsideIndex = 4; - private const int trafficLoadInsideIndex = 5; - private const int dikeTopAtPolderIndex = 6; - private const int shoulderBaseInsideIndex = 7; + private const int surfaceLevelInsideIndex = 2; + private const int ditchPolderSideIndex = 3; + private const int bottomDitchPolderSideIndex = 4; + private const int bottomDitchDikeSideIndex = 5; + private const int ditchDikeSideIndex = 6; + private const int dikeToeAtPolderIndex = 7; private const int shoulderTopInsideIndex = 8; - private const int dikeToeAtPolderIndex = 9; - private const int ditchDikeSideIndex = 10; - private const int bottomDitchDikeSideIndex = 11; - private const int bottomDitchPolderSideIndex = 12; - private const int ditchPolderSideIndex = 13; - private const int surfaceLevelInsideIndex = 14; + private const int shoulderBaseInsideIndex = 9; + private const int trafficLoadInsideIndex = 10; + private const int dikeTopAtPolderIndex = 11; + private const int trafficLoadOutsideIndex = 12; + private const int dikeToeAtRiverIndex = 13; + private const int surfaceLevelOutsideIndex = 14; private const int nrOfChartData = 15; [Test] @@ -510,19 +510,19 @@ // Setup const int updatedSoilProfileIndex = soilProfileIndex + nrOfChartData - 1; const int updatedSurfaceLineIndex = surfaceLineIndex - 1; - const int updatedSurfaceLevelOutsideIndex = surfaceLevelOutsideIndex - 1; - const int updatedDikeToeAtRiverIndex = dikeToeAtRiverIndex - 1; - const int updatedTrafficLoadOutsideIndex = trafficLoadOutsideIndex - 1; + const int updatedSurfaceLevelInsideIndex = surfaceLevelInsideIndex - 1; + const int updatedDitchPolderSideIndex = ditchPolderSideIndex - 1; + const int updatedBottomDitchPolderSideIndex = bottomDitchPolderSideIndex - 1; + const int updatedBottomDitchDikeSideIndex = bottomDitchDikeSideIndex - 1; + const int updatedDitchDikeSideIndex = ditchDikeSideIndex - 1; + const int updatedDikeToeAtPolderIndex = dikeToeAtPolderIndex - 1; + const int updatedShoulderTopInsideIndex = shoulderTopInsideIndex - 1; + const int updatedShoulderBaseInsideIndex = shoulderBaseInsideIndex - 1; const int updatedTrafficLoadInsideIndex = trafficLoadInsideIndex - 1; const int updatedDikeTopAtPolderIndex = dikeTopAtPolderIndex - 1; - const int updatedShoulderBaseInsideIndex = shoulderBaseInsideIndex - 1; - const int updatedShoulderTopInsideIndex = shoulderTopInsideIndex - 1; - const int updatedDikeToeAtPolderIndex = dikeToeAtPolderIndex - 1; - const int updatedDitchDikeSideIndex = ditchDikeSideIndex - 1; - const int updatedBottomDitchDikeSideIndex = bottomDitchDikeSideIndex - 1; - const int updatedBottomDitchPolderSideIndex = bottomDitchPolderSideIndex - 1; - const int updatedDitchPolderSideIndex = ditchPolderSideIndex - 1; - const int updatedSurfaceLevelInsideIndex = surfaceLevelInsideIndex - 1; + const int updatedTrafficLoadOutsideIndex = trafficLoadOutsideIndex - 1; + const int updatedDikeToeAtRiverIndex = dikeToeAtRiverIndex - 1; + const int updatedSurfaceLevelOutsideIndex = surfaceLevelOutsideIndex - 1; var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); @@ -541,35 +541,35 @@ var soilProfileData = (ChartDataCollection) chartDataList[updatedSoilProfileIndex]; var surfaceLineData = (ChartLineData) chartDataList[updatedSurfaceLineIndex]; - var surfaceLevelOutsideData = (ChartPointData) chartDataList[updatedSurfaceLevelOutsideIndex]; - var dikeToeAtRiverData = (ChartPointData) chartDataList[updatedDikeToeAtRiverIndex]; - var trafficLoadOutsideData = (ChartPointData) chartDataList[updatedTrafficLoadOutsideIndex]; + var surfaceLevelInsideData = (ChartPointData) chartDataList[updatedSurfaceLevelInsideIndex]; + var ditchPolderSideData = (ChartPointData) chartDataList[updatedDitchPolderSideIndex]; + var bottomDitchPolderSideData = (ChartPointData) chartDataList[updatedBottomDitchPolderSideIndex]; + var bottomDitchDikeSideData = (ChartPointData) chartDataList[updatedBottomDitchDikeSideIndex]; + var ditchDikeSideData = (ChartPointData) chartDataList[updatedDitchDikeSideIndex]; + var dikeToeAtPolderData = (ChartPointData) chartDataList[updatedDikeToeAtPolderIndex]; + var shoulderTopInsideData = (ChartPointData) chartDataList[updatedShoulderTopInsideIndex]; + var shoulderBaseInsideData = (ChartPointData) chartDataList[updatedShoulderBaseInsideIndex]; var trafficLoadInsideData = (ChartPointData) chartDataList[updatedTrafficLoadInsideIndex]; var dikeTopAtPolderData = (ChartPointData) chartDataList[updatedDikeTopAtPolderIndex]; - var shoulderBaseInsideData = (ChartPointData) chartDataList[updatedShoulderBaseInsideIndex]; - var shoulderTopInsideData = (ChartPointData) chartDataList[updatedShoulderTopInsideIndex]; - var dikeToeAtPolderData = (ChartPointData) chartDataList[updatedDikeToeAtPolderIndex]; - var ditchDikeSideData = (ChartPointData) chartDataList[updatedDitchDikeSideIndex]; - var bottomDitchDikeSideData = (ChartPointData) chartDataList[updatedBottomDitchDikeSideIndex]; - var bottomDitchPolderSideData = (ChartPointData) chartDataList[updatedBottomDitchPolderSideIndex]; - var ditchPolderSideData = (ChartPointData) chartDataList[updatedDitchPolderSideIndex]; - var surfaceLevelInsideData = (ChartPointData) chartDataList[updatedSurfaceLevelInsideIndex]; + var trafficLoadOutsideData = (ChartPointData) chartDataList[updatedTrafficLoadOutsideIndex]; + var dikeToeAtRiverData = (ChartPointData) chartDataList[updatedDikeToeAtRiverIndex]; + var surfaceLevelOutsideData = (ChartPointData) chartDataList[updatedSurfaceLevelOutsideIndex]; Assert.AreEqual("Ondergrondschematisatie", soilProfileData.Name); Assert.AreEqual("Profielschematisatie", surfaceLineData.Name); - Assert.AreEqual("Maaiveld buitenwaarts", surfaceLevelOutsideData.Name); - Assert.AreEqual("Teen dijk buitenwaarts", dikeToeAtRiverData.Name); - Assert.AreEqual("Verkeersbelasting kant buitenwaarts", trafficLoadOutsideData.Name); + Assert.AreEqual("Maaiveld binnenwaarts", surfaceLevelInsideData.Name); + Assert.AreEqual("Insteek sloot polderzijde", ditchPolderSideData.Name); + Assert.AreEqual("Slootbodem polderzijde", bottomDitchPolderSideData.Name); + Assert.AreEqual("Slootbodem dijkzijde", bottomDitchDikeSideData.Name); + Assert.AreEqual("Insteek sloot dijkzijde", ditchDikeSideData.Name); + Assert.AreEqual("Teen dijk binnenwaarts", dikeToeAtPolderData.Name); + Assert.AreEqual("Kruin binnenberm", shoulderTopInsideData.Name); + Assert.AreEqual("Insteek binnenberm", shoulderBaseInsideData.Name); Assert.AreEqual("Verkeersbelasting kant binnenwaarts", trafficLoadInsideData.Name); Assert.AreEqual("Kruin binnentalud", dikeTopAtPolderData.Name); - Assert.AreEqual("Insteek binnenberm", shoulderBaseInsideData.Name); - Assert.AreEqual("Kruin binnenberm", shoulderTopInsideData.Name); - Assert.AreEqual("Teen dijk binnenwaarts", dikeToeAtPolderData.Name); - Assert.AreEqual("Insteek sloot dijkzijde", ditchDikeSideData.Name); - Assert.AreEqual("Slootbodem dijkzijde", bottomDitchDikeSideData.Name); - Assert.AreEqual("Slootbodem polderzijde", bottomDitchPolderSideData.Name); - Assert.AreEqual("Insteek sloot polderzijde", ditchPolderSideData.Name); - Assert.AreEqual("Maaiveld binnenwaarts", surfaceLevelInsideData.Name); + Assert.AreEqual("Verkeersbelasting kant buitenwaarts", trafficLoadOutsideData.Name); + Assert.AreEqual("Teen dijk buitenwaarts", dikeToeAtRiverData.Name); + Assert.AreEqual("Maaiveld buitenwaarts", surfaceLevelOutsideData.Name); RingtoetsMacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry(); calculation.InputParameters.SurfaceLine = surfaceLine; @@ -582,35 +582,35 @@ var actualSoilProfileData = (ChartDataCollection) chartDataList[updatedSoilProfileIndex]; var actualSurfaceLineData = (ChartLineData) chartDataList[updatedSurfaceLineIndex]; - var actualSurfaceLevelOutsideData = (ChartPointData) chartDataList[updatedSurfaceLevelOutsideIndex]; - var actualDikeToeAtRiverData = (ChartPointData) chartDataList[updatedDikeToeAtRiverIndex]; - var actualTrafficLoadOutsideData = (ChartPointData) chartDataList[updatedTrafficLoadOutsideIndex]; + var actualSurfaceLevelInsideData = (ChartPointData) chartDataList[updatedSurfaceLevelInsideIndex]; + var actualDitchPolderSideData = (ChartPointData) chartDataList[updatedDitchPolderSideIndex]; + var actualBottomDitchPolderSideData = (ChartPointData) chartDataList[updatedBottomDitchPolderSideIndex]; + var actualBottomDitchDikeSideData = (ChartPointData) chartDataList[updatedBottomDitchDikeSideIndex]; + var actualDitchDikeSideData = (ChartPointData) chartDataList[updatedDitchDikeSideIndex]; + var actualDikeToeAtPolderData = (ChartPointData) chartDataList[updatedDikeToeAtPolderIndex]; + var actualShoulderTopInsideData = (ChartPointData) chartDataList[updatedShoulderTopInsideIndex]; + var actualShoulderBaseInsideData = (ChartPointData) chartDataList[updatedShoulderBaseInsideIndex]; var actualTrafficLoadInsideData = (ChartPointData) chartDataList[updatedTrafficLoadInsideIndex]; var actualDikeTopAtPolderData = (ChartPointData) chartDataList[updatedDikeTopAtPolderIndex]; - var actualShoulderBaseInsideData = (ChartPointData) chartDataList[updatedShoulderBaseInsideIndex]; - var actualShoulderTopInsideData = (ChartPointData) chartDataList[updatedShoulderTopInsideIndex]; - var actualDikeToeAtPolderData = (ChartPointData) chartDataList[updatedDikeToeAtPolderIndex]; - var actualDitchDikeSideData = (ChartPointData) chartDataList[updatedDitchDikeSideIndex]; - var actualBottomDitchDikeSideData = (ChartPointData) chartDataList[updatedBottomDitchDikeSideIndex]; - var actualBottomDitchPolderSideData = (ChartPointData) chartDataList[updatedBottomDitchPolderSideIndex]; - var actualDitchPolderSideData = (ChartPointData) chartDataList[updatedDitchPolderSideIndex]; - var actualSurfaceLevelInsideData = (ChartPointData) chartDataList[updatedSurfaceLevelInsideIndex]; + var actualTrafficLoadOutsideData = (ChartPointData) chartDataList[updatedTrafficLoadOutsideIndex]; + var actualDikeToeAtRiverData = (ChartPointData) chartDataList[updatedDikeToeAtRiverIndex]; + var actualSurfaceLevelOutsideData = (ChartPointData) chartDataList[updatedSurfaceLevelOutsideIndex]; Assert.AreEqual("Ondergrondschematisatie", actualSoilProfileData.Name); Assert.AreEqual(surfaceLine.Name, actualSurfaceLineData.Name); - Assert.AreEqual("Maaiveld buitenwaarts", actualSurfaceLevelOutsideData.Name); - Assert.AreEqual("Teen dijk buitenwaarts", actualDikeToeAtRiverData.Name); - Assert.AreEqual("Verkeersbelasting kant buitenwaarts", actualTrafficLoadOutsideData.Name); + Assert.AreEqual("Maaiveld binnenwaarts", actualSurfaceLevelInsideData.Name); + Assert.AreEqual("Insteek sloot polderzijde", actualDitchPolderSideData.Name); + Assert.AreEqual("Slootbodem polderzijde", actualBottomDitchPolderSideData.Name); + Assert.AreEqual("Slootbodem dijkzijde", actualBottomDitchDikeSideData.Name); + Assert.AreEqual("Insteek sloot dijkzijde", actualDitchDikeSideData.Name); + Assert.AreEqual("Teen dijk binnenwaarts", actualDikeToeAtPolderData.Name); + Assert.AreEqual("Kruin binnenberm", actualShoulderTopInsideData.Name); + Assert.AreEqual("Insteek binnenberm", actualShoulderBaseInsideData.Name); Assert.AreEqual("Verkeersbelasting kant binnenwaarts", actualTrafficLoadInsideData.Name); Assert.AreEqual("Kruin binnentalud", actualDikeTopAtPolderData.Name); - Assert.AreEqual("Insteek binnenberm", actualShoulderBaseInsideData.Name); - Assert.AreEqual("Kruin binnenberm", actualShoulderTopInsideData.Name); - Assert.AreEqual("Teen dijk binnenwaarts", actualDikeToeAtPolderData.Name); - Assert.AreEqual("Insteek sloot dijkzijde", actualDitchDikeSideData.Name); - Assert.AreEqual("Slootbodem dijkzijde", actualBottomDitchDikeSideData.Name); - Assert.AreEqual("Slootbodem polderzijde", actualBottomDitchPolderSideData.Name); - Assert.AreEqual("Insteek sloot polderzijde", actualDitchPolderSideData.Name); - Assert.AreEqual("Maaiveld binnenwaarts", actualSurfaceLevelInsideData.Name); + Assert.AreEqual("Verkeersbelasting kant buitenwaarts", actualTrafficLoadOutsideData.Name); + Assert.AreEqual("Teen dijk buitenwaarts", actualDikeToeAtRiverData.Name); + Assert.AreEqual("Maaiveld buitenwaarts", actualSurfaceLevelOutsideData.Name); } } @@ -764,51 +764,51 @@ var soilProfileData = (ChartDataCollection) chartDatasList[soilProfileIndex]; var surfaceLineData = (ChartLineData) chartDatasList[surfaceLineIndex]; - var surfaceLevelOutsideData = (ChartPointData) chartDatasList[surfaceLevelOutsideIndex]; - var dikeToeAtRiverData = (ChartPointData) chartDatasList[dikeToeAtRiverIndex]; - var trafficLoadOutsideData = (ChartPointData) chartDatasList[trafficLoadOutsideIndex]; + var surfaceLevelInsideData = (ChartPointData) chartDatasList[surfaceLevelInsideIndex]; + var ditchPolderSideData = (ChartPointData) chartDatasList[ditchPolderSideIndex]; + var bottomDitchPolderSideData = (ChartPointData) chartDatasList[bottomDitchPolderSideIndex]; + var bottomDitchDikeSideData = (ChartPointData) chartDatasList[bottomDitchDikeSideIndex]; + var ditchDikeSideData = (ChartPointData) chartDatasList[ditchDikeSideIndex]; + var dikeToeAtPolderData = (ChartPointData) chartDatasList[dikeToeAtPolderIndex]; + var shoulderTopInsideData = (ChartPointData) chartDatasList[shoulderTopInsideIndex]; + var shoulderBaseInsideData = (ChartPointData) chartDatasList[shoulderBaseInsideIndex]; var trafficLoadInsideData = (ChartPointData) chartDatasList[trafficLoadInsideIndex]; var dikeTopAtPolderData = (ChartPointData) chartDatasList[dikeTopAtPolderIndex]; - var shoulderBaseInsideData = (ChartPointData) chartDatasList[shoulderBaseInsideIndex]; - var shoulderTopInsideData = (ChartPointData) chartDatasList[shoulderTopInsideIndex]; - var dikeToeAtPolderData = (ChartPointData) chartDatasList[dikeToeAtPolderIndex]; - var ditchDikeSideData = (ChartPointData) chartDatasList[ditchDikeSideIndex]; - var bottomDitchDikeSideData = (ChartPointData) chartDatasList[bottomDitchDikeSideIndex]; - var bottomDitchPolderSideData = (ChartPointData) chartDatasList[bottomDitchPolderSideIndex]; - var ditchPolderSideData = (ChartPointData) chartDatasList[ditchPolderSideIndex]; - var surfaceLevelInsideData = (ChartPointData) chartDatasList[surfaceLevelInsideIndex]; + var trafficLoadOutsideData = (ChartPointData) chartDatasList[trafficLoadOutsideIndex]; + var dikeToeAtRiverData = (ChartPointData) chartDatasList[dikeToeAtRiverIndex]; + var surfaceLevelOutsideData = (ChartPointData) chartDatasList[surfaceLevelOutsideIndex]; CollectionAssert.IsEmpty(soilProfileData.Collection); CollectionAssert.IsEmpty(surfaceLineData.Points); - CollectionAssert.IsEmpty(surfaceLevelOutsideData.Points); - CollectionAssert.IsEmpty(dikeToeAtRiverData.Points); - CollectionAssert.IsEmpty(trafficLoadOutsideData.Points); + CollectionAssert.IsEmpty(surfaceLevelInsideData.Points); + CollectionAssert.IsEmpty(ditchPolderSideData.Points); + CollectionAssert.IsEmpty(bottomDitchPolderSideData.Points); + CollectionAssert.IsEmpty(bottomDitchDikeSideData.Points); + CollectionAssert.IsEmpty(ditchDikeSideData.Points); + CollectionAssert.IsEmpty(dikeToeAtPolderData.Points); + CollectionAssert.IsEmpty(shoulderTopInsideData.Points); + CollectionAssert.IsEmpty(shoulderBaseInsideData.Points); CollectionAssert.IsEmpty(trafficLoadInsideData.Points); CollectionAssert.IsEmpty(dikeTopAtPolderData.Points); - CollectionAssert.IsEmpty(shoulderBaseInsideData.Points); - CollectionAssert.IsEmpty(shoulderTopInsideData.Points); - CollectionAssert.IsEmpty(dikeToeAtPolderData.Points); - CollectionAssert.IsEmpty(ditchDikeSideData.Points); - CollectionAssert.IsEmpty(bottomDitchDikeSideData.Points); - CollectionAssert.IsEmpty(bottomDitchPolderSideData.Points); - CollectionAssert.IsEmpty(ditchPolderSideData.Points); - CollectionAssert.IsEmpty(surfaceLevelInsideData.Points); + CollectionAssert.IsEmpty(trafficLoadOutsideData.Points); + CollectionAssert.IsEmpty(dikeToeAtRiverData.Points); + CollectionAssert.IsEmpty(surfaceLevelOutsideData.Points); Assert.AreEqual("Ondergrondschematisatie", soilProfileData.Name); Assert.AreEqual("Profielschematisatie", surfaceLineData.Name); - Assert.AreEqual("Maaiveld buitenwaarts", surfaceLevelOutsideData.Name); - Assert.AreEqual("Teen dijk buitenwaarts", dikeToeAtRiverData.Name); - Assert.AreEqual("Verkeersbelasting kant buitenwaarts", trafficLoadOutsideData.Name); + Assert.AreEqual("Maaiveld binnenwaarts", surfaceLevelInsideData.Name); + Assert.AreEqual("Insteek sloot polderzijde", ditchPolderSideData.Name); + Assert.AreEqual("Slootbodem polderzijde", bottomDitchPolderSideData.Name); + Assert.AreEqual("Slootbodem dijkzijde", bottomDitchDikeSideData.Name); + Assert.AreEqual("Insteek sloot dijkzijde", ditchDikeSideData.Name); + Assert.AreEqual("Teen dijk binnenwaarts", dikeToeAtPolderData.Name); + Assert.AreEqual("Kruin binnenberm", shoulderTopInsideData.Name); + Assert.AreEqual("Insteek binnenberm", shoulderBaseInsideData.Name); Assert.AreEqual("Verkeersbelasting kant binnenwaarts", trafficLoadInsideData.Name); Assert.AreEqual("Kruin binnentalud", dikeTopAtPolderData.Name); - Assert.AreEqual("Insteek binnenberm", shoulderBaseInsideData.Name); - Assert.AreEqual("Kruin binnenberm", shoulderTopInsideData.Name); - Assert.AreEqual("Teen dijk binnenwaarts", dikeToeAtPolderData.Name); - Assert.AreEqual("Insteek sloot dijkzijde", ditchDikeSideData.Name); - Assert.AreEqual("Slootbodem dijkzijde", bottomDitchDikeSideData.Name); - Assert.AreEqual("Slootbodem polderzijde", bottomDitchPolderSideData.Name); - Assert.AreEqual("Insteek sloot polderzijde", ditchPolderSideData.Name); - Assert.AreEqual("Maaiveld binnenwaarts", surfaceLevelInsideData.Name); + Assert.AreEqual("Verkeersbelasting kant buitenwaarts", trafficLoadOutsideData.Name); + Assert.AreEqual("Teen dijk buitenwaarts", dikeToeAtRiverData.Name); + Assert.AreEqual("Maaiveld buitenwaarts", surfaceLevelOutsideData.Name); } private static void AssertSoilProfileChartData(StochasticSoilProfile soilProfile, ChartData chartData, bool mapDataShouldContainAreas)