Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingConfiguration.cs =================================================================== diff -u -ra4dbbc9c2836e10eb53a02685ad6f991a8bfa704 -r5813e3023cea94d7aad8f1fc057b0e85b538f2f5 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingConfiguration.cs (.../HydraRingConfiguration.cs) (revision a4dbbc9c2836e10eb53a02685ad6f991a8bfa704) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingConfiguration.cs (.../HydraRingConfiguration.cs) (revision 5813e3023cea94d7aad8f1fc057b0e85b538f2f5) @@ -164,10 +164,12 @@ foreach (var hydraRingCalculation in hydraRingCalculations) { + var hydraRingDikeSection = hydraRingCalculation.DikeSection; + orderedDictionaries.Add(new OrderedDictionary { { - "SectionId", 999 // TODO: Dike section integration + "SectionId", hydraRingDikeSection.SectionId }, { "PresentationId", 1 // Fixed: no support for combination of multiple dike sections @@ -176,22 +178,22 @@ "MainMechanismId", 1 // Fixed: no support for combination of multiple dike sections }, { - "Name", "HydraRingLocation" // TODO: Dike section integration + "Name", hydraRingDikeSection.SectionName }, { - "Description", "HydraRingLocation" // TODO: Dike section integration + "Description", hydraRingDikeSection.SectionName // Just use the section name }, { - "RingCoordinateBegin", null // TODO: Dike section integration + "RingCoordinateBegin", GetHydraRingValue(hydraRingDikeSection.SectionBeginCoordinate) }, { - "RingCoordinateEnd", null // TODO: Dike section integration + "RingCoordinateEnd", GetHydraRingValue(hydraRingDikeSection.SectionEndCoordinate) }, { - "XCoordinate", null // TODO: Dike cross section integration + "XCoordinate", GetHydraRingValue(hydraRingDikeSection.CrossSectionXCoordinate) }, { - "YCoordinate", null // TODO: Dike cross section integration + "YCoordinate", GetHydraRingValue(hydraRingDikeSection.CrossSectionYCoordinate) }, { "StationId1", hydraRingCalculation.HydraulicBoundaryLocationId @@ -203,10 +205,10 @@ "Relative", 100.0 // Fixed: no support for coupling two stations }, { - "Normal", null // TODO: Dike cross section integration + "Normal", GetHydraRingValue(hydraRingDikeSection.CrossSectionNormal) }, { - "Length", null // TODO: Dike section integration + "Length", GetHydraRingValue(hydraRingDikeSection.SectionLength) } }); } @@ -226,7 +228,7 @@ orderedDictionaries.Add(new OrderedDictionary { { - "SectionId", 999 // TODO: Dike section integration + "SectionId", hydraRingCalculation.DikeSection.SectionId }, { "MechanismId", failureMechanismDefaults.MechanismId @@ -285,7 +287,7 @@ orderDictionaries.Add(new OrderedDictionary { { - "SectionId", 999 // TODO: Dike section integration + "SectionId", hydraRingCalculation.DikeSection.SectionId }, { "MechanismId", failureMechanismDefaults.MechanismId @@ -366,7 +368,7 @@ orderDictionaries.Add(new OrderedDictionary { { - "SectionId", 999 // TODO: Dike section integration + "SectionId", hydraRingCalculation.DikeSection.SectionId }, { "MechanismId", failureMechanismDefaults.MechanismId @@ -439,7 +441,7 @@ orderDictionaries.Add(new OrderedDictionary { { - "SectionId", 999 // TODO: Dike section integration + "SectionId", hydraRingCalculation.DikeSection.SectionId }, { "SequenceNumber", i + 1 @@ -472,7 +474,7 @@ orderedDictionaries.Add(new OrderedDictionary { { - "SectionId", 999 // TODO: Dike section integration + "SectionId", hydraRingCalculation.DikeSection.SectionId }, { "MechanismId", failureMechanismDefaults.MechanismId @@ -509,7 +511,7 @@ orderedDictionaries.Add(new OrderedDictionary { { - "SectionId", 999 // TODO: Dike section integration + "SectionId", hydraRingCalculation.DikeSection.SectionId }, { "MechanismId", failureMechanismDefaults.MechanismId Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingConfigurationTest.cs =================================================================== diff -u -r38333dbf729a71541c35ade675e63135881d0b53 -r5813e3023cea94d7aad8f1fc057b0e85b538f2f5 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingConfigurationTest.cs (.../HydraRingConfigurationTest.cs) (revision 38333dbf729a71541c35ade675e63135881d0b53) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingConfigurationTest.cs (.../HydraRingConfigurationTest.cs) (revision 5813e3023cea94d7aad8f1fc057b0e85b538f2f5) @@ -53,31 +53,31 @@ "INSERT INTO [HydraulicModels] VALUES (3, 2, 'WTI 2017');" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Sections];" + Environment.NewLine + - "INSERT INTO [Sections] VALUES (999, 1, 1, 'HydraRingLocation', 'HydraRingLocation', NULL, NULL, NULL, NULL, 700004, 700004, 100, NULL, NULL);" + Environment.NewLine + + "INSERT INTO [Sections] VALUES (9999, 1, 1, 'LocationName', 'LocationName', 2.2, 3.3, 5.5, 6.6, 700004, 700004, 100, 7.7, 4.4);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + - "INSERT INTO [DesignTables] VALUES (999, 1, NULL, NULL, 2, 26, NULL, NULL, NULL, NULL, 0, 50, 1.1);" + Environment.NewLine + + "INSERT INTO [DesignTables] VALUES (9999, 1, NULL, NULL, 2, 26, NULL, NULL, NULL, NULL, 0, 50, 1.1);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Numerics];" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (999, 1, NULL, NULL, 1, 1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (9999, 1, NULL, NULL, 1, 1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [VariableDatas];" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (999, 1, NULL, NULL, 26, 2.2, 0, NULL, NULL, NULL, NULL, 0, NULL, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (999, 1, NULL, NULL, 26, 22.2, 0, NULL, NULL, NULL, NULL, 1, NULL, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (999, 1, NULL, NULL, 26, NULL, 2, 333.3, 444.4, NULL, NULL, 0, NULL, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (999, 1, NULL, NULL, 26, NULL, 2, 3333.3, NULL, NULL, NULL, 1, 4444.4, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (999, 1, NULL, NULL, 26, NULL, 4, 33333.3, 44444.4, 55555.5, NULL, 0, NULL, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (999, 1, NULL, NULL, 26, NULL, 4, 333333.3, NULL, 555555.5, NULL, 1, 444444.4, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (9999, 1, NULL, NULL, 26, 2.2, 0, NULL, NULL, NULL, NULL, 0, NULL, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (9999, 1, NULL, NULL, 26, 22.2, 0, NULL, NULL, NULL, NULL, 1, NULL, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (9999, 1, NULL, NULL, 26, NULL, 2, 333.3, 444.4, NULL, NULL, 0, NULL, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (9999, 1, NULL, NULL, 26, NULL, 2, 3333.3, NULL, NULL, NULL, 1, 4444.4, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (9999, 1, NULL, NULL, 26, NULL, 4, 33333.3, 44444.4, 55555.5, NULL, 0, NULL, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (9999, 1, NULL, NULL, 26, NULL, 4, 333333.3, NULL, 555555.5, NULL, 1, 444444.4, 300);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [CalculationProfiles];" + Environment.NewLine + - "INSERT INTO [CalculationProfiles] VALUES (999, 1, 1.1, 2.2, 3.3);" + Environment.NewLine + - "INSERT INTO [CalculationProfiles] VALUES (999, 2, 11.1, 22.2, 33.3);" + Environment.NewLine + + "INSERT INTO [CalculationProfiles] VALUES (9999, 1, 1.1, 2.2, 3.3);" + Environment.NewLine + + "INSERT INTO [CalculationProfiles] VALUES (9999, 2, 11.1, 22.2, 33.3);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionFaultTreeModels];" + Environment.NewLine + - "INSERT INTO [SectionFaultTreeModels] VALUES (999, 1, NULL, NULL, 1);" + Environment.NewLine + + "INSERT INTO [SectionFaultTreeModels] VALUES (9999, 1, NULL, NULL, 1);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionSubMechanismModels];" + Environment.NewLine + - "INSERT INTO [SectionSubMechanismModels] VALUES (999, 1, NULL, NULL, 1, 1234);" + Environment.NewLine + + "INSERT INTO [SectionSubMechanismModels] VALUES (9999, 1, NULL, NULL, 1, 1234);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Fetches];" + Environment.NewLine + Environment.NewLine + @@ -131,7 +131,7 @@ { get { - return new HydraRingDikeSection(1, "Name", 2.2, 3.3, 4.4, 5.5, 6.6, 7.7); + return new HydraRingDikeSection(9999, "LocationName", 2.2, 3.3, 4.4, 5.5, 6.6, 7.7); } } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationIntegrationTest.cs =================================================================== diff -u -r8693789d18f77ae54b04670ed135a10ea4ad1a8d -r5813e3023cea94d7aad8f1fc057b0e85b538f2f5 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationIntegrationTest.cs (.../HydraRingConfigurationIntegrationTest.cs) (revision 8693789d18f77ae54b04670ed135a10ea4ad1a8d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationIntegrationTest.cs (.../HydraRingConfigurationIntegrationTest.cs) (revision 5813e3023cea94d7aad8f1fc057b0e85b538f2f5) @@ -41,21 +41,21 @@ "INSERT INTO [HydraulicModels] VALUES (1, 1, 'WTI 2017');" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Sections];" + Environment.NewLine + - "INSERT INTO [Sections] VALUES (999, 1, 1, 'HydraRingLocation', 'HydraRingLocation', NULL, NULL, NULL, NULL, 700004, 700004, 100, NULL, NULL);" + Environment.NewLine + + "INSERT INTO [Sections] VALUES (700004, 1, 1, '700004', '700004', NULL, NULL, NULL, NULL, 700004, 700004, 100, NULL, NULL);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + - "INSERT INTO [DesignTables] VALUES (999, 1, NULL, NULL, 2, 26, NULL, NULL, NULL, NULL, 0, 50, 3.29053);" + Environment.NewLine + + "INSERT INTO [DesignTables] VALUES (700004, 1, NULL, NULL, 2, 26, NULL, NULL, NULL, NULL, 0, 50, 3.29053);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Numerics];" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (999, 1, NULL, NULL, 1, 1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (700004, 1, NULL, NULL, 1, 1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [VariableDatas];" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (999, 1, NULL, NULL, 26, 0, 0, NULL, NULL, NULL, NULL, 0, NULL, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (700004, 1, NULL, NULL, 26, 0, 0, NULL, NULL, NULL, NULL, 0, NULL, 300);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [CalculationProfiles];" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionFaultTreeModels];" + Environment.NewLine + - "INSERT INTO [SectionFaultTreeModels] VALUES (999, 1, NULL, NULL, 1);" + Environment.NewLine + + "INSERT INTO [SectionFaultTreeModels] VALUES (700004, 1, NULL, NULL, 1);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionSubMechanismModels];" + Environment.NewLine + Environment.NewLine +