Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs =================================================================== diff -u -r30b12b82918d500fe834eafd9f6cd9b2c5dbe60f -r4d64cb92533df603783b2e1528944aad2889aef9 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs (.../AssessmentSectionView.cs) (revision 30b12b82918d500fe834eafd9f6cd9b2c5dbe60f) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs (.../AssessmentSectionView.cs) (revision 4d64cb92533df603783b2e1528944aad2889aef9) @@ -28,6 +28,7 @@ using Core.Components.Gis.Data; using Core.Components.Gis.Forms; using Ringtoets.Common.Data; +using Ringtoets.HydraRing.Data; using Ringtoets.Integration.Forms.Properties; using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; @@ -92,39 +93,31 @@ { var mapDataList = new List(); - if (HasReferenceLinePoints()) + if (data != null) { mapDataList.Add(GetReferenceLineData()); - } - - if (HasHydraulicBoundaryLocations()) - { mapDataList.Add(GetHydraulicBoundaryLocations()); } - + mapControl.Data = new MapDataCollection(mapDataList, Resources.AssessmentSectionMap_DisplayName); } private MapData GetReferenceLineData() { - Point2D[] referenceLinePoints = data.ReferenceLine.Points.ToArray(); + ReferenceLine referenceLine = data.ReferenceLine; + IEnumerable referenceLinePoints = referenceLine == null ? + Enumerable.Empty() : + referenceLine.Points; return new MapLineData(referenceLinePoints, RingtoetsCommonDataResources.ReferenceLine_DisplayName); } private MapData GetHydraulicBoundaryLocations() { - Point2D[] hrLocations = data.HydraulicBoundaryDatabase.Locations.Select(h => h.Location).ToArray(); + HydraulicBoundaryDatabase hydraulicBoundaryDatabase = data.HydraulicBoundaryDatabase; + IEnumerable hrLocations = hydraulicBoundaryDatabase == null ? + Enumerable.Empty() : + hydraulicBoundaryDatabase.Locations.Select(h => h.Location).ToArray(); return new MapPointData(hrLocations, RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName); } - - private bool HasReferenceLinePoints() - { - return data.ReferenceLine != null && data.ReferenceLine.Points.Any(); - } - - private bool HasHydraulicBoundaryLocations() - { - return data.HydraulicBoundaryDatabase != null && data.HydraulicBoundaryDatabase.Locations.Any(); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs =================================================================== diff -u -r30b12b82918d500fe834eafd9f6cd9b2c5dbe60f -r4d64cb92533df603783b2e1528944aad2889aef9 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs (.../AssessmentSectionViewTest.cs) (revision 30b12b82918d500fe834eafd9f6cd9b2c5dbe60f) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs (.../AssessmentSectionViewTest.cs) (revision 4d64cb92533df603783b2e1528944aad2889aef9) @@ -28,7 +28,6 @@ using Core.Components.DotSpatial.Forms; using Core.Components.Gis.Data; using NUnit.Framework; -using Rhino.Mocks; using Ringtoets.Common.Data; using Ringtoets.HydraRing.Data; using Ringtoets.Integration.Forms.Views; @@ -81,7 +80,17 @@ // Assert var mapData = (MapDataCollection) map.Data; - Assert.AreEqual(0, mapData.List.Count); + Assert.AreEqual(2, mapData.List.Count); + + var referenceLineMapData = (MapLineData)mapData.List[0]; + CollectionAssert.IsEmpty(referenceLineMapData.Points); + Assert.AreEqual("Referentielijn", referenceLineMapData.Name); + Assert.IsTrue(referenceLineMapData.IsVisible); + + var hrLocationsMapData = (MapPointData)mapData.List[1]; + CollectionAssert.IsEmpty(hrLocationsMapData.Points); + Assert.AreEqual("Hydraulische randvoorwaarden", hrLocationsMapData.Name); + Assert.IsTrue(hrLocationsMapData.IsVisible); } [Test] @@ -90,18 +99,23 @@ // Setup var view = new AssessmentSectionView(); var map = (MapControl) view.Controls[0]; - var assessmentSectionBase = new TestAssessmentSectionBase + + var referenceLine = new ReferenceLine(); + referenceLine.SetGeometry(new[] { - HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(), - ReferenceLine = new ReferenceLine() - }; - assessmentSectionBase.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)); - assessmentSectionBase.ReferenceLine.SetGeometry(new List - { new Point2D(1.0, 2.0), new Point2D(2.0, 1.0) }); + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)); + + var assessmentSectionBase = new TestAssessmentSectionBase + { + HydraulicBoundaryDatabase = hydraulicBoundaryDatabase, + ReferenceLine = referenceLine + }; + // Call view.Data = assessmentSectionBase; @@ -110,8 +124,16 @@ Assert.IsInstanceOf(map.Data); var mapData = map.Data as MapDataCollection; Assert.IsNotNull(mapData); - Assert.IsTrue(mapData.List.Any(md => md is MapPointData)); - Assert.IsTrue(mapData.List.Any(md => md is MapLineData)); + + var referenceLineMapData = (MapLineData)mapData.List[0]; + CollectionAssert.AreEqual(referenceLine.Points, referenceLineMapData.Points); + Assert.AreEqual("Referentielijn", referenceLineMapData.Name); + Assert.IsTrue(referenceLineMapData.IsVisible); + + var hrLocationsMapData = (MapPointData)mapData.List[1]; + CollectionAssert.AreEqual(hydraulicBoundaryDatabase.Locations.Select(l => l.Location), hrLocationsMapData.Points); + Assert.AreEqual("Hydraulische randvoorwaarden", hrLocationsMapData.Name); + Assert.IsTrue(hrLocationsMapData.IsVisible); } [Test] Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs =================================================================== diff -u -r5047fad63b41f7f79bc8a1690fc69045e7233666 -r4d64cb92533df603783b2e1528944aad2889aef9 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs (.../PipingFailureMechanismView.cs) (revision 5047fad63b41f7f79bc8a1690fc69045e7233666) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs (.../PipingFailureMechanismView.cs) (revision 4d64cb92533df603783b2e1528944aad2889aef9) @@ -28,6 +28,8 @@ using Core.Components.Gis.Data; using Core.Components.Gis.Forms; +using Ringtoets.Common.Data; +using Ringtoets.HydraRing.Data; using Ringtoets.Piping.Forms.PresentationObjects; using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; @@ -115,39 +117,31 @@ if (data != null) { - if (HasReferenceLinePoints()) - { - mapDataList.Add(GetReferenceLineMapData()); - } - - if (HasHydraulicBoundaryLocations()) - { - mapDataList.Add(GetHydraulicBoundaryLocationsMapData()); - } - - if (HasSections()) - { - mapDataList.Add(GetSectionsMapData()); - } - - if (HasSurfaceLines()) - { - mapDataList.Add(GetSurfaceLinesMapData()); - } + mapDataList.Add(GetReferenceLineMapData()); + mapDataList.Add(GetHydraulicBoundaryLocationsMapData()); + mapDataList.Add(GetSectionsMapData()); + mapDataList.Add(GetSurfaceLinesMapData()); } mapControl.Data = new MapDataCollection(mapDataList, PipingDataResources.PipingFailureMechanism_DisplayName); } private MapData GetReferenceLineMapData() { - Point2D[] referenceLinePoints = data.Parent.ReferenceLine.Points.ToArray(); + ReferenceLine referenceLine = data.Parent.ReferenceLine; + IEnumerable referenceLinePoints = referenceLine == null ? + Enumerable.Empty() : + referenceLine.Points; return new MapLineData(referenceLinePoints, RingtoetsCommonDataResources.ReferenceLine_DisplayName); } private MapData GetHydraulicBoundaryLocationsMapData() { - Point2D[] hrLocations = data.Parent.HydraulicBoundaryDatabase.Locations.Select(h => h.Location).ToArray(); + HydraulicBoundaryDatabase hydraulicBoundaryDatabase = data.Parent.HydraulicBoundaryDatabase; + + IEnumerable hrLocations = hydraulicBoundaryDatabase == null ? + Enumerable.Empty() : + hydraulicBoundaryDatabase.Locations.Select(h => h.Location); return new MapPointData(hrLocations, RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName); } @@ -162,25 +156,5 @@ IEnumerable> sectionLines = data.WrappedData.Sections.Select(sl => sl.Points); return new MapMultiLineData(sectionLines, RingtoetsCommonDataResources.FailureMechanism_Sections_DisplayName); } - - private bool HasReferenceLinePoints() - { - return data.Parent.ReferenceLine != null && data.Parent.ReferenceLine.Points.Any(); - } - - private bool HasHydraulicBoundaryLocations() - { - return data.Parent.HydraulicBoundaryDatabase != null && data.Parent.HydraulicBoundaryDatabase.Locations.Any(); - } - - private bool HasSurfaceLines() - { - return data.WrappedData.SurfaceLines.Any(); - } - - private bool HasSections() - { - return data.WrappedData.Sections.Any(); - } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs =================================================================== diff -u -r30b12b82918d500fe834eafd9f6cd9b2c5dbe60f -r4d64cb92533df603783b2e1528944aad2889aef9 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision 30b12b82918d500fe834eafd9f6cd9b2c5dbe60f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision 4d64cb92533df603783b2e1528944aad2889aef9) @@ -67,7 +67,11 @@ // Assert var mapData = (MapDataCollection)map.Data; - Assert.AreEqual(0, mapData.List.Count); + Assert.AreEqual(4, mapData.List.Count); + AssertReferenceMapData(assessmentSectionBase.ReferenceLine, mapData.List[0]); + AssertHydraulicBoundaryLocationsMapData(assessmentSectionBase.HydraulicBoundaryDatabase, mapData.List[1]); + AssertFailureMechanismSectionsMapData(pipingFailureMechanism.Sections, mapData.List[2]); + AssertSurfacelinesMapData(pipingFailureMechanism.SurfaceLines, mapData.List[3]); } [Test] @@ -120,21 +124,36 @@ AssertHydraulicBoundaryLocationsMapData(assessmentSectionBase.HydraulicBoundaryDatabase, mapData.List[1]); AssertFailureMechanismSectionsMapData(pipingFailureMechanism.Sections, mapData.List[2]); AssertSurfacelinesMapData(pipingFailureMechanism.SurfaceLines, mapData.List[3]); - } private void AssertReferenceMapData(ReferenceLine referenceLine, MapData mapData) { Assert.IsInstanceOf(mapData); var referenceLineData = (MapLineData)mapData; - CollectionAssert.AreEqual(referenceLine.Points, referenceLineData.Points); + if (referenceLine == null) + { + CollectionAssert.IsEmpty(referenceLineData.Points); + } + else + { + CollectionAssert.AreEqual(referenceLine.Points, referenceLineData.Points); + } + Assert.AreEqual("Referentielijn", mapData.Name); } private void AssertHydraulicBoundaryLocationsMapData(HydraulicBoundaryDatabase database, MapData mapData) { Assert.IsInstanceOf(mapData); var hydraulicLocationsMapData = (MapPointData)mapData; - CollectionAssert.AreEqual(database.Locations.Select(hrp => hrp.Location), hydraulicLocationsMapData.Points); + if (database == null) + { + CollectionAssert.IsEmpty(hydraulicLocationsMapData.Points); + } + else + { + CollectionAssert.AreEqual(database.Locations.Select(hrp => hrp.Location), hydraulicLocationsMapData.Points); + } + Assert.AreEqual("Hydraulische randvoorwaarden", mapData.Name); } private void AssertFailureMechanismSectionsMapData(IEnumerable sections, MapData mapData) @@ -145,6 +164,7 @@ { CollectionAssert.Contains(sectionsMapLinesData.Lines, failureMechanismSection.Points); } + Assert.AreEqual("Vakindeling", mapData.Name); } private void AssertSurfacelinesMapData(IEnumerable surfaceLines, MapData mapData) @@ -155,6 +175,7 @@ { CollectionAssert.Contains(surfacelinesMapData.Lines, surfaceLine.Points.Select(p => new Point2D(p.X, p.Y))); } + Assert.AreEqual("Profielmetingen", mapData.Name); } [Test]