Activity Riskeer/

11:07 am

Joël van den Berg

More
428346a
changed 17 files
1691, 1715 and 80 more

Added hydraulic boundarly location as input for piping. Related to Issue [WTI-156]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2330 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: cfb46b3007b5171c3a12bf4555bc49a238035b8b

Former-commit-id: f70448114fefbe117ff7d9d7035de75b70ced42c

- -0
- +5
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Data/HydraulicBoundaryLocation.cs
- History
- Source
- Diff
/Ringtoets/.../HydraulicBoundaryLocation.cs
- -0
- +14
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Data.Test/HydraulicBoundaryLocationTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraulicBoundaryLocationTest.cs
- -48
- +57
/Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs
- History
- Source
- Diff
/Ringtoets/Piping/.../PipingInput.cs
- -0
- +4
/Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj
- History
- Source
- Diff
/Ringtoets/.../Ringtoets.Piping.Data.csproj
- -1
- +18
/Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingContext.cs
- History
- Source
- Diff
/Ringtoets/Piping/.../PipingContext.cs
- -0
- +18
/Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs
- History
- Source
- Diff
/Ringtoets/Piping/.../Resources.Designer.cs
- -0
- +6
/Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx
- History
- Source
- Diff
/Ringtoets/Piping/.../Resources.resx
- -111
- +135
/Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs
- History
- Source
- Diff
/Ringtoets/.../PipingInputContextProperties.cs
- -0
- +1
/Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj
- History
- Source
- Diff
/Ringtoets/.../Ringtoets.Piping.Forms.csproj
- -2
- +2
/Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/DesignVariableTypeConverter.cs
- History
- Source
- Diff
/Ringtoets/.../DesignVariableTypeConverter.cs
- -0
- +32
/Ringtoets/Piping/src/Ringtoets.Piping.Forms/UITypeEditors/PipingInputContextHydraulicBoundaryLocationEditor.cs
- History
- Source
/Ringtoets/.../PipingInputContextHydraulicBoundaryLocationEditor.cs
- -3
- +3
/Ringtoets/Piping/src/Ringtoets.Piping.Forms/UITypeEditors/PipingInputContextSelectionEditor.cs
- History
- Source
- Diff
/Ringtoets/.../PipingInputContextSelectionEditor.cs
- -0
- +1
/Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs
- History
- Source
- Diff
/Ringtoets/Piping/.../PipingInputTest.cs
- -0
- +4
/Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/Ringtoets.Piping.Data.Test.csproj
- History
- Source
- Diff
/Ringtoets/.../Ringtoets.Piping.Data.Test.csproj
- -2
- +15
/Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs
- History
- Source
- Diff
/Ringtoets/.../PipingInputContextPropertiesTest.cs
- -0
- +1
/Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj
- History
- Source
- Diff
/Ringtoets/.../Ringtoets.Piping.Forms.Test.csproj
- -0
- +121
/Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextHydraulicBoundaryLocationEditorTest.cs
- History
- Source
/Ringtoets/.../PipingInputContextHydraulicBoundaryLocationEditorTest.cs

11:04 am

Robert Tangerman <robert.tangerman@deltares.nl>

More
968645e
changed 16 files
1691, 1715 and 80 more

Implemented reader for HydraRing settings file. Related to Issue [WTI-362]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2329 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 6181595aab2611f0daf2114c5fe5fb8cb9929117

Former-commit-id: 443508f9e81a8ceb11333f934b528f3a81b72e88

