Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs =================================================================== diff -u -rdec46d5efaad5332ffb2a96e67ec11209ddc5515 -r5685b03c0cf1bac591de0ae2c23483537f6f7691 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision dec46d5efaad5332ffb2a96e67ec11209ddc5515) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision 5685b03c0cf1bac591de0ae2c23483537f6f7691) @@ -144,7 +144,7 @@ configurationDictionary["Fetches"] = new List(); configurationDictionary["AreaPoints"] = new List(); configurationDictionary["PresentationSections"] = new List(); - configurationDictionary["Profiles"] = GetCalculationProfilesConfiguration(); + configurationDictionary["Profiles"] = GetProfilesConfiguration(); configurationDictionary["ForelandModels"] = new List(); configurationDictionary["Forelands"] = GetForelandsConfiguration(); configurationDictionary["ProbabilityAlternatives"] = new List(); @@ -448,6 +448,37 @@ return orderDictionaries; } + private IList GetProfilesConfiguration() + { + var orderDictionaries = new List(); + + foreach (var hydraRingCalculationInput in hydraRingCalculationInputs) + { + for (var i = 0; i < hydraRingCalculationInput.ProfilePoints.Count(); i++) + { + var hydraRingProfilePoint = hydraRingCalculationInput.ProfilePoints.ElementAt(i); + + orderDictionaries.Add(new OrderedDictionary + { + { + "SectionId", hydraRingCalculationInput.Section.SectionId + }, + { + "SequenceNumber", i + 1 + }, + { + "XCoordinate", GetHydraRingValue(hydraRingProfilePoint.X) + }, + { + "ZCoordinate", GetHydraRingValue(hydraRingProfilePoint.Z) + } + }); + } + } + + return orderDictionaries; + } + private IList GetCalculationProfilesConfiguration() { var orderDictionaries = new List(); @@ -587,9 +618,6 @@ "SectionId", hydraRingCalculationInput.Section.SectionId }, { - "MechanismId", failureMechanismDefaults.MechanismId - }, - { "LayerId", defaultLayerId // Fixed: no support for revetments }, { Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs =================================================================== diff -u -rdec46d5efaad5332ffb2a96e67ec11209ddc5515 -r5685b03c0cf1bac591de0ae2c23483537f6f7691 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision dec46d5efaad5332ffb2a96e67ec11209ddc5515) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 5685b03c0cf1bac591de0ae2c23483537f6f7691) @@ -167,8 +167,8 @@ "INSERT INTO [SectionFaultTreeModels] VALUES (700004, 101, 1, 1, 1017);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionSubMechanismModels];" + Environment.NewLine + - "INSERT INTO [SectionSubMechanismModels] VALUES (700004, 101, 1, 1, 102, 94);" + Environment.NewLine + - "INSERT INTO [SectionSubMechanismModels] VALUES (700004, 101, 1, 1, 103, 95);" + Environment.NewLine + + "INSERT INTO [SectionSubMechanismModels] VALUES (700004, 1, 1, 102, 94);" + Environment.NewLine + + "INSERT INTO [SectionSubMechanismModels] VALUES (700004, 1, 1, 103, 95);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Fetches];" + Environment.NewLine + Environment.NewLine + @@ -177,7 +177,7 @@ "DELETE FROM [PresentationSections];" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Profiles];" + Environment.NewLine + - "INSERT INTO [Profiles] VALUES (700004, 1, 1.1, 2.2, 3.3);" + Environment.NewLine + + "INSERT INTO [Profiles] VALUES (700004, 1, 1.1, 2.2);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [ForelandModels];" + Environment.NewLine + Environment.NewLine + Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs =================================================================== diff -u -rdec46d5efaad5332ffb2a96e67ec11209ddc5515 -r5685b03c0cf1bac591de0ae2c23483537f6f7691 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision dec46d5efaad5332ffb2a96e67ec11209ddc5515) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision 5685b03c0cf1bac591de0ae2c23483537f6f7691) @@ -79,7 +79,7 @@ "INSERT INTO [SectionFaultTreeModels] VALUES (1, 1, 1, 1, 1);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionSubMechanismModels];" + Environment.NewLine + - "INSERT INTO [SectionSubMechanismModels] VALUES (1, 1, 1, 1, 1, 1234);" + Environment.NewLine + + "INSERT INTO [SectionSubMechanismModels] VALUES (1, 1, 1, 1, 1234);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Fetches];" + Environment.NewLine + Environment.NewLine + @@ -88,8 +88,8 @@ "DELETE FROM [PresentationSections];" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Profiles];" + Environment.NewLine + - "INSERT INTO [Profiles] VALUES (1, 1, 1.1, 2.2, 3.3);" + Environment.NewLine + - "INSERT INTO [Profiles] VALUES (1, 2, 11.1, 22.2, 33.3);" + Environment.NewLine + + "INSERT INTO [Profiles] VALUES (1, 1, 1.1, 2.2);" + Environment.NewLine + + "INSERT INTO [Profiles] VALUES (1, 2, 11.1, 22.2);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [ForelandModels];" + Environment.NewLine + Environment.NewLine + @@ -185,9 +185,9 @@ "INSERT INTO [SectionFaultTreeModels] VALUES (3, 1, 1, 1, 1);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionSubMechanismModels];" + Environment.NewLine + - "INSERT INTO [SectionSubMechanismModels] VALUES (1, 1, 1, 1, 1, 1234);" + Environment.NewLine + - "INSERT INTO [SectionSubMechanismModels] VALUES (2, 1, 1, 1, 1, 1234);" + Environment.NewLine + - "INSERT INTO [SectionSubMechanismModels] VALUES (3, 1, 1, 1, 1, 1234);" + Environment.NewLine + + "INSERT INTO [SectionSubMechanismModels] VALUES (1, 1, 1, 1, 1234);" + Environment.NewLine + + "INSERT INTO [SectionSubMechanismModels] VALUES (2, 1, 1, 1, 1234);" + Environment.NewLine + + "INSERT INTO [SectionSubMechanismModels] VALUES (3, 1, 1, 1, 1234);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Fetches];" + Environment.NewLine + Environment.NewLine + @@ -196,12 +196,12 @@ "DELETE FROM [PresentationSections];" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Profiles];" + Environment.NewLine + - "INSERT INTO [Profiles] VALUES (1, 1, 1.1, 2.2, 3.3);" + Environment.NewLine + - "INSERT INTO [Profiles] VALUES (1, 2, 11.1, 22.2, 33.3);" + Environment.NewLine + - "INSERT INTO [Profiles] VALUES (2, 1, 1.1, 2.2, 3.3);" + Environment.NewLine + - "INSERT INTO [Profiles] VALUES (2, 2, 11.1, 22.2, 33.3);" + Environment.NewLine + - "INSERT INTO [Profiles] VALUES (3, 1, 1.1, 2.2, 3.3);" + Environment.NewLine + - "INSERT INTO [Profiles] VALUES (3, 2, 11.1, 22.2, 33.3);" + Environment.NewLine + + "INSERT INTO [Profiles] VALUES (1, 1, 1.1, 2.2);" + Environment.NewLine + + "INSERT INTO [Profiles] VALUES (1, 2, 11.1, 22.2);" + Environment.NewLine + + "INSERT INTO [Profiles] VALUES (2, 1, 1.1, 2.2);" + Environment.NewLine + + "INSERT INTO [Profiles] VALUES (2, 2, 11.1, 22.2);" + Environment.NewLine + + "INSERT INTO [Profiles] VALUES (3, 1, 1.1, 2.2);" + Environment.NewLine + + "INSERT INTO [Profiles] VALUES (3, 2, 11.1, 22.2);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [ForelandModels];" + Environment.NewLine + Environment.NewLine +