Index: Core/Components/src/Core.Components.DotSpatial/BaseMap.cs =================================================================== diff -u -r71ce26f5bde53bd1173fbe6ea09510e30a6a1166 -r04c70d10f22ba007f8210813d3d02697e42f8a5d --- Core/Components/src/Core.Components.DotSpatial/BaseMap.cs (.../BaseMap.cs) (revision 71ce26f5bde53bd1173fbe6ea09510e30a6a1166) +++ Core/Components/src/Core.Components.DotSpatial/BaseMap.cs (.../BaseMap.cs) (revision 04c70d10f22ba007f8210813d3d02697e42f8a5d) @@ -28,21 +28,26 @@ /// /// Gets and sets the . When is not empty it will load the data on the map. /// - /// Thrown when is invalid. + /// Thrown when is null. + /// Thrown when does not exist. + /// Thrown when has an unaccepted extension. public void SetMapData(MapData mapData) { - try + if (IsDisposed) { - if (mapData.IsValid()) - { - data = mapData; - LoadData(); - } + return; } - catch (Exception e) + + if(mapData == null) { - throw new ArgumentException("Could not set the data on the map.", e.Message); + throw new ArgumentNullException("mapData", "MapData is required when adding shapeFiles"); } + + if (mapData.IsValid()) + { + data = mapData; + LoadData(); + } } /// Index: Core/Components/src/Core.Components.DotSpatial/Data/MapData.cs =================================================================== diff -u -r71ce26f5bde53bd1173fbe6ea09510e30a6a1166 -r04c70d10f22ba007f8210813d3d02697e42f8a5d --- Core/Components/src/Core.Components.DotSpatial/Data/MapData.cs (.../MapData.cs) (revision 71ce26f5bde53bd1173fbe6ea09510e30a6a1166) +++ Core/Components/src/Core.Components.DotSpatial/Data/MapData.cs (.../MapData.cs) (revision 04c70d10f22ba007f8210813d3d02697e42f8a5d) @@ -10,7 +10,7 @@ /// public class MapData { - private const string extension = "shp"; + private const string extension = ".shp"; private readonly HashSet filePaths; @@ -37,6 +37,7 @@ /// Adds the shape file to the list. Each should be unique. /// /// The path to the file. + /// Thrown when is null. /// Thrown when does not exist. /// Thrown when has an unaccepted extension. /// True when added to the list. False when it is not added, for example when is not unique. @@ -50,12 +51,13 @@ /// /// Checks if the given paths are valid. /// - /// Thrown when does not exist. - /// Thrown when has an unaccepted extension. + /// Throwns when value in is null. + /// Thrown when value in does not exist. + /// Thrown when value has an unaccepted extension. /// public bool IsValid() { - foreach (var path in FilePaths) + foreach (var path in filePaths) { IsPathValid(path); } @@ -65,6 +67,11 @@ private void IsPathValid(string path) { + if (path == null) + { + throw new ArgumentNullException("path", "A path is required when adding shape files"); + } + if (!File.Exists(path)) { throw new FileNotFoundException(string.Format(Resources.MapData_IsPathValid_File_on_path__0__does_not_exist, path)); Index: Core/Components/src/Core.Components.DotSpatial/Properties/Resources.Designer.cs =================================================================== diff -u -r71ce26f5bde53bd1173fbe6ea09510e30a6a1166 -r04c70d10f22ba007f8210813d3d02697e42f8a5d --- Core/Components/src/Core.Components.DotSpatial/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 71ce26f5bde53bd1173fbe6ea09510e30a6a1166) +++ Core/Components/src/Core.Components.DotSpatial/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 04c70d10f22ba007f8210813d3d02697e42f8a5d) @@ -61,33 +61,6 @@ } /// - /// Looks up a localized string similar to Kan bestand met deze extensie niet openen.. - /// - public static string BaseMap_LoadData_Cannot_open_file_extension { - get { - return ResourceManager.GetString("BaseMap_LoadData_Cannot_open_file_extension", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Het bestand {0} kon niet worden gevonden.. - /// - public static string BaseMap_LoadData_File_loading_failded__The_file__0__could_not_be_found { - get { - return ResourceManager.GetString("BaseMap_LoadData_File_loading_failded__The_file__0__could_not_be_found", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Bestand is niet compleet.. - /// - public static string BaseMap_LoadData_NullException_in_file { - get { - return ResourceManager.GetString("BaseMap_LoadData_NullException_in_file", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Shape file op pad {0} is aan de kaart toegevoegd.. /// public static string BaseMap_LoadData_Shape_file_on_path__0__is_added_to_the_map_ { Index: Core/Components/src/Core.Components.DotSpatial/Properties/Resources.resx =================================================================== diff -u -r71ce26f5bde53bd1173fbe6ea09510e30a6a1166 -r04c70d10f22ba007f8210813d3d02697e42f8a5d --- Core/Components/src/Core.Components.DotSpatial/Properties/Resources.resx (.../Resources.resx) (revision 71ce26f5bde53bd1173fbe6ea09510e30a6a1166) +++ Core/Components/src/Core.Components.DotSpatial/Properties/Resources.resx (.../Resources.resx) (revision 04c70d10f22ba007f8210813d3d02697e42f8a5d) @@ -117,15 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Het bestand {0} kon niet worden gevonden. - - - Bestand is niet compleet. - - - Kan bestand met deze extensie niet openen. - Bestand op pad {0} bestaat niet. Index: Core/Components/test/Core.Components.DotSpatial.Test/BaseMapTest.cs =================================================================== diff -u -r70875d4b12e2e60901b99d1e67469e7c11ec5b4d -r04c70d10f22ba007f8210813d3d02697e42f8a5d --- Core/Components/test/Core.Components.DotSpatial.Test/BaseMapTest.cs (.../BaseMapTest.cs) (revision 70875d4b12e2e60901b99d1e67469e7c11ec5b4d) +++ Core/Components/test/Core.Components.DotSpatial.Test/BaseMapTest.cs (.../BaseMapTest.cs) (revision 04c70d10f22ba007f8210813d3d02697e42f8a5d) @@ -1,7 +1,9 @@ using System; -using System.Collections.ObjectModel; +using System.IO; using System.Windows.Forms; using Core.Common.TestUtil; +using Core.Common.Utils.Reflection; +using Core.Components.DotSpatial.Data; using Core.Components.DotSpatial.Properties; using DotSpatial.Controls; using NUnit.Framework; @@ -12,63 +14,97 @@ [TestFixture] public class BaseMapTest { -// [Test] -// public void DefaultConstructor_PropertiesSet() -// { -// // Setup -// var mocks = new MockRepository(); -// var map = mocks.StrictMock(); -// mocks.ReplayAll(); -// -// // Call -// var baseMap = new BaseMap(); -// -// // Assert -// Assert.IsInstanceOf(baseMap); -// Assert.IsNotNull(baseMap.Data); -// Assert.IsNotNull(map); -// mocks.VerifyAll(); -// } -// -// [Test] -// public void Data_NotNull_DataSet() -// { -// // Setup -// var map = new BaseMap(); -// var fileData = new Collection { "1", "2", "3" }; -// -// // Call -// map.Data = fileData; -// -// //Assert -// CollectionAssert.AreEqual(fileData, map.Data); -// } -// -// [Test] -// public void Data_NotKnownFileType_HandlesApplicationExceptionAndWriteLog() -// { -// // Setup -// var map = new BaseMap(); -// -// // Call / Assert -// Action action = () => map.Data = new Collection { "test" }; -// TestHelper.AssertLogMessageIsGenerated(action, Resources.BaseMap_LoadData_Cannot_open_file_extension); -// } -// -// [Test] -// public void Data_FileDoesNotExist_WritesLog() -// { -// // Setup -// var map = new BaseMap(); -// var fileName = "test.shp"; -// var completeFilePath = string.Format("{0}\\{1}", Environment.CurrentDirectory, fileName); -// var expectedLog = string.Format(Resources.BaseMap_LoadData_File_loading_failded__The_file__0__could_not_be_found, completeFilePath); -// -// // Call / Assert -// Action action = () => map.Data = new Collection { fileName }; -// TestHelper.AssertLogMessageIsGenerated(action, expectedLog); -// } + [Test] + public void DefaultConstructor_PropertiesSet() + { + // Setup + var mocks = new MockRepository(); + var map = mocks.StrictMock(); + mocks.ReplayAll(); - //TODO Add test for successfull map loading + // Call + var baseMap = new BaseMap(); + + // Assert + Assert.IsInstanceOf(baseMap); + Assert.IsNotNull(map); + mocks.VerifyAll(); + } + + [Test] + public void Data_ShapeFileIsValidMissesNeededFiles_ThrowsFileNotFoundException() + { + // Setup + var map = new BaseMap(); + var data = new MapData(); + + data.AddShapeFile(string.Format("{0}\\Resources\\DR10_segments.shp", Environment.CurrentDirectory)); + + // Call + TestDelegate setDataDelegate = () => map.SetMapData(data); + + // Assert + Assert.Throws(setDataDelegate); + } + + [Test] + public void SetDataOnMap_FileDeleted_ThrowsFileNotFoundException() + { + // Setup + var map = new BaseMap(); + var data = new MapData(); + var filePath = string.Format("{0}\\Resources\\DR10_binnenteen.shp", Environment.CurrentDirectory); + + data.AddShapeFile(filePath); + + File.Delete(filePath); + + // Call + TestDelegate testDelegate = () => map.SetMapData(data); + + // Assert + Assert.Throws(testDelegate); + } + + [Test] + public void Data_IsValid_DoesNotThrowException() + { + // Setup + var map = new BaseMap(); + var data = new MapData(); + + data.AddShapeFile(string.Format("{0}\\Resources\\DR10_dijkvakgebieden.shp", Environment.CurrentDirectory)); + + // Call + TestDelegate setDataDelegate = () => map.SetMapData(data); + + // Assert + Assert.DoesNotThrow(setDataDelegate); + } + + [Test] + public void SetDataOnMap_Succeeds_AddOneMapLayerAndWriteLog() + { + // Setup + var map = new BaseMap(); + var data = new MapData(); + + var filePath = string.Format("{0}\\Resources\\DR10_dijkvakgebieden.shp", Environment.CurrentDirectory); + var excpectedLog = string.Format(Resources.BaseMap_LoadData_Shape_file_on_path__0__is_added_to_the_map_, filePath); + + data.AddShapeFile(filePath); + + var mapComponent = TypeUtils.GetField(map, "map"); + + // Pre-condition + var preLayerCount = mapComponent.GetLayers().Count; + + // Call + Action action = () => map.SetMapData(data); + + // Assert + TestHelper.AssertLogMessageIsGenerated(action, excpectedLog); + Assert.AreEqual(preLayerCount+1, mapComponent.GetLayers().Count); + } } } \ No newline at end of file Index: Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj =================================================================== diff -u -ra76df67ff1bcdceeb8297286983072a14dd1229e -r04c70d10f22ba007f8210813d3d02697e42f8a5d --- Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj (.../Core.Components.DotSpatial.Test.csproj) (revision a76df67ff1bcdceeb8297286983072a14dd1229e) +++ Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj (.../Core.Components.DotSpatial.Test.csproj) (revision 04c70d10f22ba007f8210813d3d02697e42f8a5d) @@ -101,6 +101,7 @@ + True @@ -109,6 +110,10 @@ + + {F49BD8B2-332A-4C91-A196-8CCE0A2C7D98} + Core.Common.Utils + {D749EE4C-CE50-4C17-BF01-9A953028C126} Core.Common.TestUtil @@ -120,21 +125,57 @@ - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest + + PreserveNewest + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + @@ -144,6 +185,16 @@ + Always + + + + + Always + + + + PreserveNewest Index: Core/Components/test/Core.Components.DotSpatial.Test/Data/MapDataTest.cs =================================================================== diff -u --- Core/Components/test/Core.Components.DotSpatial.Test/Data/MapDataTest.cs (revision 0) +++ Core/Components/test/Core.Components.DotSpatial.Test/Data/MapDataTest.cs (revision 04c70d10f22ba007f8210813d3d02697e42f8a5d) @@ -0,0 +1,121 @@ +using System; +using System.Collections.Generic; +using System.IO; +using Core.Common.Utils.Reflection; +using Core.Components.DotSpatial.Data; +using NUnit.Framework; +using Rhino.Mocks; + +namespace Core.Components.DotSpatial.Test.Data +{ + [TestFixture] + public class MapDataTest + { + [Test] + public void Constructor_Always_CreatesHashSet() + { + // Call + var data = new MapData(); + var filePaths = TypeUtils.GetField>(data, "filePaths"); + + // Assert + Assert.IsNotNull(filePaths); + Assert.IsInstanceOf>(data.FilePaths); + } + + [Test] + public void AddShapeFile_IsValid_ReturnsTrue() + { + // Setup + var data = new MapData(); + var filePath = string.Format("{0}\\Resources\\DR10_dijkvakgebieden.shp", Environment.CurrentDirectory); + + // Call + var succeeded = data.AddShapeFile(filePath); + + // Assert + Assert.IsTrue(succeeded); + } + + [Test] + public void AddShapeFile_IsDuplicate_ReturnsFalse() + { + // Setup + var data = new MapData(); + var filePath = string.Format("{0}\\Resources\\DR10_dijkvakgebieden.shp", Environment.CurrentDirectory); + + // Call + var succeededFirst = data.AddShapeFile(filePath); + var succeededSecond = data.AddShapeFile(filePath); + + // Assert + Assert.IsTrue(succeededFirst); + Assert.IsFalse(succeededSecond); + } + + [Test] + public void AddShapeFile_FileDoesNotExist_ThrowsFileNotFoundException() + { + // Setup + var data = new MapData(); + var filePath = "Test"; + + // Call + TestDelegate testDelegate = () => data.AddShapeFile(filePath); + + // Assert + Assert.Throws(testDelegate); + } + + [Test] + public void AddShapeFile_ExtensionIsInvalid_ThrowsArgumentException() + { + // Setup + var data = new MapData(); + var filePath = string.Format("{0}\\Resources\\DR10_dijkvakgebieden.dbf", Environment.CurrentDirectory); + + // Call + TestDelegate testDelegate = () => data.AddShapeFile(filePath); + + // Assert + Assert.Throws(testDelegate); + } + + [Test] + public void AddShapeFile_IsNull_ThrowsArgumentNullException() + { + // Setup + var data = new MapData(); + + // Call + TestDelegate testDelegate = () => data.AddShapeFile(null); + + // Assert + Assert.Throws(testDelegate); + } + + [Test] + public void FilePaths_Always_EqualsAddedShapeFiles() + { + // Setup + var data = new MapData(); + var filePathsToAdd = new string[] + { + string.Format("{0}\\Resources\\DR10_dijkvakgebieden.shp", Environment.CurrentDirectory), + string.Format("{0}\\Resources\\DR10_segments.shp", Environment.CurrentDirectory) + }; + + var addedPaths = new HashSet(); + + foreach (string path in filePathsToAdd) + { + // Call + data.AddShapeFile(path); + addedPaths.Add(path); + + // Assert + Assert.AreEqual(data.FilePaths, addedPaths); + } + } + } +} \ No newline at end of file Index: Core/Components/test/Core.Components.DotSpatial.Test/Properties/TestResources.Designer.cs =================================================================== diff -u -ra76df67ff1bcdceeb8297286983072a14dd1229e -r04c70d10f22ba007f8210813d3d02697e42f8a5d --- Core/Components/test/Core.Components.DotSpatial.Test/Properties/TestResources.Designer.cs (.../TestResources.Designer.cs) (revision a76df67ff1bcdceeb8297286983072a14dd1229e) +++ Core/Components/test/Core.Components.DotSpatial.Test/Properties/TestResources.Designer.cs (.../TestResources.Designer.cs) (revision 04c70d10f22ba007f8210813d3d02697e42f8a5d) @@ -63,6 +63,146 @@ /// /// Looks up a localized resource of type System.Byte[]. /// + internal static byte[] DR10_binnenteen { + get { + object obj = ResourceManager.GetObject("DR10_binnenteen", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8"?> + ///<metadata xml:lang="en"><Esri><CreaDate>20140305</CreaDate><CreaTime>17083100</CreaTime><ArcGISFormat>1.0</ArcGISFormat><SyncOnce>TRUE</SyncOnce><DataProperties><lineage><Process ToolSource="c:\program files (x86)\arcgis\desktop10.1\ArcToolbox\Toolboxes\Data Management Tools.tbx\DefineProjection" Date="20140305" Time="170831">DefineProjection DR10_binnenteen PROJCS['RD_New',GEOGCS['GCS_Amersfoort',DATUM['D_Amersfoort',SPHEROID['Bessel_1841',6377397.155,299.1528128]],P [rest of string was truncated]";. + /// + internal static string DR10_binnenteen_shp { + get { + return ResourceManager.GetString("DR10_binnenteen_shp", resourceCulture); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] DR10_binnenteen1 { + get { + object obj = ResourceManager.GetObject("DR10_binnenteen1", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] DR10_binnenteen2 { + get { + object obj = ResourceManager.GetObject("DR10_binnenteen2", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] DR10_binnenteen3 { + get { + object obj = ResourceManager.GetObject("DR10_binnenteen3", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] DR10_binnenteen4 { + get { + object obj = ResourceManager.GetObject("DR10_binnenteen4", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] DR10_binnenteen5 { + get { + object obj = ResourceManager.GetObject("DR10_binnenteen5", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] DR10_dijkvakgebieden { + get { + object obj = ResourceManager.GetObject("DR10_dijkvakgebieden", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8"?> + ///<metadata xml:lang="nl"><Esri><CreaDate>20120830</CreaDate><CreaTime>15014200</CreaTime><ArcGISFormat>1.0</ArcGISFormat><SyncOnce>FALSE</SyncOnce><DataProperties><itemProps><itemName Sync="TRUE">DR10_dijkvakgebieden</itemName><imsContentType Sync="TRUE">002</imsContentType><itemSize Sync="TRUE">0.000</itemSize><itemLocation><linkage Sync="TRUE">file://\\D00347\D$\Ringtoets dataset WGS DR10 Piping\dataset piping\DR10_dijkvakgebieden.shp</linkage><protocol Sync="TRUE">L [rest of string was truncated]";. + /// + internal static string DR10_dijkvakgebieden_shp { + get { + return ResourceManager.GetString("DR10_dijkvakgebieden_shp", resourceCulture); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] DR10_dijkvakgebieden1 { + get { + object obj = ResourceManager.GetObject("DR10_dijkvakgebieden1", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] DR10_dijkvakgebieden2 { + get { + object obj = ResourceManager.GetObject("DR10_dijkvakgebieden2", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] DR10_dijkvakgebieden3 { + get { + object obj = ResourceManager.GetObject("DR10_dijkvakgebieden3", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] DR10_dijkvakgebieden4 { + get { + object obj = ResourceManager.GetObject("DR10_dijkvakgebieden4", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] DR10_dijkvakgebieden5 { + get { + object obj = ResourceManager.GetObject("DR10_dijkvakgebieden5", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// internal static byte[] DR10_segments { get { object obj = ResourceManager.GetObject("DR10_segments", resourceCulture); Index: Core/Components/test/Core.Components.DotSpatial.Test/Properties/TestResources.resx =================================================================== diff -u -ra76df67ff1bcdceeb8297286983072a14dd1229e -r04c70d10f22ba007f8210813d3d02697e42f8a5d --- Core/Components/test/Core.Components.DotSpatial.Test/Properties/TestResources.resx (.../TestResources.resx) (revision a76df67ff1bcdceeb8297286983072a14dd1229e) +++ Core/Components/test/Core.Components.DotSpatial.Test/Properties/TestResources.resx (.../TestResources.resx) (revision 04c70d10f22ba007f8210813d3d02697e42f8a5d) @@ -118,6 +118,48 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\DR10_binnenteen.dbf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\DR10_binnenteen.prj;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\DR10_binnenteen.sbn;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\DR10_binnenteen.sbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\DR10_binnenteen.shp;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\DR10_binnenteen.shx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\DR10_binnenteen.shp.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + + ..\Resources\DR10_dijkvakgebieden.dbf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\DR10_dijkvakgebieden.prj;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\DR10_dijkvakgebieden.sbn;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\DR10_dijkvakgebieden.sbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\DR10_dijkvakgebieden.shp;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\DR10_dijkvakgebieden.shx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\DR10_dijkvakgebieden.shp.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + ..\Resources\DR10_segments.shp;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Index: Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_binnenteen.dbf =================================================================== diff -u Binary files differ Index: Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_binnenteen.prj =================================================================== diff -u --- Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_binnenteen.prj (revision 0) +++ Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_binnenteen.prj (revision 04c70d10f22ba007f8210813d3d02697e42f8a5d) @@ -0,0 +1 @@ +PROJCS["RD_New",GEOGCS["GCS_Amersfoort",DATUM["D_Amersfoort",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Double_Stereographic"],PARAMETER["False_Easting",155000.0],PARAMETER["False_Northing",463000.0],PARAMETER["Central_Meridian",5.38763888888889],PARAMETER["Scale_Factor",0.9999079],PARAMETER["Latitude_Of_Origin",52.15616055555555],UNIT["Meter",1.0]] \ No newline at end of file Index: Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_binnenteen.sbn =================================================================== diff -u Binary files differ Index: Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_binnenteen.sbx =================================================================== diff -u Binary files differ Index: Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_binnenteen.shp =================================================================== diff -u Binary files differ Index: Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_binnenteen.shp.xml =================================================================== diff -u --- Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_binnenteen.shp.xml (revision 0) +++ Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_binnenteen.shp.xml (revision 04c70d10f22ba007f8210813d3d02697e42f8a5d) @@ -0,0 +1,2 @@ + +20140305170831001.0TRUEDefineProjection DR10_binnenteen PROJCS['RD_New',GEOGCS['GCS_Amersfoort',DATUM['D_Amersfoort',SPHEROID['Bessel_1841',6377397.155,299.1528128]],PRIMEM['Greenwich',0.0],UNIT['Degree',0.0174532925199433]],PROJECTION['Double_Stereographic'],PARAMETER['False_Easting',155000.0],PARAMETER['False_Northing',463000.0],PARAMETER['Central_Meridian',5.38763888888889],PARAMETER['Scale_Factor',0.9999079],PARAMETER['Latitude_Of_Origin',52.15616055555555],UNIT['Meter',1.0]] Index: Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_binnenteen.shx =================================================================== diff -u Binary files differ Index: Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_dijkvakgebieden.dbf =================================================================== diff -u Binary files differ Index: Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_dijkvakgebieden.prj =================================================================== diff -u --- Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_dijkvakgebieden.prj (revision 0) +++ Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_dijkvakgebieden.prj (revision 04c70d10f22ba007f8210813d3d02697e42f8a5d) @@ -0,0 +1 @@ +PROJCS["RD_New",GEOGCS["GCS_Amersfoort",DATUM["D_Amersfoort",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Double_Stereographic"],PARAMETER["False_Easting",155000.0],PARAMETER["False_Northing",463000.0],PARAMETER["Central_Meridian",5.38763888888889],PARAMETER["Scale_Factor",0.9999079],PARAMETER["Latitude_Of_Origin",52.15616055555555],UNIT["Meter",1.0]] \ No newline at end of file Index: Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_dijkvakgebieden.sbn =================================================================== diff -u Binary files differ Index: Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_dijkvakgebieden.sbx =================================================================== diff -u Binary files differ Index: Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_dijkvakgebieden.shp =================================================================== diff -u Binary files differ Index: Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_dijkvakgebieden.shp.xml =================================================================== diff -u --- Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_dijkvakgebieden.shp.xml (revision 0) +++ Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_dijkvakgebieden.shp.xml (revision 04c70d10f22ba007f8210813d3d02697e42f8a5d) @@ -0,0 +1,2 @@ + +20120830150142001.0FALSEDR10_dijkvakgebieden0020.000file://\\D00347\D$\Ringtoets dataset WGS DR10 Piping\dataset piping\DR10_dijkvakgebieden.shpLocal Area NetworkProjectedGCS_AmersfoortLinear Unit: Meter (1.000000)RD_New<ProjectedCoordinateSystem xsi:type='typens:ProjectedCoordinateSystem' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:xs='http://www.w3.org/2001/XMLSchema' xmlns:typens='http://www.esri.com/schemas/ArcGIS/10.0'><WKT>PROJCS[&quot;RD_New&quot;,GEOGCS[&quot;GCS_Amersfoort&quot;,DATUM[&quot;D_Amersfoort&quot;,SPHEROID[&quot;Bessel_1841&quot;,6377397.155,299.1528128]],PRIMEM[&quot;Greenwich&quot;,0.0],UNIT[&quot;Degree&quot;,0.0174532925199433]],PROJECTION[&quot;Double_Stereographic&quot;],PARAMETER[&quot;False_Easting&quot;,155000.0],PARAMETER[&quot;False_Northing&quot;,463000.0],PARAMETER[&quot;Central_Meridian&quot;,5.38763888888889],PARAMETER[&quot;Scale_Factor&quot;,0.9999079],PARAMETER[&quot;Latitude_Of_Origin&quot;,52.15616055555555],UNIT[&quot;Meter&quot;,1.0],AUTHORITY[&quot;EPSG&quot;,28992]]</WKT><XOrigin>-30515500</XOrigin><YOrigin>-30279500</YOrigin><XYScale>146716411.36275291</XYScale><ZOrigin>-100000</ZOrigin><ZScale>10000</ZScale><MOrigin>-100000</MOrigin><MScale>10000</MScale><XYTolerance>0.001</XYTolerance><ZTolerance>0.001</ZTolerance><MTolerance>0.001</MTolerance><HighPrecision>true</HighPrecision><WKID>28992</WKID></ProjectedCoordinateSystem>Buffer DR10_vakindeling_piping "D:\Ringtoets dataset WGS DR10 Piping\dataset piping\DR10_dijkvakgebieden.shp" "1000 Meters" RIGHT FLAT NONE #20120830150142002012083015014200Microsoft Windows XP Version 5.1 (Build 2600) Service Pack 3; ESRI ArcGIS 10.0.3.3600DR10_dijkvakgebiedenShapefile0.000datasetEPSG7.4.10SimpleFALSE0FALSEFALSEDR10_dijkvakgebiedenFeature Class0FIDFIDOID400Internal feature number.ESRISequential unique whole numbers that are automatically generated.ShapeShapeGeometry000Feature geometry.ESRICoordinates defining the features.FID_1FID_1Integer990OBJECTIDOBJECTIDDouble10100FID_2FID_2Integer990IdIdInteger660dwarsprofidwarsprofiString1000PROFIELNAAPROFIELNAAString1700SEGMENT_IDSEGMENT_IDString2600SOILGEOMETSOILGEOMETString1900PROBABILITPROBABILITInteger990CALCULATIOCALCULATIOString1400BUFF_DISTBUFF_DISTDouble190020120830 Index: Core/Components/test/Core.Components.DotSpatial.Test/Resources/DR10_dijkvakgebieden.shx =================================================================== diff -u Binary files differ Index: Core/Plugins/src/Core.Plugins.DotSpatial/Forms/MapDataView.cs =================================================================== diff -u -r71ce26f5bde53bd1173fbe6ea09510e30a6a1166 -r04c70d10f22ba007f8210813d3d02697e42f8a5d --- Core/Plugins/src/Core.Plugins.DotSpatial/Forms/MapDataView.cs (.../MapDataView.cs) (revision 71ce26f5bde53bd1173fbe6ea09510e30a6a1166) +++ Core/Plugins/src/Core.Plugins.DotSpatial/Forms/MapDataView.cs (.../MapDataView.cs) (revision 04c70d10f22ba007f8210813d3d02697e42f8a5d) @@ -25,9 +25,6 @@ Controls.Add(baseMap); } - /// - /// The that will be set on the . - /// public object Data { get Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Core.Plugins.DotSpatial.Test.csproj =================================================================== diff -u -ra76df67ff1bcdceeb8297286983072a14dd1229e -r04c70d10f22ba007f8210813d3d02697e42f8a5d --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Core.Plugins.DotSpatial.Test.csproj (.../Core.Plugins.DotSpatial.Test.csproj) (revision a76df67ff1bcdceeb8297286983072a14dd1229e) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Core.Plugins.DotSpatial.Test.csproj (.../Core.Plugins.DotSpatial.Test.csproj) (revision 04c70d10f22ba007f8210813d3d02697e42f8a5d) @@ -121,6 +121,11 @@ + + True + True + TestResources.resx + @@ -137,6 +142,10 @@ {F49BD8B2-332A-4C91-A196-8CCE0A2C7D98} Core.Common.Utils + + {D749EE4C-CE50-4C17-BF01-9A953028C126} + Core.Common.TestUtil + {AA47E858-A2A7-470E-8B2D-C76AE8ED9CCD} Core.Components.DotSpatial @@ -148,7 +157,36 @@ + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + ResXFileCodeGenerator + TestResources.Designer.cs + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + ..\Resources\DR10_dijkvakgebieden.dbf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\DR10_dijkvakgebieden.prj;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\DR10_dijkvakgebieden.sbn;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\DR10_dijkvakgebieden.sbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\DR10_dijkvakgebieden.shp;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\DR10_dijkvakgebieden.shx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\DR10_dijkvakgebieden.shp.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + \ No newline at end of file Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Resources/DR10_dijkvakgebieden.dbf =================================================================== diff -u Binary files differ Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Resources/DR10_dijkvakgebieden.prj =================================================================== diff -u --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Resources/DR10_dijkvakgebieden.prj (revision 0) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Resources/DR10_dijkvakgebieden.prj (revision 04c70d10f22ba007f8210813d3d02697e42f8a5d) @@ -0,0 +1 @@ +PROJCS["RD_New",GEOGCS["GCS_Amersfoort",DATUM["D_Amersfoort",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Double_Stereographic"],PARAMETER["False_Easting",155000.0],PARAMETER["False_Northing",463000.0],PARAMETER["Central_Meridian",5.38763888888889],PARAMETER["Scale_Factor",0.9999079],PARAMETER["Latitude_Of_Origin",52.15616055555555],UNIT["Meter",1.0]] \ No newline at end of file Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Resources/DR10_dijkvakgebieden.sbn =================================================================== diff -u Binary files differ Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Resources/DR10_dijkvakgebieden.sbx =================================================================== diff -u Binary files differ Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Resources/DR10_dijkvakgebieden.shp =================================================================== diff -u Binary files differ Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Resources/DR10_dijkvakgebieden.shp.xml =================================================================== diff -u --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Resources/DR10_dijkvakgebieden.shp.xml (revision 0) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Resources/DR10_dijkvakgebieden.shp.xml (revision 04c70d10f22ba007f8210813d3d02697e42f8a5d) @@ -0,0 +1,2 @@ + +20120830150142001.0FALSEDR10_dijkvakgebieden0020.000file://\\D00347\D$\Ringtoets dataset WGS DR10 Piping\dataset piping\DR10_dijkvakgebieden.shpLocal Area NetworkProjectedGCS_AmersfoortLinear Unit: Meter (1.000000)RD_New<ProjectedCoordinateSystem xsi:type='typens:ProjectedCoordinateSystem' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:xs='http://www.w3.org/2001/XMLSchema' xmlns:typens='http://www.esri.com/schemas/ArcGIS/10.0'><WKT>PROJCS[&quot;RD_New&quot;,GEOGCS[&quot;GCS_Amersfoort&quot;,DATUM[&quot;D_Amersfoort&quot;,SPHEROID[&quot;Bessel_1841&quot;,6377397.155,299.1528128]],PRIMEM[&quot;Greenwich&quot;,0.0],UNIT[&quot;Degree&quot;,0.0174532925199433]],PROJECTION[&quot;Double_Stereographic&quot;],PARAMETER[&quot;False_Easting&quot;,155000.0],PARAMETER[&quot;False_Northing&quot;,463000.0],PARAMETER[&quot;Central_Meridian&quot;,5.38763888888889],PARAMETER[&quot;Scale_Factor&quot;,0.9999079],PARAMETER[&quot;Latitude_Of_Origin&quot;,52.15616055555555],UNIT[&quot;Meter&quot;,1.0],AUTHORITY[&quot;EPSG&quot;,28992]]</WKT><XOrigin>-30515500</XOrigin><YOrigin>-30279500</YOrigin><XYScale>146716411.36275291</XYScale><ZOrigin>-100000</ZOrigin><ZScale>10000</ZScale><MOrigin>-100000</MOrigin><MScale>10000</MScale><XYTolerance>0.001</XYTolerance><ZTolerance>0.001</ZTolerance><MTolerance>0.001</MTolerance><HighPrecision>true</HighPrecision><WKID>28992</WKID></ProjectedCoordinateSystem>Buffer DR10_vakindeling_piping "D:\Ringtoets dataset WGS DR10 Piping\dataset piping\DR10_dijkvakgebieden.shp" "1000 Meters" RIGHT FLAT NONE #20120830150142002012083015014200Microsoft Windows XP Version 5.1 (Build 2600) Service Pack 3; ESRI ArcGIS 10.0.3.3600DR10_dijkvakgebiedenShapefile0.000datasetEPSG7.4.10SimpleFALSE0FALSEFALSEDR10_dijkvakgebiedenFeature Class0FIDFIDOID400Internal feature number.ESRISequential unique whole numbers that are automatically generated.ShapeShapeGeometry000Feature geometry.ESRICoordinates defining the features.FID_1FID_1Integer990OBJECTIDOBJECTIDDouble10100FID_2FID_2Integer990IdIdInteger660dwarsprofidwarsprofiString1000PROFIELNAAPROFIELNAAString1700SEGMENT_IDSEGMENT_IDString2600SOILGEOMETSOILGEOMETString1900PROBABILITPROBABILITInteger990CALCULATIOCALCULATIOString1400BUFF_DISTBUFF_DISTDouble190020120830 Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Resources/DR10_dijkvakgebieden.shx =================================================================== diff -u Binary files differ