Index: Core/Common/src/Core.Common.Base/Geometry/Point2D.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Core/Common/src/Core.Common.Base/Geometry/Point2D.cs (.../Point2D.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/src/Core.Common.Base/Geometry/Point2D.cs (.../Point2D.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -45,6 +45,13 @@
}
///
+ /// Creates a new instance of , with and
+ /// taken from .
+ ///
+ /// The to take the properties from.
+ public Point2D(Point2D point) : this(point.X, point.Y) {}
+
+ ///
/// Gets or sets the x coordinate.
///
public double X { get; }
Index: Core/Common/src/Core.Common.Base/Geometry/Point3D.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Core/Common/src/Core.Common.Base/Geometry/Point3D.cs (.../Point3D.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/src/Core.Common.Base/Geometry/Point3D.cs (.../Point3D.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -42,6 +42,13 @@
}
///
+ /// Creates a new instance of , with ,
+ /// and taken from .
+ ///
+ /// The to take the properties from.
+ public Point3D(Point3D point) : this(point.X, point.Y, point.Z) {}
+
+ ///
/// Gets or sets the x coordinate.
///
public double X { get; }
Index: Core/Common/test/Core.Common.Base.Test/Geometry/Point2DTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Core/Common/test/Core.Common.Base.Test/Geometry/Point2DTest.cs (.../Point2DTest.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/test/Core.Common.Base.Test/Geometry/Point2DTest.cs (.../Point2DTest.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -48,6 +48,23 @@
}
[Test]
+ public void CopyConstructor_WithPointWithXandY_SetPropeties()
+ {
+ // Setup
+ var random = new Random(22);
+ double x = random.NextDouble();
+ double y = random.NextDouble();
+ var pointToCopy = new Point2D(x, y);
+
+ // Call
+ var point = new Point2D(pointToCopy);
+
+ // Assert
+ Assert.AreEqual(x, point.X);
+ Assert.AreEqual(y, point.Y);
+ }
+
+ [Test]
public void Equals_ToNull_ReturnsFalse()
{
// Setup
Index: Core/Common/test/Core.Common.Base.Test/Geometry/Point3DTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Core/Common/test/Core.Common.Base.Test/Geometry/Point3DTest.cs (.../Point3DTest.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Common/test/Core.Common.Base.Test/Geometry/Point3DTest.cs (.../Point3DTest.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -46,6 +46,24 @@
}
[Test]
+ public void CopyConstructor_WithPointWithXandY_SetPropeties()
+ {
+ // Setup
+ const double x = 1.1;
+ const double y = 2.2;
+ const double z = -1.1;
+ var pointToCopy = new Point3D(x, y, z);
+
+ // Call
+ var point = new Point3D(pointToCopy);
+
+ // Assert
+ Assert.AreEqual(x, point.X);
+ Assert.AreEqual(y, point.Y);
+ Assert.AreEqual(z, point.Z);
+ }
+
+ [Test]
public void Equals_ToNull_ReturnsFalse()
{
// Setup
Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs
===================================================================
diff -u -r638081278e33e132e3ffedd52fff0d6c00ab4728 -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 638081278e33e132e3ffedd52fff0d6c00ab4728)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -157,7 +157,7 @@
private static FailureMechanismSection DeepCloneSection(FailureMechanismSection section)
{
return new FailureMechanismSection(section.Name,
- section.Points.Select(p => new Point2D(p.X, p.Y)));
+ section.Points.Select(p => new Point2D(p)));
}
#region FailureMechanisms
Index: Ringtoets/Common/src/Ringtoets.Common.Data/DikeProfiles/ForeshoreProfile.cs
===================================================================
diff -u -r581725e1056b02305f9ec09bc8501882b23657bd -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/Common/src/Ringtoets.Common.Data/DikeProfiles/ForeshoreProfile.cs (.../ForeshoreProfile.cs) (revision 581725e1056b02305f9ec09bc8501882b23657bd)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/DikeProfiles/ForeshoreProfile.cs (.../ForeshoreProfile.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -150,7 +150,7 @@
BreakWater = fromForeshoreProfile.BreakWater != null
? new BreakWater(fromForeshoreProfile.BreakWater.Type, fromForeshoreProfile.BreakWater.Height)
: null;
- WorldReferencePoint = new Point2D(fromForeshoreProfile.WorldReferencePoint.X, fromForeshoreProfile.WorldReferencePoint.Y);
+ WorldReferencePoint = new Point2D(fromForeshoreProfile.WorldReferencePoint);
SetGeometry(fromForeshoreProfile.Geometry);
}
@@ -221,7 +221,7 @@
throw new ArgumentException(Resources.ForeshoreProfile_SetGeometry_A_point_in_the_collection_is_null);
}
- Geometry = new RoundedPoint2DCollection(2, foreshorePoints.Select(p => new Point2D(p.X, p.Y)));
+ Geometry = new RoundedPoint2DCollection(2, foreshorePoints.Select(p => new Point2D(p)));
}
private bool EqualGeometry(Point2D[] otherGeometry)
Index: Ringtoets/Common/src/Ringtoets.Common.Data/StructureBase.cs
===================================================================
diff -u -r922d8c8ebb07e20fb0fe567d65f7d2df2bd224c1 -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/Common/src/Ringtoets.Common.Data/StructureBase.cs (.../StructureBase.cs) (revision 922d8c8ebb07e20fb0fe567d65f7d2df2bd224c1)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/StructureBase.cs (.../StructureBase.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -132,7 +132,7 @@
}
Name = fromStructure.Name;
- Location = new Point2D(fromStructure.Location.X, fromStructure.Location.Y);
+ Location = new Point2D(fromStructure.Location);
StructureNormalOrientation = fromStructure.StructureNormalOrientation;
}
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs
===================================================================
diff -u -rd99f9c6b8fcf5bf289607f71958bcff47ebf9475 -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs (.../RingtoetsMapDataFeaturesFactory.cs) (revision d99f9c6b8fcf5bf289607f71958bcff47ebf9475)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs (.../RingtoetsMapDataFeaturesFactory.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -387,7 +387,7 @@
{
new MapGeometry(new[]
{
- section.Points.Select(p => new Point2D(p.X, p.Y))
+ section.Points.Select(p => new Point2D(p))
})
});
Index: Ringtoets/Common/src/Ringtoets.Common.IO/FailureMechanismSectionReader.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/Common/src/Ringtoets.Common.IO/FailureMechanismSectionReader.cs (.../FailureMechanismSectionReader.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/FailureMechanismSectionReader.cs (.../FailureMechanismSectionReader.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -158,7 +158,7 @@
throw CreateCriticalFileReadException(RingtoetsCommonIOResources.FailureMechanismSectionReader_File_has_unsupported_multiPolyline);
}
- return mapGeometries[0].PointCollections.First().Select(p => new Point2D(p.X, p.Y));
+ return mapGeometries[0].PointCollections.First().Select(p => new Point2D(p));
}
private CriticalFileReadException CreateCriticalFileReadException(string message)
Index: Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLineReader.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLineReader.cs (.../ReferenceLineReader.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLineReader.cs (.../ReferenceLineReader.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -121,7 +121,7 @@
}
MapGeometry referenceGeometry = referenceGeometries[0];
- referenceLine.SetGeometry(referenceGeometry.PointCollections.First().Select(t => new Point2D(t.X, t.Y)));
+ referenceLine.SetGeometry(referenceGeometry.PointCollections.First().Select(t => new Point2D(t)));
return referenceLine;
}
}
Index: Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLinesMetaReader.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLinesMetaReader.cs (.../ReferenceLinesMetaReader.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLines/ReferenceLinesMetaReader.cs (.../ReferenceLinesMetaReader.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -211,7 +211,7 @@
return Enumerable.Empty();
}
- return mapGeometries[0].PointCollections.First().Select(p => new Point2D(p.X, p.Y));
+ return mapGeometries[0].PointCollections.First().Select(p => new Point2D(p));
}
private static string GetAssessmentSectionId(MapFeature lineFeature)
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Factories/GrassCoverErosionInwardsMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -rf1f94637a6b45b394493bf16a078b317c02d329b -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Factories/GrassCoverErosionInwardsMapDataFeaturesFactoryTest.cs (.../GrassCoverErosionInwardsMapDataFeaturesFactoryTest.cs) (revision f1f94637a6b45b394493bf16a078b317c02d329b)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Factories/GrassCoverErosionInwardsMapDataFeaturesFactoryTest.cs (.../GrassCoverErosionInwardsMapDataFeaturesFactoryTest.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -93,7 +93,7 @@
private static void AssertEqualPointCollections(IEnumerable points, MapGeometry geometry)
{
- CollectionAssert.AreEqual(points.Select(p => new Point2D(p.X, p.Y)), geometry.PointCollections.First());
+ CollectionAssert.AreEqual(points.Select(p => new Point2D(p)), geometry.PointCollections.First());
}
}
}
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -rf1f94637a6b45b394493bf16a078b317c02d329b -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs (.../GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs) (revision f1f94637a6b45b394493bf16a078b317c02d329b)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs (.../GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -132,7 +132,7 @@
private static void AssertEqualPointCollections(IEnumerable points, MapGeometry geometry)
{
- CollectionAssert.AreEqual(points.Select(p => new Point2D(p.X, p.Y)), geometry.PointCollections.First());
+ CollectionAssert.AreEqual(points.Select(p => new Point2D(p)), geometry.PointCollections.First());
}
private static void AssertEqualFeatureCollections(Point2D[] points, MapFeature[] features)
Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/DataImportHelper.cs
===================================================================
diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/DataImportHelper.cs (.../DataImportHelper.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9)
+++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/DataImportHelper.cs (.../DataImportHelper.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -171,7 +171,7 @@
private static FailureMechanismSection DeepCloneSection(FailureMechanismSection section)
{
return new FailureMechanismSection(section.Name,
- section.Points.Select(p => new Point2D(p.X, p.Y)));
+ section.Points.Select(p => new Point2D(p)));
}
#region Piping Specific Imports
Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs
===================================================================
diff -u -red4b032b9903f394deb9691c2c39a9f2122ab0f5 -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision ed4b032b9903f394deb9691c2c39a9f2122ab0f5)
+++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -1016,7 +1016,7 @@
{
var duneLocation = new DuneLocation(hydraulicBoundaryLocation.Id,
hydraulicBoundaryLocation.Name,
- new Point2D(hydraulicBoundaryLocation.Location.X, hydraulicBoundaryLocation.Location.Y),
+ new Point2D(hydraulicBoundaryLocation.Location),
new DuneLocation.ConstructionProperties
{
CoastalAreaId = 7,
@@ -1027,7 +1027,7 @@
var duneLocationWithOutput = new DuneLocation(hydraulicBoundaryLocation.Id,
hydraulicBoundaryLocation.Name,
- new Point2D(hydraulicBoundaryLocation.Location.X, hydraulicBoundaryLocation.Location.Y),
+ new Point2D(hydraulicBoundaryLocation.Location),
new DuneLocation.ConstructionProperties
{
CoastalAreaId = 7,
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsMapDataFeaturesFactory.cs
===================================================================
diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsMapDataFeaturesFactory.cs (.../MacroStabilityInwardsMapDataFeaturesFactory.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsMapDataFeaturesFactory.cs (.../MacroStabilityInwardsMapDataFeaturesFactory.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -127,7 +127,7 @@
private static IEnumerable GetWorldPoints(StochasticSoilModel stochasticSoilModel)
{
- return stochasticSoilModel.Geometry.Select(p => new Point2D(p.X, p.Y));
+ return stochasticSoilModel.Geometry.Select(p => new Point2D(p));
}
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/RingtoetsMacroStabilityInwardsSurfaceLineTest.cs
===================================================================
diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/RingtoetsMacroStabilityInwardsSurfaceLineTest.cs (.../RingtoetsMacroStabilityInwardsSurfaceLineTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/RingtoetsMacroStabilityInwardsSurfaceLineTest.cs (.../RingtoetsMacroStabilityInwardsSurfaceLineTest.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -734,7 +734,7 @@
var points = new[]
{
new Point3D(random.NextDouble(), random.NextDouble(), random.NextDouble()),
- new Point3D(testPoint.X, testPoint.Y, testPoint.Z),
+ new Point3D(testPoint),
new Point3D(2 + random.NextDouble(), random.NextDouble(), random.NextDouble())
};
surfaceLine.SetGeometry(points);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsMapDataFeaturesFactoryTest.cs (.../MacroStabilityInwardsMapDataFeaturesFactoryTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsMapDataFeaturesFactoryTest.cs (.../MacroStabilityInwardsMapDataFeaturesFactoryTest.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -219,7 +219,7 @@
private static void AssertEqualPointCollections(IEnumerable points, MapGeometry geometry)
{
- CollectionAssert.AreEqual(points.Select(p => new Point2D(p.X, p.Y)), geometry.PointCollections.First());
+ CollectionAssert.AreEqual(points.Select(p => new Point2D(p)), geometry.PointCollections.First());
}
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs
===================================================================
diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs (.../MacroStabilityInwardsFailureMechanismViewTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs (.../MacroStabilityInwardsFailureMechanismViewTest.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -1024,7 +1024,7 @@
{
Assert.AreEqual(1, soilModelsFeatures[index].MapGeometries.Count());
StochasticSoilModel stochasticSoilModel = stochasticSoilModelsArray[index];
- CollectionAssert.AreEquivalent(stochasticSoilModel.Geometry.Select(p => new Point2D(p.X, p.Y)), soilModelsFeatures[index].MapGeometries.First().PointCollections.First());
+ CollectionAssert.AreEquivalent(stochasticSoilModel.Geometry.Select(p => new Point2D(p)), soilModelsFeatures[index].MapGeometries.First().PointCollections.First());
}
Assert.AreEqual("Stochastische ondergrondmodellen", mapData.Name);
}
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingMapDataFeaturesFactory.cs
===================================================================
diff -u -r12dbf9394aec78889af2c835f9d37237603e8af9 -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingMapDataFeaturesFactory.cs (.../PipingMapDataFeaturesFactory.cs) (revision 12dbf9394aec78889af2c835f9d37237603e8af9)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingMapDataFeaturesFactory.cs (.../PipingMapDataFeaturesFactory.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -127,7 +127,7 @@
private static IEnumerable GetWorldPoints(StochasticSoilModel stochasticSoilModel)
{
- return stochasticSoilModel.Geometry.Select(p => new Point2D(p.X, p.Y));
+ return stochasticSoilModel.Geometry.Select(p => new Point2D(p));
}
}
}
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Primitives/RingtoetsPipingSurfaceLine.cs
===================================================================
diff -u -r9d44bfb40ac6f92504318d5fffa2c82351d8f4bd -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/Piping/src/Ringtoets.Piping.Primitives/RingtoetsPipingSurfaceLine.cs (.../RingtoetsPipingSurfaceLine.cs) (revision 9d44bfb40ac6f92504318d5fffa2c82351d8f4bd)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Primitives/RingtoetsPipingSurfaceLine.cs (.../RingtoetsPipingSurfaceLine.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -132,7 +132,7 @@
{
throw new ArgumentException(Resources.RingtoetsPipingSurfaceLine_A_point_in_the_collection_was_null);
}
- Points = points.Select(p => new Point3D(p.X, p.Y, p.Z)).ToArray();
+ Points = points.Select(p => new Point3D(p)).ToArray();
if (Points.Length > 0)
{
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsPipingSurfaceLineTest.cs
===================================================================
diff -u -r616d3ed2e3262894d16948262fa1b223d2bc806e -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsPipingSurfaceLineTest.cs (.../RingtoetsPipingSurfaceLineTest.cs) (revision 616d3ed2e3262894d16948262fa1b223d2bc806e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsPipingSurfaceLineTest.cs (.../RingtoetsPipingSurfaceLineTest.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -1131,7 +1131,7 @@
var points = new[]
{
new Point3D(random.NextDouble(), random.NextDouble(), random.NextDouble()),
- new Point3D(testPoint.X, testPoint.Y, testPoint.Z),
+ new Point3D(testPoint),
new Point3D(2 + random.NextDouble(), random.NextDouble(), random.NextDouble())
};
surfaceLine.SetGeometry(points);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -rf1f94637a6b45b394493bf16a078b317c02d329b -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs (.../PipingMapDataFeaturesFactoryTest.cs) (revision f1f94637a6b45b394493bf16a078b317c02d329b)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs (.../PipingMapDataFeaturesFactoryTest.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -219,7 +219,7 @@
private static void AssertEqualPointCollections(IEnumerable points, MapGeometry geometry)
{
- CollectionAssert.AreEqual(points.Select(p => new Point2D(p.X, p.Y)), geometry.PointCollections.First());
+ CollectionAssert.AreEqual(points.Select(p => new Point2D(p)), geometry.PointCollections.First());
}
}
}
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs
===================================================================
diff -u -r69ba77aac3b14ca0060f5788121f36f5fd19c83f -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision 69ba77aac3b14ca0060f5788121f36f5fd19c83f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -1024,7 +1024,7 @@
{
Assert.AreEqual(1, soilModelsFeatures[index].MapGeometries.Count());
StochasticSoilModel stochasticSoilModel = stochasticSoilModelsArray[index];
- CollectionAssert.AreEquivalent(stochasticSoilModel.Geometry.Select(p => new Point2D(p.X, p.Y)), soilModelsFeatures[index].MapGeometries.First().PointCollections.First());
+ CollectionAssert.AreEquivalent(stochasticSoilModel.Geometry.Select(p => new Point2D(p)), soilModelsFeatures[index].MapGeometries.First().PointCollections.First());
}
Assert.AreEqual("Stochastische ondergrondmodellen", mapData.Name);
}
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Factories/WaveConditionsChartDataPointsFactoryTest.cs
===================================================================
diff -u -rb28507193a2799b3e4a4e5e447693e17e1e121b5 -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Factories/WaveConditionsChartDataPointsFactoryTest.cs (.../WaveConditionsChartDataPointsFactoryTest.cs) (revision b28507193a2799b3e4a4e5e447693e17e1e121b5)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Factories/WaveConditionsChartDataPointsFactoryTest.cs (.../WaveConditionsChartDataPointsFactoryTest.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -324,7 +324,7 @@
var expectedGeometry = new[]
{
- new Point2D(lastGeometryPoint.X, lastGeometryPoint.Y),
+ new Point2D(lastGeometryPoint),
new Point2D(deltaY / 3 + lastGeometryPoint.X, input.LowerBoundaryRevetment)
};
@@ -361,7 +361,7 @@
var expectedGeometry = new[]
{
new Point2D((lowerBoundaryWaterLevels - lastGeometryPoint.Y) / 3 + lastGeometryPoint.X, lowerBoundaryWaterLevels),
- new Point2D(lastGeometryPoint.X, lastGeometryPoint.Y),
+ new Point2D(lastGeometryPoint),
new Point2D((lowerBoundaryRevetment - lastGeometryPoint.Y) / 3 + lastGeometryPoint.X, lowerBoundaryRevetment)
};
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs
===================================================================
diff -u -r0e3838802bb93401ed6b70766299b8f8851b70c2 -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision 0e3838802bb93401ed6b70766299b8f8851b70c2)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -668,7 +668,7 @@
expectedGeometry.AddRange(new[]
{
- new Point2D(lastForeshorePoint.X, lastForeshorePoint.Y),
+ new Point2D(lastForeshorePoint),
new Point2D(GetPointX(lowerBoundaryRevetment, lastForeshorePoint), lowerBoundaryRevetment)
});
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Factories/StabilityStoneCoverMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -rf1f94637a6b45b394493bf16a078b317c02d329b -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Factories/StabilityStoneCoverMapDataFeaturesFactoryTest.cs (.../StabilityStoneCoverMapDataFeaturesFactoryTest.cs) (revision f1f94637a6b45b394493bf16a078b317c02d329b)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Factories/StabilityStoneCoverMapDataFeaturesFactoryTest.cs (.../StabilityStoneCoverMapDataFeaturesFactoryTest.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -93,7 +93,7 @@
private static void AssertEqualPointCollections(IEnumerable points, MapGeometry geometry)
{
- CollectionAssert.AreEqual(points.Select(p => new Point2D(p.X, p.Y)), geometry.PointCollections.First());
+ CollectionAssert.AreEqual(points.Select(p => new Point2D(p)), geometry.PointCollections.First());
}
}
}
\ No newline at end of file
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Factories/WaveImpactAsphaltCoverMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -rf1f94637a6b45b394493bf16a078b317c02d329b -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Factories/WaveImpactAsphaltCoverMapDataFeaturesFactoryTest.cs (.../WaveImpactAsphaltCoverMapDataFeaturesFactoryTest.cs) (revision f1f94637a6b45b394493bf16a078b317c02d329b)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Factories/WaveImpactAsphaltCoverMapDataFeaturesFactoryTest.cs (.../WaveImpactAsphaltCoverMapDataFeaturesFactoryTest.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7)
@@ -93,7 +93,7 @@
private static void AssertEqualPointCollections(IEnumerable points, MapGeometry geometry)
{
- CollectionAssert.AreEqual(points.Select(p => new Point2D(p.X, p.Y)), geometry.PointCollections.First());
+ CollectionAssert.AreEqual(points.Select(p => new Point2D(p)), geometry.PointCollections.First());
}
}
}
\ No newline at end of file