- -0
- +1
/Core/Common/src/Core.Common.IO/Core.Common.IO.csproj
- History
- Source
- Diff
/Core/Common/.../Core.Common.IO.csproj
- -0
- +65
/Core/Common/src/Core.Common.IO/StreamReaderHelper.cs
- History
- Source
/Core/Common/.../StreamReaderHelper.cs
- -0
- +197
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraRingSettingsCsvReader.cs
- History
- Source
/Ringtoets/.../HydraRingSettingsCsvReader.cs
- -0
- +104
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.Designer.cs
- History
- Source
/Ringtoets/HydraRing/.../Resources.Designer.cs
- -0
- +133
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.resx
- History
- Source
/Ringtoets/HydraRing/.../Properties/Resources.resx
- -0
- +2597
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Resources/Hydra-Ring settings.csv
- History
- Source
/Ringtoets/HydraRing/.../Hydra-Ring settings.csv
- -1
- +22
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
- History
- Source
- Diff
/Ringtoets/.../Ringtoets.HydraRing.Calculation.csproj
- -0
- +138
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/HydraRingSettingsCsvReaderTest.cs
- History
- Source
/Ringtoets/.../HydraRingSettingsCsvReaderTest.cs
- -0
- +75
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Properties/Resources.Designer.cs
- History
- Source
/Ringtoets/HydraRing/.../Resources.Designer.cs
- -0
- +124
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Properties/Resources.resx
- History
- Source
/Ringtoets/HydraRing/.../Properties/Resources.resx
- -0
- +3
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Resources/Hydra-Ring settings test.csv
- History
- Source
/Ringtoets/.../Hydra-Ring settings test.csv
- -0
- +17
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj
- History
- Source
- Diff
/Ringtoets/.../Ringtoets.HydraRing.Calculation.Test.csproj
- -1
- +0
/Ringtoets/Piping/src/Ringtoets.Piping.IO/Ringtoets.Piping.IO.csproj
- History
- Source
- Diff
/Ringtoets/.../Ringtoets.Piping.IO.csproj
- -44
- +0
/Ringtoets/Piping/src/Ringtoets.Piping.IO/StreamReaderHelper.cs
- History
- Source
- Diff
/Ringtoets/Piping/.../StreamReaderHelper.cs
- -3
- +5
/Ringtoets/Piping/src/Ringtoets.Piping.IO/SurfaceLines/CharacteristicPointsCsvReader.cs
- History
- Source
- Diff
/Ringtoets/.../CharacteristicPointsCsvReader.cs
- -0
- +1
/Ringtoets/Piping/src/Ringtoets.Piping.IO/SurfaceLines/PipingSurfaceLinesCsvReader.cs
- History
- Source
- Diff
/Ringtoets/.../PipingSurfaceLinesCsvReader.cs

10:54 am

Elmar Kleijn

More
c6af9c0
changed 4 files
1691, 1715 and 80 more

Improved HydraRingCalculation test coverage Related to Issue [WTI-324]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2328 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: ee1fb3626c2c2f95b1f3e459c1bc2eff7e23be4d

Former-commit-id: 57f6b76ac02ef1c0c6ad91df6c0c0f29e760fdc0

- -4
- +0
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
- History
- Source
- Diff
/Ringtoets/.../Ringtoets.HydraRing.Calculation.csproj
- -0
- +55
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Hydraulics/AssessmentLevelCalculationTest.cs
- History
- Source
/Ringtoets/.../AssessmentLevelCalculationTest.cs
- -0
- +66
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Hydraulics/HydraulicCalculationTest.cs
- History
- Source
/Ringtoets/.../HydraulicCalculationTest.cs
- -4
- +2
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj
- History
- Source
- Diff
/Ringtoets/.../Ringtoets.HydraRing.Calculation.Test.csproj

10:40 am

Elmar Kleijn

More
59b1c01
changed 21 files
1691, 1715 and 80 more

Reordered HydraRingCalculation related test classes Related to Issue [WTI-324]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2327 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: b16e86d23827e30131d41f6ceebeabfa1e66f847

Former-commit-id: 963527998e6a56224a6f3bff79ded5da989ef9f4

- -90
- +0
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingCalculationTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingCalculationTest.cs
- -190
- +0
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingConfigurationTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfigurationTest.cs
- -47
- +0
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingDikeSectionTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingDikeSectionTest.cs
- -42
- +0
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingProfilePointTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingProfilePointTest.cs
- -52
- +0
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingVariableTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingVariableTest.cs
- -0
- +44
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingDeviationTypeTest.cs
- History
- Source
/Ringtoets/.../HydraRingDeviationTypeTest.cs
- -0
- +47
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingDikeSectionTest.cs
- History
- Source
/Ringtoets/.../HydraRingDikeSectionTest.cs
- -0
- +45
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingDistributionTypeTest.cs
- History
- Source
/Ringtoets/.../HydraRingDistributionTypeTest.cs
- -0
- +37
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingFailureMechanismTypeTest.cs
- History
- Source
/Ringtoets/.../HydraRingFailureMechanismTypeTest.cs
- -0
- +42
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingProfilePointTest.cs
- History
- Source
/Ringtoets/.../HydraRingProfilePointTest.cs
- -0
- +45
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingTimeIntegrationSchemeTypeTest.cs
- History
- Source
/Ringtoets/.../HydraRingTimeIntegrationSchemeTypeTest.cs
- -0
- +46
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingUncertaintiesTypeTest.cs
- History
- Source
/Ringtoets/.../HydraRingUncertaintiesTypeTest.cs
- -0
- +52
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingVariableTest.cs
- History
- Source
/Ringtoets/HydraRing/.../HydraRingVariableTest.cs
- -0
- +90
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingCalculationTest.cs
- History
- Source
/Ringtoets/.../HydraRingCalculationTest.cs
- -0
- +190
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfigurationTest.cs
… 6 more files in changeset.

