Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs =================================================================== diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -racbd08302b69fc06e5cade26def0dea4d35e3b92 --- Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs (.../MapDataConverter.cs) (revision 61f3b606ba0003553fe583462bab6e493043be5e) +++ Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs (.../MapDataConverter.cs) (revision acbd08302b69fc06e5cade26def0dea4d35e3b92) @@ -35,7 +35,7 @@ { public bool CanConvertMapData(MapData data) { - return data.GetType() == typeof(T); + return data is T; } public IList Convert(MapData data) Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataConverterTest.cs =================================================================== diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -racbd08302b69fc06e5cade26def0dea4d35e3b92 --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataConverterTest.cs (.../MapDataConverterTest.cs) (revision 61f3b606ba0003553fe583462bab6e493043be5e) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataConverterTest.cs (.../MapDataConverterTest.cs) (revision acbd08302b69fc06e5cade26def0dea4d35e3b92) @@ -27,7 +27,7 @@ // Assert Assert.IsFalse(mapDataResult); Assert.IsTrue(classResult); - Assert.IsFalse(childResult); + Assert.IsTrue(childResult); } [Test] Index: Core/Plugins/src/Core.Plugins.DotSpatial/Forms/MapDataView.cs =================================================================== diff -u -r9f8c22d452747d0d7b435f91f4a44b0b89714089 -racbd08302b69fc06e5cade26def0dea4d35e3b92 --- Core/Plugins/src/Core.Plugins.DotSpatial/Forms/MapDataView.cs (.../MapDataView.cs) (revision 9f8c22d452747d0d7b435f91f4a44b0b89714089) +++ Core/Plugins/src/Core.Plugins.DotSpatial/Forms/MapDataView.cs (.../MapDataView.cs) (revision acbd08302b69fc06e5cade26def0dea4d35e3b92) @@ -20,7 +20,6 @@ // All rights reserved. using System.Windows.Forms; -using Core.Components.DotSpatial; using Core.Components.DotSpatial.Forms; using Core.Components.Gis; using Core.Components.Gis.Data; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Forms/PresentationObjects/HydraulicBoundaryDatabaseContext.cs =================================================================== diff -u -rbb0c146c092dadc5f82f0fad45ed92658d436d5c -racbd08302b69fc06e5cade26def0dea4d35e3b92 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Forms/PresentationObjects/HydraulicBoundaryDatabaseContext.cs (.../HydraulicBoundaryDatabaseContext.cs) (revision bb0c146c092dadc5f82f0fad45ed92658d436d5c) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Forms/PresentationObjects/HydraulicBoundaryDatabaseContext.cs (.../HydraulicBoundaryDatabaseContext.cs) (revision acbd08302b69fc06e5cade26def0dea4d35e3b92) @@ -22,13 +22,12 @@ using System; using Core.Common.Base; using Ringtoets.HydraRing.Data; -using Ringtoets.HydraRing.Forms.Properties; using Ringtoets.Integration.Data; namespace Ringtoets.HydraRing.Forms.PresentationObjects { /// - /// Presentation object for all data required to configure an instance of . + /// Presentation object for all data required to configure an instance of . /// public class HydraulicBoundaryDatabaseContext : Observable { Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSectionBase.cs =================================================================== diff -u -rc6dd26c14af11a7e13f783f578466e46b463165a -racbd08302b69fc06e5cade26def0dea4d35e3b92 --- Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSectionBase.cs (.../AssessmentSectionBase.cs) (revision c6dd26c14af11a7e13f783f578466e46b463165a) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSectionBase.cs (.../AssessmentSectionBase.cs) (revision acbd08302b69fc06e5cade26def0dea4d35e3b92) @@ -23,6 +23,7 @@ using Core.Common.Base; using Core.Common.Base.Storage; +using Core.Components.Gis.Data; using Ringtoets.Common.Data; using Ringtoets.HydraRing.Data; using Ringtoets.Integration.Data.Contribution; Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Map/AssessmentSectionMapData.cs =================================================================== diff -u --- Ringtoets/Integration/src/Ringtoets.Integration.Data/Map/AssessmentSectionMapData.cs (revision 0) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Map/AssessmentSectionMapData.cs (revision acbd08302b69fc06e5cade26def0dea4d35e3b92) @@ -0,0 +1,64 @@ +// Copyright (C) Stichting Deltares 2016. 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; +using System.Collections.Generic; +using Core.Components.Gis.Data; + +namespace Ringtoets.Integration.Data.Map +{ + /// + /// The data object with the for the . + /// + public class AssessmentSectionMapData : MapDataCollection, IEquatable + { + private readonly AssessmentSectionBase assessmentSection; + + /// + /// Creates a new instance of . + /// + /// The that links to this . + /// Thrown when is null. + public AssessmentSectionMapData(AssessmentSectionBase assessmentSection) : base(new List()) + { + if (assessmentSection == null) + { + throw new ArgumentNullException("assessmentSection"); + } + this.assessmentSection = assessmentSection; + } + + public override bool Equals(object other) + { + return Equals(other as AssessmentSectionMapData); + } + + public override int GetHashCode() + { + return assessmentSection.GetHashCode(); + } + + public bool Equals(AssessmentSectionMapData other) + { + return other != null && Equals(other.assessmentSection, assessmentSection); + } + } +} \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Ringtoets.Integration.Data.csproj =================================================================== diff -u -rc6dd26c14af11a7e13f783f578466e46b463165a -racbd08302b69fc06e5cade26def0dea4d35e3b92 --- Ringtoets/Integration/src/Ringtoets.Integration.Data/Ringtoets.Integration.Data.csproj (.../Ringtoets.Integration.Data.csproj) (revision c6dd26c14af11a7e13f783f578466e46b463165a) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Ringtoets.Integration.Data.csproj (.../Ringtoets.Integration.Data.csproj) (revision acbd08302b69fc06e5cade26def0dea4d35e3b92) @@ -46,6 +46,7 @@ + @@ -70,6 +71,10 @@ Core.Common.Version False + + {318BA582-88C9-4816-A54A-A7E431461DE3} + Core.Components.Gis + {d4200f43-3f72-4f42-af0a-8ced416a38ec} Ringtoets.Common.Data Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rc6dd26c14af11a7e13f783f578466e46b463165a -racbd08302b69fc06e5cade26def0dea4d35e3b92 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c6dd26c14af11a7e13f783f578466e46b463165a) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision acbd08302b69fc06e5cade26def0dea4d35e3b92) @@ -138,6 +138,16 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// + internal static System.Drawing.Bitmap Map { + get { + object obj = ResourceManager.GetObject("Map", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap PlaceholderIcon { get { object obj = ResourceManager.GetObject("PlaceholderIcon", resourceCulture); @@ -172,5 +182,14 @@ return ((System.Drawing.Bitmap)(obj)); } } + + /// + /// Looks up a localized string similar to Trajectkaart. + /// + internal static string TrajectMap_DisplayName { + get { + return ResourceManager.GetString("TrajectMap_DisplayName", resourceCulture); + } + } } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx =================================================================== diff -u -rc6dd26c14af11a7e13f783f578466e46b463165a -racbd08302b69fc06e5cade26def0dea4d35e3b92 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision c6dd26c14af11a7e13f783f578466e46b463165a) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision acbd08302b69fc06e5cade26def0dea4d35e3b92) @@ -154,4 +154,10 @@ Kan geen presentatie object maken voor een referentielijn zonder een traject als eigenaar. + + Trajectkaart + + + ..\Resources\map.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Resources/map.png =================================================================== diff -u Binary files differ Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj =================================================================== diff -u -rc6dd26c14af11a7e13f783f578466e46b463165a -racbd08302b69fc06e5cade26def0dea4d35e3b92 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (.../Ringtoets.Integration.Forms.csproj) (revision c6dd26c14af11a7e13f783f578466e46b463165a) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (.../Ringtoets.Integration.Forms.csproj) (revision acbd08302b69fc06e5cade26def0dea4d35e3b92) @@ -154,6 +154,9 @@ + + +