Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql =================================================================== diff -u -r06e3624f72482462ebb7e4ee29d1a8173005e59d -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql (.../DatabaseStructure17.2.sql) (revision 06e3624f72482462ebb7e4ee29d1a8173005e59d) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql (.../DatabaseStructure17.2.sql) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 18-Oct-2017 08:21:55 */ +/* Created On : 19-Oct-2017 2:48:36 PM */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -1785,7 +1785,7 @@ ( 'MacroStabilityInwardsCharacteristicPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'SurfaceLineEntityId' INTEGER NOT NULL, - 'Type' SMALLINT NOT NULL, -- Enumtype: 1 = SurfaceLevelOutside 2 = DikeTopAtRiver 3 = DikeToeAtRiver 4 = TrafficLoadOutside 5 = DikeTopAtPolder 6 = TrafficLoadInside 7 = ShoulderBaseInside 8 = ShoulderTopInside 9 = DikeToeAtPolder 10 = DitchDikeSide 11 = BottomDitchDikeSide 12 = BottomDitchPolderSide 13 = DitchPolderSide 14 = SurfaceLevelInside + 'Type' SMALLINT NOT NULL, -- Enumtype: 1 = SurfaceLevelOutside 2 = DikeTopAtRiver 3 = DikeToeAtRiver 4 = DikeTopAtPolder 5 = ShoulderBaseInside 6 = ShoulderTopInside 7 = DikeToeAtPolder 8 = DitchDikeSide 9 = BottomDitchDikeSide 10 = BottomDitchPolderSide 11 = DitchPolderSide 12 = SurfaceLevelInside 'X' REAL, 'Y' REAL, 'Z' REAL, Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsSurfaceLineCreateExtensions.cs =================================================================== diff -u -r2d2bea96014455b3ba10a7ba20b8aa1a2d633fca -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsSurfaceLineCreateExtensions.cs (.../MacroStabilityInwardsSurfaceLineCreateExtensions.cs) (revision 2d2bea96014455b3ba10a7ba20b8aa1a2d633fca) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsSurfaceLineCreateExtensions.cs (.../MacroStabilityInwardsSurfaceLineCreateExtensions.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -81,8 +81,6 @@ var characteristicPointAssociations = new[] { Tuple.Create(surfaceLine.SurfaceLevelOutside, MacroStabilityInwardsCharacteristicPointType.SurfaceLevelOutside), - Tuple.Create(surfaceLine.TrafficLoadOutside, MacroStabilityInwardsCharacteristicPointType.TrafficLoadOutside), - Tuple.Create(surfaceLine.TrafficLoadInside, MacroStabilityInwardsCharacteristicPointType.TrafficLoadInside), Tuple.Create(surfaceLine.DikeTopAtPolder, MacroStabilityInwardsCharacteristicPointType.DikeTopAtPolder), Tuple.Create(surfaceLine.DikeTopAtRiver, MacroStabilityInwardsCharacteristicPointType.DikeTopAtRiver), Tuple.Create(surfaceLine.ShoulderBaseInside, MacroStabilityInwardsCharacteristicPointType.ShoulderBaseInside), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsCharacteristicPointType.cs =================================================================== diff -u -r1ba21a629ef9ee35b003e5f5e66f26f5b8bc7766 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsCharacteristicPointType.cs (.../MacroStabilityInwardsCharacteristicPointType.cs) (revision 1ba21a629ef9ee35b003e5f5e66f26f5b8bc7766) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsCharacteristicPointType.cs (.../MacroStabilityInwardsCharacteristicPointType.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -46,58 +46,48 @@ DikeToeAtRiver = 3, /// - /// Corresponds to . - /// - TrafficLoadOutside = 4, - - /// /// Corresponds to . /// - DikeTopAtPolder = 5, + DikeTopAtPolder = 4, /// - /// Corresponds to . - /// - TrafficLoadInside = 6, - - /// /// Corresponds to . /// - ShoulderBaseInside = 7, + ShoulderBaseInside = 5, /// /// Corresponds to . /// - ShoulderTopInside = 8, + ShoulderTopInside = 6, /// /// Corresponds to . /// - DikeToeAtPolder = 9, + DikeToeAtPolder = 7, /// /// Corresponds to . /// - DitchDikeSide = 10, + DitchDikeSide = 8, /// /// Corresponds to . /// - BottomDitchDikeSide = 11, + BottomDitchDikeSide = 9, /// /// Corresponds to . /// - BottomDitchPolderSide = 12, + BottomDitchPolderSide = 10, /// /// Corresponds to . /// - DitchPolderSide = 13, + DitchPolderSide = 11, /// /// Corresponds to . /// - SurfaceLevelInside = 14 + SurfaceLevelInside = 12 } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -r06e3624f72482462ebb7e4ee29d1a8173005e59d -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 06e3624f72482462ebb7e4ee29d1a8173005e59d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -9,93 +9,93 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/SurfaceLineEntityReadExtensions.cs =================================================================== diff -u -r1ba21a629ef9ee35b003e5f5e66f26f5b8bc7766 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/SurfaceLineEntityReadExtensions.cs (.../SurfaceLineEntityReadExtensions.cs) (revision 1ba21a629ef9ee35b003e5f5e66f26f5b8bc7766) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/SurfaceLineEntityReadExtensions.cs (.../SurfaceLineEntityReadExtensions.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -195,12 +195,6 @@ case MacroStabilityInwardsCharacteristicPointType.SurfaceLevelInside: surfaceLine.SetSurfaceLevelInsideAt(geometryPoint); break; - case MacroStabilityInwardsCharacteristicPointType.TrafficLoadOutside: - surfaceLine.SetTrafficLoadOutsideAt(geometryPoint); - break; - case MacroStabilityInwardsCharacteristicPointType.TrafficLoadInside: - surfaceLine.SetTrafficLoadInsideAt(geometryPoint); - break; case MacroStabilityInwardsCharacteristicPointType.ShoulderBaseInside: surfaceLine.SetShoulderBaseInsideAt(geometryPoint); break; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -rd75a6c0c39a582f42b7a05b705aaa1f703a47d89 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs) (revision d75a6c0c39a582f42b7a05b705aaa1f703a47d89) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -298,7 +298,7 @@ Assert.AreEqual(surfaceLine.ReferenceLineIntersectionWorldPoint.Y, entity.ReferenceLineIntersectionY); Assert.AreEqual(0, entity.PipingCharacteristicPointEntities.Count); - Assert.AreEqual(14, entity.MacroStabilityInwardsCharacteristicPointEntities.Count); + Assert.AreEqual(12, entity.MacroStabilityInwardsCharacteristicPointEntities.Count); } private MacroStabilityInwardsSurfaceLine CreateSurfaceLine(Random random) @@ -308,7 +308,7 @@ ReferenceLineIntersectionWorldPoint = new Point2D(random.NextDouble(), random.NextDouble()) }; - var geometryPoints = new Point3D[14]; + var geometryPoints = new Point3D[12]; for (var i = 0; i < geometryPoints.Length; i++) { geometryPoints[i] = new Point3D(random.NextDouble(), random.NextDouble(), random.NextDouble()); @@ -323,11 +323,9 @@ surfaceLine.SetDikeTopAtRiverAt(geometryPoints[6]); surfaceLine.SetShoulderBaseInsideAt(geometryPoints[7]); surfaceLine.SetShoulderTopInsideAt(geometryPoints[8]); - surfaceLine.SetTrafficLoadInsideAt(geometryPoints[9]); - surfaceLine.SetTrafficLoadOutsideAt(geometryPoints[10]); - surfaceLine.SetDikeToeAtRiverAt(geometryPoints[11]); - surfaceLine.SetDikeToeAtPolderAt(geometryPoints[12]); - surfaceLine.SetSurfaceLevelInsideAt(geometryPoints[13]); + surfaceLine.SetDikeToeAtRiverAt(geometryPoints[9]); + surfaceLine.SetDikeToeAtPolderAt(geometryPoints[10]); + surfaceLine.SetSurfaceLevelInsideAt(geometryPoints[11]); surfaceLine.SetSurfaceLevelOutsideAt(geometryPoints[0]); return surfaceLine; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSurfaceLineCreateExtensionsTest.cs =================================================================== diff -u -r342550ddfacbc6b0253b9b452da4aa68c3fac73f -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSurfaceLineCreateExtensionsTest.cs (.../MacroStabilityInwardsSurfaceLineCreateExtensionsTest.cs) (revision 342550ddfacbc6b0253b9b452da4aa68c3fac73f) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSurfaceLineCreateExtensionsTest.cs (.../MacroStabilityInwardsSurfaceLineCreateExtensionsTest.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -166,31 +166,27 @@ const int surfaceLevelOutsideIndex = 1; surfaceLine.SetSurfaceLevelOutsideAt(geometry[surfaceLevelOutsideIndex]); - const int trafficLoadOutsideIndex = 2; - surfaceLine.SetTrafficLoadOutsideAt(geometry[trafficLoadOutsideIndex]); - const int trafficLoadInsideIndex = 3; - surfaceLine.SetTrafficLoadInsideAt(geometry[trafficLoadInsideIndex]); - const int dikeTopAtPolderIndex = 4; + const int dikeTopAtPolderIndex = 2; surfaceLine.SetDikeTopAtPolderAt(geometry[dikeTopAtPolderIndex]); - const int dikeTopAtRiverIndex = 5; + const int dikeTopAtRiverIndex = 3; surfaceLine.SetDikeTopAtRiverAt(geometry[dikeTopAtRiverIndex]); - const int shoulderBaseInsideIndex = 6; + const int shoulderBaseInsideIndex = 4; surfaceLine.SetShoulderBaseInsideAt(geometry[shoulderBaseInsideIndex]); - const int shoulderTopInsideIndex = 7; + const int shoulderTopInsideIndex = 5; surfaceLine.SetShoulderTopInsideAt(geometry[shoulderTopInsideIndex]); - const int bottomDitchDikeSideIndex = 8; + const int bottomDitchDikeSideIndex = 6; surfaceLine.SetBottomDitchDikeSideAt(geometry[bottomDitchDikeSideIndex]); - const int bottomDitchPolderSideIndex = 9; + const int bottomDitchPolderSideIndex = 7; surfaceLine.SetBottomDitchPolderSideAt(geometry[bottomDitchPolderSideIndex]); - const int dikeToeAtPolderIndex = 10; + const int dikeToeAtPolderIndex = 8; surfaceLine.SetDikeToeAtPolderAt(geometry[dikeToeAtPolderIndex]); - const int dikeToeAtRiverIndex = 11; + const int dikeToeAtRiverIndex = 9; surfaceLine.SetDikeToeAtRiverAt(geometry[dikeToeAtRiverIndex]); - const int ditchDikeSideIndex = 12; + const int ditchDikeSideIndex = 10; surfaceLine.SetDitchDikeSideAt(geometry[ditchDikeSideIndex]); - const int ditchPolderSideIndex = 13; + const int ditchPolderSideIndex = 11; surfaceLine.SetDitchPolderSideAt(geometry[ditchPolderSideIndex]); - const int surfaceLevelInsideIndex = 14; + const int surfaceLevelInsideIndex = 12; surfaceLine.SetSurfaceLevelInsideAt(geometry[surfaceLevelInsideIndex]); var registry = new PersistenceRegistry(); @@ -206,7 +202,7 @@ string expectedXml = new Point3DXmlSerializer().ToXml(geometry); Assert.AreEqual(expectedXml, entity.PointsXml); - Assert.AreEqual(14, entity.MacroStabilityInwardsCharacteristicPointEntities.Count); + Assert.AreEqual(12, entity.MacroStabilityInwardsCharacteristicPointEntities.Count); foreach (MacroStabilityInwardsCharacteristicPointEntity characteristicPointEntity in entity.MacroStabilityInwardsCharacteristicPointEntities) { switch (characteristicPointEntity.Type) @@ -216,16 +212,6 @@ Assert.AreEqual(geometry[surfaceLevelOutsideIndex].Y, characteristicPointEntity.Y); Assert.AreEqual(geometry[surfaceLevelOutsideIndex].Z, characteristicPointEntity.Z); break; - case (byte) MacroStabilityInwardsCharacteristicPointType.TrafficLoadOutside: - Assert.AreEqual(geometry[trafficLoadOutsideIndex].X, characteristicPointEntity.X); - Assert.AreEqual(geometry[trafficLoadOutsideIndex].Y, characteristicPointEntity.Y); - Assert.AreEqual(geometry[trafficLoadOutsideIndex].Z, characteristicPointEntity.Z); - break; - case (byte) MacroStabilityInwardsCharacteristicPointType.TrafficLoadInside: - Assert.AreEqual(geometry[trafficLoadInsideIndex].X, characteristicPointEntity.X); - Assert.AreEqual(geometry[trafficLoadInsideIndex].Y, characteristicPointEntity.Y); - Assert.AreEqual(geometry[trafficLoadInsideIndex].Z, characteristicPointEntity.Z); - break; case (byte) MacroStabilityInwardsCharacteristicPointType.DikeTopAtPolder: Assert.AreEqual(geometry[dikeTopAtPolderIndex].X, characteristicPointEntity.X); Assert.AreEqual(geometry[dikeTopAtPolderIndex].Y, characteristicPointEntity.Y); @@ -304,8 +290,6 @@ }; surfaceLine.SetGeometry(geometry); surfaceLine.SetSurfaceLevelOutsideAt(geometry[0]); - surfaceLine.SetTrafficLoadOutsideAt(geometry[0]); - surfaceLine.SetTrafficLoadInsideAt(geometry[0]); surfaceLine.SetDikeTopAtPolderAt(geometry[0]); surfaceLine.SetDikeTopAtRiverAt(geometry[0]); surfaceLine.SetShoulderBaseInsideAt(geometry[0]); @@ -329,12 +313,10 @@ string expectedXml = new Point3DXmlSerializer().ToXml(geometry); Assert.AreEqual(expectedXml, entity.PointsXml); - Assert.AreEqual(14, entity.MacroStabilityInwardsCharacteristicPointEntities.Count); + Assert.AreEqual(12, entity.MacroStabilityInwardsCharacteristicPointEntities.Count); CollectionAssert.AreEquivalent(new[] { (byte) MacroStabilityInwardsCharacteristicPointType.SurfaceLevelOutside, - (byte) MacroStabilityInwardsCharacteristicPointType.TrafficLoadOutside, - (byte) MacroStabilityInwardsCharacteristicPointType.TrafficLoadInside, (byte) MacroStabilityInwardsCharacteristicPointType.DikeTopAtPolder, (byte) MacroStabilityInwardsCharacteristicPointType.DikeTopAtRiver, (byte) MacroStabilityInwardsCharacteristicPointType.ShoulderBaseInside, Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r68647f42dd790c7900bdbe376e97322435b4a957 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 68647f42dd790c7900bdbe376e97322435b4a957) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -1566,8 +1566,6 @@ Assert.AreEqual(expectedSurfaceLine.SurfaceLevelOutside, actualSurfaceLine.SurfaceLevelOutside); Assert.AreEqual(expectedSurfaceLine.DikeToeAtRiver, actualSurfaceLine.DikeToeAtRiver); - Assert.AreEqual(expectedSurfaceLine.TrafficLoadOutside, actualSurfaceLine.TrafficLoadOutside); - Assert.AreEqual(expectedSurfaceLine.TrafficLoadInside, actualSurfaceLine.TrafficLoadInside); Assert.AreEqual(expectedSurfaceLine.DikeTopAtPolder, actualSurfaceLine.DikeTopAtPolder); Assert.AreEqual(expectedSurfaceLine.DikeTopAtRiver, actualSurfaceLine.DikeTopAtRiver); Assert.AreEqual(expectedSurfaceLine.ShoulderBaseInside, actualSurfaceLine.ShoulderBaseInside); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/SurfaceLineEntityReadExtensionsTest.cs =================================================================== diff -u -rd9bbfea8e0f8e620379c9b51e427d24560b7cbd4 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/SurfaceLineEntityReadExtensionsTest.cs (.../SurfaceLineEntityReadExtensionsTest.cs) (revision d9bbfea8e0f8e620379c9b51e427d24560b7cbd4) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/SurfaceLineEntityReadExtensionsTest.cs (.../SurfaceLineEntityReadExtensionsTest.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -388,8 +388,6 @@ Assert.IsNull(surfaceLine.SurfaceLevelOutside); Assert.IsNull(surfaceLine.DikeToeAtRiver); - Assert.IsNull(surfaceLine.TrafficLoadOutside); - Assert.IsNull(surfaceLine.TrafficLoadInside); Assert.IsNull(surfaceLine.DikeTopAtPolder); Assert.IsNull(surfaceLine.DikeTopAtRiver); Assert.IsNull(surfaceLine.ShoulderBaseInside); @@ -436,8 +434,6 @@ Assert.IsNull(surfaceLine.SurfaceLevelOutside); Assert.IsNull(surfaceLine.DikeToeAtRiver); - Assert.IsNull(surfaceLine.TrafficLoadOutside); - Assert.IsNull(surfaceLine.TrafficLoadInside); Assert.IsNull(surfaceLine.DikeTopAtPolder); Assert.IsNull(surfaceLine.DikeTopAtRiver); Assert.IsNull(surfaceLine.ShoulderBaseInside); @@ -457,7 +453,7 @@ var collector = new ReadConversionCollector(); var random = new Random(31); - Point3D[] points = Array.ConvertAll(new Point3D[14], p => CreatePoint3D(random)); + Point3D[] points = Array.ConvertAll(new Point3D[12], p => CreatePoint3D(random)); var entity = new SurfaceLineEntity { @@ -469,18 +465,16 @@ { CreateMacroStabilityInwardsCharacteristicPointEntity(points[0], MacroStabilityInwardsCharacteristicPointType.SurfaceLevelOutside), CreateMacroStabilityInwardsCharacteristicPointEntity(points[1], MacroStabilityInwardsCharacteristicPointType.DikeToeAtRiver), - CreateMacroStabilityInwardsCharacteristicPointEntity(points[2], MacroStabilityInwardsCharacteristicPointType.TrafficLoadOutside), - CreateMacroStabilityInwardsCharacteristicPointEntity(points[3], MacroStabilityInwardsCharacteristicPointType.TrafficLoadInside), - CreateMacroStabilityInwardsCharacteristicPointEntity(points[4], MacroStabilityInwardsCharacteristicPointType.DikeTopAtPolder), - CreateMacroStabilityInwardsCharacteristicPointEntity(points[5], MacroStabilityInwardsCharacteristicPointType.DikeTopAtRiver), - CreateMacroStabilityInwardsCharacteristicPointEntity(points[6], MacroStabilityInwardsCharacteristicPointType.ShoulderBaseInside), - CreateMacroStabilityInwardsCharacteristicPointEntity(points[7], MacroStabilityInwardsCharacteristicPointType.ShoulderTopInside), - CreateMacroStabilityInwardsCharacteristicPointEntity(points[8], MacroStabilityInwardsCharacteristicPointType.DikeToeAtPolder), - CreateMacroStabilityInwardsCharacteristicPointEntity(points[9], MacroStabilityInwardsCharacteristicPointType.DitchDikeSide), - CreateMacroStabilityInwardsCharacteristicPointEntity(points[10], MacroStabilityInwardsCharacteristicPointType.BottomDitchDikeSide), - CreateMacroStabilityInwardsCharacteristicPointEntity(points[11], MacroStabilityInwardsCharacteristicPointType.BottomDitchPolderSide), - CreateMacroStabilityInwardsCharacteristicPointEntity(points[12], MacroStabilityInwardsCharacteristicPointType.DitchPolderSide), - CreateMacroStabilityInwardsCharacteristicPointEntity(points[13], MacroStabilityInwardsCharacteristicPointType.SurfaceLevelInside) + CreateMacroStabilityInwardsCharacteristicPointEntity(points[2], MacroStabilityInwardsCharacteristicPointType.DikeTopAtPolder), + CreateMacroStabilityInwardsCharacteristicPointEntity(points[3], MacroStabilityInwardsCharacteristicPointType.DikeTopAtRiver), + CreateMacroStabilityInwardsCharacteristicPointEntity(points[4], MacroStabilityInwardsCharacteristicPointType.ShoulderBaseInside), + CreateMacroStabilityInwardsCharacteristicPointEntity(points[5], MacroStabilityInwardsCharacteristicPointType.ShoulderTopInside), + CreateMacroStabilityInwardsCharacteristicPointEntity(points[6], MacroStabilityInwardsCharacteristicPointType.DikeToeAtPolder), + CreateMacroStabilityInwardsCharacteristicPointEntity(points[7], MacroStabilityInwardsCharacteristicPointType.DitchDikeSide), + CreateMacroStabilityInwardsCharacteristicPointEntity(points[8], MacroStabilityInwardsCharacteristicPointType.BottomDitchDikeSide), + CreateMacroStabilityInwardsCharacteristicPointEntity(points[9], MacroStabilityInwardsCharacteristicPointType.BottomDitchPolderSide), + CreateMacroStabilityInwardsCharacteristicPointEntity(points[10], MacroStabilityInwardsCharacteristicPointType.DitchPolderSide), + CreateMacroStabilityInwardsCharacteristicPointEntity(points[11], MacroStabilityInwardsCharacteristicPointType.SurfaceLevelInside) } }; @@ -496,18 +490,16 @@ Assert.AreSame(surfaceLine.Points[0], surfaceLine.SurfaceLevelOutside); Assert.AreSame(surfaceLine.Points[1], surfaceLine.DikeToeAtRiver); - Assert.AreSame(surfaceLine.Points[2], surfaceLine.TrafficLoadOutside); - Assert.AreSame(surfaceLine.Points[3], surfaceLine.TrafficLoadInside); - Assert.AreSame(surfaceLine.Points[4], surfaceLine.DikeTopAtPolder); - Assert.AreSame(surfaceLine.Points[5], surfaceLine.DikeTopAtRiver); - Assert.AreSame(surfaceLine.Points[6], surfaceLine.ShoulderBaseInside); - Assert.AreSame(surfaceLine.Points[7], surfaceLine.ShoulderTopInside); - Assert.AreSame(surfaceLine.Points[8], surfaceLine.DikeToeAtPolder); - Assert.AreSame(surfaceLine.Points[9], surfaceLine.DitchDikeSide); - Assert.AreSame(surfaceLine.Points[10], surfaceLine.BottomDitchDikeSide); - Assert.AreSame(surfaceLine.Points[11], surfaceLine.BottomDitchPolderSide); - Assert.AreSame(surfaceLine.Points[12], surfaceLine.DitchPolderSide); - Assert.AreSame(surfaceLine.Points[13], surfaceLine.SurfaceLevelInside); + Assert.AreSame(surfaceLine.Points[2], surfaceLine.DikeTopAtPolder); + Assert.AreSame(surfaceLine.Points[3], surfaceLine.DikeTopAtRiver); + Assert.AreSame(surfaceLine.Points[4], surfaceLine.ShoulderBaseInside); + Assert.AreSame(surfaceLine.Points[5], surfaceLine.ShoulderTopInside); + Assert.AreSame(surfaceLine.Points[6], surfaceLine.DikeToeAtPolder); + Assert.AreSame(surfaceLine.Points[7], surfaceLine.DitchDikeSide); + Assert.AreSame(surfaceLine.Points[8], surfaceLine.BottomDitchDikeSide); + Assert.AreSame(surfaceLine.Points[9], surfaceLine.BottomDitchPolderSide); + Assert.AreSame(surfaceLine.Points[10], surfaceLine.DitchPolderSide); + Assert.AreSame(surfaceLine.Points[11], surfaceLine.SurfaceLevelInside); } [Test] @@ -533,8 +525,6 @@ { CreateMacroStabilityInwardsCharacteristicPointEntity(points[0], MacroStabilityInwardsCharacteristicPointType.SurfaceLevelOutside), CreateMacroStabilityInwardsCharacteristicPointEntity(points[0], MacroStabilityInwardsCharacteristicPointType.DikeToeAtRiver), - CreateMacroStabilityInwardsCharacteristicPointEntity(points[0], MacroStabilityInwardsCharacteristicPointType.TrafficLoadOutside), - CreateMacroStabilityInwardsCharacteristicPointEntity(points[0], MacroStabilityInwardsCharacteristicPointType.TrafficLoadInside), CreateMacroStabilityInwardsCharacteristicPointEntity(points[0], MacroStabilityInwardsCharacteristicPointType.DikeTopAtPolder), CreateMacroStabilityInwardsCharacteristicPointEntity(points[0], MacroStabilityInwardsCharacteristicPointType.DikeTopAtRiver), CreateMacroStabilityInwardsCharacteristicPointEntity(points[0], MacroStabilityInwardsCharacteristicPointType.ShoulderBaseInside), @@ -562,8 +552,6 @@ Assert.AreSame(geometryPoint, surfaceLine.SurfaceLevelOutside); Assert.AreSame(geometryPoint, surfaceLine.DikeToeAtRiver); - Assert.AreSame(geometryPoint, surfaceLine.TrafficLoadOutside); - Assert.AreSame(geometryPoint, surfaceLine.TrafficLoadInside); Assert.AreSame(geometryPoint, surfaceLine.DikeTopAtPolder); Assert.AreSame(geometryPoint, surfaceLine.DikeTopAtRiver); Assert.AreSame(geometryPoint, surfaceLine.ShoulderBaseInside); @@ -593,8 +581,6 @@ { CreateMacroStabilityInwardsCharacteristicPointEntity(point3D, MacroStabilityInwardsCharacteristicPointType.SurfaceLevelOutside), CreateMacroStabilityInwardsCharacteristicPointEntity(point3D, MacroStabilityInwardsCharacteristicPointType.DikeToeAtRiver), - CreateMacroStabilityInwardsCharacteristicPointEntity(point3D, MacroStabilityInwardsCharacteristicPointType.TrafficLoadOutside), - CreateMacroStabilityInwardsCharacteristicPointEntity(point3D, MacroStabilityInwardsCharacteristicPointType.TrafficLoadInside), CreateMacroStabilityInwardsCharacteristicPointEntity(point3D, MacroStabilityInwardsCharacteristicPointType.DikeTopAtPolder), CreateMacroStabilityInwardsCharacteristicPointEntity(point3D, MacroStabilityInwardsCharacteristicPointType.DikeTopAtRiver), CreateMacroStabilityInwardsCharacteristicPointEntity(point3D, MacroStabilityInwardsCharacteristicPointType.ShoulderBaseInside), @@ -619,8 +605,6 @@ Point3D geometryPoint = surfaceLine.Points.Single(); Assert.AreSame(geometryPoint, surfaceLine.SurfaceLevelOutside); Assert.AreSame(geometryPoint, surfaceLine.DikeToeAtRiver); - Assert.AreSame(geometryPoint, surfaceLine.TrafficLoadOutside); - Assert.AreSame(geometryPoint, surfaceLine.TrafficLoadInside); Assert.AreSame(geometryPoint, surfaceLine.DikeTopAtPolder); Assert.AreSame(geometryPoint, surfaceLine.DikeTopAtRiver); Assert.AreSame(geometryPoint, surfaceLine.ShoulderBaseInside); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs =================================================================== diff -u -rb1d966e255d85fe5ea310e93fdd2f8c71ed31513 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision b1d966e255d85fe5ea310e93fdd2f8c71ed31513) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -194,16 +194,12 @@ new Point3D(10.0, 6.0, 0.5), new Point3D(11.0, 6.0, -2.3), new Point3D(12.8, 6.0, -2.3), - new Point3D(13.6, 6.0, 3.4), - new Point3D(14.2, 6.0, 3.5), - new Point3D(15.0, 6.0, 0.5) + new Point3D(13.6, 6.0, 3.4) }; CollectionAssert.AreEqual(geometryPoints, surfaceLine.Points); - Assert.AreEqual(surfaceLine.Points[14], surfaceLine.SurfaceLevelOutside); - Assert.AreEqual(surfaceLine.Points[13], surfaceLine.DikeToeAtRiver); - Assert.AreEqual(surfaceLine.Points[12], surfaceLine.TrafficLoadOutside); - Assert.AreEqual(surfaceLine.Points[11], surfaceLine.TrafficLoadInside); + Assert.AreEqual(surfaceLine.Points[12], surfaceLine.SurfaceLevelOutside); + Assert.AreEqual(surfaceLine.Points[11], surfaceLine.DikeToeAtRiver); Assert.AreEqual(surfaceLine.Points[10], surfaceLine.DikeTopAtPolder); Assert.AreEqual(surfaceLine.Points[9], surfaceLine.DikeTopAtRiver); Assert.AreEqual(surfaceLine.Points[8], surfaceLine.ShoulderBaseInside); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -re5777982eb2ab0a2dfac0c02ebb0ca812d379548 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision e5777982eb2ab0a2dfac0c02ebb0ca812d379548) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -1406,16 +1406,12 @@ new Point3D(10.0, 6.0, 0.5), new Point3D(11.0, 6.0, -2.3), new Point3D(12.8, 6.0, -2.3), - new Point3D(13.6, 6.0, 3.4), - new Point3D(14.2, 6.0, 3.5), - new Point3D(15.0, 6.0, 0.5) + new Point3D(13.6, 6.0, 3.4) }; surfaceLine.SetGeometry(geometryPoints); - surfaceLine.SetSurfaceLevelOutsideAt(geometryPoints[14]); - surfaceLine.SetDikeToeAtRiverAt(geometryPoints[13]); - surfaceLine.SetTrafficLoadOutsideAt(geometryPoints[12]); - surfaceLine.SetTrafficLoadInsideAt(geometryPoints[11]); + surfaceLine.SetSurfaceLevelOutsideAt(geometryPoints[12]); + surfaceLine.SetDikeToeAtRiverAt(geometryPoints[11]); surfaceLine.SetDikeTopAtPolderAt(geometryPoints[10]); surfaceLine.SetDikeTopAtRiverAt(geometryPoints[9]); surfaceLine.SetShoulderBaseInsideAt(geometryPoints[8]); Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r831379390ac72116a2f1c3a014063bbd60ab928d -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 831379390ac72116a2f1c3a014063bbd60ab928d) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -380,24 +380,6 @@ } /// - /// Looks up a localized string similar to Verkeersbelasting kant binnenwaarts. - /// - public static string CharacteristicPoint_TrafficLoadInside { - get { - return ResourceManager.GetString("CharacteristicPoint_TrafficLoadInside", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Verkeersbelasting kant buitenwaarts. - /// - public static string CharacteristicPoint_TrafficLoadOutside { - get { - return ResourceManager.GetString("CharacteristicPoint_TrafficLoadOutside", resourceCulture); - } - } - - /// /// Looks up a localized string similar to De stochasten van een illustratiepunt bevatten niet dezelfde stochasten als in de onderliggende illustratiepunten.. /// public static string Child_stochasts_not_same_as_parent_stochasts { Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx =================================================================== diff -u -r831379390ac72116a2f1c3a014063bbd60ab928d -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 831379390ac72116a2f1c3a014063bbd60ab928d) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -333,12 +333,6 @@ Kruin binnenberm - - Verkeersbelasting kant binnenwaarts - - - Verkeersbelasting kant buitenwaarts - Maaiveld binnenwaarts Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rc16bf14238e7817258f0fa8d5304e0d0e1ae22be -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c16bf14238e7817258f0fa8d5304e0d0e1ae22be) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -788,24 +788,6 @@ } /// - /// Looks up a localized string similar to De locatie van de verkeersbelasting wanneer de dijk van binnen de polder wordt benaderd.. - /// - public static string CharacteristicPoint_TrafficLoadInside_Description { - get { - return ResourceManager.GetString("CharacteristicPoint_TrafficLoadInside_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to De locatie van de verkeersbelasting wanneer de dijk van buiten de polder wordt benaderd.. - /// - public static string CharacteristicPoint_TrafficLoadOutside_Description { - get { - return ResourceManager.GetString("CharacteristicPoint_TrafficLoadOutside_Description", resourceCulture); - } - } - - /// /// Looks up a localized string similar to {0} - {1}. /// public static string ChartDataFactory_Create_DataIdentifier_0_DataTypeDisplayName_1_ { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -rc16bf14238e7817258f0fa8d5304e0d0e1ae22be -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision c16bf14238e7817258f0fa8d5304e0d0e1ae22be) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -1098,12 +1098,6 @@ De locatie van het maaiveld buiten de polder. - - De locatie van de verkeersbelasting wanneer de dijk van binnen de polder wordt benaderd. - - - De locatie van de verkeersbelasting wanneer de dijk van buiten de polder wordt benaderd. - Karakteristieke punten Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs =================================================================== diff -u -r514c9212b8abac9217b74f04494602d91eff32b2 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs (.../MacroStabilityInwardsChartDataFactory.cs) (revision 514c9212b8abac9217b74f04494602d91eff32b2) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs (.../MacroStabilityInwardsChartDataFactory.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -106,32 +106,6 @@ /// /// Create with default styling for a characteristic point - /// of type traffic load inside. - /// - /// The created . - public static ChartPointData CreateTrafficLoadInsideChartData() - { - return new ChartPointData(RingtoetsCommonDataResources.CharacteristicPoint_TrafficLoadInside, - GetCharacteristicPointStyle(Color.LightSlateGray, - Color.White, - ChartPointSymbol.Circle)); - } - - /// - /// Create with default styling for a characteristic point - /// of type traffic load outside. - /// - /// The created . - public static ChartPointData CreateTrafficLoadOutsideChartData() - { - return new ChartPointData(RingtoetsCommonDataResources.CharacteristicPoint_TrafficLoadOutside, - GetCharacteristicPointStyle(Color.DarkSlateGray, - Color.White, - ChartPointSymbol.Circle)); - } - - /// - /// Create with default styling for a characteristic point /// of type dike top at river. /// /// The created . Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataPointsFactory.cs =================================================================== diff -u -r9f936b0b29f490a024df02345df182133b1c041a -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataPointsFactory.cs (.../MacroStabilityInwardsChartDataPointsFactory.cs) (revision 9f936b0b29f490a024df02345df182133b1c041a) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataPointsFactory.cs (.../MacroStabilityInwardsChartDataPointsFactory.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -137,36 +137,6 @@ } /// - /// Create a traffic load outside point in 2D space based on the provided . - /// - /// The surface line to create the traffic load outside point for. - /// An array with a traffic load outside point in 2D space or an empty array when: - /// - /// is null; - /// the traffic load outside point in is null. - /// - /// - public static Point2D[] CreateTrafficLoadOutsidePoint(MacroStabilityInwardsSurfaceLine surfaceLine) - { - return GetLocalPointsFromGeometry(surfaceLine, surfaceLine?.TrafficLoadOutside); - } - - /// - /// Create a traffic load inside point in 2D space based on the provided . - /// - /// The surface line to create the traffic load inside point for. - /// An array with a traffic load inside point in 2D space or an empty array when: - /// - /// is null; - /// the traffic load inside point in is null. - /// - /// - public static Point2D[] CreateTrafficLoadInsidePoint(MacroStabilityInwardsSurfaceLine surfaceLine) - { - return GetLocalPointsFromGeometry(surfaceLine, surfaceLine?.TrafficLoadInside); - } - - /// /// Create a dike top at polder point in 2D space based on the provided . /// /// The surface line to create the dike top at polder point for. Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSurfaceLineProperties.cs =================================================================== diff -u -r0aaab7275b297d00870a726881bc876295a68d39 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSurfaceLineProperties.cs (.../MacroStabilityInwardsSurfaceLineProperties.cs) (revision 0aaab7275b297d00870a726881bc876295a68d39) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSurfaceLineProperties.cs (.../MacroStabilityInwardsSurfaceLineProperties.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -94,28 +94,6 @@ } [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] - [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_TrafficLoadOutside))] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_TrafficLoadOutside_Description))] - public Point3D TrafficLoadOutside - { - get - { - return data.TrafficLoadOutside; - } - } - - [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] - [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_TrafficLoadInside))] - [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_TrafficLoadInside_Description))] - public Point3D TrafficLoadInside - { - get - { - return data.TrafficLoadInside; - } - } - - [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Characteristic_points))] [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), nameof(RingtoetsCommonDataResources.CharacteristicPoint_DikeTopAtPolder))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.CharacteristicPoint_DikeTopAtPolder_Description))] public Point3D DikeTopAtPolder Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs =================================================================== diff -u -r514c9212b8abac9217b74f04494602d91eff32b2 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs (.../MacroStabilityInwardsInputView.cs) (revision 514c9212b8abac9217b74f04494602d91eff32b2) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs (.../MacroStabilityInwardsInputView.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -55,9 +55,7 @@ private readonly ChartPointData dikeToeAtPolderChartData; private readonly ChartPointData shoulderTopInsideChartData; private readonly ChartPointData shoulderBaseInsideChartData; - private readonly ChartPointData trafficLoadInsideChartData; private readonly ChartPointData dikeTopAtPolderChartData; - private readonly ChartPointData trafficLoadOutsideChartData; private readonly ChartPointData dikeToeAtRiverChartData; private readonly ChartPointData dikeTopAtRiverChartData; private readonly ChartPointData surfaceLevelOutsideChartData; @@ -90,9 +88,7 @@ dikeToeAtPolderChartData = RingtoetsChartDataFactory.CreateDikeToeAtPolderChartData(); shoulderTopInsideChartData = MacroStabilityInwardsChartDataFactory.CreateShoulderTopInsideChartData(); shoulderBaseInsideChartData = MacroStabilityInwardsChartDataFactory.CreateShoulderBaseInsideChartData(); - trafficLoadInsideChartData = MacroStabilityInwardsChartDataFactory.CreateTrafficLoadInsideChartData(); dikeTopAtPolderChartData = MacroStabilityInwardsChartDataFactory.CreateDikeTopAtPolderChartData(); - trafficLoadOutsideChartData = MacroStabilityInwardsChartDataFactory.CreateTrafficLoadOutsideChartData(); dikeToeAtRiverChartData = RingtoetsChartDataFactory.CreateDikeToeAtRiverChartData(); dikeTopAtRiverChartData = MacroStabilityInwardsChartDataFactory.CreateDikeTopAtRiverChartData(); surfaceLevelOutsideChartData = MacroStabilityInwardsChartDataFactory.CreateSurfaceLevelOutsideChartData(); @@ -109,9 +105,7 @@ chartDataCollection.Add(dikeToeAtPolderChartData); chartDataCollection.Add(shoulderTopInsideChartData); chartDataCollection.Add(shoulderBaseInsideChartData); - chartDataCollection.Add(trafficLoadInsideChartData); chartDataCollection.Add(dikeTopAtPolderChartData); - chartDataCollection.Add(trafficLoadOutsideChartData); chartDataCollection.Add(dikeToeAtRiverChartData); chartDataCollection.Add(dikeTopAtRiverChartData); chartDataCollection.Add(surfaceLevelOutsideChartData); @@ -224,9 +218,7 @@ 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); - trafficLoadOutsideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateTrafficLoadOutsidePoint(surfaceLine); dikeToeAtRiverChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateDikeToeAtRiverPoint(surfaceLine); dikeTopAtRiverChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateDikeTopAtRiverPoint(surfaceLine); surfaceLevelOutsideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateSurfaceLevelOutsidePoint(surfaceLine); Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs =================================================================== diff -u -r8bfecdc9ee73e23debf1c933b9c121eca5de28e6 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs (.../MacroStabilityInwardsOutputChartControl.cs) (revision 8bfecdc9ee73e23debf1c933b9c121eca5de28e6) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs (.../MacroStabilityInwardsOutputChartControl.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -52,7 +52,6 @@ private readonly ChartPointData shoulderTopInsideChartData; private readonly ChartPointData shoulderBaseInsideChartData; private readonly ChartPointData dikeTopAtPolderChartData; - private readonly ChartPointData trafficLoadOutsideChartData; private readonly ChartPointData dikeToeAtRiverChartData; private readonly ChartPointData dikeTopAtRiverChartData; private readonly ChartPointData surfaceLevelOutsideChartData; @@ -80,7 +79,6 @@ shoulderTopInsideChartData = MacroStabilityInwardsChartDataFactory.CreateShoulderTopInsideChartData(); shoulderBaseInsideChartData = MacroStabilityInwardsChartDataFactory.CreateShoulderBaseInsideChartData(); dikeTopAtPolderChartData = MacroStabilityInwardsChartDataFactory.CreateDikeTopAtPolderChartData(); - trafficLoadOutsideChartData = MacroStabilityInwardsChartDataFactory.CreateTrafficLoadOutsideChartData(); dikeToeAtRiverChartData = RingtoetsChartDataFactory.CreateDikeToeAtRiverChartData(); dikeTopAtRiverChartData = MacroStabilityInwardsChartDataFactory.CreateDikeTopAtRiverChartData(); surfaceLevelOutsideChartData = MacroStabilityInwardsChartDataFactory.CreateSurfaceLevelOutsideChartData(); @@ -96,7 +94,6 @@ chartDataCollection.Add(shoulderTopInsideChartData); chartDataCollection.Add(shoulderBaseInsideChartData); chartDataCollection.Add(dikeTopAtPolderChartData); - chartDataCollection.Add(trafficLoadOutsideChartData); chartDataCollection.Add(dikeToeAtRiverChartData); chartDataCollection.Add(dikeTopAtRiverChartData); chartDataCollection.Add(surfaceLevelOutsideChartData); @@ -154,7 +151,6 @@ shoulderTopInsideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateShoulderTopInsidePoint(surfaceLine); shoulderBaseInsideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateShoulderBaseInsidePoint(surfaceLine); dikeTopAtPolderChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateDikeTopAtPolderPoint(surfaceLine); - trafficLoadOutsideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateTrafficLoadOutsidePoint(surfaceLine); dikeToeAtRiverChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateDikeToeAtRiverPoint(surfaceLine); dikeTopAtRiverChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateDikeTopAtRiverPoint(surfaceLine); surfaceLevelOutsideChartData.Points = MacroStabilityInwardsChartDataPointsFactory.CreateSurfaceLevelOutsidePoint(surfaceLine); Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SurfaceLines/MacroStabilityInwardsSurfaceLineExtensions.cs =================================================================== diff -u -r93acf9b0dcf191ef5088f4d822a81b1759c10532 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SurfaceLines/MacroStabilityInwardsSurfaceLineExtensions.cs (.../MacroStabilityInwardsSurfaceLineExtensions.cs) (revision 93acf9b0dcf191ef5088f4d822a81b1759c10532) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SurfaceLines/MacroStabilityInwardsSurfaceLineExtensions.cs (.../MacroStabilityInwardsSurfaceLineExtensions.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -66,8 +66,6 @@ surfaceLine.TrySetDikeToeAtPolder(characteristicPoints.DikeToeAtPolder); surfaceLine.TrySetSurfaceLevelInside(characteristicPoints.SurfaceLevelInside); - surfaceLine.TrySetTrafficLoadOutside(characteristicPoints.TrafficLoadOutside); - surfaceLine.TrySetTrafficLoadInside(characteristicPoints.TrafficLoadInside); surfaceLine.TrySetShoulderBaseInside(characteristicPoints.ShoulderBaseInside); surfaceLine.TrySetShoulderTopInside(characteristicPoints.ShoulderTopInside); surfaceLine.TrySetDitchDikeSide(characteristicPoints.DitchDikeSide); @@ -309,50 +307,6 @@ } /// - /// Tries to set the at the location of - /// . - /// - /// The to set the - /// for. - /// The point at which to set the . - private static void TrySetTrafficLoadInside(this MacroStabilityInwardsSurfaceLine surfaceLine, Point3D point) - { - if (point != null) - { - try - { - surfaceLine.SetTrafficLoadInsideAt(point); - } - catch (ArgumentException e) - { - LogOptionalCharacteristicPointError(surfaceLine, e); - } - } - } - - /// - /// Tries to set the at the location of - /// . - /// - /// The to set the - /// for. - /// The point at which to set the . - private static void TrySetTrafficLoadOutside(this MacroStabilityInwardsSurfaceLine surfaceLine, Point3D point) - { - if (point != null) - { - try - { - surfaceLine.SetTrafficLoadOutsideAt(point); - } - catch (ArgumentException e) - { - LogOptionalCharacteristicPointError(surfaceLine, e); - } - } - } - - /// /// Tries to set the at the location of /// . /// Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SurfaceLineCreator.cs =================================================================== diff -u -r9f35261205f8f664dc06e652f6d264ad9fee7bd9 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SurfaceLineCreator.cs (.../SurfaceLineCreator.cs) (revision 9f35261205f8f664dc06e652f6d264ad9fee7bd9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SurfaceLineCreator.cs (.../SurfaceLineCreator.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -156,14 +156,6 @@ { characteristicPoints.Add(CreateCharacteristicPointOfType(geometryPoint, CharacteristicPointType.DikeTopAtPolder)); } - if (ReferenceEquals(surfaceLine.TrafficLoadInside, surfaceLinePoint)) - { - characteristicPoints.Add(CreateCharacteristicPointOfType(geometryPoint, CharacteristicPointType.TrafficLoadInside)); - } - if (ReferenceEquals(surfaceLine.TrafficLoadOutside, surfaceLinePoint)) - { - characteristicPoints.Add(CreateCharacteristicPointOfType(geometryPoint, CharacteristicPointType.TrafficLoadOutside)); - } if (ReferenceEquals(surfaceLine.ShoulderBaseInside, surfaceLinePoint)) { characteristicPoints.Add(CreateCharacteristicPointOfType(geometryPoint, CharacteristicPointType.ShoulderBaseInside)); Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsSurfaceLine.cs =================================================================== diff -u -r93acf9b0dcf191ef5088f4d822a81b1759c10532 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsSurfaceLine.cs (.../MacroStabilityInwardsSurfaceLine.cs) (revision 93acf9b0dcf191ef5088f4d822a81b1759c10532) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsSurfaceLine.cs (.../MacroStabilityInwardsSurfaceLine.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -52,18 +52,6 @@ public Point3D DikeToeAtRiver { get; private set; } /// - /// Gets the location of the start of traffic load when approaching - /// from outside the polder. - /// - public Point3D TrafficLoadOutside { get; private set; } - - /// - /// Gets the location of the start of traffic load when approaching - /// from inside the polder. - /// - public Point3D TrafficLoadInside { get; private set; } - - /// /// Gets the location of the top of the dike when approaching from /// inside the polder. /// @@ -261,40 +249,6 @@ } /// - /// Sets the at the given point. - /// - /// The location as a which to set as the . - /// Thrown when doesn't contain a at - /// . - /// Thrown when is null. - public void SetTrafficLoadInsideAt(Point3D point) - { - Point3D geometryPoint = GetPointFromGeometry(point); - if (geometryPoint == null) - { - throw CreatePointNotInGeometryException(point, RingtoetsCommonDataResources.CharacteristicPoint_TrafficLoadInside); - } - TrafficLoadInside = geometryPoint; - } - - /// - /// Sets the at the given point. - /// - /// The location as a which to set as the . - /// Thrown when doesn't contain a at - /// . - /// Thrown when is null. - public void SetTrafficLoadOutsideAt(Point3D point) - { - Point3D geometryPoint = GetPointFromGeometry(point); - if (geometryPoint == null) - { - throw CreatePointNotInGeometryException(point, RingtoetsCommonDataResources.CharacteristicPoint_TrafficLoadOutside); - } - TrafficLoadOutside = geometryPoint; - } - - /// /// Sets the at the given point. /// /// The location as a which to set as the . @@ -411,8 +365,6 @@ hashCode = (hashCode * 397) ^ (SurfaceLevelInside?.GetHashCode() ?? 0); hashCode = (hashCode * 397) ^ (SurfaceLevelOutside?.GetHashCode() ?? 0); - hashCode = (hashCode * 397) ^ (TrafficLoadInside?.GetHashCode() ?? 0); - hashCode = (hashCode * 397) ^ (TrafficLoadOutside?.GetHashCode() ?? 0); hashCode = (hashCode * 397) ^ (DikeTopAtPolder?.GetHashCode() ?? 0); hashCode = (hashCode * 397) ^ (DikeTopAtRiver?.GetHashCode() ?? 0); hashCode = (hashCode * 397) ^ (ShoulderBaseInside?.GetHashCode() ?? 0); @@ -431,8 +383,6 @@ private void SetCharacteristicPoints(MacroStabilityInwardsSurfaceLine fromSurfaceLine) { SurfaceLevelOutside = PointFromGeometryOrNull(fromSurfaceLine.SurfaceLevelOutside); - TrafficLoadOutside = PointFromGeometryOrNull(fromSurfaceLine.TrafficLoadOutside); - TrafficLoadInside = PointFromGeometryOrNull(fromSurfaceLine.TrafficLoadInside); DikeTopAtPolder = PointFromGeometryOrNull(fromSurfaceLine.DikeTopAtPolder); DikeTopAtRiver = PointFromGeometryOrNull(fromSurfaceLine.DikeTopAtRiver); ShoulderBaseInside = PointFromGeometryOrNull(fromSurfaceLine.ShoulderBaseInside); @@ -463,8 +413,6 @@ { return Equals(SurfaceLevelInside, other.SurfaceLevelInside) && Equals(SurfaceLevelOutside, other.SurfaceLevelOutside) - && Equals(TrafficLoadInside, other.TrafficLoadInside) - && Equals(TrafficLoadOutside, other.TrafficLoadOutside) && Equals(DikeTopAtPolder, other.DikeTopAtPolder) && Equals(DikeTopAtRiver, other.DikeTopAtRiver) && Equals(ShoulderBaseInside, other.ShoulderBaseInside) Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs =================================================================== diff -u -r514c9212b8abac9217b74f04494602d91eff32b2 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs (.../MacroStabilityInwardsChartDataFactoryTest.cs) (revision 514c9212b8abac9217b74f04494602d91eff32b2) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs (.../MacroStabilityInwardsChartDataFactoryTest.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -97,30 +97,6 @@ } [Test] - public void CreateTrafficLoadInsideChartData_ReturnsChartPointDataWithExpectedStyling() - { - // Call - ChartPointData data = MacroStabilityInwardsChartDataFactory.CreateTrafficLoadInsideChartData(); - - // Assert - Assert.IsFalse(data.HasData); - Assert.AreEqual("Verkeersbelasting kant binnenwaarts", data.Name); - AssertEqualStyle(data.Style, Color.LightSlateGray, 8, Color.White, 1, ChartPointSymbol.Circle); - } - - [Test] - public void CreateTrafficLoadOutsideChartData_ReturnsChartPointDataWithExpectedStyling() - { - // Call - ChartPointData data = MacroStabilityInwardsChartDataFactory.CreateTrafficLoadOutsideChartData(); - - // Assert - Assert.IsFalse(data.HasData); - Assert.AreEqual("Verkeersbelasting kant buitenwaarts", data.Name); - AssertEqualStyle(data.Style, Color.DarkSlateGray, 8, Color.White, 1, ChartPointSymbol.Circle); - } - - [Test] public void CreateDikeTopAtRiverChartData_ReturnsChartPointDataWithExpectedStyling() { // Call Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataPointsFactoryTest.cs =================================================================== diff -u -r9f936b0b29f490a024df02345df182133b1c041a -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataPointsFactoryTest.cs (.../MacroStabilityInwardsChartDataPointsFactoryTest.cs) (revision 9f936b0b29f490a024df02345df182133b1c041a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataPointsFactoryTest.cs (.../MacroStabilityInwardsChartDataPointsFactoryTest.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -138,84 +138,6 @@ } [Test] - public void CreateTrafficLoadOutsidePoint_SurfaceLineNull_ReturnsEmptyPointsArray() - { - // Call - Point2D[] points = MacroStabilityInwardsChartDataPointsFactory.CreateTrafficLoadOutsidePoint(null); - - // Assert - CollectionAssert.IsEmpty(points); - } - - [Test] - public void CreateTrafficLoadOutsidePoint_SurfaceLevelOutsideNull_ReturnsEmptyPointsArray() - { - // Setup - MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry(); - - // Call - Point2D[] points = MacroStabilityInwardsChartDataPointsFactory.CreateTrafficLoadOutsidePoint(surfaceLine); - - // Assert - CollectionAssert.IsEmpty(points); - } - - [Test] - public void CreateTrafficLoadOutsidePoint_GivenSurfaceLineWithTrafficLoadOutside_ReturnsTrafficLoadOutsidePointsArray() - { - // Setup - var trafficLoadOutside = new Point3D(1.2, 2.3, 4.0); - MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry(); - - surfaceLine.SetTrafficLoadOutsideAt(trafficLoadOutside); - - // Call - Point2D[] points = MacroStabilityInwardsChartDataPointsFactory.CreateTrafficLoadOutsidePoint(surfaceLine); - - // Assert - AssertEqualLocalPointCollection(trafficLoadOutside, surfaceLine, points); - } - - [Test] - public void CreateTrafficLoadInsidePoint_SurfaceLineNull_ReturnsEmptyPointsArray() - { - // Call - Point2D[] points = MacroStabilityInwardsChartDataPointsFactory.CreateTrafficLoadInsidePoint(null); - - // Assert - CollectionAssert.IsEmpty(points); - } - - [Test] - public void CreateTrafficLoadInsidePoint_TrafficLoadInsideNull_ReturnsEmptyPointsArray() - { - // Setup - MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry(); - - // Call - Point2D[] points = MacroStabilityInwardsChartDataPointsFactory.CreateTrafficLoadInsidePoint(surfaceLine); - - // Assert - CollectionAssert.IsEmpty(points); - } - - [Test] - public void CreateTrafficLoadInsidePoint_GivenSurfaceLineWithTrafficLoadInside_ReturnsTrafficLoadInsidePointsArray() - { - // Setup - var trafficLoadInside = new Point3D(1.2, 2.3, 4.0); - MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry(); - - surfaceLine.SetTrafficLoadInsideAt(trafficLoadInside); - - // Call - Point2D[] points = MacroStabilityInwardsChartDataPointsFactory.CreateTrafficLoadInsidePoint(surfaceLine); - - // Assert - AssertEqualLocalPointCollection(trafficLoadInside, surfaceLine, points); - } - - [Test] public void CreateDikeTopAtPolderPoint_SurfaceLineNull_ReturnsEmptyPointsArray() { // Call Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSurfaceLinePropertiesTest.cs =================================================================== diff -u -r0aaab7275b297d00870a726881bc876295a68d39 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSurfaceLinePropertiesTest.cs (.../MacroStabilityInwardsSurfaceLinePropertiesTest.cs) (revision 0aaab7275b297d00870a726881bc876295a68d39) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSurfaceLinePropertiesTest.cs (.../MacroStabilityInwardsSurfaceLinePropertiesTest.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -60,8 +60,6 @@ var point10 = new Point3D(10.1, 3.5, 0.5); var point11 = new Point3D(12.2, 3.8, 0.5); var point12 = new Point3D(13.1, 4.2, 1.0); - var point13 = new Point3D(14.1, 5.6, 1.1); - var point14 = new Point3D(15.1, 4.6, 1.1); var surfaceLine = new MacroStabilityInwardsSurfaceLine(expectedName); surfaceLine.SetGeometry(new[] @@ -77,25 +75,21 @@ point9, point10, point11, - point12, - point13, - point14 + point12 }); surfaceLine.SetSurfaceLevelOutsideAt(point1); surfaceLine.SetDikeToeAtRiverAt(point2); surfaceLine.SetDikeTopAtPolderAt(point3); surfaceLine.SetShoulderBaseInsideAt(point4); - surfaceLine.SetTrafficLoadOutsideAt(point5); - surfaceLine.SetTrafficLoadInsideAt(point6); - surfaceLine.SetShoulderTopInsideAt(point7); - surfaceLine.SetDikeToeAtPolderAt(point8); - surfaceLine.SetDitchDikeSideAt(point9); - surfaceLine.SetBottomDitchDikeSideAt(point10); - surfaceLine.SetBottomDitchPolderSideAt(point11); - surfaceLine.SetDitchPolderSideAt(point12); - surfaceLine.SetSurfaceLevelInsideAt(point13); - surfaceLine.SetDikeTopAtRiverAt(point14); + surfaceLine.SetShoulderTopInsideAt(point5); + surfaceLine.SetDikeToeAtPolderAt(point6); + surfaceLine.SetDitchDikeSideAt(point7); + surfaceLine.SetBottomDitchDikeSideAt(point8); + surfaceLine.SetBottomDitchPolderSideAt(point9); + surfaceLine.SetDitchPolderSideAt(point10); + surfaceLine.SetSurfaceLevelInsideAt(point11); + surfaceLine.SetDikeTopAtRiverAt(point12); var properties = new MacroStabilityInwardsSurfaceLineProperties { @@ -110,8 +104,6 @@ Assert.AreEqual(surfaceLine.DikeTopAtRiver, properties.DikeTopAtRiver); Assert.AreEqual(surfaceLine.DikeTopAtPolder, properties.DikeTopAtPolder); Assert.AreEqual(surfaceLine.ShoulderBaseInside, properties.ShoulderBaseInside); - Assert.AreEqual(surfaceLine.TrafficLoadOutside, properties.TrafficLoadOutside); - Assert.AreEqual(surfaceLine.TrafficLoadInside, properties.TrafficLoadInside); Assert.AreEqual(surfaceLine.ShoulderTopInside, properties.ShoulderTopInside); Assert.AreEqual(surfaceLine.DikeToeAtPolder, properties.DikeToeAtPolder); Assert.AreEqual(surfaceLine.DitchDikeSide, properties.DitchDikeSide); @@ -135,7 +127,7 @@ // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(16, dynamicProperties.Count); + Assert.AreEqual(14, dynamicProperties.Count); const string generalCategory = "Algemeen"; const string charactersticPointsCategory = "Karakteristieke punten"; @@ -178,75 +170,61 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( dynamicProperties[5], charactersticPointsCategory, - "Verkeersbelasting kant buitenwaarts", - "De locatie van de verkeersbelasting wanneer de dijk van buiten de polder wordt benaderd.", - true); - - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( - dynamicProperties[6], - charactersticPointsCategory, - "Verkeersbelasting kant binnenwaarts", - "De locatie van de verkeersbelasting wanneer de dijk van binnen de polder wordt benaderd.", - true); - - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( - dynamicProperties[7], - charactersticPointsCategory, "Kruin binnentalud", "De kruin van het talud wanneer de dijk van binnen de polder wordt benaderd.", true); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( - dynamicProperties[8], + dynamicProperties[6], charactersticPointsCategory, "Insteek binnenberm", "De locatie van de insteek van de binnenberm.", true); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( - dynamicProperties[9], + dynamicProperties[7], charactersticPointsCategory, "Kruin binnenberm", "De locatie van de kruin van de binnenberm.", true); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( - dynamicProperties[10], + dynamicProperties[8], charactersticPointsCategory, "Teen dijk binnenwaarts", "De locatie van de teen van de dijk wanneer de dijk van binnen de polder wordt benaderd.", true); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( - dynamicProperties[11], + dynamicProperties[9], charactersticPointsCategory, "Insteek sloot dijkzijde", "De locatie van het begin van de sloot wanneer deze van de kant van de dijk wordt benaderd.", true); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( - dynamicProperties[12], + dynamicProperties[10], charactersticPointsCategory, "Slootbodem dijkzijde", "De locatie van het begin van de slootbodem wanneer deze van de kant van de dijk wordt benaderd.", true); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( - dynamicProperties[13], + dynamicProperties[11], charactersticPointsCategory, "Slootbodem polderzijde", "De locatie van het begin van de slootbodem wanneer deze van binnen de polder wordt benaderd.", true); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( - dynamicProperties[14], + dynamicProperties[12], charactersticPointsCategory, "Insteek sloot polderzijde", "De locatie van het begin van de sloot wanneer deze van binnen de polder wordt benaderd.", true); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( - dynamicProperties[15], + dynamicProperties[13], charactersticPointsCategory, "Maaiveld binnenwaarts", "De locatie van het maaiveld binnen de polder.", Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs =================================================================== diff -u -r514c9212b8abac9217b74f04494602d91eff32b2 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision 514c9212b8abac9217b74f04494602d91eff32b2) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -50,15 +50,13 @@ private const int dikeToeAtPolderIndex = 7; private const int shoulderTopInsideIndex = 8; 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 dikeTopAtRiverIndex = 14; - private const int surfaceLevelOutsideIndex = 15; - private const int leftGridIndex = 16; - private const int rightGridIndex = 17; - private const int nrOfChartData = 18; + private const int dikeTopAtPolderIndex = 10; + private const int dikeToeAtRiverIndex = 11; + private const int dikeTopAtRiverIndex = 12; + private const int surfaceLevelOutsideIndex = 13; + private const int leftGridIndex = 14; + private const int rightGridIndex = 15; + private const int nrOfChartData = 16; [Test] public void DefaultConstructor_DefaultValues() @@ -465,9 +463,7 @@ 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 updatedTrafficLoadOutsideIndex = trafficLoadOutsideIndex - 1; const int updatedDikeToeAtRiverIndex = dikeToeAtRiverIndex - 1; const int updatedSurfaceLevelOutsideIndex = surfaceLevelOutsideIndex - 1; const int updatedLeftGridIndex = leftGridIndex - 1; @@ -498,9 +494,7 @@ 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 trafficLoadOutsideData = (ChartPointData) chartDataList[updatedTrafficLoadOutsideIndex]; var dikeToeAtRiverData = (ChartPointData) chartDataList[updatedDikeToeAtRiverIndex]; var surfaceLevelOutsideData = (ChartPointData) chartDataList[updatedSurfaceLevelOutsideIndex]; var leftGridData = (ChartPointData) chartDataList[updatedLeftGridIndex]; @@ -516,9 +510,7 @@ 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("Verkeersbelasting kant buitenwaarts", trafficLoadOutsideData.Name); Assert.AreEqual("Teen dijk buitenwaarts", dikeToeAtRiverData.Name); Assert.AreEqual("Maaiveld buitenwaarts", surfaceLevelOutsideData.Name); Assert.AreEqual("Linker grid", leftGridData.Name); @@ -543,9 +535,7 @@ 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 actualTrafficLoadOutsideData = (ChartPointData) chartDataList[updatedTrafficLoadOutsideIndex]; var actualDikeToeAtRiverData = (ChartPointData) chartDataList[updatedDikeToeAtRiverIndex]; var actualSurfaceLevelOutsideData = (ChartPointData) chartDataList[updatedSurfaceLevelOutsideIndex]; var actualLeftGridData = (ChartPointData) chartDataList[updatedLeftGridIndex]; @@ -561,9 +551,7 @@ 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("Verkeersbelasting kant buitenwaarts", actualTrafficLoadOutsideData.Name); Assert.AreEqual("Teen dijk buitenwaarts", actualDikeToeAtRiverData.Name); Assert.AreEqual("Maaiveld buitenwaarts", actualSurfaceLevelOutsideData.Name); Assert.AreEqual("Linker grid", actualLeftGridData.Name); @@ -755,7 +743,7 @@ // Precondition Assert.IsNotNull(chartData); - Assert.AreEqual(18, chartData.Collection.Count()); + Assert.AreEqual(16, chartData.Collection.Count()); AssertSoilProfileChartData(stochasticSoilProfile, chartData.Collection.ElementAt(soilProfileIndex), true, false); // When @@ -888,9 +876,7 @@ 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 trafficLoadOutsideData = (ChartPointData) chartDatasList[trafficLoadOutsideIndex]; var dikeToeAtRiverData = (ChartPointData) chartDatasList[dikeToeAtRiverIndex]; var dikeTopAtRiverData = (ChartPointData) chartDatasList[dikeTopAtRiverIndex]; var surfaceLevelOutsideData = (ChartPointData) chartDatasList[surfaceLevelOutsideIndex]; @@ -907,9 +893,7 @@ CollectionAssert.IsEmpty(dikeToeAtPolderData.Points); CollectionAssert.IsEmpty(shoulderTopInsideData.Points); CollectionAssert.IsEmpty(shoulderBaseInsideData.Points); - CollectionAssert.IsEmpty(trafficLoadInsideData.Points); CollectionAssert.IsEmpty(dikeTopAtPolderData.Points); - CollectionAssert.IsEmpty(trafficLoadOutsideData.Points); CollectionAssert.IsEmpty(dikeToeAtRiverData.Points); CollectionAssert.IsEmpty(dikeTopAtRiverData.Points); CollectionAssert.IsEmpty(surfaceLevelOutsideData.Points); @@ -926,9 +910,7 @@ 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("Verkeersbelasting kant buitenwaarts", trafficLoadOutsideData.Name); Assert.AreEqual("Teen dijk buitenwaarts", dikeToeAtRiverData.Name); Assert.AreEqual("Kruin buitentalud", dikeTopAtRiverData.Name); Assert.AreEqual("Maaiveld buitenwaarts", surfaceLevelOutsideData.Name); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs =================================================================== diff -u -r8bfecdc9ee73e23debf1c933b9c121eca5de28e6 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs (.../MacroStabilityInwardsOutputChartControlTest.cs) (revision 8bfecdc9ee73e23debf1c933b9c121eca5de28e6) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs (.../MacroStabilityInwardsOutputChartControlTest.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -40,7 +40,7 @@ { private const int soilProfileIndex = 0; private const int surfaceLineIndex = 1; - private const int nrOfChartData = 15; + private const int nrOfChartData = 14; [Test] public void Constructor_ExpectedValues() Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SurfaceLines/MacroStabilityInwardsSurfaceLineExtensionsTest.cs =================================================================== diff -u -re5286601ea3115129e2ac795d81eadf4841c2800 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SurfaceLines/MacroStabilityInwardsSurfaceLineExtensionsTest.cs (.../MacroStabilityInwardsSurfaceLineExtensionsTest.cs) (revision e5286601ea3115129e2ac795d81eadf4841c2800) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SurfaceLines/MacroStabilityInwardsSurfaceLineExtensionsTest.cs (.../MacroStabilityInwardsSurfaceLineExtensionsTest.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -137,16 +137,6 @@ set.ShoulderTopInside = null; yield return new TestCaseData(set).SetName(name); - name = "Missing TrafficLoadOutside"; - set = CreateCompleteCharacteristicPointSet(name); - set.TrafficLoadOutside = null; - yield return new TestCaseData(set).SetName(name); - - name = "Missing TrafficLoadInside"; - set = CreateCompleteCharacteristicPointSet(name); - set.TrafficLoadInside = null; - yield return new TestCaseData(set).SetName(name); - name = "Missing DitchDikeSide"; set = CreateCompleteCharacteristicPointSet(name); set.DitchDikeSide = null; @@ -220,8 +210,6 @@ Assert.AreEqual(points.DikeTopAtRiver, surfaceLine.DikeTopAtRiver); Assert.AreEqual(points.ShoulderBaseInside, surfaceLine.ShoulderBaseInside); Assert.AreEqual(points.ShoulderTopInside, surfaceLine.ShoulderTopInside); - Assert.AreEqual(points.TrafficLoadOutside, surfaceLine.TrafficLoadOutside); - Assert.AreEqual(points.TrafficLoadInside, surfaceLine.TrafficLoadInside); Assert.AreEqual(points.SurfaceLevelOutside, surfaceLine.SurfaceLevelOutside); Assert.AreEqual(points.SurfaceLevelInside, surfaceLine.SurfaceLevelInside); Assert.AreEqual(points.DikeToeAtRiver, surfaceLine.DikeToeAtRiver); @@ -282,8 +270,6 @@ points.DikeTopAtRiver, points.ShoulderBaseInside, points.ShoulderTopInside, - points.TrafficLoadOutside, - points.TrafficLoadInside, points.SurfaceLevelOutside, points.SurfaceLevelInside, points.DikeToeAtRiver, @@ -299,8 +285,6 @@ { var surfaceLevelOutside = new Point3D(2, 2, 5); var dikeToeAtRiver = new Point3D(2.1, 2, 5); - var trafficLoadOutside = new Point3D(2.25, 2, 5); - var trafficLoadInside = new Point3D(2.45, 2, 5); var dikeTopAtPolder = new Point3D(2.7, 2, 5); var dikeTopAtRiver = new Point3D(2.6, 2, 5); var shoulderBaseInside = new Point3D(3.2, 2, 5); @@ -317,8 +301,6 @@ DikeTopAtPolder = dikeTopAtPolder, ShoulderBaseInside = shoulderBaseInside, ShoulderTopInside = shoulderTopInside, - TrafficLoadOutside = trafficLoadOutside, - TrafficLoadInside = trafficLoadInside, SurfaceLevelOutside = surfaceLevelOutside, SurfaceLevelInside = surfaceLevelInside, DikeToeAtRiver = dikeToeAtRiver, Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SurfaceLines/MacrostabilityInwardsSurfaceLineTransformerTest.cs =================================================================== diff -u -r93acf9b0dcf191ef5088f4d822a81b1759c10532 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SurfaceLines/MacrostabilityInwardsSurfaceLineTransformerTest.cs (.../MacrostabilityInwardsSurfaceLineTransformerTest.cs) (revision 93acf9b0dcf191ef5088f4d822a81b1759c10532) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SurfaceLines/MacrostabilityInwardsSurfaceLineTransformerTest.cs (.../MacrostabilityInwardsSurfaceLineTransformerTest.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -42,16 +42,6 @@ get { yield return new TestCaseData( - new Action((cp, p) => cp.TrafficLoadOutside = p), - new Func(sl => sl.TrafficLoadOutside), - "Verkeersbelasting kant buitenwaarts") - .SetName("Move TrafficLoadOutside"); - yield return new TestCaseData( - new Action((cp, p) => cp.TrafficLoadInside = p), - new Func(sl => sl.TrafficLoadInside), - "Verkeersbelasting kant binnenwaarts") - .SetName("Move TrafficLoadInside"); - yield return new TestCaseData( new Action((cp, p) => cp.ShoulderBaseInside = p), new Func(sl => sl.ShoulderBaseInside), "Insteek binnenberm") @@ -276,8 +266,6 @@ { SurfaceLevelOutside = point2, DikeToeAtRiver = point2, - TrafficLoadOutside = point2, - TrafficLoadInside = point2, DikeTopAtPolder = point2, DikeTopAtRiver = point2, ShoulderBaseInside = point3, @@ -317,8 +305,6 @@ { result.SurfaceLevelOutside, result.DikeToeAtRiver, - result.TrafficLoadOutside, - result.TrafficLoadInside, result.DikeTopAtPolder, result.ShoulderBaseInside, result.ShoulderTopInside, @@ -367,8 +353,6 @@ { SurfaceLevelOutside = point2, DikeToeAtRiver = point2, - TrafficLoadOutside = point2, - TrafficLoadInside = point2, DikeTopAtPolder = point2, DikeTopAtRiver = point2, ShoulderBaseInside = point3, Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SurfaceLineCreatorTest.cs =================================================================== diff -u -r9f35261205f8f664dc06e652f6d264ad9fee7bd9 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SurfaceLineCreatorTest.cs (.../SurfaceLineCreatorTest.cs) (revision 9f35261205f8f664dc06e652f6d264ad9fee7bd9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SurfaceLineCreatorTest.cs (.../SurfaceLineCreatorTest.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -190,9 +190,7 @@ new Point3D(8, 0, 3), new Point3D(9, 0, 0), new Point3D(10, 0, 2), - new Point3D(11, 0, 3), - new Point3D(12, 0, 0), - new Point3D(13, 0, 2) + new Point3D(11, 0, 3) }; var surfaceLine = new MacroStabilityInwardsSurfaceLine(name); @@ -206,11 +204,9 @@ surfaceLine.SetDitchPolderSideAt(geometry[6]); surfaceLine.SetSurfaceLevelInsideAt(geometry[7]); surfaceLine.SetSurfaceLevelOutsideAt(geometry[8]); - surfaceLine.SetTrafficLoadInsideAt(geometry[9]); - surfaceLine.SetTrafficLoadOutsideAt(geometry[10]); - surfaceLine.SetShoulderBaseInsideAt(geometry[11]); - surfaceLine.SetShoulderTopInsideAt(geometry[12]); - surfaceLine.SetDikeTopAtRiverAt(geometry[13]); + surfaceLine.SetShoulderBaseInsideAt(geometry[9]); + surfaceLine.SetShoulderTopInsideAt(geometry[10]); + surfaceLine.SetDikeTopAtRiverAt(geometry[11]); // Call SurfaceLine2 actual = SurfaceLineCreator.Create(surfaceLine, LandwardDirection.PositiveX); @@ -238,11 +234,9 @@ Assert.IsTrue(actualCharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide).LocationEquals(ToGeometryPoint(geometry[6]))); Assert.IsTrue(actualCharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).LocationEquals(ToGeometryPoint(geometry[7]))); Assert.IsTrue(actualCharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelOutside).LocationEquals(ToGeometryPoint(geometry[8]))); - Assert.IsTrue(actualCharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).LocationEquals(ToGeometryPoint(geometry[9]))); - Assert.IsTrue(actualCharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).LocationEquals(ToGeometryPoint(geometry[10]))); - Assert.IsTrue(actualCharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside).LocationEquals(ToGeometryPoint(geometry[11]))); - Assert.IsTrue(actualCharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside).LocationEquals(ToGeometryPoint(geometry[12]))); - Assert.IsTrue(actualCharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).LocationEquals(ToGeometryPoint(geometry[13]))); + Assert.IsTrue(actualCharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside).LocationEquals(ToGeometryPoint(geometry[9]))); + Assert.IsTrue(actualCharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside).LocationEquals(ToGeometryPoint(geometry[10]))); + Assert.IsTrue(actualCharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).LocationEquals(ToGeometryPoint(geometry[11]))); } [Test] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSurfaceLineTest.cs =================================================================== diff -u -r93acf9b0dcf191ef5088f4d822a81b1759c10532 -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSurfaceLineTest.cs (.../MacroStabilityInwardsSurfaceLineTest.cs) (revision 93acf9b0dcf191ef5088f4d822a81b1759c10532) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSurfaceLineTest.cs (.../MacroStabilityInwardsSurfaceLineTest.cs) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -295,42 +295,6 @@ } [Test] - public void Equals_DifferentTrafficLoadInside_ReturnsFalse() - { - // Setup - MacroStabilityInwardsSurfaceLine surfaceLineOne = CreateSurfaceLineWithCharacteristicPoints(); - MacroStabilityInwardsSurfaceLine surfaceLineTwo = CreateSurfaceLineWithCharacteristicPoints(); - Point3D[] points = surfaceLineTwo.Points.ToArray(); - surfaceLineTwo.SetTrafficLoadInsideAt(points[5]); - - // Call - bool isLineOneEqualToLineTwo = surfaceLineOne.Equals(surfaceLineTwo); - bool isLineTwoEqualToLineOne = surfaceLineTwo.Equals(surfaceLineOne); - - // Assert - Assert.IsFalse(isLineOneEqualToLineTwo); - Assert.IsFalse(isLineTwoEqualToLineOne); - } - - [Test] - public void Equals_DifferentTrafficLoadOutside_ReturnsFalse() - { - // Setup - MacroStabilityInwardsSurfaceLine surfaceLineOne = CreateSurfaceLineWithCharacteristicPoints(); - MacroStabilityInwardsSurfaceLine surfaceLineTwo = CreateSurfaceLineWithCharacteristicPoints(); - Point3D[] points = surfaceLineTwo.Points.ToArray(); - surfaceLineTwo.SetTrafficLoadOutsideAt(points[5]); - - // Call - bool isLineOneEqualToLineTwo = surfaceLineOne.Equals(surfaceLineTwo); - bool isLineTwoEqualToLineOne = surfaceLineTwo.Equals(surfaceLineOne); - - // Assert - Assert.IsFalse(isLineOneEqualToLineTwo); - Assert.IsFalse(isLineTwoEqualToLineOne); - } - - [Test] public void Equals_DifferentDikeTopAtPolder_ReturnsFalse() { // Setup @@ -427,7 +391,7 @@ MacroStabilityInwardsSurfaceLine surfaceLineOne = CreateSurfaceLineWithCharacteristicPoints(); MacroStabilityInwardsSurfaceLine surfaceLineTwo = CreateSurfaceLineWithCharacteristicPoints(); Point3D[] points = surfaceLineTwo.Points.ToArray(); - surfaceLineTwo.SetBottomDitchDikeSideAt(points[5]); + surfaceLineTwo.SetBottomDitchDikeSideAt(points[4]); // Call bool isLineOneEqualToLineTwo = surfaceLineOne.Equals(surfaceLineTwo); @@ -825,44 +789,6 @@ } [TestFixture] - public class SetTrafficLoadInsideAtTest : SetCharacteristicPointTest - { - protected override void SetCharacteristicPoint(MacroStabilityInwardsSurfaceLine surfaceLine, Point3D point) - { - surfaceLine.SetTrafficLoadInsideAt(point); - } - - protected override Point3D GetCharacteristicPoint(MacroStabilityInwardsSurfaceLine surfaceLine) - { - return surfaceLine.TrafficLoadInside; - } - - protected override string CharacteristicPointDescription() - { - return "Verkeersbelasting kant binnenwaarts"; - } - } - - [TestFixture] - public class SetTrafficLoadOutsideAtTest : SetCharacteristicPointTest - { - protected override void SetCharacteristicPoint(MacroStabilityInwardsSurfaceLine surfaceLine, Point3D point) - { - surfaceLine.SetTrafficLoadOutsideAt(point); - } - - protected override Point3D GetCharacteristicPoint(MacroStabilityInwardsSurfaceLine surfaceLine) - { - return surfaceLine.TrafficLoadOutside; - } - - protected override string CharacteristicPointDescription() - { - return "Verkeersbelasting kant buitenwaarts"; - } - } - - [TestFixture] public class SetDikeToeAtRiverAtTest : SetCharacteristicPointTest { protected override void SetCharacteristicPoint(MacroStabilityInwardsSurfaceLine surfaceLine, Point3D point) @@ -919,8 +845,6 @@ Point3D[] actualSurfaceLinePoints = actualSurfaceLine.Points; AssertAreEqualAndFromSurfaceLine(actualSurfaceLinePoints, expectedSurfaceLine.SurfaceLevelOutside, actualSurfaceLine.SurfaceLevelOutside); - AssertAreEqualAndFromSurfaceLine(actualSurfaceLinePoints, expectedSurfaceLine.TrafficLoadOutside, actualSurfaceLine.TrafficLoadOutside); - AssertAreEqualAndFromSurfaceLine(actualSurfaceLinePoints, expectedSurfaceLine.TrafficLoadInside, actualSurfaceLine.TrafficLoadInside); AssertAreEqualAndFromSurfaceLine(actualSurfaceLinePoints, expectedSurfaceLine.DikeTopAtPolder, actualSurfaceLine.DikeTopAtPolder); AssertAreEqualAndFromSurfaceLine(actualSurfaceLinePoints, expectedSurfaceLine.ShoulderBaseInside, actualSurfaceLine.ShoulderBaseInside); AssertAreEqualAndFromSurfaceLine(actualSurfaceLinePoints, expectedSurfaceLine.ShoulderTopInside, actualSurfaceLine.ShoulderTopInside); @@ -961,26 +885,22 @@ new Point3D(8, 0, 5), new Point3D(9, 0, 4), new Point3D(10, 0, 3), - new Point3D(11, 0, 2), - new Point3D(12, 0, 1), - new Point3D(13, 0, 1) + new Point3D(11, 0, 2) }; surfaceLine.SetGeometry(geometry); surfaceLine.SetSurfaceLevelOutsideAt(geometry[0]); - surfaceLine.SetTrafficLoadOutsideAt(geometry[1]); - surfaceLine.SetTrafficLoadInsideAt(geometry[2]); - surfaceLine.SetDikeTopAtPolderAt(geometry[3]); - surfaceLine.SetDikeTopAtRiverAt(geometry[4]); - surfaceLine.SetShoulderBaseInsideAt(geometry[5]); - surfaceLine.SetShoulderTopInsideAt(geometry[6]); - surfaceLine.SetBottomDitchDikeSideAt(geometry[7]); - surfaceLine.SetBottomDitchPolderSideAt(geometry[8]); - surfaceLine.SetDikeToeAtPolderAt(geometry[9]); - surfaceLine.SetDikeToeAtRiverAt(geometry[10]); - surfaceLine.SetDitchDikeSideAt(geometry[11]); - surfaceLine.SetDitchPolderSideAt(geometry[12]); - surfaceLine.SetSurfaceLevelInsideAt(geometry[13]); + surfaceLine.SetDikeTopAtPolderAt(geometry[1]); + surfaceLine.SetDikeTopAtRiverAt(geometry[2]); + surfaceLine.SetShoulderBaseInsideAt(geometry[3]); + surfaceLine.SetShoulderTopInsideAt(geometry[4]); + surfaceLine.SetBottomDitchDikeSideAt(geometry[5]); + surfaceLine.SetBottomDitchPolderSideAt(geometry[6]); + surfaceLine.SetDikeToeAtPolderAt(geometry[7]); + surfaceLine.SetDikeToeAtRiverAt(geometry[8]); + surfaceLine.SetDitchDikeSideAt(geometry[9]); + surfaceLine.SetDitchPolderSideAt(geometry[10]); + surfaceLine.SetSurfaceLevelInsideAt(geometry[11]); return surfaceLine; } Index: build/DatabaseStructure.sql =================================================================== diff -u -r06e3624f72482462ebb7e4ee29d1a8173005e59d -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 --- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 06e3624f72482462ebb7e4ee29d1a8173005e59d) +++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 18-Oct-2017 08:21:55 */ +/* Created On : 19-Oct-2017 2:48:36 PM */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -1785,7 +1785,7 @@ ( 'MacroStabilityInwardsCharacteristicPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'SurfaceLineEntityId' INTEGER NOT NULL, - 'Type' SMALLINT NOT NULL, -- Enumtype: 1 = SurfaceLevelOutside 2 = DikeTopAtRiver 3 = DikeToeAtRiver 4 = TrafficLoadOutside 5 = DikeTopAtPolder 6 = TrafficLoadInside 7 = ShoulderBaseInside 8 = ShoulderTopInside 9 = DikeToeAtPolder 10 = DitchDikeSide 11 = BottomDitchDikeSide 12 = BottomDitchPolderSide 13 = DitchPolderSide 14 = SurfaceLevelInside + 'Type' SMALLINT NOT NULL, -- Enumtype: 1 = SurfaceLevelOutside 2 = DikeTopAtRiver 3 = DikeToeAtRiver 4 = DikeTopAtPolder 5 = ShoulderBaseInside 6 = ShoulderTopInside 7 = DikeToeAtPolder 8 = DitchDikeSide 9 = BottomDitchDikeSide 10 = BottomDitchPolderSide 11 = DitchPolderSide 12 = SurfaceLevelInside 'X' REAL, 'Y' REAL, 'Z' REAL, Index: design/DatabaseDesign.eap =================================================================== diff -u -r06e3624f72482462ebb7e4ee29d1a8173005e59d -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 Binary files differ