10:37 am

Elmar Kleijn

More
dd33f3b
changed 46 files
1691, 1715 and 80 more

Reordered HydraRingCalculation related classes Related to Issue [WTI-324]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2326 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: d952ba7be9e85a52d2b511a7a7ce25625d06ad3e

Former-commit-id: 119d6232fa60f9d493b8d96770d2bfaa4708ff0a

- -108
- +0
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingCalculation.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingCalculation.cs
- -704
- +0
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingConfiguration.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfiguration.cs
- -161
- +0
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingDikeSection.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingDikeSection.cs
- -55
- +0
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingProfilePoint.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingProfilePoint.cs
- -153
- +0
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingVariable.cs
- History
- Source
- Diff
/Ringtoets/HydraRing/.../HydraRingVariable.cs
- -74
- +0
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/AssessmentLevelCalculation.cs
- History
- Source
- Diff
/Ringtoets/.../AssessmentLevelCalculation.cs
- -0
- +35
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingDeviationType.cs
- History
- Source
/Ringtoets/HydraRing/.../HydraRingDeviationType.cs
- -0
- +161
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingDikeSection.cs
- History
- Source
/Ringtoets/HydraRing/.../HydraRingDikeSection.cs
- -0
- +36
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingDistributionType.cs
- History
- Source
/Ringtoets/.../HydraRingDistributionType.cs
- -0
- +43
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingFailureMechanismType.cs
- History
- Source
/Ringtoets/.../HydraRingFailureMechanismType.cs
- -0
- +76
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingProfilePoint.cs
- History
- Source
/Ringtoets/HydraRing/.../HydraRingProfilePoint.cs
- -0
- +36
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingTimeIntegrationSchemeType.cs
- History
- Source
/Ringtoets/.../HydraRingTimeIntegrationSchemeType.cs
- -0
- +37
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingUncertaintiesType.cs
- History
- Source
/Ringtoets/.../HydraRingUncertaintiesType.cs
- -0
- +151
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingVariable.cs
- History
- Source
- Diff
/Ringtoets/HydraRing/.../HydraRingVariable.cs
- -30
- +0
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraulicCalculation.cs
- History
- Source
- Diff
/Ringtoets/.../HydraulicCalculation.cs
… 31 more files in changeset.

10:17 am

Elmar Kleijn

More
6d95a16
changed 13 files
1691, 1715 and 80 more

Renamed HydraRingCalculationData to HydraRingCalculation Related to Issue [WTI-324]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2325 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 54ad0b545d380a924a096f724dd6c7498637fd5c

Former-commit-id: b9c2c82f8d7a4dbc0c76291b915e00de2ee65ae3

- -0
- +108
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingCalculation.cs
- History
- Source
/Ringtoets/HydraRing/.../HydraRingCalculation.cs
- -108
- +0
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingCalculationData.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingCalculationData.cs
- -5
- +5
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingConfiguration.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfiguration.cs
- -0
- +74
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/AssessmentLevelCalculation.cs
- History
- Source
/Ringtoets/.../AssessmentLevelCalculation.cs
- -74
- +0
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/AssessmentLevelCalculationData.cs
- History
- Source
- Diff
/Ringtoets/.../AssessmentLevelCalculationData.cs
- -0
- +30
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraulicCalculation.cs
- History
- Source
/Ringtoets/HydraRing/.../HydraulicCalculation.cs
- -30
- +0
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraulicCalculationData.cs
- History
- Source
- Diff
/Ringtoets/.../HydraulicCalculationData.cs
- -3
- +3
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
- History
- Source
- Diff
/Ringtoets/.../Ringtoets.HydraRing.Calculation.csproj
- -91
- +0
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingCalculationDataTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingCalculationDataTest.cs
- -0
- +91
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingCalculationTest.cs
- History
- Source
/Ringtoets/.../HydraRingCalculationTest.cs
- -5
- +6
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingConfigurationTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfigurationTest.cs
- -2
- +2
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationIntegrationTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfigurationIntegrationTest.cs
- -1
- +1
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj
- History
- Source
- Diff
/Ringtoets/.../Ringtoets.HydraRing.Calculation.Test.csproj

