Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql =================================================================== diff -u -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 -r1b7dec5dc5d682b37d0191d99da2ff640cc56022 --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql (.../DatabaseStructure17.2.sql) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql (.../DatabaseStructure17.2.sql) (revision 1b7dec5dc5d682b37d0191d99da2ff640cc56022) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 19-Oct-2017 2:48:36 PM */ +/* Created On : 26-Oct-2017 1:46:00 PM */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -1858,7 +1858,6 @@ 'PopMean' REAL, 'PopCoefficientOfVariation' REAL, 'OuterRingXml' TEXT NOT NULL, - 'HolesXml' TEXT NOT NULL, 'Order' INT (4) NOT NULL, CONSTRAINT 'FK_MacroStabilityInwardsSoilLayerTwoDEntity_MacroStabilityInwardsSoilProfileTwoDEntity' FOREIGN KEY ('MacroStabilityInwardsSoilProfileTwoDEntityId') REFERENCES 'MacroStabilityInwardsSoilProfileTwoDEntity' ('MacroStabilityInwardsSoilProfileTwoDEntityId') ON DELETE Cascade ON UPDATE Cascade ) Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensions.cs =================================================================== diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -r1b7dec5dc5d682b37d0191d99da2ff640cc56022 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensions.cs (.../MacroStabilityInwardsSoilLayer2DCreateExtensions.cs) (revision 7585d2fd78627d94d55ffa16423af90a91e4efd4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensions.cs (.../MacroStabilityInwardsSoilLayer2DCreateExtensions.cs) (revision 1b7dec5dc5d682b37d0191d99da2ff640cc56022) @@ -54,7 +54,6 @@ return new MacroStabilityInwardsSoilLayerTwoDEntity { OuterRingXml = new Point2DXmlSerializer().ToXml(soilLayer.OuterRing.Points), - HolesXml = new RingXmlSerializer().ToXml(soilLayer.Holes), IsAquifer = Convert.ToByte(data.IsAquifer), MaterialName = data.MaterialName.DeepClone(), Color = data.Color.ToArgb(), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsSoilLayerTwoDEntity.cs =================================================================== diff -u -r8e213638a22dd9f04d965d875bb58156db019be5 -r1b7dec5dc5d682b37d0191d99da2ff640cc56022 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsSoilLayerTwoDEntity.cs (.../MacroStabilityInwardsSoilLayerTwoDEntity.cs) (revision 8e213638a22dd9f04d965d875bb58156db019be5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsSoilLayerTwoDEntity.cs (.../MacroStabilityInwardsSoilLayerTwoDEntity.cs) (revision 1b7dec5dc5d682b37d0191d99da2ff640cc56022) @@ -56,7 +56,6 @@ public double? PopMean { get; set; } public double? PopCoefficientOfVariation { get; set; } public string OuterRingXml { get; set; } - public string HolesXml { get; set; } public int Order { get; set; } public virtual MacroStabilityInwardsSoilProfileTwoDEntity MacroStabilityInwardsSoilProfileTwoDEntity { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -r06e3624f72482462ebb7e4ee29d1a8173005e59d -r1b7dec5dc5d682b37d0191d99da2ff640cc56022 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 06e3624f72482462ebb7e4ee29d1a8173005e59d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 1b7dec5dc5d682b37d0191d99da2ff640cc56022) @@ -4,7 +4,7 @@ - + @@ -887,7 +887,6 @@ - @@ -5295,7 +5294,6 @@ - @@ -8337,7 +8335,6 @@ - Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 -r1b7dec5dc5d682b37d0191d99da2ff640cc56022 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 1b7dec5dc5d682b37d0191d99da2ff640cc56022) @@ -6,96 +6,96 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - - + + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensions.cs =================================================================== diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -r1b7dec5dc5d682b37d0191d99da2ff640cc56022 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensions.cs (.../MacroStabilityInwardsSoilLayerTwoDEntityReadExtensions.cs) (revision 7585d2fd78627d94d55ffa16423af90a91e4efd4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensions.cs (.../MacroStabilityInwardsSoilLayerTwoDEntityReadExtensions.cs) (revision 1b7dec5dc5d682b37d0191d99da2ff640cc56022) @@ -51,9 +51,8 @@ } var outerRing = new Ring(new Point2DXmlSerializer().FromXml(entity.OuterRingXml)); - Ring[] holes = new RingXmlSerializer().FromXml(entity.HolesXml); - return new MacroStabilityInwardsSoilLayer2D(outerRing, holes) + return new MacroStabilityInwardsSoilLayer2D(outerRing, new Ring[0]) { Data = new MacroStabilityInwardsSoilLayerData { Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs =================================================================== diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -r1b7dec5dc5d682b37d0191d99da2ff640cc56022 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs (.../MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs) (revision 7585d2fd78627d94d55ffa16423af90a91e4efd4) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs (.../MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs) (revision 1b7dec5dc5d682b37d0191d99da2ff640cc56022) @@ -137,7 +137,6 @@ Assert.AreEqual(order, entity.Order); AssertOuterRing(soilLayer.OuterRing, entity); - AssertHoles(soilLayer, entity); } [Test] @@ -237,12 +236,6 @@ TestHelper.AssertAreEqualButNotSame(materialName, entity.MaterialName); } - private static void AssertHoles(MacroStabilityInwardsSoilLayer2D soilLayer, MacroStabilityInwardsSoilLayerTwoDEntity entity) - { - string expectedHolesXml = new RingXmlSerializer().ToXml(soilLayer.Holes); - Assert.AreEqual(expectedHolesXml, entity.HolesXml); - } - private static void AssertOuterRing(Ring outerRing, MacroStabilityInwardsSoilLayerTwoDEntity entity) { string expectedOuterRingXml = new Point2DXmlSerializer().ToXml(outerRing.Points); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -r1b7dec5dc5d682b37d0191d99da2ff640cc56022 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 7585d2fd78627d94d55ffa16423af90a91e4efd4) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 1b7dec5dc5d682b37d0191d99da2ff640cc56022) @@ -1505,7 +1505,6 @@ MacroStabilityInwardsSoilLayer2D actualLayer) { Assert.AreEqual(expectedLayer.OuterRing, actualLayer.OuterRing); - CollectionAssert.AreEqual(expectedLayer.Holes, actualLayer.Holes); AssertMacroStabilityInwardsSoilLayerData(expectedLayer.Data, actualLayer.Data); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensionsTest.cs =================================================================== diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -r1b7dec5dc5d682b37d0191d99da2ff640cc56022 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensionsTest.cs (.../MacroStabilityInwardsSoilLayerTwoDEntityReadExtensionsTest.cs) (revision 7585d2fd78627d94d55ffa16423af90a91e4efd4) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensionsTest.cs (.../MacroStabilityInwardsSoilLayerTwoDEntityReadExtensionsTest.cs) (revision 1b7dec5dc5d682b37d0191d99da2ff640cc56022) @@ -80,12 +80,6 @@ CreateRandomPoint2D(random), CreateRandomPoint2D(random) }; - var holes = new[] - { - CreateRandomRing(random), - CreateRandomRing(random), - CreateRandomRing(random) - }; var entity = new MacroStabilityInwardsSoilLayerTwoDEntity { @@ -108,8 +102,7 @@ StrengthIncreaseExponentCoefficientOfVariation = strengthIncreaseExponentCoefficientOfVariation, PopMean = popMean, PopCoefficientOfVariation = popCoefficientOfVariation, - OuterRingXml = new Point2DXmlSerializer().ToXml(outerRingPoints), - HolesXml = new RingXmlSerializer().ToXml(holes) + OuterRingXml = new Point2DXmlSerializer().ToXml(outerRingPoints) }; // Call @@ -167,7 +160,6 @@ }, data.Pop); CollectionAssert.AreEqual(outerRingPoints, layer.OuterRing.Points); - CollectionAssert.AreEqual(holes, layer.Holes); } [Test] @@ -177,8 +169,7 @@ var entity = new MacroStabilityInwardsSoilLayerTwoDEntity { MaterialName = nameof(MacroStabilityInwardsSoilLayerTwoDEntity), - OuterRingXml = new Point2DXmlSerializer().ToXml(CreateRandomRing(new Random(31)).Points), - HolesXml = new RingXmlSerializer().ToXml(new Ring[0]) + OuterRingXml = new Point2DXmlSerializer().ToXml(CreateRandomRing(new Random(31)).Points) }; // Call Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSoilProfileTwoDEntityReadExtensionsTest.cs =================================================================== diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -r1b7dec5dc5d682b37d0191d99da2ff640cc56022 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSoilProfileTwoDEntityReadExtensionsTest.cs (.../MacroStabilityInwardsSoilProfileTwoDEntityReadExtensionsTest.cs) (revision 7585d2fd78627d94d55ffa16423af90a91e4efd4) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSoilProfileTwoDEntityReadExtensionsTest.cs (.../MacroStabilityInwardsSoilProfileTwoDEntityReadExtensionsTest.cs) (revision 1b7dec5dc5d682b37d0191d99da2ff640cc56022) @@ -93,7 +93,6 @@ }; var point2DXmlSerializer = new Point2DXmlSerializer(); - var ringXmlSerializer = new RingXmlSerializer(); var entity = new MacroStabilityInwardsSoilProfileTwoDEntity { Name = nameof(MacroStabilityInwardsSoilProfileTwoDEntity), @@ -103,14 +102,12 @@ { MaterialName = "A", OuterRingXml = point2DXmlSerializer.ToXml(outerRingA.Points), - HolesXml = ringXmlSerializer.ToXml(new Ring[0]), Order = 1 }, new MacroStabilityInwardsSoilLayerTwoDEntity { MaterialName = "B", OuterRingXml = point2DXmlSerializer.ToXml(outerRingB.Points), - HolesXml = ringXmlSerializer.ToXml(new Ring[0]), Order = 0 } }, Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityTestFactoryTest.cs =================================================================== diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -r1b7dec5dc5d682b37d0191d99da2ff640cc56022 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityTestFactoryTest.cs (.../MacroStabilityInwardsSoilLayerTwoDEntityTestFactoryTest.cs) (revision 7585d2fd78627d94d55ffa16423af90a91e4efd4) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityTestFactoryTest.cs (.../MacroStabilityInwardsSoilLayerTwoDEntityTestFactoryTest.cs) (revision 1b7dec5dc5d682b37d0191d99da2ff640cc56022) @@ -24,8 +24,6 @@ using Application.Ringtoets.Storage.TestUtil.MacroStabilityInwards; using Core.Common.Base.Geometry; using NUnit.Framework; -using Ringtoets.MacroStabilityInwards.Data.SoilProfile; -using Ringtoets.MacroStabilityInwards.Primitives; namespace Application.Ringtoets.Storage.TestUtil.Test.MacroStabilityInwards { @@ -41,9 +39,6 @@ // Assert Point2D[] outerRing = new Point2DXmlSerializer().FromXml(entity.OuterRingXml); Assert.AreEqual(2, outerRing.Length); - - Ring[] holes = new RingXmlSerializer().FromXml(entity.HolesXml); - Assert.AreEqual(0, holes.Length); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityTestFactory.cs =================================================================== diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -r1b7dec5dc5d682b37d0191d99da2ff640cc56022 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityTestFactory.cs (.../MacroStabilityInwardsSoilLayerTwoDEntityTestFactory.cs) (revision 7585d2fd78627d94d55ffa16423af90a91e4efd4) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityTestFactory.cs (.../MacroStabilityInwardsSoilLayerTwoDEntityTestFactory.cs) (revision 1b7dec5dc5d682b37d0191d99da2ff640cc56022) @@ -23,8 +23,6 @@ using Application.Ringtoets.Storage.DbContext; using Application.Ringtoets.Storage.Serializers; using Core.Common.Base.Geometry; -using Ringtoets.MacroStabilityInwards.Data.SoilProfile; -using Ringtoets.MacroStabilityInwards.Primitives; namespace Application.Ringtoets.Storage.TestUtil.MacroStabilityInwards { @@ -41,16 +39,15 @@ public static MacroStabilityInwardsSoilLayerTwoDEntity CreateMacroStabilityInwardsSoilLayerTwoDEntity() { var random = new Random(31); - var outerRing = new Ring(new[] + var points = new[] { new Point2D(random.NextDouble(), random.NextDouble()), new Point2D(random.NextDouble(), random.NextDouble()) - }); + }; return new MacroStabilityInwardsSoilLayerTwoDEntity { - OuterRingXml = new Point2DXmlSerializer().ToXml(outerRing.Points), - HolesXml = new RingXmlSerializer().ToXml(new Ring[0]) + OuterRingXml = new Point2DXmlSerializer().ToXml(points) }; } } Index: build/DatabaseStructure.sql =================================================================== diff -u -r66396d7a91ffdfadfcd6a94759ce579c611c78b9 -r1b7dec5dc5d682b37d0191d99da2ff640cc56022 --- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 66396d7a91ffdfadfcd6a94759ce579c611c78b9) +++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 1b7dec5dc5d682b37d0191d99da2ff640cc56022) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 19-Oct-2017 2:48:36 PM */ +/* Created On : 26-Oct-2017 1:46:00 PM */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -1858,7 +1858,6 @@ 'PopMean' REAL, 'PopCoefficientOfVariation' REAL, 'OuterRingXml' TEXT NOT NULL, - 'HolesXml' TEXT NOT NULL, 'Order' INT (4) NOT NULL, CONSTRAINT 'FK_MacroStabilityInwardsSoilLayerTwoDEntity_MacroStabilityInwardsSoilProfileTwoDEntity' FOREIGN KEY ('MacroStabilityInwardsSoilProfileTwoDEntityId') REFERENCES 'MacroStabilityInwardsSoilProfileTwoDEntity' ('MacroStabilityInwardsSoilProfileTwoDEntityId') ON DELETE Cascade ON UPDATE Cascade )