Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs =================================================================== diff -u -rfff190e93adf8dd50b1badaa7044576ab2a8c4c1 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs (.../MapLineDataConverter.cs) (revision fff190e93adf8dd50b1badaa7044576ab2a8c4c1) +++ Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs (.../MapLineDataConverter.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -44,7 +44,8 @@ var layer = new MapLineLayer(featureSet) { - IsVisible = data.IsVisible + IsVisible = data.IsVisible, + Name = data.Name }; return new List Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapMultiLineDataConverter.cs =================================================================== diff -u -rfff190e93adf8dd50b1badaa7044576ab2a8c4c1 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/src/Core.Components.DotSpatial/Converter/MapMultiLineDataConverter.cs (.../MapMultiLineDataConverter.cs) (revision fff190e93adf8dd50b1badaa7044576ab2a8c4c1) +++ Core/Components/src/Core.Components.DotSpatial/Converter/MapMultiLineDataConverter.cs (.../MapMultiLineDataConverter.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -48,7 +48,8 @@ var layer = new MapLineLayer(featureSet) { - IsVisible = data.IsVisible + IsVisible = data.IsVisible, + Name = data.Name }; return new List Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs =================================================================== diff -u -rfff190e93adf8dd50b1badaa7044576ab2a8c4c1 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs (.../MapPointDataConverter.cs) (revision fff190e93adf8dd50b1badaa7044576ab2a8c4c1) +++ Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs (.../MapPointDataConverter.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -44,7 +44,8 @@ var layer = new MapPointLayer(featureSet) { - IsVisible = data.IsVisible + IsVisible = data.IsVisible, + Name = data.Name }; return new List Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs =================================================================== diff -u -rfff190e93adf8dd50b1badaa7044576ab2a8c4c1 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs (.../MapPolygonDataConverter.cs) (revision fff190e93adf8dd50b1badaa7044576ab2a8c4c1) +++ Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs (.../MapPolygonDataConverter.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -44,7 +44,8 @@ var layer = new MapPolygonLayer(featureSet) { - IsVisible = data.IsVisible + IsVisible = data.IsVisible, + Name = data.Name }; return new List Index: Core/Components/src/Core.Components.Gis.IO/PolylineShapeFileReader.cs =================================================================== diff -u -r5e0d414ac611e8a6fd5b77a41d0459be8b749e83 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/src/Core.Components.Gis.IO/PolylineShapeFileReader.cs (.../PolylineShapeFileReader.cs) (revision 5e0d414ac611e8a6fd5b77a41d0459be8b749e83) +++ Core/Components/src/Core.Components.Gis.IO/PolylineShapeFileReader.cs (.../PolylineShapeFileReader.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -23,15 +23,12 @@ using System.Data; using System.IO; using System.Linq; - using Core.Common.Base.Geometry; using Core.Common.IO.Exceptions; using Core.Common.Utils; using Core.Common.Utils.Builders; using Core.Components.Gis.Data; - using DotSpatial.Data; - using CoreCommonUtilsResources = Core.Common.Utils.Properties.Resources; using GisIOResources = Core.Components.Gis.IO.Properties.Resources; @@ -94,7 +91,7 @@ /// The representing the read line shape, or /// null when at the end of the shapefile. /// When reading a multi-line feature. - public MapLineData ReadLine() + public MapLineData ReadLine(string name = null) { if (readIndex == lineShapeFile.Features.Count) { @@ -104,7 +101,7 @@ try { IFeature lineFeature = GetSingleLineFeature(readIndex); - return ConvertSingleLineFeatureToMapLineData(lineFeature); + return ConvertSingleLineFeatureToMapLineData(lineFeature, name ?? GisIOResources.PolylineShapeFileReader_ReadLine_Line); } finally { @@ -147,9 +144,9 @@ return lineFeature; } - private MapLineData ConvertSingleLineFeatureToMapLineData(IFeature lineFeature) + private MapLineData ConvertSingleLineFeatureToMapLineData(IFeature lineFeature, string name) { - var lineData = new MapLineData(lineFeature.Coordinates.Select(c => new Point2D(c.X, c.Y))); + var lineData = new MapLineData(lineFeature.Coordinates.Select(c => new Point2D(c.X, c.Y)), name); DataTable table = lineShapeFile.GetAttributes(readIndex, 1); DataRow dataRow = table.Rows[0]; for (int i = 0; i < table.Columns.Count; i++) Index: Core/Components/src/Core.Components.Gis.IO/Properties/Resources.Designer.cs =================================================================== diff -u -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/src/Core.Components.Gis.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) +++ Core/Components/src/Core.Components.Gis.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -79,6 +79,15 @@ } /// + /// Looks up a localized string similar to Lijn. + /// + internal static string PolylineShapeFileReader_ReadLine_Line { + get { + return ResourceManager.GetString("PolylineShapeFileReader_ReadLine_Line", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Ingelezen element is een 'multi-lijn'; alleen enkelvoudige lijn elementen worden ondersteund.. /// internal static string PolylineShapeFileReader_ReadLine_Read_unsupported_multipolyline { Index: Core/Components/src/Core.Components.Gis.IO/Properties/Resources.resx =================================================================== diff -u -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/src/Core.Components.Gis.IO/Properties/Resources.resx (.../Resources.resx) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) +++ Core/Components/src/Core.Components.Gis.IO/Properties/Resources.resx (.../Resources.resx) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -126,4 +126,7 @@ op index {0} + + Lijn + \ No newline at end of file Index: Core/Components/src/Core.Components.Gis/Data/MapData.cs =================================================================== diff -u -r2310b1df9f3fcfa1e01ee6eec2206a4dd0f38f5c -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/src/Core.Components.Gis/Data/MapData.cs (.../MapData.cs) (revision 2310b1df9f3fcfa1e01ee6eec2206a4dd0f38f5c) +++ Core/Components/src/Core.Components.Gis/Data/MapData.cs (.../MapData.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -19,12 +19,31 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using Core.Common.Base; namespace Core.Components.Gis.Data { /// /// Abstract class for data with the purpose of becoming visible in map components. /// - public abstract class MapData : Observable {} + public abstract class MapData : Observable + { + /// + /// Creates a new instance of . + /// + /// The name of the . + /// Thrown when is null or only whitespace. + protected MapData(string name) + { + if (string.IsNullOrWhiteSpace(name)) + { + throw new ArgumentNullException("name", "A name must be set to map data"); + } + + Name = name; + } + + public string Name { get; private set; } + } } \ No newline at end of file Index: Core/Components/src/Core.Components.Gis/Data/MapDataCollection.cs =================================================================== diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/src/Core.Components.Gis/Data/MapDataCollection.cs (.../MapDataCollection.cs) (revision 61f3b606ba0003553fe583462bab6e493043be5e) +++ Core/Components/src/Core.Components.Gis/Data/MapDataCollection.cs (.../MapDataCollection.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -33,8 +33,14 @@ /// Creates a new instance of . /// /// A of . - /// Thrown when is null. - public MapDataCollection(IList list) + /// The name of the . + /// Thrown when + /// + /// is null. + /// is null or only whitespace. + /// + /// + public MapDataCollection(IList list, string name) : base(name) { if (list == null) { Index: Core/Components/src/Core.Components.Gis/Data/MapLineData.cs =================================================================== diff -u -r295f682376c0fdfe225ce196a5d654964a3c81bd -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/src/Core.Components.Gis/Data/MapLineData.cs (.../MapLineData.cs) (revision 295f682376c0fdfe225ce196a5d654964a3c81bd) +++ Core/Components/src/Core.Components.Gis/Data/MapLineData.cs (.../MapLineData.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -34,8 +34,14 @@ /// Creates a new instance of . /// /// A of which describes a line in 2D space. - /// Thrown when is null. - public MapLineData(IEnumerable points) : base(points) + /// The name of the . + /// Thrown when + /// + /// is null. + /// is null or only whitespace. + /// + /// + public MapLineData(IEnumerable points, string name) : base(points, name) { MetaData = new Dictionary(); } Index: Core/Components/src/Core.Components.Gis/Data/MapMultiLineData.cs =================================================================== diff -u -rb909f6664a8d22063cb0516befb25f8935c12478 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/src/Core.Components.Gis/Data/MapMultiLineData.cs (.../MapMultiLineData.cs) (revision b909f6664a8d22063cb0516befb25f8935c12478) +++ Core/Components/src/Core.Components.Gis/Data/MapMultiLineData.cs (.../MapMultiLineData.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -35,8 +35,14 @@ /// Creates a new instance of . /// /// A of as (X,Y) lines. - /// Thrown when is null. - public MapMultiLineData(IEnumerable> lines) + /// The name of the . + /// Thrown when + /// + /// is null. + /// is null or only whitespace. + /// + /// + public MapMultiLineData(IEnumerable> lines, string name): base(name) { if (lines == null) { Index: Core/Components/src/Core.Components.Gis/Data/MapPointData.cs =================================================================== diff -u -r295f682376c0fdfe225ce196a5d654964a3c81bd -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/src/Core.Components.Gis/Data/MapPointData.cs (.../MapPointData.cs) (revision 295f682376c0fdfe225ce196a5d654964a3c81bd) +++ Core/Components/src/Core.Components.Gis/Data/MapPointData.cs (.../MapPointData.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -34,7 +34,13 @@ /// Create a new instance of . /// /// A of which describes points in 2D space. - /// Thrown when is null. - public MapPointData(IEnumerable points) : base(points) {} + /// The name of the . + /// Thrown when + /// + /// is null. + /// is null or only whitespace. + /// + /// + public MapPointData(IEnumerable points, string name) : base(points, name) {} } } \ No newline at end of file Index: Core/Components/src/Core.Components.Gis/Data/MapPolygonData.cs =================================================================== diff -u -r295f682376c0fdfe225ce196a5d654964a3c81bd -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/src/Core.Components.Gis/Data/MapPolygonData.cs (.../MapPolygonData.cs) (revision 295f682376c0fdfe225ce196a5d654964a3c81bd) +++ Core/Components/src/Core.Components.Gis/Data/MapPolygonData.cs (.../MapPolygonData.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -34,7 +34,13 @@ /// Creates a new instance of . /// /// A of which describes a closed area in 2D space. - /// Thrown when is null. - public MapPolygonData(IEnumerable points) : base(points) {} + /// The name of the . + /// Thrown when + /// + /// is null. + /// is null or only whitespace. + /// + /// + public MapPolygonData(IEnumerable points, string name) : base(points, name) {} } } \ No newline at end of file Index: Core/Components/src/Core.Components.Gis/Data/PointBasedMapData.cs =================================================================== diff -u -r295f682376c0fdfe225ce196a5d654964a3c81bd -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/src/Core.Components.Gis/Data/PointBasedMapData.cs (.../PointBasedMapData.cs) (revision 295f682376c0fdfe225ce196a5d654964a3c81bd) +++ Core/Components/src/Core.Components.Gis/Data/PointBasedMapData.cs (.../PointBasedMapData.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -35,8 +35,14 @@ /// Create a new instance of . /// /// A of which describe locations in 2D space. - /// Thrown when is null. - protected PointBasedMapData(IEnumerable points) + /// The name of the . + /// Thrown when + /// + /// is null. + /// is null or only whitespace. + /// + /// + protected PointBasedMapData(IEnumerable points, string name) : base(name) { if (points == null) { Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/BaseMapTest.cs =================================================================== diff -u -r880ce6f91c0318987639d8ebfb5356401a133ab1 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/test/Core.Components.DotSpatial.Forms.Test/BaseMapTest.cs (.../BaseMapTest.cs) (revision 880ce6f91c0318987639d8ebfb5356401a133ab1) +++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/BaseMapTest.cs (.../BaseMapTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -55,7 +55,7 @@ { // Setup var map = new BaseMap(); - var testData = new TestMapData(); + var testData = new TestMapData("test data"); // Call TestDelegate test = () => map.Data = testData; @@ -82,7 +82,7 @@ { // Setup var map = new BaseMap(); - var testData = new MapPointData(Enumerable.Empty()); + var testData = new MapPointData(Enumerable.Empty(), "test data"); // Call map.Data = testData; @@ -96,7 +96,7 @@ { // Setup var map = new BaseMap(); - var testData = new MapPointData(Enumerable.Empty()); + var testData = new MapPointData(Enumerable.Empty(), "test data"); var mapView = map.Controls.OfType().First(); // Call @@ -116,16 +116,16 @@ var mapView = map.Controls.OfType().First(); var testData = new MapDataCollection(new List { - new MapPointData(Enumerable.Empty()) - }); + new MapPointData(Enumerable.Empty(), "test data") + }, "test data"); map.Data = testData; // Precondition Assert.AreEqual(1, mapView.Layers.Count); Assert.IsInstanceOf(mapView.Layers[0]); - testData.List.Add(new MapLineData(Enumerable.Empty())); + testData.List.Add(new MapLineData(Enumerable.Empty(), "test data")); // Call map.UpdateObserver(); @@ -144,8 +144,8 @@ var mapView = map.Controls.OfType().First(); var testData = new MapDataCollection(new List { - new MapPointData(Enumerable.Empty()) - }); + new MapPointData(Enumerable.Empty(), "test data") + }, "test data"); map.Data = testData; @@ -155,7 +155,7 @@ map.Data = null; - testData.List.Add(new MapPointData(Enumerable.Empty())); + testData.List.Add(new MapPointData(Enumerable.Empty(), "test data")); // Call map.UpdateObserver(); @@ -172,7 +172,7 @@ // Setup var form = new Form(); var map = new BaseMap(); - var testData = new MapPointData(Enumerable.Empty()); + var testData = new MapPointData(Enumerable.Empty(), "test data"); var mapView = map.Controls.OfType().First(); var invalidated = 0; @@ -263,7 +263,7 @@ // Setup var form = new Form(); var map = new BaseMap(); - var testData = new MapPointData(Enumerable.Empty()); + var testData = new MapPointData(Enumerable.Empty(), "test data"); var view = map.Controls.OfType().First(); map.Data = testData; Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataCollectionConverterTest.cs =================================================================== diff -u -r287b1b719a43b0de337f8149dfa3a2a3220a375a -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataCollectionConverterTest.cs (.../MapDataCollectionConverterTest.cs) (revision 287b1b719a43b0de337f8149dfa3a2a3220a375a) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataCollectionConverterTest.cs (.../MapDataCollectionConverterTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -30,7 +30,7 @@ { // Setup var converter = new MapDataCollectionConverter(); - var collectionData = new MapDataCollection(new List()); + var collectionData = new MapDataCollection(new List(), "test data"); // Call var canConvert = converter.CanConvertMapData(collectionData); @@ -44,7 +44,7 @@ { // Setup var converter = new MapDataCollectionConverter(); - var mapData = new TestMapData(); + var mapData = new TestMapData("test data"); // Call var canConvert = converter.CanConvertMapData(mapData); @@ -71,7 +71,7 @@ { // Setup var testConverter = new MapDataCollectionConverter(); - var testMapData = new TestMapData(); + var testMapData = new TestMapData("test data"); var expectedMessage = string.Format("The data of type {0} cannot be converted by this converter.", testMapData.GetType()); // Precondition @@ -100,9 +100,9 @@ linePoints.Add(new Point2D(random.NextDouble(), random.NextDouble())); } - var collectionData = new MapDataCollection(new List()); - var pointData = new MapPointData(points); - var lineData = new MapLineData(linePoints); + var collectionData = new MapDataCollection(new List(), "test data"); + var pointData = new MapPointData(points, "test data"); + var lineData = new MapLineData(linePoints, "test data"); collectionData.List.Add(pointData); collectionData.List.Add(lineData); Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataConverterTest.cs =================================================================== diff -u -r287b1b719a43b0de337f8149dfa3a2a3220a375a -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataConverterTest.cs (.../MapDataConverterTest.cs) (revision 287b1b719a43b0de337f8149dfa3a2a3220a375a) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataConverterTest.cs (.../MapDataConverterTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -19,9 +19,9 @@ var testConverter = new TestMapDataConverter(); // Call - var mapDataResult = testConverter.CanConvertMapData(new TestMapData()); - var classResult = testConverter.CanConvertMapData(new Class()); - var childResult = testConverter.CanConvertMapData(new Child()); + var mapDataResult = testConverter.CanConvertMapData(new TestMapData("test data")); + var classResult = testConverter.CanConvertMapData(new Class("test data")); + var childResult = testConverter.CanConvertMapData(new Child("test data")); // Assert Assert.IsFalse(mapDataResult); @@ -47,7 +47,7 @@ { // Setup var testConverter = new TestMapDataConverter(); - var testMapData = new TestMapData(); + var testMapData = new TestMapData("test data"); var expectedMessage = string.Format("The data of type {0} cannot be converted by this converter.", testMapData.GetType()); // Precondition @@ -65,7 +65,7 @@ { // Setup var testConverter = new TestMapDataConverter(); - var testMapData = new TestMapData(); + var testMapData = new TestMapData("test data"); // Precondition Assert.IsTrue(testConverter.CanConvertMapData(testMapData)); @@ -77,9 +77,13 @@ Assert.IsNotNull(result); } - private class Class : MapData {} + private class Class : MapData { + public Class(string name) : base(name) {} + } - private class Child : Class {} + private class Child : Class { + public Child(string name) : base(name) {} + } private class TestMapDataConverter : MapDataConverter where T : MapData { Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataFactoryTest.cs =================================================================== diff -u -r287b1b719a43b0de337f8149dfa3a2a3220a375a -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataFactoryTest.cs (.../MapDataFactoryTest.cs) (revision 287b1b719a43b0de337f8149dfa3a2a3220a375a) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataFactoryTest.cs (.../MapDataFactoryTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -22,7 +22,7 @@ var testData = CreateTestData(); // Call - IList layers = factory.Create(new MapPointData(testData)); + IList layers = factory.Create(new MapPointData(testData, "test data")); // Assert Assert.IsInstanceOf>(layers); @@ -38,7 +38,7 @@ var testData = CreateTestData(); // Call - IList layers = factory.Create(new MapLineData(testData)); + IList layers = factory.Create(new MapLineData(testData, "test data")); // Assert Assert.IsInstanceOf>(layers); @@ -54,7 +54,7 @@ var testData = CreateTestData(); // Call - IList layers = factory.Create(new MapPolygonData(testData)); + IList layers = factory.Create(new MapPolygonData(testData, "test data")); // Assert Assert.IsInstanceOf>(layers); @@ -73,10 +73,10 @@ var testData = CreateTestData(); var mapDataCollection = new MapDataCollection(new List { - new MapPointData(testData), - new MapLineData(testData), - new MapPolygonData(testData) - }); + new MapPointData(testData, "test data"), + new MapLineData(testData, "test data"), + new MapPolygonData(testData, "test data") + }, "test data"); // Call IList layers = factory.Create(mapDataCollection); @@ -109,7 +109,7 @@ { // Setup var factory = new MapDataFactory(); - var testData = new TestMapData(); + var testData = new TestMapData("test data"); // Call TestDelegate test = () => factory.Create(testData); Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs =================================================================== diff -u -r287b1b719a43b0de337f8149dfa3a2a3220a375a -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs (.../MapLineDataConverterTest.cs) (revision 287b1b719a43b0de337f8149dfa3a2a3220a375a) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs (.../MapLineDataConverterTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -29,7 +29,7 @@ { // Setup var converter = new MapLineDataConverter(); - var lineData = new MapLineData(new Collection()); + var lineData = new MapLineData(new Collection(), "test data"); // Call var canConvert = converter.CanConvertMapData(lineData); @@ -43,7 +43,7 @@ { // Setup var converter = new MapLineDataConverter(); - var mapData = new TestMapData(); + var mapData = new TestMapData("test data"); // Call var canConvert = converter.CanConvertMapData(mapData); @@ -70,7 +70,7 @@ { // Setup var testConverter = new MapLineDataConverter(); - var testMapData = new TestMapData(); + var testMapData = new TestMapData("test data"); var expectedMessage = string.Format("The data of type {0} cannot be converted by this converter.", testMapData.GetType()); // Precondition @@ -97,7 +97,7 @@ points.Add(new Point2D(random.NextDouble(), random.NextDouble())); } - var lineData = new MapLineData(points); + var lineData = new MapLineData(points, "test data"); // Call var mapLayers = converter.Convert(lineData); Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapMultiLineDataConverterTest.cs =================================================================== diff -u -r3607710d80a1f77bf97f81b10869074b765686a0 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapMultiLineDataConverterTest.cs (.../MapMultiLineDataConverterTest.cs) (revision 3607710d80a1f77bf97f81b10869074b765686a0) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapMultiLineDataConverterTest.cs (.../MapMultiLineDataConverterTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -30,7 +30,7 @@ { // Setup var converter = new MapMultiLineDataConverter(); - var lineData = new MapMultiLineData(Enumerable.Empty>()); + var lineData = new MapMultiLineData(Enumerable.Empty>(), "test data"); // Call var canConvert = converter.CanConvertMapData(lineData); @@ -44,7 +44,7 @@ { // Setup var converter = new MapMultiLineDataConverter(); - var mapData = new TestMapData(); + var mapData = new TestMapData("test data"); // Call var canConvert = converter.CanConvertMapData(mapData); @@ -71,7 +71,7 @@ { // Setup var testConverter = new MapMultiLineDataConverter(); - var testMapData = new TestMapData(); + var testMapData = new TestMapData("test data"); var expectedMessage = string.Format("The data of type {0} cannot be converted by this converter.", testMapData.GetType()); // Precondition @@ -104,7 +104,7 @@ lines.Add(points); } - var lineData = new MapMultiLineData(lines); + var lineData = new MapMultiLineData(lines, "test data"); // Call var mapLayers = converter.Convert(lineData); Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs =================================================================== diff -u -r287b1b719a43b0de337f8149dfa3a2a3220a375a -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs (.../MapPointDataConverterTest.cs) (revision 287b1b719a43b0de337f8149dfa3a2a3220a375a) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs (.../MapPointDataConverterTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -31,7 +31,7 @@ { // Setup var converter = new MapPointDataConverter(); - var pointData = new MapPointData(new Collection()); + var pointData = new MapPointData(new Collection(), "test data"); // Call var canConvert = converter.CanConvertMapData(pointData); @@ -45,7 +45,7 @@ { // Setup var converter = new MapPointDataConverter(); - var mapData = new TestMapData(); + var mapData = new TestMapData("test data"); // Call var canConvert = converter.CanConvertMapData(mapData); @@ -68,7 +68,7 @@ points.Add(new Point2D(random.NextDouble(), random.NextDouble())); } - var pointData = new MapPointData(points); + var pointData = new MapPointData(points, "test data"); // Call var mapLayers = converter.Convert(pointData); @@ -101,7 +101,7 @@ { // Setup var testConverter = new MapPointDataConverter(); - var testMapData = new TestMapData(); + var testMapData = new TestMapData("test data"); var expectedMessage = string.Format("The data of type {0} cannot be converted by this converter.", testMapData.GetType()); // Precondition Assert.IsFalse(testConverter.CanConvertMapData(testMapData)); Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs =================================================================== diff -u -r287b1b719a43b0de337f8149dfa3a2a3220a375a -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs (.../MapPolygonDataConverterTest.cs) (revision 287b1b719a43b0de337f8149dfa3a2a3220a375a) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs (.../MapPolygonDataConverterTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -30,7 +30,7 @@ { // Setup var converter = new MapPolygonDataConverter(); - var polygonData = new MapPolygonData(new Collection()); + var polygonData = new MapPolygonData(new Collection(), "test data"); // Call var canConvert = converter.CanConvertMapData(polygonData); @@ -44,7 +44,7 @@ { // Setup var converter = new MapPolygonDataConverter(); - var mapData = new TestMapData(); + var mapData = new TestMapData("test data"); // Call var canConvert = converter.CanConvertMapData(mapData); @@ -67,7 +67,7 @@ polygonPoints.Add(new Point2D(random.NextDouble(), random.NextDouble())); } - var polygonData = new MapPolygonData(polygonPoints); + var polygonData = new MapPolygonData(polygonPoints, "test data"); // Call var mapLayers = converter.Convert(polygonData); @@ -99,7 +99,7 @@ { // Setup var testConverter = new MapPolygonDataConverter(); - var testMapData = new TestMapData(); + var testMapData = new TestMapData("test data"); var expectedMessage = string.Format("The data of type {0} cannot be converted by this converter.", testMapData.GetType()); // Precondition Index: Core/Components/test/Core.Components.DotSpatial.TestUtil/TestMapData.cs =================================================================== diff -u -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/test/Core.Components.DotSpatial.TestUtil/TestMapData.cs (.../TestMapData.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) +++ Core/Components/test/Core.Components.DotSpatial.TestUtil/TestMapData.cs (.../TestMapData.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -5,5 +5,7 @@ /// /// A class representing a implementation which is not in the regular codebase. /// - public class TestMapData : MapData {} + public class TestMapData : MapData { + public TestMapData(string name) : base(name) {} + } } \ No newline at end of file Index: Core/Components/test/Core.Components.Gis.Test/Data/MapDataCollectionTest.cs =================================================================== diff -u -rf612f81e3d6435ddd1a9c571738aab54e6048a9e -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/test/Core.Components.Gis.Test/Data/MapDataCollectionTest.cs (.../MapDataCollectionTest.cs) (revision f612f81e3d6435ddd1a9c571738aab54e6048a9e) +++ Core/Components/test/Core.Components.Gis.Test/Data/MapDataCollectionTest.cs (.../MapDataCollectionTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -15,24 +15,64 @@ public void Constructor_NullList_ThrowsArgumentNullException() { // Call - TestDelegate test = () => new MapDataCollection(null); + TestDelegate test = () => new MapDataCollection(null, "test data"); // Assert TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "A list collection is required when creating MapDataCollection."); } [Test] + public void Constructor_NullName_ThrowsArgumentNullExcpetion() + { + // Setup + var list = Enumerable.Empty().ToList(); + + // Call + TestDelegate test = () => new MapDataCollection(list, null); + + // Assert + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "A name must be set to map data"); + } + + [Test] + public void Constructor_EmptyName_ThrowsArgumentNullExcpetion() + { + // Setup + var list = Enumerable.Empty().ToList(); + + // Call + TestDelegate test = () => new MapDataCollection(list, ""); + + // Assert + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "A name must be set to map data"); + } + + [Test] public void Constructor_ListSet_InstanceWithListSet() { // Setup var list = Enumerable.Empty().ToList(); // Call - var collection = new MapDataCollection(list); + var collection = new MapDataCollection(list, "test data"); // Assert Assert.IsInstanceOf(collection); Assert.AreSame(list, collection.List); } + + [Test] + public void Constructor_WithName_SetsName() + { + // Setup + var list = Enumerable.Empty().ToList(); + var name = "Some name"; + + // Call + var data = new MapDataCollection(list, name); + + // Assert + Assert.AreEqual(name, data.Name); + } } } \ No newline at end of file Index: Core/Components/test/Core.Components.Gis.Test/Data/MapDataTest.cs =================================================================== diff -u -r2310b1df9f3fcfa1e01ee6eec2206a4dd0f38f5c -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/test/Core.Components.Gis.Test/Data/MapDataTest.cs (.../MapDataTest.cs) (revision 2310b1df9f3fcfa1e01ee6eec2206a4dd0f38f5c) +++ Core/Components/test/Core.Components.Gis.Test/Data/MapDataTest.cs (.../MapDataTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -1,4 +1,6 @@ -using Core.Common.Base; +using System; +using Core.Common.Base; +using Core.Common.TestUtil; using Core.Components.Gis.Data; using NUnit.Framework; @@ -8,15 +10,50 @@ public class MapDataTest { [Test] - public void DefaultConstructor_Values() + public void Constructor_Values() { // Call - var mapData = new MapDataChild(); + var mapData = new MapDataChild("test data"); // Assert Assert.IsInstanceOf(mapData); } - private class MapDataChild : MapData { } + [Test] + public void Constructor_NameNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => new MapDataChild(null); + + // Assert + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, "A name must be set to map data"); + } + + [Test] + public void Constructor_NameEmpty_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => new MapDataChild(""); + + // Assert + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, "A name must be set to map data"); + } + + [Test] + public void Constructor_WithName_SetsName() + { + // Setup + var name = "Some name"; + + // Call + var data = new MapDataChild(name); + + // Assert + Assert.AreEqual(name, data.Name); + } + + private class MapDataChild : MapData { + public MapDataChild(string name) : base(name) {} + } } } Index: Core/Components/test/Core.Components.Gis.Test/Data/MapLineDataTest.cs =================================================================== diff -u -r33c64ea2cd6b287bf5954e63a548d89dadb7f153 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/test/Core.Components.Gis.Test/Data/MapLineDataTest.cs (.../MapLineDataTest.cs) (revision 33c64ea2cd6b287bf5954e63a548d89dadb7f153) +++ Core/Components/test/Core.Components.Gis.Test/Data/MapLineDataTest.cs (.../MapLineDataTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -16,20 +16,41 @@ public void Constructor_NullPoints_ThrowsArgumentNullException() { // Call - TestDelegate test = () => new MapLineData(null); + TestDelegate test = () => new MapLineData(null, "test data"); // Assert TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, string.Format("A point collection is required when creating a subclass of {0}.", typeof(PointBasedMapData))); } [Test] + public void Constructor_NullName_ThrowsArgumentNullExcpetion() + { + // Call + TestDelegate test = () => new MapLineData(Enumerable.Empty(), null); + + // Assert + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "A name must be set to map data"); + } + + [Test] + public void Constructor_EmptyName_ThrowsArgumentNullExcpetion() + { + // Call + TestDelegate test = () => new MapLineData(Enumerable.Empty(), ""); + + // Assert + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "A name must be set to map data"); + } + + + [Test] public void Constructor_WithEmptyPoints_CreatesNewMapLineData() { // Setup var points = new Collection(); // Call - var data = new MapLineData(points); + var data = new MapLineData(points, "test data"); // Assert Assert.IsInstanceOf(data); @@ -44,7 +65,7 @@ var points = CreateTestPoints(); // Call - var data = new MapLineData(points); + var data = new MapLineData(points, "test data"); // Assert Assert.IsInstanceOf(data); @@ -54,10 +75,24 @@ } [Test] + public void Constructor_WithName_SetsName() + { + // Setup + var points = new Collection(); + var name = "Some name"; + + // Call + var data = new MapLineData(points, name); + + // Assert + Assert.AreEqual(name, data.Name); + } + + [Test] public void MetaData_SetNewValue_GetNewlySetValue() { // Setup - var data = new MapLineData(Enumerable.Empty()); + var data = new MapLineData(Enumerable.Empty(), "test data"); const string key = ""; var newValue = new object(); Index: Core/Components/test/Core.Components.Gis.Test/Data/MapMultiLineDataTest.cs =================================================================== diff -u -rb909f6664a8d22063cb0516befb25f8935c12478 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/test/Core.Components.Gis.Test/Data/MapMultiLineDataTest.cs (.../MapMultiLineDataTest.cs) (revision b909f6664a8d22063cb0516befb25f8935c12478) +++ Core/Components/test/Core.Components.Gis.Test/Data/MapMultiLineDataTest.cs (.../MapMultiLineDataTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -17,20 +17,46 @@ public void Constructor_NullCollection_ThrowsArgumentNullException() { // Call - TestDelegate test = () => new MapMultiLineData(null); + TestDelegate test = () => new MapMultiLineData(null, "test data"); // Assert TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, string.Format("A lines collection is required when creating a subclass of {0}.", typeof(MapMultiLineData))); } [Test] + public void Constructor_NullName_ThrowsArgumentNullExcpetion() + { + // Setup + var collection = new Collection>(); + + // Call + TestDelegate test = () => new MapMultiLineData(collection, null); + + // Assert + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "A name must be set to map data"); + } + + [Test] + public void Constructor_EmptyName_ThrowsArgumentNullExcpetion() + { + // Setup + var collection = new Collection>(); + + // Call + TestDelegate test = () => new MapMultiLineData(collection, ""); + + // Assert + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "A name must be set to map data"); + } + + [Test] public void Constructor_WithEmptyCollection_CreatesNewMapLineData() { // Setup var collection = new Collection>(); // Call - var data = new MapMultiLineData(collection); + var data = new MapMultiLineData(collection, "test data"); // Assert Assert.IsInstanceOf(data); @@ -44,14 +70,28 @@ var lines = CreateTestLines(); // Call - var data = new MapMultiLineData(lines); + var data = new MapMultiLineData(lines, "test data"); // Assert Assert.IsInstanceOf(data); Assert.AreNotSame(lines, data.Lines); CollectionAssert.AreEqual(lines, data.Lines); } + [Test] + public void Constructor_WithName_SetsName() + { + // Setup + var collection = new Collection>(); + var name = "Some name"; + + // Call + var data = new MapMultiLineData(collection, name); + + // Assert + Assert.AreEqual(name, data.Name); + } + private static IEnumerable> CreateTestLines() { return new Collection> Index: Core/Components/test/Core.Components.Gis.Test/Data/MapPointDataTest.cs =================================================================== diff -u -r33c64ea2cd6b287bf5954e63a548d89dadb7f153 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/test/Core.Components.Gis.Test/Data/MapPointDataTest.cs (.../MapPointDataTest.cs) (revision 33c64ea2cd6b287bf5954e63a548d89dadb7f153) +++ Core/Components/test/Core.Components.Gis.Test/Data/MapPointDataTest.cs (.../MapPointDataTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -15,20 +15,46 @@ public void Constructor_NullPoints_ThrowsArgumentNullException() { // Call - TestDelegate test = () => new MapPointData(null); + TestDelegate test = () => new MapPointData(null, "test data"); // Assert TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, string.Format("A point collection is required when creating a subclass of {0}.", typeof(PointBasedMapData))); } [Test] + public void Constructor_NullName_ThrowsArgumentNullExcpetion() + { + // Setup + var points = new Collection(); + + // Call + TestDelegate test = () => new MapPointData(points, null); + + // Assert + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "A name must be set to map data"); + } + + [Test] + public void Constructor_EmptyName_ThrowsArgumentNullExcpetion() + { + // Setup + var points = new Collection(); + + // Call + TestDelegate test = () => new MapPointData(points, ""); + + // Assert + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "A name must be set to map data"); + } + + [Test] public void Constructor_WithEmptyPoints_CreatesNewMapPointData() { // Setup var points = new Collection(); // Call - var data = new MapPointData(points); + var data = new MapPointData(points, "test data"); // Assert Assert.IsInstanceOf(data); @@ -42,7 +68,7 @@ var points = CreateTestPoints(); // Call - var data = new MapPointData(points); + var data = new MapPointData(points, "test data"); // Assert Assert.IsInstanceOf(data); Index: Core/Components/test/Core.Components.Gis.Test/Data/MapPolygonDataTest.cs =================================================================== diff -u -r33c64ea2cd6b287bf5954e63a548d89dadb7f153 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/test/Core.Components.Gis.Test/Data/MapPolygonDataTest.cs (.../MapPolygonDataTest.cs) (revision 33c64ea2cd6b287bf5954e63a548d89dadb7f153) +++ Core/Components/test/Core.Components.Gis.Test/Data/MapPolygonDataTest.cs (.../MapPolygonDataTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -15,20 +15,47 @@ public void Constructor_NullPoints_ThrowsArgumentNullException() { // Call - TestDelegate test = () => new MapPolygonData(null); + TestDelegate test = () => new MapPolygonData(null, "test data"); // Assert TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, string.Format("A point collection is required when creating a subclass of {0}.", typeof(PointBasedMapData))); } [Test] + public void Constructor_NullName_ThrowsArgumentNullExcpetion() + { + // Setup + var points = new Collection(); + + // Call + TestDelegate test = () => new MapPolygonData(points, null); + + // Assert + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "A name must be set to map data"); + } + + [Test] + public void Constructor_EmptyName_ThrowsArgumentNullExcpetion() + { + // Setup + var points = new Collection(); + + // Call + TestDelegate test = () => new MapPolygonData(points, ""); + + // Assert + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "A name must be set to map data"); + } + + + [Test] public void Constructor_WithEmptyPoints_CreatesNewMapPolygonData() { // Setup var points = new Collection(); // Call - var data = new MapPolygonData(points); + var data = new MapPolygonData(points, "test data"); // Assert Assert.IsInstanceOf(data); @@ -42,14 +69,28 @@ var points = CreateTestPoints(); // Call - var data = new MapPolygonData(points); + var data = new MapPolygonData(points, "test data"); // Assert Assert.IsInstanceOf(data); Assert.AreNotSame(points, data.Points); CollectionAssert.AreEqual(points, data.Points); } + [Test] + public void Constructor_WithName_SetsName() + { + // Setup + var points = new Collection(); + var name = "Some name"; + + // Call + var data = new MapPolygonData(points, name); + + // Assert + Assert.AreEqual(name, data.Name); + } + private static Collection CreateTestPoints() { return new Collection Index: Core/Components/test/Core.Components.Gis.Test/Data/PointsBasedMapDataTest.cs =================================================================== diff -u -r33c64ea2cd6b287bf5954e63a548d89dadb7f153 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Components/test/Core.Components.Gis.Test/Data/PointsBasedMapDataTest.cs (.../PointsBasedMapDataTest.cs) (revision 33c64ea2cd6b287bf5954e63a548d89dadb7f153) +++ Core/Components/test/Core.Components.Gis.Test/Data/PointsBasedMapDataTest.cs (.../PointsBasedMapDataTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -16,14 +16,40 @@ public void Constructor_WithoutPoints_ThrowsArgumentNullException() { // Call - TestDelegate test = () => new TestPointBasedMapData(null); + TestDelegate test = () => new TestPointBasedMapData(null, "some name"); // Assert var expectedMessage = "A point collection is required when creating a subclass of Core.Components.Gis.Data.PointBasedMapData."; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); } [Test] + public void Constructor_NullName_ThrowsArgumentNullExcpetion() + { + // Setup + var points = new Collection(); + + // Call + TestDelegate test = () => new TestPointBasedMapData(points, null); + + // Assert + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "A name must be set to map data"); + } + + [Test] + public void Constructor_EmptyName_ThrowsArgumentNullExcpetion() + { + // Setup + var points = new Collection(); + + // Call + TestDelegate test = () => new TestPointBasedMapData(points, ""); + + // Assert + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "A name must be set to map data"); + } + + [Test] public void Constructor_WithPoints_PropertiesSet() { // Setup @@ -34,17 +60,31 @@ }; // Call - var data = new TestPointBasedMapData(points); + var data = new TestPointBasedMapData(points, "some name"); // Assert Assert.AreNotSame(points, data.Points); CollectionAssert.AreEqual(points, data.Points); Assert.IsTrue(data.IsVisible); } + [Test] + public void Constructor_WithName_SetsName() + { + // Setup + var points = new Collection(); + var name = "Some name"; + + // Call + var data = new TestPointBasedMapData(points, name); + + // Assert + Assert.AreEqual(name, data.Name); + } + private class TestPointBasedMapData : PointBasedMapData { - public TestPointBasedMapData(IEnumerable points) : base(points) { } + public TestPointBasedMapData(IEnumerable points, string name) : base(points, name) { } } } } \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendView.cs =================================================================== diff -u -r3607710d80a1f77bf97f81b10869074b765686a0 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendView.cs (.../MapLegendView.cs) (revision 3607710d80a1f77bf97f81b10869074b765686a0) +++ Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendView.cs (.../MapLegendView.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -89,7 +89,7 @@ { treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo { - Text = mapPointData => DotSpatialResources.MapData_Point_data_label, + Text = mapPointData => mapPointData.Name, Image = mapPointData => DotSpatialResources.PointsIcon, CanDrag = (mapPointData, parentData) => true, CanCheck = mapPointData => true, @@ -99,7 +99,7 @@ treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo { - Text = mapLineData => DotSpatialResources.MapData_Line_data_label, + Text = mapLineData => mapLineData.Name, Image = mapLineData => DotSpatialResources.LineIcon, CanDrag = (mapLineData, parentData) => true, CanCheck = mapLineData => true, @@ -109,7 +109,7 @@ treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo { - Text = mapPolygonData => DotSpatialResources.MapData_Polygon_data_label, + Text = mapPolygonData => mapPolygonData.Name, Image = mapPolygonData => DotSpatialResources.AreaIcon, CanDrag = (mapPolygonData, parentData) => true, CanCheck = mapPolygonData => true, @@ -119,7 +119,7 @@ treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo { - Text = mapDataCollection => DotSpatialResources.General_Map, + Text = mapDataCollection => mapDataCollection.Name, Image = mapDataCollection => GuiResources.folder, ChildNodeObjects = mapDataCollection => mapDataCollection.List.Reverse().Cast().ToArray(), CanDrop = BaseMapCanDrop, @@ -129,7 +129,7 @@ treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo { - Text = mapMultiLineData => DotSpatialResources.MapData_MultiLine_data_label, + Text = mapMultiLineData => mapMultiLineData.Name, Image = mapMultiLineData => DotSpatialResources.LineIcon, CanDrag = (mapMultiLineData, parentData) => true, CanCheck = mapMultiLineData => true, Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/DotSpatialGuiPluginTest.cs =================================================================== diff -u -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/DotSpatialGuiPluginTest.cs (.../DotSpatialGuiPluginTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/DotSpatialGuiPluginTest.cs (.../DotSpatialGuiPluginTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -65,7 +65,7 @@ { var mapView = mocks.Stub(); var map = mocks.Stub(); - map.Data = new TestMapData(); + map.Data = new TestMapData("test data"); mapView.Stub(v => v.Map).Return(map); view = mapView; } Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Forms/MapDataViewTest.cs =================================================================== diff -u -r33c64ea2cd6b287bf5954e63a548d89dadb7f153 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Forms/MapDataViewTest.cs (.../MapDataViewTest.cs) (revision 33c64ea2cd6b287bf5954e63a548d89dadb7f153) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Forms/MapDataViewTest.cs (.../MapDataViewTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -74,7 +74,7 @@ // Setup var mapView = new MapDataView(); var map = (BaseMap) mapView.Controls[0]; - var pointData = new MapPointData(Enumerable.Empty()); + var pointData = new MapPointData(Enumerable.Empty(), "test data"); // Call mapView.Data = pointData; Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs =================================================================== diff -u -rc5b9900d1cc5bd7eb5ecc0727d1949fb21f486a2 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs (.../MapDataCollectionTreeNodeInfoTest.cs) (revision c5b9900d1cc5bd7eb5ecc0727d1949fb21f486a2) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs (.../MapDataCollectionTreeNodeInfoTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -52,13 +52,19 @@ } [Test] - public void Text_Always_ReturnsTextFromResource() + public void Text_Always_ReturnsNameFromMapData() { + // Setup + var mapDataCollection = mocks.StrictMock(new List(), "Collectie"); + + mocks.ReplayAll(); + // Call - var text = info.Text(null); + var text = info.Text(mapDataCollection); // Assert - Assert.AreEqual(DotSpatialResources.General_Map, text); + Assert.AreEqual(mapDataCollection.Name, text); + mocks.VerifyAll(); } [Test] @@ -75,15 +81,15 @@ public void ChildNodeObjects_Always_ReturnsChildsOnDataReversed() { // Setup - var mapData1 = mocks.StrictMock(); - var mapData2 = mocks.StrictMock(); - var mapData3 = mocks.StrictMock(); + var mapData1 = mocks.StrictMock("test data"); + var mapData2 = mocks.StrictMock("test data"); + var mapData3 = mocks.StrictMock("test data"); var mapDataCollection = mocks.StrictMock(new List { mapData1, mapData2, mapData3 - }); + }, "test data"); mocks.ReplayAll(); @@ -105,7 +111,7 @@ public void CanDrop_SourceNodeTagIsNoMapData_ReturnsFalse() { // Setup - var mapDataCollection = mocks.StrictMock(new List()); + var mapDataCollection = mocks.StrictMock(new List(), "test data"); mocks.ReplayAll(); @@ -122,8 +128,8 @@ public void CanDrop_SourceNodeTagIsMapData_ReturnsTrue() { // Setup - var mapData = mocks.StrictMock(); - var mapDataCollection = mocks.StrictMock(new List()); + var mapData = mocks.StrictMock("test data"); + var mapDataCollection = mocks.StrictMock(new List(), "test data"); mocks.ReplayAll(); @@ -140,7 +146,7 @@ public void CanInsert_SourceNodeTagIsNoMapData_ReturnsFalse() { // Setup - var mapDataCollection = mocks.StrictMock(new List()); + var mapDataCollection = mocks.StrictMock(new List(), "test data"); mocks.ReplayAll(); @@ -157,8 +163,8 @@ public void CanInsert_SourceNodeTagIsMapData_ReturnsTrue() { // Setup - var mapData = mocks.StrictMock(); - var mapDataCollection = mocks.StrictMock(new List()); + var mapData = mocks.StrictMock("test data"); + var mapDataCollection = mocks.StrictMock(new List(), "test data"); mocks.ReplayAll(); @@ -179,15 +185,15 @@ { // Setup var observer = mocks.StrictMock(); - var mapData1 = mocks.StrictMock(); - var mapData2 = mocks.StrictMock(); - var mapData3 = mocks.StrictMock(); + var mapData1 = mocks.StrictMock("test data"); + var mapData2 = mocks.StrictMock("test data"); + var mapData3 = mocks.StrictMock("test data"); var mapDataCollection = mocks.StrictMock(new List { mapData1, mapData2, mapData3 - }); + }, "test data"); var treeViewControlMock = mocks.StrictMock(); @@ -216,15 +222,15 @@ { // Setup var observer = mocks.StrictMock(); - var mapData1 = mocks.StrictMock(); - var mapData2 = mocks.StrictMock(); - var mapData3 = mocks.StrictMock(); + var mapData1 = mocks.StrictMock("test data"); + var mapData2 = mocks.StrictMock("test data"); + var mapData3 = mocks.StrictMock("test data"); var mapDataCollection = mocks.StrictMock(new List { mapData1, mapData2, mapData3 - }); + }, "test data"); mapDataCollection.Attach(observer); Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapLegendViewTest.cs =================================================================== diff -u -r3607710d80a1f77bf97f81b10869074b765686a0 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapLegendViewTest.cs (.../MapLegendViewTest.cs) (revision 3607710d80a1f77bf97f81b10869074b765686a0) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapLegendViewTest.cs (.../MapLegendViewTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -47,7 +47,7 @@ { // Setup var view = new MapLegendView(); - var mapData = new MapDataCollection(new List()); + var mapData = new MapDataCollection(new List(), "test data"); // Call view.Data = mapData; @@ -63,7 +63,7 @@ { // Setup var view = new MapLegendView(); - var mapData = new MapPointData(Enumerable.Empty()); + var mapData = new MapPointData(Enumerable.Empty(), "test data"); // Call view.Data = mapData; @@ -78,7 +78,7 @@ { // Setup var view = new MapLegendView(); - var mapData = new MapLineData(Enumerable.Empty()); + var mapData = new MapLineData(Enumerable.Empty(), "test data"); // Call view.Data = mapData; @@ -93,7 +93,7 @@ { // Setup var view = new MapLegendView(); - var mapData = new MapPolygonData(Enumerable.Empty()); + var mapData = new MapPolygonData(Enumerable.Empty(), "test data"); // Call view.Data = mapData; @@ -108,7 +108,7 @@ { // Setup var view = new MapLegendView(); - var mapData = new MapMultiLineData(Enumerable.Empty>()); + var mapData = new MapMultiLineData(Enumerable.Empty>(), "test data"); // Call view.Data = mapData; Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapLineDataTreeNodeInfoTest.cs =================================================================== diff -u -rfff190e93adf8dd50b1badaa7044576ab2a8c4c1 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapLineDataTreeNodeInfoTest.cs (.../MapLineDataTreeNodeInfoTest.cs) (revision fff190e93adf8dd50b1badaa7044576ab2a8c4c1) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapLineDataTreeNodeInfoTest.cs (.../MapLineDataTreeNodeInfoTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -52,11 +52,17 @@ [Test] public void Text_Always_ReturnsTextFromResource() { + // Setup + var mocks = new MockRepository(); + var mapLineData = mocks.StrictMock(Enumerable.Empty(), "MapLineData"); + mocks.ReplayAll(); + // Call - var text = info.Text(null); + var text = info.Text(mapLineData); // Assert - Assert.AreEqual(DotSpatialResources.MapData_Line_data_label, text); + Assert.AreEqual(mapLineData.Name, text); + mocks.VerifyAll(); } [Test] @@ -74,7 +80,7 @@ { // Setup var mocks = new MockRepository(); - var lineData = mocks.StrictMock(Enumerable.Empty()); + var lineData = mocks.StrictMock(Enumerable.Empty(), "test data"); mocks.ReplayAll(); @@ -93,7 +99,7 @@ { // Setup var mocks = new MockRepository(); - var lineData = mocks.StrictMock(Enumerable.Empty()); + var lineData = mocks.StrictMock(Enumerable.Empty(), "test data"); lineData.IsVisible = isVisible; @@ -114,7 +120,7 @@ { // Setup var mocks = new MockRepository(); - var lineData = mocks.StrictMock(Enumerable.Empty()); + var lineData = mocks.StrictMock(Enumerable.Empty(), "test data"); mocks.ReplayAll(); @@ -136,7 +142,7 @@ // Setup var mocks = new MockRepository(); var observable = mocks.StrictMock(); - var lineData = mocks.StrictMock(Enumerable.Empty()); + var lineData = mocks.StrictMock(Enumerable.Empty(), "test data"); observable.Expect(o => o.NotifyObservers()); @@ -158,7 +164,7 @@ { // Setup var mocks = new MockRepository(); - var lineData = mocks.StrictMock(Enumerable.Empty()); + var lineData = mocks.StrictMock(Enumerable.Empty(), "test data"); mocks.ReplayAll(); Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPointDataTreeNodeInfoTest.cs =================================================================== diff -u -rfff190e93adf8dd50b1badaa7044576ab2a8c4c1 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPointDataTreeNodeInfoTest.cs (.../MapPointDataTreeNodeInfoTest.cs) (revision fff190e93adf8dd50b1badaa7044576ab2a8c4c1) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPointDataTreeNodeInfoTest.cs (.../MapPointDataTreeNodeInfoTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -52,11 +52,17 @@ [Test] public void Text_Always_ReturnsTextFromResource() { + // Setup + var mocks = new MockRepository(); + var mapPointData = mocks.StrictMock(Enumerable.Empty(), "MapPointData"); + mocks.ReplayAll(); + // Call - var text = info.Text(null); + var text = info.Text(mapPointData); // Assert - Assert.AreEqual(DotSpatialResources.MapData_Point_data_label, text); + Assert.AreEqual(mapPointData.Name, text); + mocks.VerifyAll(); } [Test] @@ -74,7 +80,7 @@ { // Setup var mocks = new MockRepository(); - var lineData = mocks.StrictMock(Enumerable.Empty()); + var lineData = mocks.StrictMock(Enumerable.Empty(), "test data"); mocks.ReplayAll(); @@ -93,7 +99,7 @@ { // Setup var mocks = new MockRepository(); - var lineData = mocks.StrictMock(Enumerable.Empty()); + var lineData = mocks.StrictMock(Enumerable.Empty(), "test data"); lineData.IsVisible = isVisible; @@ -114,7 +120,7 @@ { // Setup var mocks = new MockRepository(); - var lineData = mocks.StrictMock(Enumerable.Empty()); + var lineData = mocks.StrictMock(Enumerable.Empty(), "test data"); mocks.ReplayAll(); @@ -136,7 +142,7 @@ // Setup var mocks = new MockRepository(); var observable = mocks.StrictMock(); - var lineData = mocks.StrictMock(Enumerable.Empty()); + var lineData = mocks.StrictMock(Enumerable.Empty(), "test data"); observable.Expect(o => o.NotifyObservers()); @@ -158,7 +164,7 @@ { // Setup var mocks = new MockRepository(); - var pointData = mocks.StrictMock(Enumerable.Empty()); + var pointData = mocks.StrictMock(Enumerable.Empty(), "test data"); mocks.ReplayAll(); Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPolygonDataTreeNodeInfoTest.cs =================================================================== diff -u -rfff190e93adf8dd50b1badaa7044576ab2a8c4c1 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPolygonDataTreeNodeInfoTest.cs (.../MapPolygonDataTreeNodeInfoTest.cs) (revision fff190e93adf8dd50b1badaa7044576ab2a8c4c1) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPolygonDataTreeNodeInfoTest.cs (.../MapPolygonDataTreeNodeInfoTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -52,11 +52,17 @@ [Test] public void Text_Always_ReturnsTextFromResource() { + // Setup + var mocks = new MockRepository(); + var mapPolygonData = mocks.StrictMock(Enumerable.Empty(), "MapPolygonData"); + mocks.ReplayAll(); + // Call - var text = info.Text(null); + var text = info.Text(mapPolygonData); // Assert - Assert.AreEqual(DotSpatialResources.MapData_Polygon_data_label, text); + Assert.AreEqual(mapPolygonData.Name, text); + mocks.VerifyAll(); } [Test] @@ -74,7 +80,7 @@ { // Setup var mocks = new MockRepository(); - var lineData = mocks.StrictMock(Enumerable.Empty()); + var lineData = mocks.StrictMock(Enumerable.Empty(), "test data"); mocks.ReplayAll(); @@ -93,7 +99,7 @@ { // Setup var mocks = new MockRepository(); - var lineData = mocks.StrictMock(Enumerable.Empty()); + var lineData = mocks.StrictMock(Enumerable.Empty(), "test data"); lineData.IsVisible = isVisible; @@ -114,7 +120,7 @@ { // Setup var mocks = new MockRepository(); - var lineData = mocks.StrictMock(Enumerable.Empty()); + var lineData = mocks.StrictMock(Enumerable.Empty(), "test data"); mocks.ReplayAll(); @@ -136,7 +142,7 @@ // Setup var mocks = new MockRepository(); var observable = mocks.StrictMock(); - var lineData = mocks.StrictMock(Enumerable.Empty()); + var lineData = mocks.StrictMock(Enumerable.Empty(), "test data"); observable.Expect(o => o.NotifyObservers()); @@ -158,7 +164,7 @@ { // Setup var mocks = new MockRepository(); - var polygonData = mocks.StrictMock(Enumerable.Empty()); + var polygonData = mocks.StrictMock(Enumerable.Empty(), "test data"); mocks.ReplayAll(); Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenMapViewCommand.cs =================================================================== diff -u -r33c64ea2cd6b287bf5954e63a548d89dadb7f153 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenMapViewCommand.cs (.../OpenMapViewCommand.cs) (revision 33c64ea2cd6b287bf5954e63a548d89dadb7f153) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenMapViewCommand.cs (.../OpenMapViewCommand.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -5,6 +5,7 @@ using Core.Common.Controls.Commands; using Core.Common.Gui; using Core.Components.Gis.Data; +using Demo.Ringtoets.Properties; namespace Demo.Ringtoets.Commands { @@ -47,21 +48,24 @@ new Point2D(1.5, 2), new Point2D(1.1, 1), new Point2D(0.8, 0.5) - }); + }, Resources.OpenMapViewCommand_Execute_Point_demo_data); var lines = new MapLineData(new Collection { new Point2D(0.0, 1.1), new Point2D(1.0, 2.1), new Point2D(1.6, 1.6) - }); + }, Resources.OpenMapViewCommand_Execute_Line_demo_data); var polygons = new MapPolygonData(new Collection { new Point2D(1.0, 1.3), new Point2D(3.0, 2.6), new Point2D(5.6, 1.6) - }); + }, Resources.OpenMapViewCommand_Execute_Polygon_demo_data); - documentViewController.DocumentViewsResolver.OpenViewForData(new MapDataCollection(new List { points, lines, polygons })); + documentViewController.DocumentViewsResolver.OpenViewForData(new MapDataCollection(new List + { + points, lines, polygons + }, Resources.OpenMapViewCommand_Execute_List)); } } } \ No newline at end of file Index: Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.Designer.cs =================================================================== diff -u -r503ce83bfc5077074351e8d10b18ab8c1343f6b2 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 503ce83bfc5077074351e8d10b18ab8c1343f6b2) +++ Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -173,6 +173,42 @@ } /// + /// Looks up a localized string similar to Lijn demo data. + /// + public static string OpenMapViewCommand_Execute_Line_demo_data { + get { + return ResourceManager.GetString("OpenMapViewCommand_Execute_Line_demo_data", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Lijst. + /// + public static string OpenMapViewCommand_Execute_List { + get { + return ResourceManager.GetString("OpenMapViewCommand_Execute_List", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Punt demo data. + /// + public static string OpenMapViewCommand_Execute_Point_demo_data { + get { + return ResourceManager.GetString("OpenMapViewCommand_Execute_Point_demo_data", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Polygoon demo data. + /// + public static string OpenMapViewCommand_Execute_Polygon_demo_data { + get { + return ResourceManager.GetString("OpenMapViewCommand_Execute_Polygon_demo_data", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Demo. /// public static string Ribbon_Demo_Header { Index: Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.resx =================================================================== diff -u -r503ce83bfc5077074351e8d10b18ab8c1343f6b2 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.resx (.../Resources.resx) (revision 503ce83bfc5077074351e8d10b18ab8c1343f6b2) +++ Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.resx (.../Resources.resx) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -157,4 +157,16 @@ Open een documentvenster met een diagram. + + Punt demo data + + + Lijn demo data + + + Polygoon demo data + + + Lijst + \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r76ace4042e4e8a92a0ba37e8e9a9373ed6cea951 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 76ace4042e4e8a92a0ba37e8e9a9373ed6cea951) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -153,6 +153,15 @@ } /// + /// Looks up a localized string similar to Hydraulische randvoorwaarden. + /// + public static string HydraulicBoundareyConditions_DisplayName { + get { + return ResourceManager.GetString("HydraulicBoundareyConditions_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Overig. /// public static string OtherFailureMechanism_DisplayName { @@ -162,6 +171,24 @@ } /// + /// Looks up a localized string similar to Dijken - Piping. + /// + public static string PipingFailureMechanism_DisplayName { + get { + return ResourceManager.GetString("PipingFailureMechanism_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Referentielijn. + /// + public static string ReferenceLine_DisplayName { + get { + return ResourceManager.GetString("ReferenceLine_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to De geometrie die opgegeven werd voor de referentielijn heeft geen waarde.. /// public static string ReferenceLine_SetGeometry_New_geometry_cannot_be_null { @@ -178,5 +205,14 @@ return ResourceManager.GetString("ReferenceLine_SetGeometry_New_geometry_has_null_coordinate", resourceCulture); } } + + /// + /// Looks up a localized string similar to Profielmetingen. + /// + public static string SurfaceLine_DisplayName { + get { + return ResourceManager.GetString("SurfaceLine_DisplayName", resourceCulture); + } + } } } Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx =================================================================== diff -u -r76ace4042e4e8a92a0ba37e8e9a9373ed6cea951 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 76ace4042e4e8a92a0ba37e8e9a9373ed6cea951) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -156,4 +156,16 @@ Overig + + Hydraulische randvoorwaarden + + + Dijken - Piping + + + Referentielijn + + + Profielmetingen + \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineReader.cs =================================================================== diff -u -r33c64ea2cd6b287bf5954e63a548d89dadb7f153 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineReader.cs (.../ReferenceLineReader.cs) (revision 33c64ea2cd6b287bf5954e63a548d89dadb7f153) +++ Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineReader.cs (.../ReferenceLineReader.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -34,6 +34,7 @@ using CoreCommonUtilsResources = Core.Common.Utils.Properties.Resources; using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources; +using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; namespace Ringtoets.Common.IO { @@ -116,7 +117,7 @@ try { - return lineShapeReader.ReadLine(); + return lineShapeReader.ReadLine(RingtoetsCommonDataResources.ReferenceLine_DisplayName); } catch (ElementReadException e) { Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r6082058138668a301e1aae6f75a12985d604cc68 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6082058138668a301e1aae6f75a12985d604cc68) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -367,15 +367,6 @@ } /// - /// Looks up a localized string similar to Referentielijn. - /// - public static string ReferenceLine_DisplayName { - get { - return ResourceManager.GetString("ReferenceLine_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Kan geen presentatie object maken voor een referentielijn zonder een traject als eigenaar.. /// public static string ReferenceLineContext_Parent_assessment_section_cannot_be_null { Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx =================================================================== diff -u -r6082058138668a301e1aae6f75a12985d604cc68 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6082058138668a301e1aae6f75a12985d604cc68) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -148,9 +148,6 @@ ..\Resources\chart_single_line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Referentielijn - Kan geen presentatie object maken voor een referentielijn zonder een traject als eigenaar. Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs =================================================================== diff -u -r0e801c8485332bd9cdd1a907619f1f93e495ba4c -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs (.../AssessmentSectionView.cs) (revision 0e801c8485332bd9cdd1a907619f1f93e495ba4c) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs (.../AssessmentSectionView.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -30,7 +30,8 @@ using Core.Plugins.DotSpatial.Forms; using Ringtoets.Common.Data; -using Ringtoets.Integration.Data; +using Ringtoets.Integration.Forms.Properties; +using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; namespace Ringtoets.Integration.Forms.Views { @@ -103,19 +104,19 @@ mapDataList.Add(GetHydraulicBoundaryLocations()); } - map.Data = new MapDataCollection(mapDataList); + map.Data = new MapDataCollection(mapDataList, Resources.TrajectMap_DisplayName); } private MapData GetReferenceLineData() { Point2D[] referenceLinePoints = data.ReferenceLine.Points.ToArray(); - return new MapLineData(referenceLinePoints); + return new MapLineData(referenceLinePoints, RingtoetsCommonDataResources.ReferenceLine_DisplayName); } private MapData GetHydraulicBoundaryLocations() { Point2D[] hrLocations = data.HydraulicBoundaryDatabase.Locations.Select(h => h.Location).ToArray(); - return new MapPointData(hrLocations); + return new MapPointData(hrLocations, RingtoetsCommonDataResources.HydraulicBoundareyConditions_DisplayName); } private bool HasReferenceLinePoints() Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/ReferenceLineImporter.cs =================================================================== diff -u -rc6a3cd9e25138d35bf0881f3ff6df9dfe1776fd2 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/ReferenceLineImporter.cs (.../ReferenceLineImporter.cs) (revision c6a3cd9e25138d35bf0881f3ff6df9dfe1776fd2) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/ReferenceLineImporter.cs (.../ReferenceLineImporter.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -39,6 +39,7 @@ using CoreCommonBaseResources = Core.Common.Base.Properties.Resources; using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources; +using RingtoetsDataResources = Ringtoets.Common.Data.Properties.Resources; using RingtoetsIntegrationFormsResources = Ringtoets.Integration.Forms.Properties.Resources; namespace Ringtoets.Integration.Plugin.FileImporters @@ -57,7 +58,7 @@ { get { - return RingtoetsIntegrationFormsResources.ReferenceLine_DisplayName; + return RingtoetsDataResources.ReferenceLine_DisplayName; } } @@ -90,7 +91,7 @@ get { return String.Format("{0} shapefile (*.shp)|*.shp", - RingtoetsIntegrationFormsResources.ReferenceLine_DisplayName); + RingtoetsDataResources.ReferenceLine_DisplayName); } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs =================================================================== diff -u -rfc22f4b149d07797f0526f04ca58595bb9446786 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs (.../RingtoetsGuiPlugin.cs) (revision fc22f4b149d07797f0526f04ca58595bb9446786) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs (.../RingtoetsGuiPlugin.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -133,7 +133,7 @@ yield return new TreeNodeInfo { - Text = context => RingtoetsFormsResources.ReferenceLine_DisplayName, + Text = context => RingtoetsCommonDataResources.ReferenceLine_DisplayName, Image = context => RingtoetsFormsResources.ReferenceLineIcon, ForeColor = context => context.WrappedData == null ? Color.FromKnownColor(KnownColor.GrayText) : Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs =================================================================== diff -u -r76ace4042e4e8a92a0ba37e8e9a9373ed6cea951 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision 76ace4042e4e8a92a0ba37e8e9a9373ed6cea951) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -36,7 +36,8 @@ /// /// Initializes a new instance of the class. /// - public PipingFailureMechanism() : base(Resources.PipingFailureMechanism_DisplayName) + public PipingFailureMechanism() + : base(RingtoetsCommonDataResources.PipingFailureMechanism_DisplayName) { SurfaceLines = new ObservableList(); SoilProfiles = new ObservableList(); Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs =================================================================== diff -u -rdaf4bf00e8ea376485f54faa2fee8497607ddfb0 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision daf4bf00e8ea376485f54faa2fee8497607ddfb0) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -214,15 +214,6 @@ } /// - /// Looks up a localized string similar to Dijken - Piping. - /// - public static string PipingFailureMechanism_DisplayName { - get { - return ResourceManager.GetString("PipingFailureMechanism_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Toetspeil moet een geldige waarde hebben.. /// public static string PipingInput_AssessmentLevel_Cannot_set_to_NaN { Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx =================================================================== diff -u -rdaf4bf00e8ea376485f54faa2fee8497607ddfb0 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision daf4bf00e8ea376485f54faa2fee8497607ddfb0) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -162,9 +162,6 @@ Berekeningen - - Dijken - Piping - {0} L moet in het bereik van [{1}, {2}] liggen. Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs =================================================================== diff -u -ra927058f93a70b14989884a77f3b46a62e12532d -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs (.../PipingFailureMechanismView.cs) (revision a927058f93a70b14989884a77f3b46a62e12532d) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs (.../PipingFailureMechanismView.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -31,6 +31,7 @@ using Core.Plugins.DotSpatial.Forms; using Ringtoets.Piping.Forms.PresentationObjects; +using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; namespace Ringtoets.Piping.Forms.Views { @@ -140,25 +141,25 @@ } } - map.Data = new MapDataCollection(mapDataList); + map.Data = new MapDataCollection(mapDataList, RingtoetsCommonDataResources.PipingFailureMechanism_DisplayName); } private MapData GetReferenceLineMapData() { Point2D[] referenceLinePoints = data.Parent.ReferenceLine.Points.ToArray(); - return new MapLineData(referenceLinePoints); + return new MapLineData(referenceLinePoints, RingtoetsCommonDataResources.ReferenceLine_DisplayName); } private MapData GetHydraulicBoundaryLocationsMapData() { Point2D[] hrLocations = data.Parent.HydraulicBoundaryDatabase.Locations.Select(h => h.Location).ToArray(); - return new MapPointData(hrLocations); + return new MapPointData(hrLocations, RingtoetsCommonDataResources.HydraulicBoundareyConditions_DisplayName); } private MapData GetSurfaceLinesMapData() { IEnumerable> surfaceLines = data.WrappedData.SurfaceLines.Select(sl => sl.Points.Select(p => new Point2D(p.X, p.Y))); - return new MapMultiLineData(surfaceLines); + return new MapMultiLineData(surfaceLines, RingtoetsCommonDataResources.SurfaceLine_DisplayName); } private MapData GetSectionsMapData() Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs =================================================================== diff -u -re0368fded7b5205d75bd1fbefd90ba8634d58fa6 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision e0368fded7b5205d75bd1fbefd90ba8634d58fa6) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -39,6 +39,7 @@ using Ringtoets.Piping.Service; using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; +using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources; using BaseResources = Core.Common.Base.Properties.Resources; @@ -68,7 +69,7 @@ { yield return new ViewInfo { - GetViewName = (view, mechanism) => PipingDataResources.PipingFailureMechanism_DisplayName, + GetViewName = (view, mechanism) => RingtoetsCommonDataResources.PipingFailureMechanism_DisplayName, Image = PipingFormsResources.PipingIcon }; } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs =================================================================== diff -u -r76ace4042e4e8a92a0ba37e8e9a9373ed6cea951 -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs (.../PipingFailureMechanismTreeNodeInfoTest.cs) (revision 76ace4042e4e8a92a0ba37e8e9a9373ed6cea951) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs (.../PipingFailureMechanismTreeNodeInfoTest.cs) (revision c9f9c04e4fc62406231afd07d63cd7da11673ec6) @@ -16,11 +16,11 @@ using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.Piping.Calculation.TestUtil; using Ringtoets.Piping.Data; -using Ringtoets.Piping.Data.Properties; using Ringtoets.Piping.Data.TestUtil; using Ringtoets.Piping.Forms.PresentationObjects; using Ringtoets.Piping.Plugin; using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources; +using RingtoetsDataResources = Ringtoets.Common.Data.Properties.Resources; using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources; using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources; @@ -80,7 +80,7 @@ var text = info.Text(mechanismContext); // Assert - Assert.AreEqual(Resources.PipingFailureMechanism_DisplayName, text); + Assert.AreEqual(RingtoetsDataResources.PipingFailureMechanism_DisplayName, text); mocks.VerifyAll(); }