10:08 am

Elmar Kleijn

More
8884523
changed 1 file
1691, 1715 and 80 more

Added RingId property to HydraRingConfiguration Related to Issue [WTI-324]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2324 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 75fa9d91e0658c5f34f0af2298598d18ce2b3c72

Former-commit-id: 8c4a057a710dc2aafc2d243d7dc1bf60fe592e19

- -1
- +15
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingConfiguration.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfiguration.cs

10:00 am

Elmar Kleijn

More
5813e30
changed 3 files
1691, 1715 and 80 more

Integrated HydraRingDikeSection into HydraRingConfiguration Related to Issue [WTI-324]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2323 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 180fc2fb7cac7704465fce64efc4050156f4bad8

Former-commit-id: 7deea372b6eb18902af2b7533df1a6ee8aeb838b

- -15
- +17
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingConfiguration.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfiguration.cs
- -14
- +14
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingConfigurationTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfigurationTest.cs
- -5
- +5
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationIntegrationTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfigurationIntegrationTest.cs

8:59 am

Marten Janssen <marten.janssen@deltares.nl>

More
627807d
changed 4 files
1691, 1715 and 80 more

- Added tests - Fixed leak Related to Issue [WTI-245]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2322 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: b738a149221526146c2817b6abe2afcff3a3c201

Former-commit-id: f59c4cb21cf67afe9bea44e7eeea5c70ed066743

- -2
- +8
/Core/Components/src/Core.Components.DotSpatial.Forms/BaseMap.cs
- History
- Source
- Diff
/Core/Components/.../BaseMap.cs
- -1
- +0
/Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj
- History
- Source
- Diff
/Core/.../Core.Components.DotSpatial.csproj
- -4
- +25
/Core/Components/src/Core.Components.DotSpatial/MapFunctionSelectionZoom.cs
- History
- Source
- Diff
/Core/.../MapFunctionSelectionZoom.cs
- -1
- +25
/Core/Components/test/Core.Components.DotSpatial.Forms.Test/BaseMapTest.cs
- History
- Source
- Diff
/Core/Components/.../BaseMapTest.cs

8:41 am

Elmar Kleijn

More
38333db
changed 4 files
1691, 1715 and 80 more

Extended HydraRingCalculationData with DikeSection property Related to Issue [WTI-324]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2321 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: a6f2f651ec4048cf313e160e3bc6447819e83040

Former-commit-id: 83796e3ab20f7c1e12e41e2834979684c8187247

- -0
- +5
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingCalculationData.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingCalculationData.cs
- -1
- +14
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/AssessmentLevelCalculationData.cs
- History
- Source
- Diff
/Ringtoets/.../AssessmentLevelCalculationData.cs
- -0
- +8
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingCalculationDataTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingCalculationDataTest.cs
- -0
- +8
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingConfigurationTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfigurationTest.cs

8:29 am

Elmar Kleijn

More
a86ee48
changed 4 files
1691, 1715 and 80 more

Added HydraRingDikeSection Related to Issue [WTI-324]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2320 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 757d8f3c9df51a09d790edf99e13ec01103cf5da

Former-commit-id: ce08db2e54795431fca8ce5416819991f35e58c1

- -0
- +161
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingDikeSection.cs
- History
- Source
/Ringtoets/HydraRing/.../HydraRingDikeSection.cs
- -0
- +1
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
- History
- Source
- Diff
/Ringtoets/.../Ringtoets.HydraRing.Calculation.csproj
- -0
- +47
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingDikeSectionTest.cs
- History
- Source
/Ringtoets/.../HydraRingDikeSectionTest.cs
- -0
- +1
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj
- History
- Source
- Diff
/Ringtoets/.../Ringtoets.HydraRing.Calculation.Test.csproj

