Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/DataTypes/SerializableMeasure.cs
===================================================================
diff -u -rd25cb785f385ccf9a25b57aeeaf741a2c78ef356 -rec3e6faff771d9393cea5c46d82db1ad607452be
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/DataTypes/SerializableMeasure.cs (.../SerializableMeasure.cs) (revision d25cb785f385ccf9a25b57aeeaf741a2c78ef356)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/DataTypes/SerializableMeasure.cs (.../SerializableMeasure.cs) (revision ec3e6faff771d9393cea5c46d82db1ad607452be)
@@ -19,8 +19,8 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
-using System;
using System.Xml.Serialization;
+using Ringtoets.AssemblyTool.IO.Properties;
namespace Ringtoets.AssemblyTool.IO.Model.DataTypes
{
@@ -35,21 +35,15 @@
public SerializableMeasure()
{
Value = double.NaN;
+ UnitOfMeasure = Resources.SerializableMeasure_Meter;
}
///
/// Creates a new instance of .
///
- /// The unit of measure.
- /// The value of the measure.
- public SerializableMeasure(string unitOfMeasure, double value)
+ /// The value of the measure in meters.
+ public SerializableMeasure(double value) : this()
{
- if (unitOfMeasure == null)
- {
- throw new ArgumentNullException(nameof(unitOfMeasure));
- }
-
- UnitOfMeasure = unitOfMeasure;
Value = value;
}
@@ -61,6 +55,7 @@
///
/// Gets or sets the value of the measure.
+ /// [m]
///
[XmlText]
public double Value { get; set; }
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableAssessmentSection.cs
===================================================================
diff -u -r1b1e58033efcfa5b93c0a2cd442e7c37d5ae91ab -rec3e6faff771d9393cea5c46d82db1ad607452be
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableAssessmentSection.cs (.../SerializableAssessmentSection.cs) (revision 1b1e58033efcfa5b93c0a2cd442e7c37d5ae91ab)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableAssessmentSection.cs (.../SerializableAssessmentSection.cs) (revision ec3e6faff771d9393cea5c46d82db1ad607452be)
@@ -70,7 +70,7 @@
Id = id;
Name = name;
- SurfaceLineLength = new SerializableMeasure("m", Math2D.Length(geometry));
+ SurfaceLineLength = new SerializableMeasure(Math2D.Length(geometry));
SurfaceLineGeometry = new SerializableLine(geometry);
}
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableFailureMechanismSection.cs
===================================================================
diff -u -r2b79eaf2cbbdff4211eade27fde9febe76029d29 -rec3e6faff771d9393cea5c46d82db1ad607452be
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableFailureMechanismSection.cs (.../SerializableFailureMechanismSection.cs) (revision 2b79eaf2cbbdff4211eade27fde9febe76029d29)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableFailureMechanismSection.cs (.../SerializableFailureMechanismSection.cs) (revision ec3e6faff771d9393cea5c46d82db1ad607452be)
@@ -75,11 +75,11 @@
}
Id = id;
- StartDistance = new SerializableMeasure("m", startDistance);
- EndDistance = new SerializableMeasure("m", endDistance);
+ StartDistance = new SerializableMeasure(startDistance);
+ EndDistance = new SerializableMeasure(endDistance);
FailureMechanismSectionCollectionId = failureMechanismSectionCollection.Id;
Geometry = new SerializableLine(geometry);
- Length = new SerializableMeasure("m", Math2D.Length(geometry));
+ Length = new SerializableMeasure(Math2D.Length(geometry));
AssemblyMethod = assemblyMethod;
FailureMechanismSectionType = sectionType;
}
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -rfb23c7e9b2fde4f4439e758e56ae5ed957385a71 -rec3e6faff771d9393cea5c46d82db1ad607452be
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision fb23c7e9b2fde4f4439e758e56ae5ed957385a71)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision ec3e6faff771d9393cea5c46d82db1ad607452be)
@@ -109,6 +109,15 @@
}
///
+ /// Looks up a localized string similar to m.
+ ///
+ internal static string SerializableMeasure_Meter {
+ get {
+ return ResourceManager.GetString("SerializableMeasure_Meter", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to EPSG:28992.
///
internal static string SrsName {
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Properties/Resources.resx
===================================================================
diff -u -rfb23c7e9b2fde4f4439e758e56ae5ed957385a71 -rec3e6faff771d9393cea5c46d82db1ad607452be
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Properties/Resources.resx (.../Resources.resx) (revision fb23c7e9b2fde4f4439e758e56ae5ed957385a71)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Properties/Resources.resx (.../Resources.resx) (revision ec3e6faff771d9393cea5c46d82db1ad607452be)
@@ -126,6 +126,9 @@
VOLLDG
+
+ m
+
EPSG:28992
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/DataTypes/SerializableMeasureTest.cs
===================================================================
diff -u -r7a9324ff54b5ca989a0c5a535c3f45dec74417bb -rec3e6faff771d9393cea5c46d82db1ad607452be
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/DataTypes/SerializableMeasureTest.cs (.../SerializableMeasureTest.cs) (revision 7a9324ff54b5ca989a0c5a535c3f45dec74417bb)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/DataTypes/SerializableMeasureTest.cs (.../SerializableMeasureTest.cs) (revision ec3e6faff771d9393cea5c46d82db1ad607452be)
@@ -40,7 +40,7 @@
var measure = new SerializableMeasure();
// Assert
- Assert.IsNull(measure.UnitOfMeasure);
+ Assert.AreEqual("m", measure.UnitOfMeasure);
Assert.IsNaN(measure.Value);
SerializableAttributeTestHelper.AssertXmlAttributeAttribute(
@@ -52,28 +52,16 @@
}
[Test]
- public void Constructor_UnitOfMeasureNull_ThrowsArgumentNullException()
- {
- // Call
- TestDelegate call = () => new SerializableMeasure(null, new Random(39).NextDouble());
-
- // Assert
- var exception = Assert.Throws(call);
- Assert.AreEqual("unitOfMeasure", exception.ParamName);
- }
-
- [Test]
public void Constructor_WithValidData_ReturnsExpectedValues()
{
// Setup
- const string unit = "absolute";
double value = new Random(39).NextDouble();
// Call
- var measure = new SerializableMeasure(unit, value);
+ var measure = new SerializableMeasure(value);
// Assert
- Assert.AreEqual(unit, measure.UnitOfMeasure);
+ Assert.AreEqual("m", measure.UnitOfMeasure);
Assert.AreEqual(value, measure.Value);
}
}
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssessmentSectionTest.cs
===================================================================
diff -u -re17ab48b3abda85cd6d9cb33e6a9f507e70fdff3 -rec3e6faff771d9393cea5c46d82db1ad607452be
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssessmentSectionTest.cs (.../SerializableAssessmentSectionTest.cs) (revision e17ab48b3abda85cd6d9cb33e6a9f507e70fdff3)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssessmentSectionTest.cs (.../SerializableAssessmentSectionTest.cs) (revision ec3e6faff771d9393cea5c46d82db1ad607452be)
@@ -119,7 +119,6 @@
// Assert
Assert.AreEqual(id, assessmentSection.Id);
Assert.AreEqual(name, assessmentSection.Name);
- Assert.AreEqual("m", assessmentSection.SurfaceLineLength.UnitOfMeasure);
Assert.AreEqual(Math2D.Length(geometry), assessmentSection.SurfaceLineLength.Value);
Assert.IsNotNull(assessmentSection.SurfaceLineGeometry);
}
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionTest.cs
===================================================================
diff -u -r2b79eaf2cbbdff4211eade27fde9febe76029d29 -rec3e6faff771d9393cea5c46d82db1ad607452be
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionTest.cs (.../SerializableFailureMechanismSectionTest.cs) (revision 2b79eaf2cbbdff4211eade27fde9febe76029d29)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionTest.cs (.../SerializableFailureMechanismSectionTest.cs) (revision ec3e6faff771d9393cea5c46d82db1ad607452be)
@@ -157,12 +157,9 @@
// Assert
Assert.AreEqual(id, section.Id);
Assert.AreEqual(sectionCollection.Id, section.FailureMechanismSectionCollectionId);
- Assert.AreEqual("m", section.StartDistance.UnitOfMeasure);
Assert.AreEqual(startDistance, section.StartDistance.Value);
- Assert.AreEqual("m", section.EndDistance.UnitOfMeasure);
Assert.AreEqual(endDistance, section.EndDistance.Value);
Assert.AreEqual(GeometrySerializationFormatter.Format(geometry), section.Geometry.LineString.Geometry);
- Assert.AreEqual("m", section.Length.UnitOfMeasure);
Assert.AreEqual(Math2D.Length(geometry), section.Length.Value);
Assert.AreEqual(assemblyMethod, section.AssemblyMethod);
Assert.AreEqual(sectionType, section.FailureMechanismSectionType);