Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Factories/CombinedSectionAssemblyMapDataFactory.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Factories/CombinedSectionAssemblyMapDataFactory.cs (revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Factories/CombinedSectionAssemblyMapDataFactory.cs (revision e33fc3dff99fa6f89bebc2755fe174b891440498)
@@ -0,0 +1,50 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Core.Components.Gis.Data;
+using Core.Components.Gis.Style;
+
+namespace Ringtoets.Integration.Forms.Factories
+{
+ ///
+ /// Factory for creating for combined section assembly results.
+ ///
+ public static class CombinedSectionAssemblyMapDataFactory
+ {
+ ///
+ /// Creates a with default styling for a combined section assembly.
+ ///
+ /// The created .
+ public static MapLineData CreateCombinedSectionAssemblyResultMapData()
+ {
+ return new MapLineData("Gecombineerd vakoordeel",
+ new LineStyle
+ {
+ Width = 6,
+ DashStyle = LineDashStyle.Solid
+ })
+ {
+ IsVisible = true,
+ SelectedMetaDataAttribute = "Vaknummer"
+ };
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj
===================================================================
diff -u -r58f11f214e2faa310cf964e68cd1778673fb4b63 -re33fc3dff99fa6f89bebc2755fe174b891440498
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (.../Ringtoets.Integration.Forms.csproj) (revision 58f11f214e2faa310cf964e68cd1778673fb4b63)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (.../Ringtoets.Integration.Forms.csproj) (revision e33fc3dff99fa6f89bebc2755fe174b891440498)
@@ -20,6 +20,7 @@
+
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultPerSectionMapView.cs
===================================================================
diff -u -r2794e5d3080e926d032d890062523aa7f33bdb5d -re33fc3dff99fa6f89bebc2755fe174b891440498
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultPerSectionMapView.cs (.../AssemblyResultPerSectionMapView.cs) (revision 2794e5d3080e926d032d890062523aa7f33bdb5d)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultPerSectionMapView.cs (.../AssemblyResultPerSectionMapView.cs) (revision e33fc3dff99fa6f89bebc2755fe174b891440498)
@@ -29,6 +29,7 @@
using Ringtoets.Common.Forms.Factories;
using Ringtoets.Common.Forms.Helpers;
using Ringtoets.Integration.Data;
+using Ringtoets.Integration.Forms.Factories;
namespace Ringtoets.Integration.Forms.Views
{
@@ -73,12 +74,7 @@
CreateObservers();
var mapDataCollection = new MapDataCollection("Assemblagekaart");
- assemblyResultLineData = new MapLineData("Gecombineerd vakoordeel",
- new LineStyle
- {
- Width = 6,
- DashStyle = LineDashStyle.Solid
- });
+ assemblyResultLineData = CombinedSectionAssemblyMapDataFactory.CreateCombinedSectionAssemblyResultMapData();
referenceLineMapData = RingtoetsMapDataFactory.CreateReferenceLineMapData();
hydraulicBoundaryLocationsMapData = RingtoetsMapDataFactory.CreateHydraulicBoundaryLocationsMapData();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Factories/CombinedSectionAssemblyMapDataFactoryTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Factories/CombinedSectionAssemblyMapDataFactoryTest.cs (revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Factories/CombinedSectionAssemblyMapDataFactoryTest.cs (revision e33fc3dff99fa6f89bebc2755fe174b891440498)
@@ -0,0 +1,53 @@
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Drawing;
+using Core.Components.Gis.Data;
+using Core.Components.Gis.Style;
+using NUnit.Framework;
+using Ringtoets.Integration.Forms.Factories;
+
+namespace Ringtoets.Integration.Forms.Test.Factories
+{
+ [TestFixture]
+ public class CombinedSectionAssemblyMapDataFactoryTest
+ {
+ [Test]
+ public void CreateCombinedSectionAssemblyResultMapData_ReturnsEmptyMapLineDataWithExpectedStyling()
+ {
+ // Call
+ MapLineData data = CombinedSectionAssemblyMapDataFactory.CreateCombinedSectionAssemblyResultMapData();
+
+ // Assert
+ Assert.AreEqual("Gecombineerd vakoordeel", data.Name);
+
+ Assert.IsTrue(data.IsVisible);
+ CollectionAssert.IsEmpty(data.Features);
+
+ LineStyle lineStyle = data.Style;
+ Assert.AreEqual(Color.Empty, lineStyle.Color);
+ Assert.AreEqual(6, lineStyle.Width);
+ Assert.AreEqual(LineDashStyle.Solid, lineStyle.DashStyle);
+
+ Assert.AreEqual("Vaknummer", data.SelectedMetaDataAttribute);
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -r58f11f214e2faa310cf964e68cd1778673fb4b63 -re33fc3dff99fa6f89bebc2755fe174b891440498
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj (.../Ringtoets.Integration.Forms.Test.csproj) (revision 58f11f214e2faa310cf964e68cd1778673fb4b63)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj (.../Ringtoets.Integration.Forms.Test.csproj) (revision e33fc3dff99fa6f89bebc2755fe174b891440498)
@@ -33,6 +33,7 @@
+