7:34 am

Elmar Kleijn

More
a4dbbc9
changed 4 files
1691, 1715 and 80 more

Extended HydraRingConfiguration with SubMechanismModelId initialization logic Related to Issue [WTI-324]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2319 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: e6757de43bcbbf72477c3dab5148a28f3f03e06c

Former-commit-id: 7d01b1b4dd61dbf8e6bdc3b4382245d9b41ab649

- -0
- +10
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingCalculationData.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingCalculationData.cs
- -6
- +56
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingConfiguration.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfiguration.cs
- -0
- +25
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingCalculationDataTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingCalculationDataTest.cs
- -0
- +6
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingConfigurationTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfigurationTest.cs

8:39 pm

Elmar Kleijn

More
8693789
changed 2 files
1691, 1715 and 80 more

Added integration test for HydraRingConfiguration with AssessmentLevelCalculationData Related to Issue [WTI-324]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2318 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 9e510cddc4de685f52c10c820c9f97f7bcfa1c45

Former-commit-id: 28de1d062d5ea7f826d55188c4ead66f564acda5

- -0
- +95
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationIntegrationTest.cs
- History
- Source
/Ringtoets/.../HydraRingConfigurationIntegrationTest.cs
- -0
- +1
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj
- History
- Source
- Diff
/Ringtoets/.../Ringtoets.HydraRing.Calculation.Test.csproj

8:22 pm

Elmar Kleijn

More
93bafb8
changed 2 files
1691, 1715 and 80 more

Extended HydraRingConfiguration with SectionFaultTreeModels initialization Related to Issue [WTI-324]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2317 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: b08f44faf50f46a8b4eda1a04136860e9d022aca

Former-commit-id: a14526c6723720668e4fda87b862a528ebfe23a7

- -1
- +28
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingConfiguration.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfiguration.cs
- -0
- +1
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingConfigurationTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfigurationTest.cs

8:18 pm

Elmar Kleijn

More
315c97c
changed 4 files
1691, 1715 and 80 more

Extended FailureMechanismSettings with FaultTreeModelId Related to Issue [WTI-324]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2316 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: f0302b04cd9159d6e2059dade9010e30dc0000f2

Former-commit-id: 2fb0c3c7fb5c300482050414b1bfd43bef1e7d21

- -1
- +17
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/FailureMechanismSettings.cs
- History
- Source
- Diff
/Ringtoets/.../FailureMechanismSettings.cs
- -10
- +10
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/FailureMechanismSettingsProvider.cs
- History
- Source
- Diff
/Ringtoets/.../FailureMechanismSettingsProvider.cs
- -11
- +12
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Settings/FailureMechanismSettingsProviderTest.cs
- History
- Source
- Diff
/Ringtoets/.../FailureMechanismSettingsProviderTest.cs
- -1
- +2
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Settings/FailureMechanismSettingsTest.cs
- History
- Source
- Diff
/Ringtoets/.../FailureMechanismSettingsTest.cs

5:14 pm

rodriqu_dd <rodriqu_dd@example.com>

More
7f7c1f6
changed 2 files
1691, 1715 and 80 more

Corrected small typo in error message characteristic point import. Related to Issue [WTI-380]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2315 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 26fb7c8bc8e9ef2801ef210fb6de3b3da9bcbb3b

Former-commit-id: b804ddddd7b6315bd66a0b9819637cb465e23c90

- -2
- +2
/Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs
- History
- Source
- Diff
/Ringtoets/Piping/.../Resources.Designer.cs
- -1
- +1
/Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx
- History
- Source
- Diff
/Ringtoets/Piping/.../Resources.resx

5:06 pm

Joël van den Berg

More
d4dfa2c
changed 11 files
1691, 1715 and 80 more

Made AssessmentSection required for PipingInputContext (by removing the constructor not requiring the parameter). Added AssessmentSection to the PipingContext. Removed AssessmentSection from inheritors of PipingContext.

Related to Issue [WTI-156]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2314 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 4d73239c8f67292ba0943f03c62140cee6668bb5

Former-commit-id: cb02056eeb8dd3c3793c0df668b57ca1664b9699

