Index: Core/Components/src/Core.Components.BruTile.IO/AsyncTileFetcher.cs =================================================================== diff -u -raaf8aa8ae095477627b0fb382fb308e08b37c8f6 -r18075f81e32764b8ee27ee97f30f7579d13aeb81 --- Core/Components/src/Core.Components.BruTile.IO/AsyncTileFetcher.cs (.../AsyncTileFetcher.cs) (revision aaf8aa8ae095477627b0fb382fb308e08b37c8f6) +++ Core/Components/src/Core.Components.BruTile.IO/AsyncTileFetcher.cs (.../AsyncTileFetcher.cs) (revision 18075f81e32764b8ee27ee97f30f7579d13aeb81) @@ -41,13 +41,15 @@ /// public class AsyncTileFetcher : ITileFetcher { + private static readonly object syncLock = new object(); + private readonly ConcurrentDictionary activeTileRequests = new ConcurrentDictionary(); private readonly ConcurrentDictionary openTileRequests = new ConcurrentDictionary(); + private ITileProvider provider; private MemoryCache volatileCache; private ITileCache persistentCache; private SmartThreadPool threadPool; - private static object syncLock = new object(); public event EventHandler TileReceived; @@ -303,7 +305,7 @@ lock (syncLock) { TileReceived?.Invoke(this, tileReceivedEventArgs); - + if (IsReady()) { OnQueueEmpty(EventArgs.Empty); Index: Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs =================================================================== diff -u -r96ead5fb68a31e1491693e187045d11b9569e2e6 -r18075f81e32764b8ee27ee97f30f7579d13aeb81 --- Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs (.../MapControl.cs) (revision 96ead5fb68a31e1491693e187045d11b9569e2e6) +++ Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs (.../MapControl.cs) (revision 18075f81e32764b8ee27ee97f30f7579d13aeb81) @@ -36,7 +36,6 @@ using DotSpatial.Projections; using GeoAPI.Geometries; using log4net; -using ILog = log4net.ILog; using Timer = System.Timers.Timer; namespace Core.Components.DotSpatial.Forms Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs =================================================================== diff -u -r9d23d07296ae1c4a7ebc5f29834525af5c0e5e53 -r18075f81e32764b8ee27ee97f30f7579d13aeb81 --- Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs (.../MapLineDataConverter.cs) (revision 9d23d07296ae1c4a7ebc5f29834525af5c0e5e53) +++ Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs (.../MapLineDataConverter.cs) (revision 18075f81e32764b8ee27ee97f30f7579d13aeb81) @@ -25,13 +25,13 @@ using Core.Common.Base.Geometry; using Core.Components.Gis.Data; using Core.Components.Gis.Features; +using Core.Components.Gis.Style; using Core.Components.Gis.Theme; using DotSpatial.Controls; using DotSpatial.Data; using DotSpatial.Symbology; using GeoAPI.Geometries; using NetTopologySuite.Geometries; -using LineStyle = Core.Components.Gis.Style.LineStyle; namespace Core.Components.DotSpatial.Converter { Index: Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/BruTileLayer.cs =================================================================== diff -u -r96ead5fb68a31e1491693e187045d11b9569e2e6 -r18075f81e32764b8ee27ee97f30f7579d13aeb81 --- Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/BruTileLayer.cs (.../BruTileLayer.cs) (revision 96ead5fb68a31e1491693e187045d11b9569e2e6) +++ Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/BruTileLayer.cs (.../BruTileLayer.cs) (revision 18075f81e32764b8ee27ee97f30f7579d13aeb81) @@ -70,7 +70,6 @@ using BruTileExtent = BruTile.Extent; using DotSpatialExtent = DotSpatial.Data.Extent; using DotSpatialLayer = DotSpatial.Symbology.Layer; -using Point = System.Drawing.Point; using WorldFile = Core.Components.DotSpatial.Projections.WorldFile; namespace Core.Components.DotSpatial.Layer.BruTile Index: Core/Components/src/Core.Components.DotSpatial/MapFunctions/MapFunctionSelectionZoom.cs =================================================================== diff -u -r96ead5fb68a31e1491693e187045d11b9569e2e6 -r18075f81e32764b8ee27ee97f30f7579d13aeb81 --- Core/Components/src/Core.Components.DotSpatial/MapFunctions/MapFunctionSelectionZoom.cs (.../MapFunctionSelectionZoom.cs) (revision 96ead5fb68a31e1491693e187045d11b9569e2e6) +++ Core/Components/src/Core.Components.DotSpatial/MapFunctions/MapFunctionSelectionZoom.cs (.../MapFunctionSelectionZoom.cs) (revision 18075f81e32764b8ee27ee97f30f7579d13aeb81) @@ -27,7 +27,6 @@ using DotSpatial.Data; using DotSpatial.Symbology; using GeoAPI.Geometries; -using Point = System.Drawing.Point; namespace Core.Components.DotSpatial.MapFunctions { @@ -139,7 +138,7 @@ else if (geoStartPoint != null) { Envelope env = new Envelope(geoStartPoint.X, e.GeographicLocation.X, - geoStartPoint.Y, e.GeographicLocation.Y); + geoStartPoint.Y, e.GeographicLocation.Y); if (Math.Abs(e.X - startPoint.X) > 1 && Math.Abs(e.Y - startPoint.Y) > 1) { e.Map.ViewExtents = env.ToExtent(); Index: Core/Components/src/Core.Components.DotSpatial/Projections/TileReprojector.cs =================================================================== diff -u -r96ead5fb68a31e1491693e187045d11b9569e2e6 -r18075f81e32764b8ee27ee97f30f7579d13aeb81 --- Core/Components/src/Core.Components.DotSpatial/Projections/TileReprojector.cs (.../TileReprojector.cs) (revision 96ead5fb68a31e1491693e187045d11b9569e2e6) +++ Core/Components/src/Core.Components.DotSpatial/Projections/TileReprojector.cs (.../TileReprojector.cs) (revision 18075f81e32764b8ee27ee97f30f7579d13aeb81) @@ -29,7 +29,6 @@ using DotSpatial.Projections; using GeoAPI.Geometries; using DotSpatialReproject = DotSpatial.Projections.Reproject; -using Point = System.Drawing.Point; namespace Core.Components.DotSpatial.Projections { Index: Core/Components/src/Core.Components.Gis.IO/Readers/PolylineShapeFileReader.cs =================================================================== diff -u -r62d14ea31186ae19a344c4562ddf0e048f49d44a -r18075f81e32764b8ee27ee97f30f7579d13aeb81 --- Core/Components/src/Core.Components.Gis.IO/Readers/PolylineShapeFileReader.cs (.../PolylineShapeFileReader.cs) (revision 62d14ea31186ae19a344c4562ddf0e048f49d44a) +++ Core/Components/src/Core.Components.Gis.IO/Readers/PolylineShapeFileReader.cs (.../PolylineShapeFileReader.cs) (revision 18075f81e32764b8ee27ee97f30f7579d13aeb81) @@ -30,10 +30,9 @@ using Core.Components.Gis.Features; using Core.Components.Gis.Geometries; using DotSpatial.Data; -using Coordinate = GeoAPI.Geometries.Coordinate; +using GeoAPI.Geometries; using CoreCommonUtilResources = Core.Common.Util.Properties.Resources; using GisIOResources = Core.Components.Gis.IO.Properties.Resources; -using IGeometry = GeoAPI.Geometries.IGeometry; namespace Core.Components.Gis.IO.Readers { Index: Core/Components/src/Core.Components.Gis.IO/Writers/PointShapeFileWriter.cs =================================================================== diff -u -r96ead5fb68a31e1491693e187045d11b9569e2e6 -r18075f81e32764b8ee27ee97f30f7579d13aeb81 --- Core/Components/src/Core.Components.Gis.IO/Writers/PointShapeFileWriter.cs (.../PointShapeFileWriter.cs) (revision 96ead5fb68a31e1491693e187045d11b9569e2e6) +++ Core/Components/src/Core.Components.Gis.IO/Writers/PointShapeFileWriter.cs (.../PointShapeFileWriter.cs) (revision 18075f81e32764b8ee27ee97f30f7579d13aeb81) @@ -29,7 +29,6 @@ using DotSpatial.Data; using GeoAPI.Geometries; using NetTopologySuite.Geometries; -using FeatureType = DotSpatial.Data.FeatureType; namespace Core.Components.Gis.IO.Writers { Index: Core/Components/src/Core.Components.Gis.IO/Writers/PolylineShapeFileWriter.cs =================================================================== diff -u -r96ead5fb68a31e1491693e187045d11b9569e2e6 -r18075f81e32764b8ee27ee97f30f7579d13aeb81 --- Core/Components/src/Core.Components.Gis.IO/Writers/PolylineShapeFileWriter.cs (.../PolylineShapeFileWriter.cs) (revision 96ead5fb68a31e1491693e187045d11b9569e2e6) +++ Core/Components/src/Core.Components.Gis.IO/Writers/PolylineShapeFileWriter.cs (.../PolylineShapeFileWriter.cs) (revision 18075f81e32764b8ee27ee97f30f7579d13aeb81) @@ -29,7 +29,6 @@ using DotSpatial.Data; using GeoAPI.Geometries; using NetTopologySuite.Geometries; -using FeatureType = DotSpatial.Data.FeatureType; namespace Core.Components.Gis.IO.Writers { Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs =================================================================== diff -u -r1ffb9e00a7251c473abbcfc3be8de1a396cf39f1 -r18075f81e32764b8ee27ee97f30f7579d13aeb81 --- Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs (.../MapControlTest.cs) (revision 1ffb9e00a7251c473abbcfc3be8de1a396cf39f1) +++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs (.../MapControlTest.cs) (revision 18075f81e32764b8ee27ee97f30f7579d13aeb81) @@ -1038,9 +1038,9 @@ Assert.IsInstanceOf(mapView.Layers[0]); Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection)); Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection)); - Assert.AreEqual(523402.42866793618, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].X,1e-6, + Assert.AreEqual(523402.42866793618, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].X, 1e-6, "Coordinate does not match. (Ball park expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000)."); - Assert.AreEqual(5313545.4037142638, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].Y,1e-6, + Assert.AreEqual(5313545.4037142638, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].Y, 1e-6, "Coordinate does not match (Estimate of expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000)."); AssertReprojectedTo28992TestExtents(mapView); } @@ -1090,9 +1090,9 @@ var pointFeatureLayer = (FeatureLayer) layersBeforeUpdate[1]; Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection)); Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection)); - Assert.AreEqual(523402.42866793618, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].X,1e-6, + Assert.AreEqual(523402.42866793618, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].X, 1e-6, "Coordinate does not match. (Ball park expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000)."); - Assert.AreEqual(5313545.4037142638, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].Y,1e-6, + Assert.AreEqual(5313545.4037142638, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].Y, 1e-6, "Coordinate does not match (Estimate of expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000)."); // When @@ -1158,9 +1158,9 @@ Assert.IsInstanceOf(mapView.Layers[0]); pointFeatureLayer = (FeatureLayer) mapView.Layers[1]; Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection)); - Assert.AreEqual(523402.42866793618, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].X,1e-6, + Assert.AreEqual(523402.42866793618, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].X, 1e-6, "Coordinate does not match. (Ball park expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000)."); - Assert.AreEqual(5313545.4037142638, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].Y,1e-6, + Assert.AreEqual(5313545.4037142638, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].Y, 1e-6, "Coordinate does not match (Estimate of expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000)."); AssertReprojectedTo28992TestExtents(mapView); @@ -1274,9 +1274,9 @@ Assert.IsInstanceOf(mapView.Layers[0]); pointFeatureLayer = (FeatureLayer) mapView.Layers[1]; Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection)); - Assert.AreEqual(523402.42866793618, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].X,1e-6, + Assert.AreEqual(523402.42866793618, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].X, 1e-6, "Coordinate does not match. (Ball park expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000)."); - Assert.AreEqual(5313545.4037142638, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].Y,1e-6, + Assert.AreEqual(5313545.4037142638, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].Y, 1e-6, "Coordinate does not match (Estimate of expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000)."); AssertReprojectedTo28992TestExtents(mapView); @@ -1322,9 +1322,9 @@ Assert.IsInstanceOf(mapView.Layers[0]); var pointFeatureLayer = (FeatureLayer) mapView.Layers[1]; Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection)); - Assert.AreEqual(523402.42866793618, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].X,1e-6, + Assert.AreEqual(523402.42866793618, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].X, 1e-6, "Coordinate does not match. (Ball park expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000)."); - Assert.AreEqual(5313545.4037142638, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].Y,1e-6, + Assert.AreEqual(5313545.4037142638, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].Y, 1e-6, "Coordinate does not match (Estimate of expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000)."); // When @@ -1371,7 +1371,7 @@ List featureLayers = mapView.Layers.Skip(1).Cast().ToList(); Assert.AreEqual("Points", featureLayers[0].Name); Assert.IsTrue(mapView.Projection.Equals(featureLayers[0].Projection)); - Assert.AreEqual(523402.42866793618, featureLayers[0].FeatureSet.Features[0].Geometry.Coordinates[0].X,1e-6, + Assert.AreEqual(523402.42866793618, featureLayers[0].FeatureSet.Features[0].Geometry.Coordinates[0].X, 1e-6, "Coordinate does not match. (Ball park expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000)."); Assert.AreEqual(5313545.4037142638, featureLayers[0].FeatureSet.Features[0].Geometry.Coordinates[0].Y, 1e-5, "Coordinate does not match (Estimate of expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000)."); @@ -1539,9 +1539,9 @@ IMapLayer[] layersBeforeUpdate = mapView.Layers.ToArray(); var pointFeatureLayer = (FeatureLayer) layersBeforeUpdate[1]; Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection)); - Assert.AreEqual(523402.42866793618, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].X,1e-6, + Assert.AreEqual(523402.42866793618, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].X, 1e-6, "Coordinate does not match. (Ball park expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000)."); - Assert.AreEqual(5313545.4037142638, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].Y,1e-6, + Assert.AreEqual(5313545.4037142638, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].Y, 1e-6, "Coordinate does not match (Estimate of expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=1.1000000&y=2.2000000)."); Action callAction = () => @@ -1567,9 +1567,9 @@ // Then CollectionAssert.AreEqual(layersBeforeUpdate, mapView.Layers); Assert.IsTrue(mapView.Projection.Equals(pointFeatureLayer.Projection)); - Assert.AreEqual(535405.97207404568, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].X,1e-6, + Assert.AreEqual(535405.97207404568, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].X, 1e-6, "Coordinate does not match. (Ball park expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=12345.6789000&y=9876.5432100)."); - Assert.AreEqual(5323789.7111355662, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].Y,1e-6, + Assert.AreEqual(5323789.7111355662, pointFeatureLayer.FeatureSet.Features[0].Geometry.Coordinates[0].Y, 1e-6, "Coordinate does not match (Estimate of expected value can be calculated from https://epsg.io/transform#s_srs=28992&t_srs=25831&x=12345.6789000&y=9876.5432100)."); }; Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs =================================================================== diff -u -r96ead5fb68a31e1491693e187045d11b9569e2e6 -r18075f81e32764b8ee27ee97f30f7579d13aeb81 --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs (.../MapLineDataConverterTest.cs) (revision 96ead5fb68a31e1491693e187045d11b9569e2e6) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs (.../MapLineDataConverterTest.cs) (revision 18075f81e32764b8ee27ee97f30f7579d13aeb81) @@ -39,7 +39,6 @@ using NetTopologySuite.Geometries; using NUnit.Framework; using Rhino.Mocks; -using LineStyle = Core.Components.Gis.Style.LineStyle; namespace Core.Components.DotSpatial.Test.Converter { Index: Core/Components/test/Core.Components.DotSpatial.Test/Layer/BruTile/BruTileLayerTest.cs =================================================================== diff -u -re6f0c8c4fe3bbf7e36a589c6c7ca5bf53abf1f18 -r18075f81e32764b8ee27ee97f30f7579d13aeb81 --- Core/Components/test/Core.Components.DotSpatial.Test/Layer/BruTile/BruTileLayerTest.cs (.../BruTileLayerTest.cs) (revision e6f0c8c4fe3bbf7e36a589c6c7ca5bf53abf1f18) +++ Core/Components/test/Core.Components.DotSpatial.Test/Layer/BruTile/BruTileLayerTest.cs (.../BruTileLayerTest.cs) (revision 18075f81e32764b8ee27ee97f30f7579d13aeb81) @@ -64,7 +64,7 @@ false, 0f) .SetName("DrawRegions for 2 consecutive tiles at level 4."); - + yield return new TestCaseData(new TileInfosTestConfig(new[] { new TileInfoConfig(new Extent(99949.76, 463000.08, 155000, 518050.32), @@ -109,7 +109,7 @@ true, 0f) .SetName("DrawRegions for 2 loose tiles at level 9 in WGS84 without specifying region."); - + yield return new TestCaseData(new TileInfosTestConfig(new[] { new TileInfoConfig(new Extent(113712.32, 509448.72, 115432.64, 511169.04), @@ -124,7 +124,7 @@ false, 0f) .SetName("DrawRegions at level 9 for region outside viewport."); - + yield return new TestCaseData(new TileInfosTestConfig(new[] { new TileInfoConfig(new Extent(99949.76, 463000.08, 155000, 518050.32), @@ -139,7 +139,7 @@ false, 1f) .SetName("DrawRegions for 2 consecutive tiles at level 4 for fully transparent layer."); - + yield return new TestCaseData(new TileInfosTestConfig(new[] { new TileInfoConfig(new Extent(99949.76, 463000.08, 155000, 518050.32), @@ -154,7 +154,7 @@ false, 0.5f) .SetName("DrawRegions for 2 consecutive tiles at level 4 for 50% transparent layer."); - + yield return new TestCaseData(new TileInfosTestConfig(new[] { new TileInfoConfig(new Extent(99949.76, 463000.08, 155000, 518050.32), Index: Core/Components/test/Core.Components.DotSpatial.Test/Layer/MapLineDataLayerTest.cs =================================================================== diff -u -rdf4b8185584046d57926f8be9b6e8fc86cda1711 -r18075f81e32764b8ee27ee97f30f7579d13aeb81 --- Core/Components/test/Core.Components.DotSpatial.Test/Layer/MapLineDataLayerTest.cs (.../MapLineDataLayerTest.cs) (revision df4b8185584046d57926f8be9b6e8fc86cda1711) +++ Core/Components/test/Core.Components.DotSpatial.Test/Layer/MapLineDataLayerTest.cs (.../MapLineDataLayerTest.cs) (revision 18075f81e32764b8ee27ee97f30f7579d13aeb81) @@ -34,7 +34,6 @@ using DotSpatial.Projections; using DotSpatial.Symbology; using NUnit.Framework; -using LineStyle = Core.Components.Gis.Style.LineStyle; namespace Core.Components.DotSpatial.Test.Layer { Index: Core/Components/test/Core.Components.DotSpatial.Test/MapFunctions/MapFunctionSelectionZoomTest.cs =================================================================== diff -u -r96ead5fb68a31e1491693e187045d11b9569e2e6 -r18075f81e32764b8ee27ee97f30f7579d13aeb81 --- Core/Components/test/Core.Components.DotSpatial.Test/MapFunctions/MapFunctionSelectionZoomTest.cs (.../MapFunctionSelectionZoomTest.cs) (revision 96ead5fb68a31e1491693e187045d11b9569e2e6) +++ Core/Components/test/Core.Components.DotSpatial.Test/MapFunctions/MapFunctionSelectionZoomTest.cs (.../MapFunctionSelectionZoomTest.cs) (revision 18075f81e32764b8ee27ee97f30f7579d13aeb81) @@ -30,7 +30,6 @@ using GeoAPI.Geometries; using NUnit.Framework; using Rhino.Mocks; -using Point = System.Drawing.Point; namespace Core.Components.DotSpatial.Test.MapFunctions { Index: Core/Components/test/Core.Components.DotSpatial.Test/Projections/WorldFileTest.cs =================================================================== diff -u -r96ead5fb68a31e1491693e187045d11b9569e2e6 -r18075f81e32764b8ee27ee97f30f7579d13aeb81 --- Core/Components/test/Core.Components.DotSpatial.Test/Projections/WorldFileTest.cs (.../WorldFileTest.cs) (revision 96ead5fb68a31e1491693e187045d11b9569e2e6) +++ Core/Components/test/Core.Components.DotSpatial.Test/Projections/WorldFileTest.cs (.../WorldFileTest.cs) (revision 18075f81e32764b8ee27ee97f30f7579d13aeb81) @@ -20,11 +20,11 @@ // All rights reserved. using System; +using System.Drawing; using Core.Common.TestUtil; using Core.Components.DotSpatial.Projections; using GeoAPI.Geometries; using NUnit.Framework; -using Point = System.Drawing.Point; namespace Core.Components.DotSpatial.Test.Projections {