Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -r9afb8f9faf41762edfb9027f82aafb6e51f81a4f --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9afb8f9faf41762edfb9027f82aafb6e51f81a4f) @@ -22,7 +22,6 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -100,7 +99,7 @@ } /// - /// Looks up a localized string similar to 0.#. + /// Looks up a localized string similar to 0. /// public static string DuneLocation_Offset_format { get { Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/Properties/Resources.resx =================================================================== diff -u -r01753e10d8917693a8674de1c68600cfd9abee31 -r9afb8f9faf41762edfb9027f82aafb6e51f81a4f --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/Properties/Resources.resx (.../Resources.resx) (revision 01753e10d8917693a8674de1c68600cfd9abee31) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/Properties/Resources.resx (.../Resources.resx) (revision 9afb8f9faf41762edfb9027f82aafb6e51f81a4f) @@ -124,6 +124,6 @@ Duinafslag - 0.# + 0 \ No newline at end of file Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -r9afb8f9faf41762edfb9027f82aafb6e51f81a4f --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9afb8f9faf41762edfb9027f82aafb6e51f81a4f) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares and State of the Netherlands 2026. All rights reserved. +// Copyright (C) Stichting Deltares and State of the Netherlands 2026. All rights reserved. // // This file is part of Riskeer. // @@ -22,7 +22,6 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -118,7 +117,7 @@ } /// - /// Looks up a localized string similar to Metrering [dam]. + /// Looks up a localized string similar to Metrering [m]. /// internal static string DuneLocation_Offset_DisplayName { get { Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Properties/Resources.resx =================================================================== diff -u -r2ce637b58614738685f008a8a96651c7dee9a770 -r9afb8f9faf41762edfb9027f82aafb6e51f81a4f --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Properties/Resources.resx (.../Resources.resx) (revision 2ce637b58614738685f008a8a96651c7dee9a770) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Properties/Resources.resx (.../Resources.resx) (revision 9afb8f9faf41762edfb9027f82aafb6e51f81a4f) @@ -130,7 +130,7 @@ Metrering van de locatie binnen het kustvak waar het onderdeel van uitmaakt. - Metrering [dam] + Metrering [m] Berekende rekenwaarde voor de waterstand voor het uitvoeren van een sterkteberekening voor het faalmechanisme Duinafslag. Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneLocationCalculationProperties.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -r9afb8f9faf41762edfb9027f82aafb6e51f81a4f --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneLocationCalculationProperties.cs (.../DuneLocationCalculationProperties.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneLocationCalculationProperties.cs (.../DuneLocationCalculationProperties.cs) (revision 9afb8f9faf41762edfb9027f82aafb6e51f81a4f) @@ -108,7 +108,8 @@ { get { - return data.DuneLocation.Offset + RoundedDouble offsetInMeters = data.DuneLocation.Offset * 10; + return offsetInMeters .ToString(DuneErosionDataResources.DuneLocation_Offset_format, CultureInfo.InvariantCulture); } Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationRow.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -r9afb8f9faf41762edfb9027f82aafb6e51f81a4f --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationRow.cs (.../DuneLocationCalculationRow.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationRow.cs (.../DuneLocationCalculationRow.cs) (revision 9afb8f9faf41762edfb9027f82aafb6e51f81a4f) @@ -94,7 +94,8 @@ { get { - return CalculatableObject.DuneLocation.Offset.ToString(DuneErosionDataResources.DuneLocation_Offset_format, CultureInfo.InvariantCulture); + RoundedDouble offsetInMeters = CalculatableObject.DuneLocation.Offset * 10; + return offsetInMeters.ToString(DuneErosionDataResources.DuneLocation_Offset_format, CultureInfo.InvariantCulture); } } Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneLocationCalculationPropertiesTest.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -r9afb8f9faf41762edfb9027f82aafb6e51f81a4f --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneLocationCalculationPropertiesTest.cs (.../DuneLocationCalculationPropertiesTest.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneLocationCalculationPropertiesTest.cs (.../DuneLocationCalculationPropertiesTest.cs) (revision 9afb8f9faf41762edfb9027f82aafb6e51f81a4f) @@ -22,6 +22,7 @@ using System; using System.ComponentModel; using System.Globalization; +using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; using Core.Common.Util.Enums; @@ -126,7 +127,7 @@ Assert.AreEqual(duneLocation.Id, properties.Id); Assert.AreEqual(duneLocation.Name, properties.Name); Assert.AreEqual(duneLocation.CoastalAreaId, properties.CoastalAreaId); - Assert.AreEqual(duneLocation.Offset.ToString("0.#", CultureInfo.InvariantCulture), properties.Offset); + Assert.AreEqual(duneLocation.Offset.ToString("0", CultureInfo.InvariantCulture), properties.Offset); Assert.AreEqual(duneLocation.Location, properties.Location); Assert.AreEqual(hrdFileName, properties.HRDFileName); @@ -244,10 +245,12 @@ var properties = new DuneLocationCalculationProperties(duneLocationCalculation, assessmentSection); // Assert + RoundedDouble expectedOffsetInMeters = duneLocation.Offset * 10; + Assert.AreEqual(id, properties.Id); Assert.AreEqual(name, properties.Name); Assert.AreEqual(coastalAreaId, properties.CoastalAreaId); - Assert.AreEqual(duneLocation.Offset.ToString("0.#", CultureInfo.InvariantCulture), properties.Offset); + Assert.AreEqual(expectedOffsetInMeters.ToString("0", CultureInfo.InvariantCulture), properties.Offset); Assert.AreEqual(hrdFileName, properties.HRDFileName); var expectedLocation = new Point2D(x, y); Assert.AreEqual(expectedLocation, properties.Location); @@ -314,7 +317,7 @@ PropertyDescriptor offsetProperty = dynamicProperties[requiredOffSetPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(offsetProperty, "Algemeen", - "Metrering [dam]", + "Metrering [m]", "Metrering van de locatie binnen het kustvak waar het onderdeel van uitmaakt.", true); @@ -413,9 +416,9 @@ } [Test] - [TestCase(3.0, "3")] - [TestCase(3.1, "3.1")] - public void Offset_Always_FormatToString(double offset, string expectedPropertyValue) + [TestCase(3.0, "30")] + [TestCase(3.1, "31")] + public void Offset_Always_ConvertToMetersAndFormatToString(double offset, string expectedPropertyValue) { // Setup var mocks = new MockRepository(); Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationRowTest.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -r9afb8f9faf41762edfb9027f82aafb6e51f81a4f --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationRowTest.cs (.../DuneLocationCalculationRowTest.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationRowTest.cs (.../DuneLocationCalculationRowTest.cs) (revision 9afb8f9faf41762edfb9027f82aafb6e51f81a4f) @@ -20,6 +20,7 @@ // All rights reserved. using System.Globalization; +using Core.Common.Base.Data; using Core.Common.TestUtil; using NUnit.Framework; using Riskeer.Common.Data.Hydraulics; @@ -65,13 +66,15 @@ var row = new DuneLocationCalculationRow(duneLocationCalculation, fileName); // Assert + RoundedDouble expectedOffsetInMeters = duneLocation.Offset * 10; + Assert.IsInstanceOf>(row); Assert.AreSame(duneLocationCalculation, row.CalculatableObject); Assert.AreEqual(duneLocation.Id, row.Id); Assert.AreEqual(duneLocation.Name, row.Name); Assert.AreEqual(fileName, row.HydraulicBoundaryDatabaseFileName); Assert.AreEqual(duneLocation.CoastalAreaId, row.CoastalAreaId); - Assert.AreEqual(duneLocation.Offset.ToString("0.#", CultureInfo.InvariantCulture), row.Offset); + Assert.AreEqual(expectedOffsetInMeters.ToString("0", CultureInfo.InvariantCulture), row.Offset); Assert.AreEqual(duneLocationCalculation.Output.WaterLevel, row.WaterLevel); Assert.AreEqual(duneLocationCalculation.Output.WaveHeight, row.WaveHeight); Assert.AreEqual(duneLocationCalculation.Output.WavePeriod, row.WavePeriod);