- -13
- +1
/Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationContext.cs
- History
- Source
- Diff
/Ringtoets/.../PipingCalculationContext.cs
- -14
- +1
/Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationGroupContext.cs
- History
- Source
- Diff
/Ringtoets/.../PipingCalculationGroupContext.cs
- -4
- +18
/Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingContext.cs
- History
- Source
- Diff
/Ringtoets/Piping/.../PipingContext.cs
- -18
- +2
/Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingInputContext.cs
- History
- Source
- Diff
/Ringtoets/Piping/.../PipingInputContext.cs
- -1
- +4
/Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationContextTest.cs
- History
- Source
- Diff
/Ringtoets/.../PipingCalculationContextTest.cs
- -19
- +84
/Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingContextTest.cs
- History
- Source
- Diff
/Ringtoets/Piping/.../PipingContextTest.cs
- -2
- +5
/Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs
- History
- Source
- Diff
/Ringtoets/.../PipingInputContextTreeNodeInfoTest.cs
- -7
- +10
/Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs
- History
- Source
- Diff
/Ringtoets/.../LognormalDistributionDesignVariableTypeConverterTest.cs
- -8
- +10
/Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs
- History
- Source
- Diff
/Ringtoets/.../NormalDistributionDesignVariableTypeConverterTest.cs
- -10
- +17
/Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSoilProfileSelectionEditorTest.cs
- History
- Source
- Diff
/Ringtoets/.../PipingInputContextSoilProfileSelectionEditorTest.cs
- -10
- +17
/Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs
- History
- Source
- Diff
/Ringtoets/.../PipingInputContextSurfaceLineSelectionEditorTest.cs

5:05 pm

Elmar Kleijn

More
f5377f1
changed 2 files
1691, 1715 and 80 more

Extended HydraRingConfiguration for unsupported stuff Related to Issue [WTI-324]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2313 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 122e51c8c793536f2aebde33efaa78aca6135094

Former-commit-id: e9226785d3ce9d7168b4621d1d480ace06368546

- -2
- +80
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingConfiguration.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfiguration.cs
- -0
- +26
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingConfigurationTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfigurationTest.cs

4:42 pm

Elmar Kleijn

More
2a50881
changed 2 files
1691, 1715 and 80 more

Made HydraRingConfigurationTest more general (no longer test for AssessmentLevelCalculationData) Related to Issue [WTI-324]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2312 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: be91f3f220d0b045b4a1c266ffd4161c6b1eca4b

Former-commit-id: 6f9bea6259bef96bdc48a468266f1c260d81826f

- -1
- +1
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingConfiguration.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfiguration.cs
- -3
- +73
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingConfigurationTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfigurationTest.cs

4:24 pm

Marten Janssen <marten.janssen@deltares.nl>

More
db3aa61
changed 11 files
1691, 1715 and 80 more

- Added Pan and zoom to selection Related to Issue [WTI-245]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2311 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 03f73616d8c54758d59adb8048abf0954820640e

Former-commit-id: 79a7c1bf5b26a1706af4447036c8bafa264263e4

- -1
- +35
/Core/Components/src/Core.Components.DotSpatial.Forms/BaseMap.cs
- History
- Source
- Diff
/Core/Components/.../BaseMap.cs
- -0
- +3
/Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj
- History
- Source
- Diff
/Core/.../Core.Components.DotSpatial.csproj
- -0
- +135
/Core/Components/src/Core.Components.DotSpatial/MapFunctionSelectionZoom.cs
- History
- Source
/Core/Components/.../MapFunctionSelectionZoom.cs
- -0
- +20
/Core/Components/src/Core.Components.Gis/IMap.cs
- History
- Source
- Diff
/Core/Components/.../IMap.cs
- -1
- +37
/Core/Components/test/Core.Components.DotSpatial.Forms.Test/BaseMapTest.cs
- History
- Source
- Diff
/Core/Components/.../BaseMapTest.cs
- -0
- +3
/Core/Components/test/Core.Components.DotSpatial.Forms.Test/Core.Components.DotSpatial.Forms.Test.csproj
- History
- Source
- Diff
/Core/.../Core.Components.DotSpatial.Forms.Test.csproj
- -0
- +9
/Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj
- History
- Source
- Diff
/Core/.../Core.Components.DotSpatial.Test.csproj
- -0
- +45
/Core/Components/test/Core.Components.DotSpatial.Test/MapFunctionSelectionZoomTest.cs
- History
- Source
/Core/.../MapFunctionSelectionZoomTest.cs
- -0
- +1
/Core/Components/test/Core.Components.DotSpatial.Test/packages.config
- History
- Source
- Diff
/Core/Components/.../packages.config
- -0
- +2
/Core/Plugins/src/Core.Plugins.DotSpatial/MapRibbon.xaml
- History
- Source
- Diff
/Core/Plugins/.../MapRibbon.xaml
- -0
- +14
/Core/Plugins/src/Core.Plugins.DotSpatial/MapRibbon.xaml.cs
- History
- Source
- Diff
/Core/Plugins/.../MapRibbon.xaml.cs

4:16 pm

Joël van den Berg

More
e0368fd
changed 4 files
1691, 1715 and 80 more

Made assessmentSection a required parameter for construction PipingInputContext. Related to Issue [WTI-156]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2310 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 857e2b55288ff5640dcba354e18c457f0dc6d5ab

Former-commit-id: 2f82ddc35a44c1ad25a6c7b46c105b67c9a4cd03

- -1
- +20
/Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingInputContext.cs
- History
- Source
- Diff
/Ringtoets/Piping/.../PipingInputContext.cs
- -1
- +2
/Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
- History
- Source
- Diff
/Ringtoets/Piping/.../PipingGuiPlugin.cs
- -7
- +43
/Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs
- History
- Source
- Diff
/Ringtoets/.../PipingInputContextTest.cs
- -8
- +55
/Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs
- History
- Source
- Diff
/Ringtoets/.../PipingInputContextPropertiesTest.cs

4:02 pm

Elmar Kleijn

More
6241d8b
changed 8 files
1691, 1715 and 80 more

Added CalculationProfiles configuration logic to HydraRingConfiguration Related to Issue [WTI-324]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2309 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 5a676bbb8e9f62499617b320ae4a43417e126e51

Former-commit-id: efcc629ca59a61f418ddc0ad3970aa8aa1c63734

- -0
- +11
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingCalculationData.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingCalculationData.cs
- -0
- +38
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingConfiguration.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfiguration.cs
- -0
- +55
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingProfilePoint.cs
- History
- Source
/Ringtoets/HydraRing/.../HydraRingProfilePoint.cs
- -0
- +1
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
- History
- Source
- Diff
/Ringtoets/.../Ringtoets.HydraRing.Calculation.csproj
- -2
- +2
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingCalculationDataTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingCalculationDataTest.cs
- -0
- +2
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingConfigurationTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfigurationTest.cs
- -0
- +42
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingProfilePointTest.cs
- History
- Source
/Ringtoets/.../HydraRingProfilePointTest.cs
- -0
- +1
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj
- History
- Source
- Diff
/Ringtoets/.../Ringtoets.HydraRing.Calculation.Test.csproj

3:07 pm

Elmar Kleijn

More
2c6b533
changed 5 files
1691, 1715 and 80 more

Improved test coverage Related to Issue [WTI-324]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2308 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: da037b6ddb19bd736ecaf28e645bdfecbbd462ab

Former-commit-id: 5688e159926a8ff4082913a0adbd0026934a3023

- -2
- +2
/Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingConfiguration.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfiguration.cs
- -0
- +58
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingCalculationDataTest.cs
- History
- Source
/Ringtoets/.../HydraRingCalculationDataTest.cs
- -1
- +1
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingConfigurationTest.cs
- History
- Source
- Diff
/Ringtoets/.../HydraRingConfigurationTest.cs
- -0
- +53
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingVariableTest.cs
- History
- Source
/Ringtoets/HydraRing/.../HydraRingVariableTest.cs
- -0
- +2
/Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj
- History
- Source
- Diff
/Ringtoets/.../Ringtoets.HydraRing.Calculation.Test.csproj

3:02 pm

bouvrie <bouvrie@example.com>

More
76ace40
changed 21 files
1691, 1715 and 80 more

* Removed 'SectionDivisions' placeholders from FailureMechanisms * Introduced FailureMechanismSectionsContext. * FailureMechanismSectionsContext is used as child tree-node-info of FailureMechanismContexts. Related to Issue [WTI-365]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/trunk@2307 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: b568c94e9d0c8b445e28930b56b49c135ac1bbda

Former-commit-id: 5b9837fa4e11dd1f1aea4a723820c3e275828c11